aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-19 15:26:19 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-19 15:26:19 +0000
commit5680a51ea03592745677e00ed12bcd24c35a84d4 (patch)
tree3822c2e5b60ac86b8b3cb7b01c8333b7cfe0c3a8 /src/core
parentd0a19eb9140ecb968357f798f06d2b052b51fd89 (diff)
remove experimental code that accidentally got delivered
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkPictureRecord.cpp36
1 files changed, 0 insertions, 36 deletions
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index c851833890..ef5199f794 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -190,39 +190,6 @@ static bool collapseSaveClipRestore(SkWriter32* writer, int32_t offset) {
return true;
}
-// This function is just a toy example and will not be delivered with this
-// CL
-static bool noClips(SkWriter32* writer, int32_t offset) {
-
- int32_t restoreOffset = (int32_t)writer->size();
-
- // back up to the save block
- while (offset > 0) {
- offset = *writer->peek32(offset);
- }
-
- // now offset points to a save
- offset = -offset;
- uint32_t opSize;
- DrawType op = peek_op_and_size(writer, offset, &opSize);
- SkASSERT(SAVE == op || SAVE_LAYER == op);
-
- // Walk forward until until we hit our restore, nuking all clips
- // along the way
- offset += opSize;
- while (offset < restoreOffset) {
- op = peek_op_and_size(writer, offset, &opSize);
-
- if (CLIP_RECT == op || CLIP_RRECT == op) {
- uint32_t* ptr = writer->peek32(offset);
- *ptr = (*ptr & MASK_24) | (NOOP << 24);
- }
- offset += opSize;
- }
-
- return true;
-}
-
void SkPictureRecord::restore() {
// FIXME: SkDeferredCanvas needs to be refactored to respect
// save/restore balancing so that the following test can be
@@ -240,9 +207,6 @@ void SkPictureRecord::restore() {
fFirstSavedLayerIndex = kNoSavedLayerIndex;
}
- // This call will not be delivered either
- noClips(&fWriter, fRestoreOffsetStack.top());
-
uint32_t initialOffset, size;
if (!collapseSaveClipRestore(&fWriter, fRestoreOffsetStack.top())) {
fillRestoreOffsetPlaceholdersForCurrentStackLevel((uint32_t)fWriter.size());