Fix rendering artifacts in pull-saveLayers-forward mode

src/core/SkPicturePlayback.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPicturePlayback_DEFINED
 #define SkPicturePlayback_DEFINED
@@ skipping 255 matching lines @@
     // PlaybackReplacements collects op ranges that can be replaced with
     // a single drawBitmap call (using a precomputed bitmap).
     class PlaybackReplacements {
     public:
         // All the operations between fStart and fStop (inclusive) will be replaced with
         // a single drawBitmap call using fPos, fBM and fPaint.
         // fPaint will be NULL if the picture's paint wasn't copyable
         struct ReplacementInfo {
             size_t          fStart;
             size_t          fStop;
-            SkPoint         fPos;
+            SkIPoint        fPos;
             SkBitmap*       fBM;
             const SkPaint*  fPaint;  // Note: this object doesn't own the paint
         };
 
         ~PlaybackReplacements() { this->freeAll(); }
 
         // Add a new replacement range. The replacement ranges should be
         // sorted in increasing order and non-overlapping (esp. no nested
         // saveLayers).
         ReplacementInfo* push();
 
     private:
         friend class SkPicturePlayback; // for access to lookupByStart
 
         // look up a replacement range by its start offset
         ReplacementInfo* lookupByStart(size_t start);
 
         void freeAll();
 
-    #ifdef SK_DEBUG
+#ifdef SK_DEBUG
         void validate() const;
-    #endif
+#endif
 
         SkTDArray<ReplacementInfo> fReplacements;
     };
 
-
     // Replace all the draw ops in the replacement ranges in 'replacements' with
     // the associated drawBitmap call
     // Draw replacing cannot be enabled at the same time as draw limiting
     void setReplacements(PlaybackReplacements* replacements) {
         SkASSERT(fStart == 0 && fStop == 0);
         fReplacements = replacements;
     }
 
     bool   fUseBBH;
     size_t fStart;
@@ skipping 34 matching lines @@
     static void WriteFactories(SkWStream* stream, const SkFactorySet& rec);
     static void WriteTypefaces(SkWStream* stream, const SkRefCntSet& rec);
 
 #ifdef SK_BUILD_FOR_ANDROID
     SkMutex fDrawMutex;
     bool fAbortCurrentPlayback;
 #endif
 };
 
 #endif