WIP enum / V8PerContextData solution

Source/bindings/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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef V8PerContextData_h
 #define V8PerContextData_h
 
 #include "ScopedPersistent.h"
 #include "V8DOMActivityLogger.h"
+#include "V8PerContextDebugData.h"
 #include "WrapperTypeInfo.h"
 #include <v8.h>
 #include <wtf/HashMap.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
 struct V8NPObject;
 typedef WTF::Vector<V8NPObject*> V8NPObjectVector;
 typedef WTF::HashMap<int, V8NPObjectVector> V8NPObjectMap;
 
-enum V8ContextEmbedderDataField {
-    v8ContextDebugIdIndex,
-    v8ContextPerContextDataIndex,
-    v8ContextIsolatedWorld,
-    // Rather than adding more embedder data fields to v8::Context,
-    // consider adding the data to V8PerContextData instead.
-};
-
 class V8PerContextData {
 public:
     static PassOwnPtr<V8PerContextData> create(v8::Persistent<v8::Context> context)
     {
         return adoptPtr(new V8PerContextData(context));
     }
 
     ~V8PerContextData()
     {
         dispose();
@@ skipping 30 matching lines @@
 
     V8DOMActivityLogger* activityLogger()
     {
         return m_activityLogger;
     }
 
     void setActivityLogger(V8DOMActivityLogger* logger)
     {
         m_activityLogger = logger;
     }
-
+    
 private:
     explicit V8PerContextData(v8::Persistent<v8::Context> context)
-        : m_context(context)
+        : m_context(context), 
+        m_originCategory(CompilationOriginUnset), 
+        m_contextCategory(CompilationContextUnset), 
+        m_restrictions(CompilationRestrictionsNone),
+        m_debugId(0)
     {
     }
 
     void dispose();
 
     v8::Local<v8::Object> createWrapperFromCacheSlowCase(WrapperTypeInfo*);
     v8::Local<v8::Function> constructorForTypeSlowCase(WrapperTypeInfo*);
 
     // For each possible type of wrapper, we keep a boilerplate object.
     // The boilerplate is used to create additional wrappers of the same type.
     typedef WTF::HashMap<WrapperTypeInfo*, v8::Persistent<v8::Object> > WrapperBoilerplateMap;
     WrapperBoilerplateMap m_wrapperBoilerplates;
 
     typedef WTF::HashMap<WrapperTypeInfo*, v8::Persistent<v8::Function> > ConstructorMap;
     ConstructorMap m_constructorMap;
 
     V8NPObjectMap m_v8NPObjectMap;
     // We cache a pointer to the V8DOMActivityLogger associated with the world
     // corresponding to this context. The ownership of the pointer is retained
     // by the DOMActivityLoggerMap in DOMWrapperWorld.
     V8DOMActivityLogger* m_activityLogger;
     v8::Persistent<v8::Context> m_context;
     ScopedPersistent<v8::Value> m_errorPrototype;
     ScopedPersistent<v8::Value> m_objectPrototype;
-};
-
-class V8PerContextDebugData {
-public:
-    static bool setContextDebugData(v8::Handle<v8::Context>, const char* worldName, int debugId);
-    static int contextDebugId(v8::Handle<v8::Context>);
+    // Transient values set during compilation into the Context for devtools
+    friend class V8PerContextDebugData;
+    friend class V8ScopedCompilation;
+    CompilationOriginCategory m_originCategory;
+    CompilationContextCategory m_contextCategory;
+    CompilationRestrictions m_restrictions;
+    int m_debugId;
 };
 
 } // namespace WebCore
 
 #endif // V8PerContextData_h