Backed out changeset a874592cff0a (bug 1340627)

other-licenses/skia-npapi/ANPCanvas.cpp

@@ -80,7 +80,7 @@ static void anp_getTotalMatrix(ANPCanvas* canvas, ANPMatrix* matrix) {
 static bool anp_getLocalClipBounds(ANPCanvas* canvas, ANPRectF* r,
                                    bool antialias) {
     SkRect bounds;
-    if (canvas->skcanvas->getLocalClipBounds(&bounds)) {
+    if (canvas->skcanvas->getClipBounds(&bounds)) {
         SkANP::SetRect(r, bounds);
         return true;
     }
@@ -89,7 +89,7 @@ static bool anp_getLocalClipBounds(ANPCanvas* canvas, ANPRectF* r,
 
 static bool anp_getDeviceClipBounds(ANPCanvas* canvas, ANPRectI* r) {
     SkIRect bounds;
-    if (canvas->skcanvas->getDeviceClipBounds(&bounds)) {
+    if (canvas->skcanvas->getClipDeviceBounds(&bounds)) {
         SkANP::SetRect(r, bounds);
         return true;
     }

other-licenses/skia-npapi/SkANP.h

@@ -56,10 +56,11 @@ struct ANPCanvas {
     // redirect all drawing to the specific SkCanvas
     explicit ANPCanvas(SkCanvas* other) {
         skcanvas = other;
+        skcanvas->ref();
     }
 
     ~ANPCanvas() {
-        delete skcanvas;
+        skcanvas->unref();
     }
 };