Simplify SkPDFShader class. Now invalid objects are never created.

src/pdf/SkPDFShader.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 "SkPDFShader.h"
@@ skipping 487 matching lines @@
     SkPDFShader::State* CreateOpaqueState() const;
 
     bool GradientHasAlpha() const;
 
 private:
     State(const State& other);
     State operator=(const State& rhs);
     void AllocateGradientInfoStorage();
 };
 
+static void remove_from_canon(SkPDFShader* shader) {
+    SkAutoMutexAcquire lock(SkPDFCanon::GetShaderMutex());
+    SkPDFCanon::GetCanon().removeShader(shader);
+}
+
 class SkPDFFunctionShader : public SkPDFDict, public SkPDFShader {
     SK_DECLARE_INST_COUNT(SkPDFFunctionShader)
 public:
-    explicit SkPDFFunctionShader(SkPDFShader::State* state);
+    static SkPDFObject* Create(SkAutoTDelete<SkPDFShader::State>*);
+
     virtual ~SkPDFFunctionShader() {
-        SkPDFShader::RemoveFromCanonIfValid(this);
+        remove_from_canon(this);
         fResources.unrefAll();
     }
 
-    bool isValid() SK_OVERRIDE { return fResources.count() > 0; }
     SkPDFObject* toPDFObject() SK_OVERRIDE { return this; }
 
     void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
                       SkTSet<SkPDFObject*>* newResourceObjects) SK_OVERRIDE {
         GetResourcesHelper(&fResources,
                            knownResourceObjects,
                            newResourceObjects);
     }
 
 private:
-    static SkPDFObject* RangeObject();
-
     SkTDArray<SkPDFObject*> fResources;
-
-    SkPDFStream* makePSFunction(const SkString& psCode, SkPDFArray* domain);
+    explicit SkPDFFunctionShader(SkPDFShader::State* state)
+        : SkPDFDict("Pattern"), SkPDFShader(state) {}
     typedef SkPDFDict INHERITED;
 };
 
 /**
  * A shader for PDF gradients. This encapsulates the function shader
  * inside a tiling pattern while providing a common pattern interface.
  * The encapsulation allows the use of a SMask for transparency gradients.
  */
 class SkPDFAlphaFunctionShader : public SkPDFStream, public SkPDFShader {
 public:
-    explicit SkPDFAlphaFunctionShader(SkPDFShader::State* state);
-    virtual ~SkPDFAlphaFunctionShader() {
-        SkPDFShader::RemoveFromCanonIfValid(this);
-    }
+    static SkPDFObject* Create(SkAutoTDelete<SkPDFShader::State>*);
 
-    bool isValid() SK_OVERRIDE {
-        return fColorShader.get() != NULL;
-    }
+    virtual ~SkPDFAlphaFunctionShader() { remove_from_canon(this); }
+
     SkPDFObject* toPDFObject() SK_OVERRIDE { return this; }
 
 private:
-    SkPDFGraphicState* CreateSMaskGraphicState();
+    explicit SkPDFAlphaFunctionShader(SkPDFShader::State* state);
+
+    static SkPDFGraphicState* CreateSMaskGraphicState(
+            const SkPDFShader::State&);
 
     void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
                       SkTSet<SkPDFObject*>* newResourceObjects) SK_OVERRIDE {
         fResourceDict->getReferencedResources(knownResourceObjects,
                                               newResourceObjects,
                                               true);
     }
 
     SkAutoTUnref<SkPDFObject> fColorShader;
     SkAutoTUnref<SkPDFResourceDict> fResourceDict;
 };
 
 class SkPDFImageShader : public SkPDFStream, public SkPDFShader {
 public:
-    explicit SkPDFImageShader(SkPDFShader::State* state);
+    static SkPDFObject* Create(SkAutoTDelete<SkPDFShader::State>*);
+
     virtual ~SkPDFImageShader() {
-        SkPDFShader::RemoveFromCanonIfValid(this);
+        remove_from_canon(this);
         fResources.unrefAll();
     }
 
-    bool isValid() SK_OVERRIDE { return size() > 0; }
     SkPDFObject* toPDFObject() SK_OVERRIDE { return this; }
 
     void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
                       SkTSet<SkPDFObject*>* newResourceObjects) SK_OVERRIDE {
         GetResourcesHelper(&fResources.toArray(),
                            knownResourceObjects,
                            newResourceObjects);
     }
 
 private:
     SkTSet<SkPDFObject*> fResources;
