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/SimpleCocoaApp | |
| 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/SimpleCocoaApp')
| -rw-r--r-- | experimental/SimpleCocoaApp/SimpleApp.mm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/experimental/SimpleCocoaApp/SimpleApp.mm b/experimental/SimpleCocoaApp/SimpleApp.mm index 95684c1683..6f9958f7fc 100644 --- a/experimental/SimpleCocoaApp/SimpleApp.mm +++ b/experimental/SimpleCocoaApp/SimpleApp.mm @@ -69,7 +69,7 @@ protected: // SkRect r = {50, 50, 80, 80}; p.setColor(0xAA11EEAA); // canvas->drawRect(r, p); - + SkRect result; SkPath path; path.moveTo(0, 0); @@ -77,7 +77,7 @@ protected: path.lineTo(1, 8); path.lineTo(0, 9); SkASSERT(path.hasRectangularInterior(&result)); - + path.reset(); path.addRect(10, 10, 100, 100, SkPath::kCW_Direction); path.addRect(20, 20, 50, 50, SkPath::kCW_Direction); @@ -94,7 +94,7 @@ protected: } private: - typedef SkView INHERITED; + typedef SkView INHERITED; }; void application_init(); @@ -194,12 +194,12 @@ class PathCanvas : public SkCanvas { path.hasRectangularInterior(©); SkDebugf("</div>\n\n"); } - + virtual void drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], SkScalar constY, const SkPaint& paint) { } - + public: void divName(const SkString& str, bool only) { filename = str; @@ -211,14 +211,14 @@ public: count = 0; nameonly = only; } - + void init() { pointsMin = verbsMin = SK_MaxS32; pointsMax = verbsMax = SK_MinS32; rectPointsMin = rectVerbsMin = SK_MaxS32; rectPointsMax = rectVerbsMax = SK_MinS32; } - + SkString filename; int count; bool nameonly; @@ -279,6 +279,7 @@ void application_init() { } void application_term() { + SkGraphics::Term(); SkEvent::Term(); } |