Revert changes which were breaking the build.

src/core/SkMatrixClipStateMgr.h

Index: src/core/SkMatrixClipStateMgr.h
diff --git a/src/core/SkMatrixClipStateMgr.h b/src/core/SkMatrixClipStateMgr.h
index ef0a99dbfaadf1634538b4394d9eb74fd1ad8166..60f9fa001679d89fe84e4d7366537636a437a29e 100644
--- a/src/core/SkMatrixClipStateMgr.h
+++ b/src/core/SkMatrixClipStateMgr.h
@@ -120,6 +120,7 @@ public:
                 newClip->fOp = op;
                 newClip->fDoAA = doAA;
                 newClip->fMatrixID = matrixID;
+                newClip->fOffset = kInvalidJumpOffset;
                 return false;
             }
 
@@ -133,6 +134,7 @@ public:
                 newClip->fOp = op;
                 newClip->fDoAA = doAA;
                 newClip->fMatrixID = matrixID;
+                newClip->fOffset = kInvalidJumpOffset;
                 return false;
             }
 
@@ -145,10 +147,19 @@ public:
                             int regionID,
                             SkRegion::Op op,
                             int matrixID);
-            void writeClip(int* curMatID, SkMatrixClipStateMgr* mgr);
-
-            SkDEBUGCODE(int numClips() const { return fClips.count(); })
+            void writeClip(int* curMatID,
+                           SkMatrixClipStateMgr* mgr,
+                           bool* overrideFirstOp);
+            void fillInSkips(SkWriter32* writer, int32_t restoreOffset);
 
+#ifdef SK_DEBUG
+            void checkOffsetNotEqual(int32_t offset) {
+                for (int i = 0; i < fClips.count(); ++i) {
+                    ClipOp& curClip = fClips[i];
+                    SkASSERT(offset != curClip.fOffset);
+                }
+            }
+#endif
         private:
             enum ClipType {
                 kRect_ClipType,
@@ -157,6 +168,8 @@ public:
                 kRegion_ClipType
             };
 
+            static const int kInvalidJumpOffset = -1;
+
             class ClipOp {
             public:
                 ClipType     fClipType;
@@ -172,6 +185,10 @@ public:
 
                 // The CTM in effect when this clip call was issued
                 int          fMatrixID;
+
+                // The offset of this clipOp's "jump-to-offset" location in the skp.
+                // -1 means the offset hasn't been written.
+                int32_t      fOffset;
             };
 
             SkTDArray<ClipOp> fClips;
@@ -232,7 +249,7 @@ public:
 
         // The next two fields are only valid when fIsSaveLayer is set.
         int32_t      fSaveLayerBaseStateID;
-        SkTDArray<int>* fSavedSkipOffsets;
+        bool         fSaveLayerBracketed;
 
 #ifdef SK_DEBUG
         MatrixClipState* fPrev; // debugging aid
@@ -330,7 +347,17 @@ public:
 
     bool call(CallType callType);
 
-    void fillInSkips(SkWriter32* writer, int32_t restoreOffset);
+    void fillInSkips(SkWriter32* writer, int32_t restoreOffset) {
+        // Since we write out the entire clip stack at each block start we
+        // need to update the skips for the entire stack each time too.
+        SkDeque::F2BIter iter(fMatrixClipStack);
+
+        for (const MatrixClipState* state = (const MatrixClipState*) iter.next();
+             state != NULL;
+             state = (const MatrixClipState*) iter.next()) {
+            state->fClipInfo->fillInSkips(writer, restoreOffset);
+        }
+    }
 
     void finish();
 
@@ -352,23 +379,9 @@ protected:
 
     // The MCStateID of the state currently in effect in the byte stream. 0 if none.
     int32_t          fCurOpenStateID;
-    // The skip offsets for the current open state. These are the locations in the 
-    // skp that must be filled in when the current open state is closed. These are
-    // here rather then distributed across the MatrixClipState's because saveLayers
-    // can cause MC states to be nested.
-    SkTDArray<int32_t>  *fSkipOffsets;
 
     SkDEBUGCODE(void validate();)
 
-    int MCStackPush(SkCanvas::SaveFlags flags);
-
-    void addClipOffset(int offset) {
-        SkASSERT(NULL != fSkipOffsets);
-        SkASSERT(kIdentityWideOpenStateID != fCurOpenStateID);
-
-        *fSkipOffsets->append() = offset;
-    }
-
     void writeDeltaMat(int currentMatID, int desiredMatID);
     static int32_t   NewMCStateID();