Use SkMutex::assertHeld in SkPDFFont and SkPDFShader.

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 584 matching lines @@
     SkAutoTDelete<State> shaderState(inState);
     if (shaderState.get()->fType == SkShader::kNone_GradientType &&
             shaderState.get()->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::CanonicalShadersMutex().assertHeld();

[mtklein, 2014/06/20 17:40:54]

Seems redundant?  Just let CanonicalShaders() do it?

[hal.canary, 2014/06/20 17:49:07]

Done.

     ShaderCanonicalEntry entry(NULL, shaderState.get());
     int index = CanonicalShaders().find(entry);
     if (index >= 0) {
         result = CanonicalShaders()[index].fPDFShader;
         result->ref();
         return result;
     }
 
     bool valid = false;
     // The PDFShader takes ownership of the shaderSate.
@@ skipping 13 matching lines @@
                 SkNEW_ARGS(SkPDFFunctionShader, (shaderState.detach()));
             valid = functionShader->isValid();
             result = functionShader;
         }
     }
     if (!valid) {
         delete result;
         return NULL;
     }
     entry.fPDFShader = result;
+    SkPDFShader::CanonicalShadersMutex().assertHeld();

[mtklein, 2014/06/20 17:40:56]

Ditto.

[hal.canary, 2014/06/20 17:49:06]

Done.

     CanonicalShaders().push(entry);
     return result;  // return the reference that came from new.
 }
 
 // static
 void SkPDFShader::RemoveShader(SkPDFObject* shader) {
     SkAutoMutexAcquire lock(CanonicalShadersMutex());
     ShaderCanonicalEntry entry(shader, NULL);
     int index = CanonicalShaders().find(entry);
     SkASSERT(index >= 0);
     CanonicalShaders().removeShuffle(index);
 }
 
 // static
 SkPDFObject* SkPDFShader::GetPDFShader(const SkShader& shader,
                                        const SkMatrix& matrix,
                                        const SkIRect& surfaceBBox) {
     SkAutoMutexAcquire lock(CanonicalShadersMutex());
     return GetPDFShaderByState(
             SkNEW_ARGS(State, (shader, matrix, surfaceBBox)));
 }
 
 // static
 SkTDArray<SkPDFShader::ShaderCanonicalEntry>& SkPDFShader::CanonicalShaders() {
+    SkPDFShader::CanonicalShadersMutex().assertHeld();
     // This initialization is only thread safe with gcc.
     static SkTDArray<ShaderCanonicalEntry> gCanonicalShaders;
     return gCanonicalShaders;
 }
 
 // static
 SkBaseMutex& SkPDFShader::CanonicalShadersMutex() {
     // This initialization is only thread safe with gcc or when

[mtklein, 2014/06/20 17:40:56]

Again, misleading.  Let's just delete all these "is only thread safe" comments.

[hal.canary, 2014/06/20 17:49:06]

Done.

     // POD-style mutex initialization is used.
     SK_DECLARE_STATIC_MUTEX(gCanonicalShadersMutex);
     return gCanonicalShadersMutex;
 }
 
 // static
 SkPDFObject* SkPDFFunctionShader::RangeObject() {
-    // This initialization is only thread safe with gcc.
+    SkPDFShader::CanonicalShadersMutex().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);
@@ skipping 651 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);
 }