LookupScope does not need to be in SkRemote.h

src/core/SkRemote.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 "SkPath.h"
 #include "SkRect.h"
 #include "SkRemote.h"
@@ skipping 43 matching lines @@
 
     static bool operator==(const Stroke& a, const Stroke& b) {
         return a.fWidth == b.fWidth
             && a.fMiter == b.fMiter
             && a.fCap   == b.fCap
             && a.fJoin  == b.fJoin;
     }
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
 
+    class LookupScope {
+    public:
+        LookupScope(Cache* cache, Encoder* encoder) : fCache(cache), fEncoder(encoder) {}
+        ~LookupScope() { for (ID id : fToUndefine) { fEncoder->undefine(id); } }
+        void undefineWhenDone(ID id) { fToUndefine.push_back(id); }
+
+        template <typename T>
+        ID lookup(const T& val) {
+            ID id;
+            if (!fCache->lookup(val, &id, this)) {
+                fEncoder->define(id, val);
+            }
+            return id;
+        }
+
+    private:
+        Cache*   fCache;
+        Encoder* fEncoder;
+        SkSTArray<4, ID> fToUndefine;
+    };
+
+
     Cache* Cache::CreateNeverCache() {
         struct NeverCache final : public Cache {
             NeverCache()
                 : fNextMatrix(Type::kMatrix)
                 , fNextMisc  (Type::kMisc)
                 , fNextPath  (Type::kPath)
                 , fNextStroke(Type::kStroke)
             {}
             void cleanup(Encoder*) override {}
 
@@ skipping 83 matching lines @@
     Client::Client(Cache* cache, Encoder* encoder)
         : SkCanvas(1,1)
         , fCache(cache)
         , fEncoder(encoder)
     {}
 
     Client::~Client() {
         fCache->cleanup(fEncoder);
     }
 
-    template <typename T>
-    ID LookupScope::lookup(const T& val) {
-        ID id;
-        if (!fCache->lookup(val, &id, this)) {
-            fEncoder->define(id, val);
-        }
-        return id;
-    }
-
     void Client::willSave()   { fEncoder->save(); }
     void Client::didRestore() { fEncoder->restore(); }
 
     void Client::didConcat   (const SkMatrix&) { this->didSetMatrix(this->getTotalMatrix()); }
     void Client::didSetMatrix(const SkMatrix& matrix) {
         LookupScope ls(fCache, fEncoder);
         fEncoder->setMatrix(ls.lookup(matrix));
     }
 
     void Client::onDrawOval(const SkRect& oval, const SkPaint& paint) {
@@ skipping 74 matching lines @@
     }
     void Server::strokePath(ID path, ID misc, ID stroke) {
         SkPaint paint;
         paint.setStyle(SkPaint::kStroke_Style);
         fMisc  .find(misc  ).applyTo(&paint);
         fStroke.find(stroke).applyTo(&paint);
         fCanvas->drawPath(fPath.find(path), paint);
     }
 
 } // namespace SkRemote