Abstract out Modulator from V8PerContextData

third_party/WebKit/Source/bindings/core/v8/V8PerContextData.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 31 matching lines @@
 #include "gin/public/gin_embedders.h"
 #include "v8/include/v8.h"
 #include "wtf/Allocator.h"
 #include "wtf/HashMap.h"
 #include "wtf/Vector.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/AtomicStringHash.h"
 
 namespace blink {
 
-class Modulator;
 class V8DOMActivityLogger;
 class V8PerContextData;
 
 enum V8ContextEmbedderDataField {
   v8ContextPerContextDataIndex =
       static_cast<int>(gin::kPerContextDataStartIndex + gin::kEmbedderBlink),
 };
 
 class CORE_EXPORT V8PerContextData final {
   USING_FAST_MALLOC(V8PerContextData);
@@ skipping 34 matching lines @@
       v8::Local<v8::Object>* prototypeObject,
       v8::Local<v8::Function>* interfaceObject);
 
   void addCustomElementBinding(std::unique_ptr<V0CustomElementBinding>);
 
   V8DOMActivityLogger* activityLogger() const { return m_activityLogger; }
   void setActivityLogger(V8DOMActivityLogger* activityLogger) {
     m_activityLogger = activityLogger;
   }
 
-  Modulator* modulator() const { return m_modulator.get(); }
-  void setModulator(Modulator*);
-  void clearModulator();
+  // Garbage collected classes that use V8PerContextData to hold an instance
+  // should subclass Data, and use addData / clearData / getData to manage the
+  // instance.
+  class CORE_EXPORT Data : public GarbageCollectedMixin {};
+
+  void addData(const char* key, Data*);
+  void clearData(const char* key);
+  Data* getData(const char* key);
 
  private:
   V8PerContextData(v8::Local<v8::Context>);
 
   v8::Local<v8::Object> createWrapperFromCacheSlowCase(const WrapperTypeInfo*);
   v8::Local<v8::Function> constructorForTypeSlowCase(const WrapperTypeInfo*);
 
   v8::Isolate* m_isolate;
 
   // For each possible type of wrapper, we keep a boilerplate object.
@@ skipping 11 matching lines @@
   ScopedPersistent<v8::Context> m_context;
   ScopedPersistent<v8::Value> m_errorPrototype;
 
   typedef Vector<std::unique_ptr<V0CustomElementBinding>>
       V0CustomElementBindingList;
   V0CustomElementBindingList m_customElementBindings;
 
   // This is owned by a static hash map in V8DOMActivityLogger.
   V8DOMActivityLogger* m_activityLogger;
 
-  Persistent<Modulator> m_modulator;
+  using DataMap =
+      PersistentHeapHashMap<const char*, Member<Data>, PtrHash<const char>>;

[haraken, 2017/04/05 02:08:10]

Do we need PtrHash<const char>?

[adithyas, 2017/04/05 21:45:35]

Guess we don't, DefaultHash makes pointer types use PtrHash. 

+  DataMap m_dataMap;
 };
 
 }  // namespace blink
 
 #endif  // V8PerContextData_h