Bug 777614 - Update skia-npapi to work with the new Skia rebase. r=nrc
authorGeorge Wright <gw@gwright.org.uk>
Thu, 23 Aug 2012 15:22:34 -0400
changeset 111007 dfa233c65e5dd8bf59930f685e1b19f0557424d9
parent 111006 a05f2097764cffbb564540df58bd681e74aa769c
child 111008 3ddbacc47f234a5e665d8380aaadf0b8cbf35fbc
push idunknown
push userunknown
push dateunknown
reviewersnrc
bugs777614
milestone18.0a1
Bug 777614 - Update skia-npapi to work with the new Skia rebase. r=nrc
other-licenses/skia-npapi/ANPCanvas.cpp
--- a/other-licenses/skia-npapi/ANPCanvas.cpp
+++ b/other-licenses/skia-npapi/ANPCanvas.cpp
@@ -74,18 +74,17 @@ static void anp_concat(ANPCanvas* canvas
 static void anp_getTotalMatrix(ANPCanvas* canvas, ANPMatrix* matrix) {
     const SkMatrix& src = canvas->skcanvas->getTotalMatrix();
     *matrix = *reinterpret_cast<const ANPMatrix*>(&src);
 }
 
 static bool anp_getLocalClipBounds(ANPCanvas* canvas, ANPRectF* r,
                                    bool antialias) {
     SkRect bounds;
-    if (canvas->skcanvas->getClipBounds(&bounds,
-                antialias ? SkCanvas::kAA_EdgeType : SkCanvas::kBW_EdgeType)) {
+    if (canvas->skcanvas->getClipBounds(&bounds)) {
         SkANP::SetRect(r, bounds);
         return true;
     }
     return false;
 }
 
 static bool anp_getDeviceClipBounds(ANPCanvas* canvas, ANPRectI* r) {
     const SkRegion& clip = canvas->skcanvas->getTotalClip();