+    explicit SkPDFImageShader(SkPDFShader::State* state) : SkPDFShader(state) {}
 };
 
 SkPDFShader::SkPDFShader(SkPDFShader::State* s) : fShaderState(s) {}
 
 SkPDFShader::~SkPDFShader() {}
 
-void SkPDFShader::RemoveFromCanonIfValid(SkPDFShader* shader) {
-    if (shader->isValid()) {
-        SkAutoMutexAcquire lock(SkPDFCanon::GetShaderMutex());
-        SkPDFCanon::GetCanon().removeShader(shader);
-    }
-}
-
 bool SkPDFShader::equals(const SkPDFShader::State& state) const {
     return state == *fShaderState.get();
 }
 
-SkPDFObject* SkPDFShader::AddToCanonIfValid(SkPDFShader* shader) {
-    if (!shader->isValid()) {
-        SkDELETE(shader);
-        return NULL;
-    }
-    SkPDFCanon::GetCanon().addShader(shader);
-    return shader->toPDFObject();
-}
-
 // static
-SkPDFObject* SkPDFShader::GetPDFShaderByState(State* inState) {
-    SkAutoTDelete<State> state(inState);
+SkPDFObject* SkPDFShader::GetPDFShaderByState(
+        SkAutoTDelete<SkPDFShader::State>* statePtr) {
+    SkAutoTDelete<State>& state = *statePtr;

[mtklein, 2015/01/22 21:16:32]

This seems fine, but you might want to go all the way down to State* instead of
SkAutoTDelete<State>& ?

State* state = ownedState->get();
...
return SkPDFImageShder::Create(ownedState);

[hal.canary, 2015/01/22 21:46:00]

Even further:

  const State& state = **ownedState;

[mtklein, 2015/01/22 21:54:21]

+1

     if (state->fType == SkShader::kNone_GradientType &&
         state->fImage.isNull()) {
         // TODO(vandebo) This drops SKComposeShader on the floor.  We could
         // handle compose shader by pulling things up to a layer, drawing with
         // the first shader, applying the xfer mode and drawing again with the
         // second shader, then applying the layer to the original drawing.
         return NULL;
     }
 
     SkPDFShader* pdfShader = SkPDFCanon::GetCanon().findShader(*state);
     if (pdfShader) {
-        SkASSERT(pdfShader->isValid());
         return SkRef(pdfShader->toPDFObject());
     }
 
     // The PDFShader takes ownership of the shaderSate.
     if (state->fType == SkShader::kNone_GradientType) {
-        return SkPDFShader::AddToCanonIfValid(
-                SkNEW_ARGS(SkPDFImageShader, (state.detach())));
+        return SkPDFImageShader::Create(&state);
     } else if (state->GradientHasAlpha()) {
-        return SkPDFShader::AddToCanonIfValid(
-                SkNEW_ARGS(SkPDFAlphaFunctionShader, (state.detach())));
+        return SkPDFAlphaFunctionShader::Create(&state);
     } else {
-        return SkPDFShader::AddToCanonIfValid(
-                SkNEW_ARGS(SkPDFFunctionShader, (state.detach())));
+        return SkPDFFunctionShader::Create(&state);
     }
 }
 
 // static
 SkPDFObject* SkPDFShader::GetPDFShader(const SkShader& shader,
                                        const SkMatrix& matrix,
                                        const SkIRect& surfaceBBox,
                                        SkScalar rasterScale) {
     SkAutoMutexAcquire lock(SkPDFCanon::GetShaderMutex());
-    return GetPDFShaderByState(
+    SkAutoTDelete<SkPDFShader::State> state(
             SkNEW_ARGS(State, (shader, matrix, surfaceBBox, rasterScale)));
-}
-
-
-// static
-SkPDFObject* SkPDFFunctionShader::RangeObject() {
-    SkPDFCanon::GetShaderMutex().assertHeld();
-    static SkPDFArray* range = NULL;
-    // This method is only used with CanonicalShadersMutex, so it's safe to
-    // populate domain.
-    if (range == NULL) {
-        range = new SkPDFArray;
-        range->reserve(6);
-        range->appendInt(0);
-        range->appendInt(1);
-        range->appendInt(0);
-        range->appendInt(1);
-        range->appendInt(0);
-        range->appendInt(1);
-    }
-    return range;
+    return GetPDFShaderByState(&state);
 }
 
 static SkPDFResourceDict* get_gradient_resource_dict(
         SkPDFObject* functionShader,
         SkPDFObject* gState) {
     SkPDFResourceDict* dict = new SkPDFResourceDict();
 
     if (functionShader != NULL) {
         dict->insertResourceAsReference(
                 SkPDFResourceDict::kPattern_ResourceType, 0, functionShader);
@@ skipping 41 matching lines @@
     SkPDFUtils::PaintPath(SkPaint::kFill_Style, SkPath::kEvenOdd_FillType,
                           &content);
 
     return content.detachAsStream();
 }
 
 /**
  * Creates a ExtGState with the SMask set to the luminosityShader in
  * luminosity mode. The shader pattern extends to the bbox.
  */
-SkPDFGraphicState* SkPDFAlphaFunctionShader::CreateSMaskGraphicState() {
+SkPDFGraphicState* SkPDFAlphaFunctionShader::CreateSMaskGraphicState(
+        const SkPDFShader::State& state) {
     SkRect bbox;
-    bbox.set(fShaderState->fBBox);
+    bbox.set(state.fBBox);
 
-    SkAutoTUnref<SkPDFObject> luminosityShader(SkPDFShader::GetPDFShaderByState(
-            fShaderState->CreateAlphaToLuminosityState()));
+    SkAutoTDelete<SkPDFShader::State> alphaToLuminosityState(
+            state.CreateAlphaToLuminosityState());
+    SkAutoTUnref<SkPDFObject> luminosityShader(
+            SkPDFShader::GetPDFShaderByState(&alphaToLuminosityState));
 
     SkAutoTDelete<SkStream> alphaStream(create_pattern_fill_content(-1, bbox));
 
     SkAutoTUnref<SkPDFResourceDict>
         resources(get_gradient_resource_dict(luminosityShader, NULL));
 
     SkAutoTUnref<SkPDFFormXObject> alphaMask(
             new SkPDFFormXObject(alphaStream.get(), bbox, resources.get()));
 
     return SkPDFGraphicState::GetSMaskGraphicState(
             alphaMask.get(), false,
             SkPDFGraphicState::kLuminosity_SMaskMode);
 }
 
-SkPDFAlphaFunctionShader::SkPDFAlphaFunctionShader(SkPDFShader::State* state)
-    : SkPDFShader(state) {
+SkPDFObject* SkPDFAlphaFunctionShader::Create(
+        SkAutoTDelete<SkPDFShader::State>* statePtr) {
+    SkAutoTDelete<SkPDFShader::State>& state = *statePtr;
     SkRect bbox;
-    bbox.set(fShaderState->fBBox);
+    bbox.set(state->fBBox);
 
-    fColorShader.reset(
-            SkPDFShader::GetPDFShaderByState(state->CreateOpaqueState()));
+    SkAutoTDelete<SkPDFShader::State> opaqueState(state->CreateOpaqueState());
+
+    SkPDFObject* colorShader = SkPDFShader::GetPDFShaderByState(&opaqueState);
+    if (!colorShader) {
+        return NULL;
+    }
 
     // Create resource dict with alpha graphics state as G0 and
     // pattern shader as P0, then write content stream.
-    SkAutoTUnref<SkPDFGraphicState> alphaGs(CreateSMaskGraphicState());
-    fResourceDict.reset(
-            get_gradient_resource_dict(fColorShader.get(), alphaGs.get()));
+    SkAutoTUnref<SkPDFGraphicState> alphaGs(
+            SkPDFAlphaFunctionShader::CreateSMaskGraphicState(*state));
+
+    SkPDFAlphaFunctionShader* alphaFunctionShader =
+            SkNEW_ARGS(SkPDFAlphaFunctionShader, (state.detach()));
+
+    alphaFunctionShader->fColorShader.reset(colorShader);
+
+    alphaFunctionShader->fResourceDict.reset(get_gradient_resource_dict(
+            alphaFunctionShader->fColorShader.get(), alphaGs.get()));
 
     SkAutoTDelete<SkStream> colorStream(
             create_pattern_fill_content(0, bbox));
-    setData(colorStream.get());
+    alphaFunctionShader->setData(colorStream.get());

[mtklein, 2015/01/22 21:16:33]

Hey, what's the lifetime of colorStream?  If SkStreams aren't ref-counted
anymore, how is this safe?

[hal.canary, 2015/01/22 21:46:00]

duplicate() is called on the stream.

[mtklein, 2015/01/22 21:54:21]

Interesting.  Seems like we might want to switch that over to hand it off.  Good
to know it's safe.

 
-    populate_tiling_pattern_dict(this, bbox, fResourceDict.get(),
+    populate_tiling_pattern_dict(alphaFunctionShader, bbox,
+                                 alphaFunctionShader->fResourceDict.get(),
                                  SkMatrix::I());
+    SkPDFCanon::GetCanon().addShader(alphaFunctionShader);
+    return alphaFunctionShader;
 }
 
+SkPDFAlphaFunctionShader::SkPDFAlphaFunctionShader(SkPDFShader::State* state)
+    : SkPDFShader(state) {}
+
 // Finds affine and persp such that in = affine * persp.
 // but it returns the inverse of perspective matrix.
 static bool split_perspective(const SkMatrix in, SkMatrix* affine,
                               SkMatrix* perspectiveInverse) {
     const SkScalar p2 = in[SkMatrix::kMPersp2];
 
     if (SkScalarNearlyZero(p2)) {
         return false;
     }
 
@@ skipping 18 matching lines @@
                                zero,         one,        zero,
                                -p0/p2,     -p1/p2,     1/p2);
 
     affine->setAll(sx - p0 * tx / p2,       kx - p1 * tx / p2,      tx / p2,
                    ky - p0 * ty / p2,       sy - p1 * ty / p2,      ty / p2,
                    zero,                    zero,                   one);
 
     return true;
 }
 
-SkPDFFunctionShader::SkPDFFunctionShader(SkPDFShader::State* state)
-    : SkPDFDict("Pattern"), SkPDFShader(state) {
+namespace {
+SkPDFObject* create_range_object() {
+    SkPDFArray* range = SkNEW(SkPDFArray);
+    range->reserve(6);
+    range->appendInt(0);
+    range->appendInt(1);
+    range->appendInt(0);
+    range->appendInt(1);
+    range->appendInt(0);
+    range->appendInt(1);
+    return range;
+}
+
+template <typename T>
+void unref(T* ptr) {
+    ptr->unref();

[mtklein, 2015/01/22 21:16:33]

This seemed more readable as you had it all on one line?

[hal.canary, 2015/01/22 21:46:00]

Done.

+}
+}  // namespace
+
+SK_DECLARE_STATIC_LAZY_PTR(SkPDFObject,

[mtklein, 2015/01/22 21:16:33]

Also seemed more readable on two lines as you had it.

[hal.canary, 2015/01/22 21:46:00]

Done.

+                           rangeObject,
+                           create_range_object,
+                           unref<SkPDFObject>);
+
+static SkPDFStream* make_ps_function(const SkString& psCode,
+                                     SkPDFArray* domain) {
+    SkAutoDataUnref funcData(
+            SkData::NewWithCopy(psCode.c_str(), psCode.size()));
+    SkPDFStream* result = SkNEW_ARGS(SkPDFStream, (funcData.get()));
+    result->insertInt("FunctionType", 4);
+    result->insert("Domain", domain);
+    result->insert("Range", rangeObject.get());
+    return result;
+}
+
+SkPDFObject* SkPDFFunctionShader::Create(
+        SkAutoTDelete<SkPDFShader::State>* statePtr) {
+    SkAutoTDelete<SkPDFShader::State>& state = *statePtr;
+
     SkString (*codeFunction)(const SkShader::GradientInfo& info,
                              const SkMatrix& perspectiveRemover) = NULL;
     SkPoint transformPoints[2];
 
     // Depending on the type of the gradient, we want to transform the
     // coordinate space in different ways.
-    const SkShader::GradientInfo* info = &fShaderState->fInfo;
+    const SkShader::GradientInfo* info = &state->fInfo;
     transformPoints[0] = info->fPoint[0];
     transformPoints[1] = info->fPoint[1];
-    switch (fShaderState->fType) {
+    switch (state->fType) {
         case SkShader::kLinear_GradientType:
             codeFunction = &linearCode;
             break;
         case SkShader::kRadial_GradientType:
             transformPoints[1] = transformPoints[0];
             transformPoints[1].fX += info->fRadius[0];
             codeFunction = &radialCode;
             break;
         case SkShader::kRadial2_GradientType: {
-            // Bail out if the radii are the same.  Empty fResources signals
-            // an error and isValid will return false.
+            // Bail out if the radii are the same.
             if (info->fRadius[0] == info->fRadius[1]) {
-                return;
+                return NULL;
             }
             transformPoints[1] = transformPoints[0];
             SkScalar dr = info->fRadius[1] - info->fRadius[0];
             transformPoints[1].fX += dr;
             codeFunction = &twoPointRadialCode;
             break;
         }
         case SkShader::kConical_GradientType: {
             transformPoints[1] = transformPoints[0];
             transformPoints[1].fX += SK_Scalar1;
             codeFunction = &twoPointConicalCode;
             break;
         }
         case SkShader::kSweep_GradientType:
             transformPoints[1] = transformPoints[0];
             transformPoints[1].fX += SK_Scalar1;
             codeFunction = &sweepCode;
             break;
         case SkShader::kColor_GradientType:
         case SkShader::kNone_GradientType:
         default:
-            return;
+            return NULL;
     }
 
     // Move any scaling (assuming a unit gradient) or translation
     // (and rotation for linear gradient), of the final gradient from
     // info->fPoints to the matrix (updating bbox appropriately).  Now
     // the gradient can be drawn on on the unit segment.
     SkMatrix mapperMatrix;
     unitToPointsMatrix(transformPoints, &mapperMatrix);
 
-    SkMatrix finalMatrix = fShaderState->fCanvasTransform;
-    finalMatrix.preConcat(fShaderState->fShaderTransform);
+    SkMatrix finalMatrix = state->fCanvasTransform;
+    finalMatrix.preConcat(state->fShaderTransform);
     finalMatrix.preConcat(mapperMatrix);
 
     // Preserves as much as posible in the final matrix, and only removes
     // the perspective. The inverse of the perspective is stored in
     // perspectiveInverseOnly matrix and has 3 useful numbers
     // (p0, p1, p2), while everything else is either 0 or 1.
     // In this way the shader will handle it eficiently, with minimal code.
     SkMatrix perspectiveInverseOnly = SkMatrix::I();
     if (finalMatrix.hasPerspective()) {
         if (!split_perspective(finalMatrix,
                                &finalMatrix, &perspectiveInverseOnly)) {
-            return;
+            return NULL;
         }
     }
 
     SkRect bbox;
-    bbox.set(fShaderState->fBBox);
+    bbox.set(state->fBBox);
     if (!inverseTransformBBox(finalMatrix, &bbox)) {
-        return;
+        return NULL;
     }
 
     SkAutoTUnref<SkPDFArray> domain(new SkPDFArray);
     domain->reserve(4);
     domain->appendScalar(bbox.fLeft);
     domain->appendScalar(bbox.fRight);
     domain->appendScalar(bbox.fTop);
     domain->appendScalar(bbox.fBottom);
 
     SkString functionCode;
     // The two point radial gradient further references
-    // fShaderState->fInfo
+    // state->fInfo
     // in translating from x, y coordinates to the t parameter. So, we have
     // to transform the points and radii according to the calculated matrix.
-    if (fShaderState->fType == SkShader::kRadial2_GradientType) {
+    if (state->fType == SkShader::kRadial2_GradientType) {
         SkShader::GradientInfo twoPointRadialInfo = *info;
         SkMatrix inverseMapperMatrix;
         if (!mapperMatrix.invert(&inverseMapperMatrix)) {
-            return;
+            return NULL;
         }
         inverseMapperMatrix.mapPoints(twoPointRadialInfo.fPoint, 2);
         twoPointRadialInfo.fRadius[0] =
             inverseMapperMatrix.mapRadius(info->fRadius[0]);
         twoPointRadialInfo.fRadius[1] =
             inverseMapperMatrix.mapRadius(info->fRadius[1]);
         functionCode = codeFunction(twoPointRadialInfo, perspectiveInverseOnly);
     } else {
         functionCode = codeFunction(*info, perspectiveInverseOnly);
     }
 
     SkAutoTUnref<SkPDFDict> pdfShader(new SkPDFDict);
     pdfShader->insertInt("ShadingType", 1);
     pdfShader->insertName("ColorSpace", "DeviceRGB");
     pdfShader->insert("Domain", domain.get());
 
-    SkPDFStream* function = makePSFunction(functionCode, domain.get());
+    SkPDFStream* function = make_ps_function(functionCode, domain.get());
     pdfShader->insert("Function", new SkPDFObjRef(function))->unref();
-    fResources.push(function);  // Pass ownership to resource list.
 
-    insertInt("PatternType", 2);
-    insert("Matrix", SkPDFUtils::MatrixToArray(finalMatrix))->unref();
-    insert("Shading", pdfShader.get());
+    SkAutoTUnref<SkPDFArray> matrixArray(
+            SkPDFUtils::MatrixToArray(finalMatrix));
+
+    SkPDFFunctionShader* pdfFunctionShader =
+            SkNEW_ARGS(SkPDFFunctionShader, (state.detach()));

[mtklein, 2015/01/22 21:16:33]

?  Either way seems fine I guess, but I've seen more code in Skia 4 in than 8.

+
+    pdfFunctionShader->fResources.push(function);
+    // Pass ownership to resource list.
+
+    pdfFunctionShader->insertInt("PatternType", 2);
+    pdfFunctionShader->insert("Matrix", matrixArray.get());
+    pdfFunctionShader->insert("Shading", pdfShader.get());
+
+    SkPDFCanon::GetCanon().addShader(pdfFunctionShader);
+    return pdfFunctionShader;
 }
 
-SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state)
-    : SkPDFShader(state) {
-    fShaderState->fImage.lockPixels();
+SkPDFObject* SkPDFImageShader::Create(
+        SkAutoTDelete<SkPDFShader::State>* statePtr) {
+    SkAutoTDelete<SkPDFShader::State>& state = *statePtr;
+
+    state->fImage.lockPixels();
 
     // The image shader pattern cell will be drawn into a separate device
     // in pattern cell space (no scaling on the bitmap, though there may be
     // translations so that all content is in the device, coordinates > 0).
 
     // Map clip bounds to shader space to ensure the device is large enough
     // to handle fake clamping.
-    SkMatrix finalMatrix = fShaderState->fCanvasTransform;
-    finalMatrix.preConcat(fShaderState->fShaderTransform);
+    SkMatrix finalMatrix = state->fCanvasTransform;
+    finalMatrix.preConcat(state->fShaderTransform);
     SkRect deviceBounds;
-    deviceBounds.set(fShaderState->fBBox);
+    deviceBounds.set(state->fBBox);
     if (!inverseTransformBBox(finalMatrix, &deviceBounds)) {
-        return;
+        return NULL;
     }
 
-    const SkBitmap* image = &fShaderState->fImage;
+    const SkBitmap* image = &state->fImage;
     SkRect bitmapBounds;
     image->getBounds(&bitmapBounds);
 
     // For tiling modes, the bounds should be extended to include the bitmap,
     // otherwise the bitmap gets clipped out and the shader is empty and awful.
     // For clamp modes, we're only interested in the clip region, whether
     // or not the main bitmap is in it.
     SkShader::TileMode tileModes[2];
-    tileModes[0] = fShaderState->fImageTileModes[0];
-    tileModes[1] = fShaderState->fImageTileModes[1];
+    tileModes[0] = state->fImageTileModes[0];
+    tileModes[1] = state->fImageTileModes[1];
     if (tileModes[0] != SkShader::kClamp_TileMode ||
             tileModes[1] != SkShader::kClamp_TileMode) {
         deviceBounds.join(bitmapBounds);
     }
 
     SkMatrix unflip;
     unflip.setTranslate(0, SkScalarRoundToScalar(deviceBounds.height()));
     unflip.preScale(SK_Scalar1, -SK_Scalar1);
     SkISize size = SkISize::Make(SkScalarRoundToInt(deviceBounds.width()),
                                  SkScalarRoundToInt(deviceBounds.height()));
@@ skipping 152 matching lines @@
                 bottomMatrix.postScale(-1, 1);
                 bottomMatrix.postTranslate(2 * width, 0);
                 drawBitmapMatrix(&canvas, bottom, bottomMatrix);
             }
             patternBBox.fBottom = deviceBounds.height();
         }
     }
 
     // Put the canvas into the pattern stream (fContent).
     SkAutoTDelete<SkStream> content(pattern.content());
-    setData(content.get());
+
+    SkPDFImageShader* imageShader =
+            SkNEW_ARGS(SkPDFImageShader, (state.detach()));

[mtklein, 2015/01/22 21:16:33]

ditto

+    imageShader->setData(content.get());
+
     SkPDFResourceDict* resourceDict = pattern.getResourceDict();
-    resourceDict->getReferencedResources(fResources, &fResources, false);
+    resourceDict->getReferencedResources(imageShader->fResources,
+                                         &imageShader->fResources, false);
 
-    populate_tiling_pattern_dict(this, patternBBox,
+    populate_tiling_pattern_dict(imageShader, patternBBox,
                                  pattern.getResourceDict(), finalMatrix);
 
-    fShaderState->fImage.unlockPixels();
-}
+    imageShader->fShaderState->fImage.unlockPixels();
 
-SkPDFStream* SkPDFFunctionShader::makePSFunction(const SkString& psCode, SkPDFArray* domain) {
-    SkAutoDataUnref funcData(SkData::NewWithCopy(psCode.c_str(), psCode.size()));
-    SkPDFStream* result = new SkPDFStream(funcData.get());
-    result->insertInt("FunctionType", 4);
-    result->insert("Domain", domain);
-    result->insert("Range", RangeObject());
-    return result;
+    SkPDFCanon::GetCanon().addShader(imageShader);
+    return imageShader;
 }
 
 bool SkPDFShader::State::operator==(const SkPDFShader::State& b) const {
     if (fType != b.fType ||
             fCanvasTransform != b.fCanvasTransform ||
             fShaderTransform != b.fShaderTransform ||
             fBBox != b.fBBox) {
         return false;
     }
 
@@ skipping 172 matching lines @@
     return false;
 }
 
 void SkPDFShader::State::AllocateGradientInfoStorage() {
     fColorData.set(sk_malloc_throw(
                fInfo.fColorCount * (sizeof(SkColor) + sizeof(SkScalar))));
     fInfo.fColors = reinterpret_cast<SkColor*>(fColorData.get());
     fInfo.fColorOffsets =
             reinterpret_cast<SkScalar*>(fInfo.fColors + fInfo.fColorCount);
 }