| Index: experimental/SimpleCocoaApp/SimpleApp.mm
|
| diff --git a/experimental/SimpleCocoaApp/SimpleApp.mm b/experimental/SimpleCocoaApp/SimpleApp.mm
|
| index 95684c1683cb252ab28220226b05e32a75dbc2be..6f9958f7fcc37cd9bdfe48dd5d53fb42550b7056 100644
|
| --- a/experimental/SimpleCocoaApp/SimpleApp.mm
|
| +++ b/experimental/SimpleCocoaApp/SimpleApp.mm
|
| @@ -69,7 +69,7 @@
|
| // 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 @@
|
| 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 @@
|
|
|
| }
|
| private:
|
| - typedef SkView INHERITED;
|
| + typedef SkView INHERITED;
|
| };
|
|
|
| void application_init();
|
| @@ -194,12 +194,12 @@
|
| 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 @@
|
| 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_term() {
|
| + SkGraphics::Term();
|
| SkEvent::Term();
|
| }
|
|
|
|
|