Implemented transparent gradients

src/pdf/SkPDFDevice.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 "SkPDFDevice.h"
 
 #include "SkAnnotation.h"
@@ skipping 1116 matching lines @@
         fLastMarginContentEntry = contentEntry;
     }
 }
 
 void SkPDFDevice::setDrawingArea(DrawingArea drawingArea) {
     // A ScopedContentEntry only exists during the course of a draw call, so
     // this can't be called while a ScopedContentEntry exists.
     fDrawingArea = drawingArea;
 }
 
 SkPDFDict* SkPDFDevice::getResourceDict() {

[vandebo (ex-Chrome), 2013/07/09 17:47:44]

Should getResourceDict and getResources be combined to just return an
SkPDFResourceDict? This can be done in a follow up CL.

[ducky, 2013/07/10 21:42:26]

Done.

     if (NULL == fResourceDict) {
         fResourceDict = SkNEW(SkPDFDict);
 
         if (fGraphicStateResources.count()) {
             SkAutoTUnref<SkPDFDict> extGState(new SkPDFDict());
             for (int i = 0; i < fGraphicStateResources.count(); i++) {
                 SkString nameString("G");
                 nameString.appendS32(i);
                 extGState->insert(
                         nameString.c_str(),
@@ skipping 31 matching lines @@
                 SkString nameString("P");
                 nameString.appendS32(i);
                 patterns->insert(nameString.c_str(),
                                  new SkPDFObjRef(fShaderResources[i]))->unref();
             }
             fResourceDict->insert("Pattern", patterns.get());
         }
 
         // For compatibility, add all proc sets (only used for output to PS
         // devices).
-        const char procs[][7] = {"PDF", "Text", "ImageB", "ImageC", "ImageI"};
-        SkAutoTUnref<SkPDFArray> procSets(new SkPDFArray());
-        procSets->reserve(SK_ARRAY_COUNT(procs));
-        for (size_t i = 0; i < SK_ARRAY_COUNT(procs); i++)
-            procSets->appendName(procs[i]);
-        fResourceDict->insert("ProcSet", procSets.get());
+        fResourceDict->insert("ProcSet", SkPDFUtils::CreateFullProcSetsArray())->unref();
     }
     return fResourceDict;
 }
 
 void SkPDFDevice::getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
                                SkTSet<SkPDFObject*>* newResourceObjects,
                                bool recursive) const {
     // TODO: reserve not correct if we need to recursively explore.
     newResourceObjects->setReserve(newResourceObjects->count() +
                                    fGraphicStateResources.count() +
@@ skipping 279 matching lines @@
     SkMatrix identity;
     identity.reset();
     SkDraw draw;
     draw.fMatrix = &identity;
     draw.fClip = &clipRegion;
     draw.fClipStack = clipStack;
     SkPaint stockPaint;
     this->drawPaint(draw, stockPaint);
     SkAutoTUnref<SkPDFFormXObject> maskFormXObject(createFormXObjectFromDevice());
     SkAutoTUnref<SkPDFGraphicState> sMaskGS(
-        SkPDFGraphicState::GetSMaskGraphicState(maskFormXObject, invertClip));
+        SkPDFGraphicState::GetSMaskGraphicState(maskFormXObject, invertClip,
+                                                SkPDFGraphicState::kAlpha_SMaskMode));
 
     // Draw the xobject with the clip as a mask.
     ScopedContentEntry content(this, &fExistingClipStack, fExistingClipRegion,
                                  identity, stockPaint);
     if (!content.entry()) {
         return;
     }
     SkPDFUtils::ApplyGraphicState(addGraphicStateResource(sMaskGS.get()),
                                   &content.entry()->fContent);
     SkPDFUtils::DrawFormXObject(fXObjectResources.count(),
@@ skipping 135 matching lines @@
                                           fExistingClipRegion, identity,
                                           stockPaint);
     if (!inClipContentEntry.entry()) {
         return;
     }
 
     SkAutoTUnref<SkPDFGraphicState> sMaskGS;
     if (xfermode == SkXfermode::kSrcIn_Mode ||
             xfermode == SkXfermode::kSrcOut_Mode) {
         sMaskGS.reset(SkPDFGraphicState::GetSMaskGraphicState(
-                dst, xfermode == SkXfermode::kSrcOut_Mode));
+                dst,
+                xfermode == SkXfermode::kSrcOut_Mode,
+                SkPDFGraphicState::kAlpha_SMaskMode));
         fXObjectResources.push(srcFormXObject.get());
         srcFormXObject.get()->ref();
     } else {
         sMaskGS.reset(SkPDFGraphicState::GetSMaskGraphicState(
-                srcFormXObject.get(), xfermode == SkXfermode::kDstOut_Mode));
+                srcFormXObject.get(),
+                xfermode == SkXfermode::kDstOut_Mode,
+                SkPDFGraphicState::kAlpha_SMaskMode));
         // dst already added to fXObjectResources in drawFormXObjectWithClip.
     }
     SkPDFUtils::ApplyGraphicState(addGraphicStateResource(sMaskGS.get()),
                                   &inClipContentEntry.entry()->fContent);
 
     SkPDFUtils::DrawFormXObject(fXObjectResources.count() - 1,
                                 &inClipContentEntry.entry()->fContent);
 
     sMaskGS.reset(SkPDFGraphicState::GetNoSMaskGraphicState());
     SkPDFUtils::ApplyGraphicState(addGraphicStateResource(sMaskGS.get()),
@@ skipping 171 matching lines @@
 }
 
 bool SkPDFDevice::onReadPixels(const SkBitmap& bitmap, int x, int y,
                                SkCanvas::Config8888) {
     return false;
 }
 
 bool SkPDFDevice::allowImageFilter(SkImageFilter*) {
     return false;
 }