Always store pixels of mutable bitmaps when recording a SkPicture.

Prior to this CL mutable bitmaps only saved a copy of their pixels
if a flag was set at recording time.  That flag has been removed
and the default behavior when recording a mutable bitmap is to
make a copy of it's pixels. This is the only way to ensure that
the pixels are not manipulated before we playback their contents.

However, enabling this behavior breaks the recording of extracted
bitmaps in SkPicture. This is because we currently cache bitmaps
within a picture based only on their pixelRef. This results in
false positive cache hit when drawing an extracted bitmap as it
shares a pixelRef with its orginating bitmap.  Therefore we must
update the index of the bitmap cache to be both the pixelRef AND
the size and offset of the bitmap using those pixels.

BUG=
TEST=extractbitmap.cpp

Review URL: https://codereview.appspot.com/6439043

git-svn-id: http://skia.googlecode.com/svn/trunk@4809 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 1 insertions, 15 deletions

diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index 976c594cad..dae7ed7829 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -58,16 +58,7 @@ public:
             clip-query calls will reflect the path's bounds, not the actual
             path.
          */
-        kUsePathBoundsForClip_RecordingFlag = 0x01,
-
-        /*  When a draw operation is recorded that has a bitmap parameter, it
-            may be unsafe to defer rendering if source bitmap may be written to
-            between the time of recording and the time of executing the draw 
-            operation. This flag specifies that SkPicture should serialize a
-            snapshot of any source bitmaps that reside in RAM and are not
-            marked as immutable, making the draw operation safe for deferral.
-         */
-        kFlattenMutableNonTexturePixelRefs_RecordingFlag = 0x02
+        kUsePathBoundsForClip_RecordingFlag = 0x01
     };
 
     /** Returns the canvas that records the drawing commands.
@@ -96,11 +87,6 @@ public:
     */
     bool hasRecorded() const;
 
-    /** Returns true if a snapshot of the specified bitmap will be flattened
-        whaen a draw operation using the bitmap is recorded.
-    */
-    bool willFlattenPixelsOnRecord(const SkBitmap&) const;
-    
     /** Replays the drawing commands on the specified canvas. This internally
         calls endRecording() if that has not already been called.
         @param surface the canvas receiving the drawing commands.