[PDF] Fixes the cases where SkPDFDevice::finishContentEntry is called with empty content.

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"
 #include "SkXfermode.h"
 
 namespace skiagm {
 
-static void make_bitmaps(int w, int h, SkBitmap* src, SkBitmap* dst) {
+static void make_bitmaps(int w, int h, SkBitmap* src, SkBitmap* dst,
+                         SkBitmap* transparent) {
     src->setConfig(SkBitmap::kARGB_8888_Config, w, h);
     src->allocPixels();
     src->eraseColor(SK_ColorTRANSPARENT);
 
     SkPaint p;
     p.setAntiAlias(true);
 
     SkRect r;
     SkScalar ww = SkIntToScalar(w);
     SkScalar hh = SkIntToScalar(h);
 
     {
         SkCanvas c(*src);
         p.setColor(0xFFFFCC44);
         r.set(0, 0, ww*3/4, hh*3/4);
         c.drawOval(r, p);
     }
 
     dst->setConfig(SkBitmap::kARGB_8888_Config, w, h);
     dst->allocPixels();
     dst->eraseColor(SK_ColorTRANSPARENT);
 
     {
         SkCanvas c(*dst);
         p.setColor(0xFF66AAFF);
         r.set(ww/3, hh/3, ww*19/20, hh*19/20);
         c.drawRect(r, p);
     }
+
+    transparent->setConfig(SkBitmap::kARGB_8888_Config, w, h);
+    transparent->allocPixels();
+    transparent->eraseColor(SK_ColorTRANSPARENT);
 }
 
 static uint16_t gData[] = { 0xFFFF, 0xCCCF, 0xCCCF, 0xFFFF };
 
 class XfermodesGM : public GM {
     enum SrcType {
      //! A WxH image with a rectangle in the lower right.
      kRectangleImage_SrcType               = 0x01,
      //! kRectangleImage_SrcType with an alpha of 34.5%.
      kRectangleImageWithAlpha_SrcType      = 0x02,
      //! 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,
 
-     kAll_SrcType                          = 0x3F, //!< All the source types.
+     kAll_SrcType                          = 0x7F, //!< All the source types.
      kBasic_SrcType                        = 0x03, //!< Just basic source types.
     };
 
     SkBitmap    fBG;
-    SkBitmap    fSrcB, fDstB;
+    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.
      */
     void draw_mode(SkCanvas* canvas, SkXfermode* mode, SrcType srcType,
                    SkScalar x, SkScalar y) {
         SkPaint p;
         SkMatrix m;
         bool restoreNeeded = false;
         m.setTranslate(x, y);
 
         canvas->drawBitmapMatrix(fSrcB, m, &p);
         p.setXfermode(mode);
         switch (srcType) {
+            case kSmallTransparentImage_SrcType:
+                m.postScale(SK_ScalarHalf, SK_ScalarHalf, x, y);
+                canvas->drawBitmapMatrix(fTransparent, m, &p);
+                break;
             case kQuarterClearInLayer_SrcType: {
                 SkRect bounds = SkRect::MakeXYWH(x, y, SkIntToScalar(W),
                                                  SkIntToScalar(H));
                 canvas->saveLayer(&bounds, &p);
                 restoreNeeded = true;
                 p.setXfermodeMode(SkXfermode::kSrcOver_Mode);
                 // Fall through.
             }
             case kQuarterClear_SrcType: {
                 SkScalar halfW = SkIntToScalar(W) / 2;
@@ skipping 31 matching lines @@
 
         if (restoreNeeded) {
             canvas->restore();
         }
     }
 
     virtual void onOnceBeforeDraw() SK_OVERRIDE {
         fBG.setConfig(SkBitmap::kARGB_4444_Config, 2, 2, 4, kOpaque_SkAlphaType);
         fBG.setPixels(gData);
 
-        make_bitmaps(W, H, &fSrcB, &fDstB);
+        make_bitmaps(W, H, &fSrcB, &fDstB, &fTransparent);
     }
 
 public:
     const static int W = 64;
     const static int H = 64;
     XfermodesGM() {}
 
 protected:
     virtual SkString onShortName() {
         return SkString("xfermodes");
     }
 
     virtual SkISize onISize() {
-        return make_isize(1590, 640);
+        return make_isize(1990, 640);
     }
 
     virtual void onDraw(SkCanvas* canvas) {
         canvas->translate(SkIntToScalar(10), SkIntToScalar(20));
 
         const struct {
             SkXfermode::Mode  fMode;
             const char*       fLabel;
             int               fSourceTypeMask;  // The source types to use this
                                                 // mode with. See draw_mode for
@@ skipping 103 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new XfermodesGM; }
 static GMRegistry reg(MyFactory);
 
 }