Fix recording of saveLayout with unusual Xfermodes.

src/core/SkRecordDraw.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRecordDraw.h"
 #include "SkPatchUtils.h"
 
@@ skipping 211 matching lines @@
     }
 
     void pushSaveBlock(const SkPaint* paint) {
         // Starting a new Save block.  Push a new entry to represent that.
         SaveBounds sb = { 0, Bounds::MakeEmpty(), paint };
         fSaveStack.push(sb);
         this->pushControl();
     }
 
     static bool PaintMayAffectTransparentBlack(const SkPaint* paint) {
-        // FIXME: this is very conservative
-        return paint && (paint->getImageFilter() || paint->getColorFilter());
+        if (paint) {
+            // FIXME: this is very conservative
+            if (paint->getImageFilter() || paint->getColorFilter())

[mtklein, 2014/09/12 19:20:08]

Please add {} 

[dneto, 2014/09/12 20:41:42]

Done.

+                return true;
+
+            SkXfermode* xfermode = paint->getXfermode();

[dneto, 2014/09/12 18:23:03]

This codepath is not the default for Chromium, but it is the default for Skia
when its own tree.

[mtklein, 2014/09/12 19:20:08]

Sync up!  :P

[dneto, 2014/09/12 20:41:42]

Acknowledged.
Yeah, that's outta my control.  I tested with both paths, which was fun. :-)

+            SkXfermode::Mode mode;
+            // SrcOver is ok, and is also the common case with a NULL xfermode.
+            // So we should make that the fast path and bypass the mode extraction
+            // and test.
+            if (xfermode && xfermode->asMode(&mode)) {
+                switch (mode) {
+                    case SkXfermode::kClear_Mode:
+                    case SkXfermode::kSrc_Mode:
+                    case SkXfermode::kSrcIn_Mode:
+                    case SkXfermode::kDstIn_Mode:
+                    case SkXfermode::kSrcOut_Mode:
+                    case SkXfermode::kDstATop_Mode:
+                    case SkXfermode::kModulate_Mode:
+                        return true;
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+        return false;
     }
 
     Bounds popSaveBlock() {
         // We're done the Save block.  Apply the block's bounds to all control ops inside it.
         SaveBounds sb;
         fSaveStack.pop(&sb);
 
         // If the paint affects transparent black, we can't trust any of our calculated bounds.
         const Bounds& bounds =
             PaintMayAffectTransparentBlack(sb.paint) ? fCurrentClipBounds : sb.bounds;
@@ skipping 228 matching lines @@
     // Used to track the bounds of Save/Restore blocks and the control ops inside them.
     SkTDArray<SaveBounds> fSaveStack;
     SkTDArray<unsigned>   fControlIndices;
 };
 
 }  // namespace SkRecords
 
 void SkRecordFillBounds(const SkRecord& record, SkBBoxHierarchy* bbh) {
     SkRecords::FillBounds(record, bbh);
 }