SkPDF: SkPDFGraphicState Lookup hashtabled

src/pdf/SkPDFCanon.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPDFBitmap.h"
 #include "SkPDFCanon.h"
 #include "SkPDFFont.h"
-#include "SkPDFGraphicState.h"
 #include "SkPDFShader.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
 void SkPDFCanon::reset() {
     for (int i = 0; i < fFontRecords.count(); ++i) {
         fFontRecords[i].fFont->unref();
     }
     fFontRecords.reset();
     fFunctionShaderRecords.unrefAll();
     fFunctionShaderRecords.reset();
     fAlphaShaderRecords.unrefAll();
     fAlphaShaderRecords.reset();
     fImageShaderRecords.unrefAll();
     fImageShaderRecords.reset();
-    fGraphicStateRecords.unrefAll();
+    fGraphicStateRecords.foreach (
+            [](Wrap<SkPDFGraphicState> ptr) { ptr.fPtr->unref(); });
     fGraphicStateRecords.reset();
     fBitmapRecords.unrefAll();
     fBitmapRecords.reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class T> T* assert_ptr(T* p) { SkASSERT(p); return p; }
 
 // requires `bool T::equals(const U&) const`
@@ skipping 62 matching lines @@
         const SkPDFShader::State& state) const {
     return find_item(fImageShaderRecords, state);
 }
 
 void SkPDFCanon::addImageShader(SkPDFImageShader* pdfShader) {
     fImageShaderRecords.push(SkRef(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);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFBitmap* SkPDFCanon::findBitmap(const SkBitmap& bm) const {
     return find_item(fBitmapRecords, bm);
 }
 
 void SkPDFCanon::addBitmap(SkPDFBitmap* pdfBitmap) {
     fBitmapRecords.push(SkRef(pdfBitmap));
 }