diff options
| author |  mtklein <mtklein@google.com> | 2015-09-09 07:22:09 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-09 07:22:09 -0700 |
| commit | d9b8d7ac1fb4628f3411253c0fc6cd37e4ff0487 (patch) | |
| tree | 0fb1483f5d9a875bd6349aa1ea8cf3e09cefa132 /experimental/SimpleiOSApp | |
| parent | 2ac6793efc9b33f6104f9c39810bee5714bdc208 (diff) | |
Revert of Make SkGraphics::Term a no-op, stop calling it. (patchset #2 id:20001 of https://codereview.chromium.org/1329853005/ )
Reason for revert:
SK_ATTR_DEPRECATED is meaningful to Android. Don't use it.
Original issue's description:
> Make SkGraphics::Term a no-op, stop calling it.
>
> I'd remove it entirely but Android is calling it explicitly.
>
> BUG=skia:4259
>
> Committed: https://skia.googlesource.com/skia/+/925979f733fe8e70d84627147dee04d030423349
TBR=reed@google.com,scroggo@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4259
Review URL: https://codereview.chromium.org/1314483006
Diffstat (limited to 'experimental/SimpleiOSApp')
| -rw-r--r-- | experimental/SimpleiOSApp/SimpleApp.mm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/experimental/SimpleiOSApp/SimpleApp.mm b/experimental/SimpleiOSApp/SimpleApp.mm index 123449f4e6..040472cfe3 100644 --- a/experimental/SimpleiOSApp/SimpleApp.mm +++ b/experimental/SimpleiOSApp/SimpleApp.mm @@ -1,10 +1,3 @@ -/* - * Copyright 2015 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - #include "SkApplication.h" #import "SkCanvas.h" #import "SkPaint.h" @@ -33,7 +26,7 @@ protected: canvas->drawRect(r, p); } private: - typedef SkView INHERITED; + typedef SkView INHERITED; }; void application_init() { @@ -42,6 +35,7 @@ void application_init() { } void application_term() { + SkGraphics::Term(); SkEvent::Term(); } |