Support beginTransparentLayer

 Handle it the same as a save/restore, but split up the SkMatrix handling
 as beginTransparentLayer does not save the matrix

 Also, enable RecordingContext by default, as all major known issues should be
 fixed now.

Change-Id: I414556f65d5de704e2ce18e44a87d932b937993b

1 files changed, 5 insertions, 3 deletions

diff --git a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h
index 3affff3..6c51852 100644
--- a/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h
+++ b/Source/WebCore/platform/graphics/android/context/PlatformGraphicsContextRecording.h
@@ -146,9 +146,12 @@ private:
     void appendDrawingOperation(GraphicsOperation::Operation* operation, const FloatRect& bounds);
     void appendStateOperation(GraphicsOperation::Operation* operation);
     void onCurrentMatrixChanged();
+    void pushSaveOperation(GraphicsOperation::Save* saveOp);
+    void popSaveOperation();
+    void pushMatrix();
+    void popMatrix();
 
     SkPicture* mPicture;
-    SkMatrix mRootMatrix;
     SkMatrix* mCurrentMatrix;
     // Used for getTotalMatrix, is not valid elsewhere
     SkMatrix mTotalMatrix;
@@ -167,7 +170,6 @@ private:
             , mHasDrawing(other.mHasDrawing)
             , mHasClip(other.mHasClip)
             , mBounds(other.mBounds)
-            , mMatrix(other.mMatrix)
         {}
 
         void addBounds(const FloatRect& bounds)
@@ -187,9 +189,9 @@ private:
         bool mHasDrawing;
         bool mHasClip;
         FloatRect mBounds;
-        SkMatrix mMatrix;
     };
     Vector<RecordingState> mRecordingStateStack;
+    Vector<SkMatrix> mMatrixStack;
     State* mOperationState;
     SkMatrix* mOperationMatrix;
 };