SkPDF: SkPDFGraphicState Lookup hashtabled

src/pdf/SkPDFCanon.cpp

Index: src/pdf/SkPDFCanon.cpp
diff --git a/src/pdf/SkPDFCanon.cpp b/src/pdf/SkPDFCanon.cpp
index eda255051ad66d54d6d733bfd8cae03356b2c38a..bca803844e0e6fde0e4e70062f55e24fb9cf6129 100644
--- a/src/pdf/SkPDFCanon.cpp
+++ b/src/pdf/SkPDFCanon.cpp
@@ -8,7 +8,6 @@
 #include "SkPDFBitmap.h"
 #include "SkPDFCanon.h"
 #include "SkPDFFont.h"
-#include "SkPDFGraphicState.h"
 #include "SkPDFShader.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -24,7 +23,8 @@ void SkPDFCanon::reset() {
     fAlphaShaderRecords.reset();
     fImageShaderRecords.unrefAll();
     fImageShaderRecords.reset();
-    fGraphicStateRecords.unrefAll();
+    fGraphicStateRecords.foreach (
+            [](Wrap<SkPDFGraphicState> ptr) { ptr.fPtr->unref(); });
     fGraphicStateRecords.reset();
     fBitmapRecords.unrefAll();
     fBitmapRecords.reset();
@@ -107,12 +107,17 @@ void SkPDFCanon::addImageShader(SkPDFImageShader* pdfShader) {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-SkPDFGraphicState* SkPDFCanon::findGraphicState(const SkPaint& paint) const {
-    return find_item(fGraphicStateRecords, paint);
+SkPDFGraphicState* SkPDFCanon::findGraphicState(SkPDFGraphicState& key) const {
+    const Wrap<SkPDFGraphicState>* ptr =
+            fGraphicStateRecords.find(Wrap<SkPDFGraphicState>(&key));
+    return ptr ? ptr->fPtr : NULL;

[mtklein, 2015/04/01 20:05:39]

It does not seem safe to return a non-const pointer.  If you change that, you'll
change the value in the hash set, but not its location, breaking its invariants.

 }
 
 void SkPDFCanon::addGraphicState(SkPDFGraphicState* state) {
-    fGraphicStateRecords.push(SkRef(state));
+    SkASSERT(state);
+    Wrap<SkPDFGraphicState> w(SkRef(state));
+    SkASSERT(!fGraphicStateRecords.contains(w));
+    fGraphicStateRecords.add(w);
 }
 
 ////////////////////////////////////////////////////////////////////////////////