Add lock to SkPDFDict

src/pdf/SkPDFTypes.h

 
 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPDFTypes_DEFINED
@@ skipping 351 matching lines @@
 
     virtual ~SkPDFDict();
 
     // The SkPDFObject interface.
     virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
                             bool indirect);
     virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
 
     /** The size of the dictionary.
      */
-    int size() { return fValue.count(); }
+    int size() const;
 
     /** Add the value to the dictionary with the given key.  Refs value.
      *  @param key   The key for this dictionary entry.
      *  @param value The value for this dictionary entry.
      *  @return The value argument is returned.
      */
     SkPDFObject* insert(SkPDFName* key, SkPDFObject* value);
 
     /** Add the value to the dictionary with the given key.  Refs value.  The
      *  method will create the SkPDFName object.
@@ skipping 34 matching lines @@
      *  @param name  The name for this dictionary entry.
      */
     void insertName(const char key[], const SkString& name) {
         this->insertName(key, name.c_str());
     }
 
     /** Remove all entries from the dictionary.
      */
     void clear();
 
+protected:
+    /** Use to remove a single key from the dictionary.
+     */
+    void remove(const char key[]);
+
+    /** Insert references to all of the key-value pairs from the other
+     *  dictionary into this one.
+     */
+    void mergeFrom(const SkPDFDict& other);
+
 private:
     struct Rec {
-      SkPDFName* key;
-      SkPDFObject* value;
+        SkPDFName* key;
+        SkPDFObject* value;
+        Rec(SkPDFName* k, SkPDFObject* v) : key(k), value(v) {}
     };
 
-public:
-    class Iter {
-    public:
-        explicit Iter(const SkPDFDict& dict);
-        SkPDFName* next(SkPDFObject** value);
-
-    private:
-        const Rec* fIter;
-        const Rec* fStop;
-    };
-
-private:
     static const int kMaxLen = 4095;
 
+    mutable SkMutex fMutex;  // protects modifications to fValue
     SkTDArray<struct Rec> fValue;
 
+    SkPDFObject* append(SkPDFName* key, SkPDFObject* value);
+
     typedef SkPDFObject INHERITED;
 };
 
 #endif