Improve saveLayer handling in SkMatrixClipStateMgr

This CL improves saveLayer handling in the SkMatrixClipStateMgr by:

1) no longer storing the clip skip offsets in the stack (since saveLayers can force multiple clip states to be open at one time)

2) writing out only the clips that are relative to the saveLayer's clip state

3) updates the testing harness to accept a save/restore bracketing a saveLayer/restore (since clips have to be applied to the saveLayer's result upon restore)

Committed: http://code.google.com/p/skia/source/detail?r=13497

[bsalomon, 2014-02-18 16:37:44]

On 2014/02/18 16:01:59, robertphillips wrote:

(mostly rubberstamp) lgtm

[robertphillips, 2014-02-18 17:29:08]

committed as r13488

[epoger, 2014-02-18 17:46:42]

Looks like this broke some compilers.

From
http://108.170.219.164:10117/builders/Build-Ubuntu13-GCC4.8-x86_64-Debug/buil...
:

[09:42:03.012014] make[1]: Entering directory
`/home/chrome-bot/buildbot/skiabot-shuttle-ubuntu13-000/buildbot/third_party/chromium_buildbot/slave/Build-Ubuntu13-GCC4_8-x86_64-Debug/build/skia/out'
[09:42:03.012032]   CXX(target)
Debug/obj.target/core/src/core/SkMatrixClipStateMgr.o
[09:42:03.012049]   CXX(target) Debug/obj.target/core/src/core/SkPictureRecord.o
[09:42:03.512624] In file included from ../include/core/SkTypes.h:13:0,
[09:42:03.512683]                  from ../include/core/SkCanvas.h:11,
[09:42:03.512702]                  from ../src/core/SkMatrixClipStateMgr.h:10,
[09:42:03.512717]                  from ../src/core/SkMatrixClipStateMgr.cpp:8:
[09:42:03.512732] ../src/core/SkMatrixClipStateMgr.cpp: In member function ‘void
SkMatrixClipStateMgr::fillInSkips(SkWriter32*, int32_t)’:
[09:42:03.512748] ../src/core/SkMatrixClipStateMgr.cpp:282:24: error: comparison
between signed and unsigned integer expressions [-Werror=sign-compare]
[09:42:03.512766]          SkASSERT(-1 == peek);
[09:42:03.512781]                         ^
[09:42:03.512796] ../include/core/SkPostConfig.h:172:44: note: in definition of
macro ‘SK_DEBUGBREAK’
[09:42:03.512811]  #      define SK_DEBUGBREAK(cond) do { if (cond) break; \
[09:42:03.512826]                                             ^
[09:42:03.512840] ../src/core/SkMatrixClipStateMgr.cpp:282:9: note: in expansion
of macro ‘SkASSERT’
[09:42:03.512855]          SkASSERT(-1 == peek);
[09:42:03.512869]          ^
[09:42:03.512883] At global scope:
[09:42:03.512897] cc1plus: error: unrecognized command line option
"-Wno-c++11-extensions" [-Werror]
[09:42:03.512911] cc1plus: all warnings being treated as errors

[robertphillips, 2014-02-19 13:33:37]

The CQ bit was checked by robertphillips@google.com

[commit-bot: I haz the power, 2014-02-19 13:33:42]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/robertphillips@google.com/164823003/1...

[commit-bot: I haz the power, 2014-02-19 13:41:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-19 13:41:53]

Retried try job too often on Build-Mac10.7-Clang-x86-Release-Trybot for step(s)
BuildBench, BuildEverything
http://108.170.219.164:10117/buildstatus?builder=Build-Mac10.7-Clang-x86-Rele...

[robertphillips, 2014-02-19 14:04:50]

The CQ bit was checked by robertphillips@google.com

[commit-bot: I haz the power, 2014-02-19 14:04:53]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/robertphillips@google.com/164823003/3...

[commit-bot: I haz the power, 2014-02-19 14:40:41]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/robertphillips@google.com/164823003/3...

[commit-bot: I haz the power, 2014-02-19 15:11:26]

Change committed as 13497