Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / utils / debugger / SkDebugCanvas.h

diff --git a/src/third_party/skia/src/utils/debugger/SkDebugCanvas.h b/src/third_party/skia/src/utils/debugger/SkDebugCanvas.h
index f15b397..e774121 100644 (file)
--- a/src/third_party/skia/src/utils/debugger/SkDebugCanvas.h
+++ b/src/third_party/skia/src/utils/debugger/SkDebugCanvas.h
@@ -231,7 +231,7 @@ public:
     }
 
 protected:
-    virtual void willSave(SaveFlags) SK_OVERRIDE;
+    virtual void willSave() SK_OVERRIDE;
     virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
     virtual void willRestore() SK_OVERRIDE;
 
@@ -255,7 +255,7 @@ protected:
     virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
     virtual void onClipRegion(const SkRegion& region, SkRegion::Op) SK_OVERRIDE;
 
-    virtual void onDrawPicture(const SkPicture* picture) SK_OVERRIDE;
+    virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE;
 
     void markActiveCommands(int index);
 
@@ -314,9 +314,11 @@ private:
     void applyUserTransform(SkCanvas* canvas);
 
     size_t getOpID() const {
+#if 0
         if (NULL != fPicture) {
             return fPicture->EXPERIMENTAL_curOpID();
         }
+#endif
         return 0;
     }