[PDF] Fix clipping in xfermode improvement.

gm/xfermodes.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gm.h"
 #include "SkBitmap.h"
 #include "SkShader.h"
@@ skipping 48 matching lines @@
      //! kRectnagleImageWithAlpha_SrcType scaled down by half.
      kSmallRectangleImageWithAlpha_SrcType = 0x04,
      //! kRectangleImage_SrcType drawn directly instead in an image.
      kRectangle_SrcType                    = 0x08,
      //! Two rectangles, first on the right half, second on the bottom half.
      kQuarterClear_SrcType                 = 0x10,
      //! kQuarterClear_SrcType in a layer.
      kQuarterClearInLayer_SrcType          = 0x20,
      //! A W/2xH/2 transparent image.
      kSmallTransparentImage_SrcType        = 0x40,
+     //! kRectangleImage_SrcType drawn directly with a mask.
+     kRectangleWithMask_SrcType            = 0x80,
 
-     kAll_SrcType                          = 0x7F, //!< All the source types.
+     kAll_SrcType                          = 0xFF, //!< All the source types.
      kBasic_SrcType                        = 0x03, //!< Just basic source types.
     };
 
     SkBitmap    fBG;
     SkBitmap    fSrcB, fDstB, fTransparent;
 
     /* The srcType argument indicates what to draw for the source part. Skia
      * uses the implied shape of the drawing command and these modes
      * demonstrate that.
      */
@@ skipping 24 matching lines @@
                 SkScalar halfH = SkIntToScalar(H) / 2;
                 p.setColor(0xFF66AAFF);
                 SkRect r = SkRect::MakeXYWH(x + halfW, y, halfW,
                                             SkIntToScalar(H));
                 canvas->drawRect(r, p);
                 p.setColor(0xFFAA66FF);
                 r = SkRect::MakeXYWH(x, y + halfH, SkIntToScalar(W), halfH);
                 canvas->drawRect(r, p);
                 break;
             }
+            case kRectangleWithMask_SrcType: {

[vandebo (ex-Chrome), 2013/12/17 23:11:03]

This demonstrates the problem in the bug before the fix.

+                canvas->save(SkCanvas::kClip_SaveFlag);
+                restoreNeeded = true;
+                SkScalar w = SkIntToScalar(W);
+                SkScalar h = SkIntToScalar(H);
+                SkRect r = SkRect::MakeXYWH(x, y + h / 4, w, h * 23 / 60);
+                canvas->clipRect(r);
+                // Fall through.
+            }
             case kRectangle_SrcType: {
                 SkScalar w = SkIntToScalar(W);
                 SkScalar h = SkIntToScalar(H);
                 SkRect r = SkRect::MakeXYWH(x + w / 3, y + h / 3,
                                             w * 37 / 60, h * 37 / 60);
                 p.setColor(0xFF66AAFF);
                 canvas->drawRect(r, p);
                 break;
             }
             case kSmallRectangleImageWithAlpha_SrcType:
@@ skipping 149 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new XfermodesGM; }
 static GMRegistry reg(MyFactory);
 
 }