diff options
| author |  mtklein <mtklein@chromium.org> | 2015-09-09 07:35:42 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-09 07:35:42 -0700 |
| commit | fe81e2d274a4948491ed6d4bbce1c96ea0c8f9cd (patch) | |
| tree | 2f2cfd77160c3c40b48e7de0d7bc072cbecb39a1 /experimental | |
| parent | d9b8d7ac1fb4628f3411253c0fc6cd37e4ff0487 (diff) | |
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
Review URL: https://codereview.chromium.org/1329853005
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/SimpleCocoaApp/SimpleApp.mm | 15 | ||||
| -rw-r--r-- | experimental/SimpleiOSApp/SimpleApp.mm | 10 | ||||
| -rw-r--r-- | experimental/SkV8Example/SkV8Example.cpp | 1 |
3 files changed, 15 insertions, 11 deletions
diff --git a/experimental/SimpleCocoaApp/SimpleApp.mm b/experimental/SimpleCocoaApp/SimpleApp.mm index 6f9958f7fc..95684c1683 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,7 +279,6 @@ void application_init() { } void application_term() { - SkGraphics::Term(); SkEvent::Term(); } diff --git a/experimental/SimpleiOSApp/SimpleApp.mm b/experimental/SimpleiOSApp/SimpleApp.mm index 040472cfe3..123449f4e6 100644 --- a/experimental/SimpleiOSApp/SimpleApp.mm +++ b/experimental/SimpleiOSApp/SimpleApp.mm @@ -1,3 +1,10 @@ +/* + * 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" @@ -26,7 +33,7 @@ protected: canvas->drawRect(r, p); } private: - typedef SkView INHERITED; + typedef SkView INHERITED; }; void application_init() { @@ -35,7 +42,6 @@ void application_init() { } void application_term() { - SkGraphics::Term(); SkEvent::Term(); } diff --git a/experimental/SkV8Example/SkV8Example.cpp b/experimental/SkV8Example/SkV8Example.cpp index d537fd4d38..03a8826c88 100644 --- a/experimental/SkV8Example/SkV8Example.cpp +++ b/experimental/SkV8Example/SkV8Example.cpp @@ -40,7 +40,6 @@ void application_init() { void application_term() { SkEvent::Term(); - SkGraphics::Term(); } SkV8ExampleWindow::SkV8ExampleWindow(void* hwnd, JsContext* context) |