Build a clipping tree in RecordingContext

Change-Id: I967c8e2ea209c848e6a09b44390ab2228b213ca5

1 files changed, 9 insertions, 8 deletions

diff --git a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h
index 1cce5a6..4a202f9 100644
--- a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h
+++ b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h
@@ -33,6 +33,7 @@
 namespace WebCore {
 namespace GraphicsOperation {
 class Operation;
+class Save;
 }
 
 class PlatformGraphicsContextRecording : public PlatformGraphicsContext {
@@ -79,12 +80,12 @@ public:
     // Clipping
     virtual void addInnerRoundedRectClip(const IntRect& rect, int thickness);
     virtual void canvasClip(const Path& path);
-    virtual void clip(const FloatRect& rect);
-    virtual void clip(const Path& path);
-    virtual void clipConvexPolygon(size_t numPoints, const FloatPoint*, bool antialias);
-    virtual void clipOut(const IntRect& r);
-    virtual void clipOut(const Path& p);
-    virtual void clipPath(const Path& pathToClip, WindRule clipRule);
+    virtual bool clip(const FloatRect& rect);
+    virtual bool clip(const Path& path);
+    virtual bool clipConvexPolygon(size_t numPoints, const FloatPoint*, bool antialias);
+    virtual bool clipOut(const IntRect& r);
+    virtual bool clipOut(const Path& p);
+    virtual bool clipPath(const Path& pathToClip, WindRule clipRule);
 
     // Drawing
     virtual void clearRect(const FloatRect& rect);
@@ -129,8 +130,8 @@ private:
     SkPicture* mPicture;
     SkMatrix mCurrentMatrix;
 
-    GraphicsOperationCollection* mGraphicsOperationCollection;
-    GraphicsOperationCollection mPendingOperations;
+    Vector<GraphicsOperationCollection*> mGraphicsOperationStack;
+    GraphicsOperation::Save* mPendingOperation;
 };
 
 }