Remove WrapperWorldType from DOMDataStore

Source/bindings/v8/DOMDataStore.h

 /*
  * Copyright (C) 2009 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 28 matching lines @@
 #include "wtf/Noncopyable.h"
 #include "wtf/StdLibExtras.h"
 
 namespace WebCore {
 
 class Node;
 
 class DOMDataStore {
     WTF_MAKE_NONCOPYABLE(DOMDataStore);
 public:
-    explicit DOMDataStore(WrapperWorldType);
+    explicit DOMDataStore(bool isMainWorld);
     ~DOMDataStore();
 
     static DOMDataStore& current(v8::Isolate*);
 
     // We can use a wrapper stored in a ScriptWrappable when we're in the main world.
     // This method does the fast check if we're in the main world. If this method returns true,
     // it is guaranteed that we're in the main world. On the other hand, if this method returns
     // false, nothing is guaranteed (we might be in the main world).
     template<typename T>
     static bool canUseScriptWrappable(T* object)
@@ skipping 72 matching lines @@
 
     template<typename V8T, typename T>
     static bool containsWrapper(T* object, v8::Isolate* isolate)
     {
         return current(isolate).template containsWrapper<V8T>(object);
     }
 
     template<typename V8T, typename T>
     inline v8::Handle<v8::Object> get(T* object, v8::Isolate* isolate)
     {
-        if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_type == MainWorld)
+        if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_isMainWorld)
             return ScriptWrappable::getUnsafeWrapperFromObject(object).newLocal(isolate);
         return m_wrapperMap.newLocal(V8T::toInternalPointer(object), isolate);
     }
 
     template<typename V8T, typename T>
     inline void setReference(const v8::Persistent<v8::Object>& parent, T* child, v8::Isolate* isolate)
     {
-        if (ScriptWrappable::wrapperCanBeStoredInObject(child) && m_type == MainWorld) {
+        if (ScriptWrappable::wrapperCanBeStoredInObject(child) && m_isMainWorld) {
             ScriptWrappable::getUnsafeWrapperFromObject(child).setReferenceFrom(parent, isolate);
             return;
         }
         m_wrapperMap.setReference(parent, V8T::toInternalPointer(child), isolate);
     }
 
     template<typename V8T, typename T>
     inline bool setReturnValueFrom(v8::ReturnValue<v8::Value> returnValue, T* object)
     {
-        if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_type == MainWorld)
+        if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_isMainWorld)
             return ScriptWrappable::setReturnValue(returnValue, object);
         return m_wrapperMap.setReturnValueFrom(returnValue, V8T::toInternalPointer(object));
     }
 
     template<typename V8T, typename T>
     inline bool containsWrapper(T* object)
     {
-        if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_type == MainWorld)
+        if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_isMainWorld)
             return !ScriptWrappable::getUnsafeWrapperFromObject(object).isEmpty();
         return m_wrapperMap.containsKey(V8T::toInternalPointer(object));
     }
 
 private:
     template<typename V8T, typename T>
     inline void set(T* object, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate, const WrapperConfiguration& configuration)
     {
         ASSERT(!!object);
         ASSERT(!wrapper.IsEmpty());
-        if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_type == MainWorld) {
+        if (ScriptWrappable::wrapperCanBeStoredInObject(object) && m_isMainWorld) {
             ScriptWrappable::setWrapperInObject(object, wrapper, isolate, configuration);
             return;
         }
         m_wrapperMap.set(V8T::toInternalPointer(object), wrapper, configuration);
     }
 
     static bool canExistInWorker(void*) { return true; }
     static bool canExistInWorker(Node*) { return false; }
 
     static bool holderContainsWrapper(v8::Local<v8::Object>, void*)
     {
         return false;
     }
 
     static bool holderContainsWrapper(v8::Local<v8::Object> holder, ScriptWrappable* wrappable)
     {
         // Verify our assumptions about the main world.
         UnsafePersistent<v8::Object> unsafePersistent = wrappable->unsafePersistent();
-        ASSERT(unsafePersistent.isEmpty() || !(holder == *unsafePersistent.persistent()) || current(v8::Isolate::GetCurrent()).m_type == MainWorld);
+        ASSERT(unsafePersistent.isEmpty() || !(holder == *unsafePersistent.persistent()) || current(v8::Isolate::GetCurrent()).m_isMainWorld);
         return holder == *unsafePersistent.persistent();
     }
 
-    WrapperWorldType m_type;
+    bool m_isMainWorld;
     DOMWrapperMap<void> m_wrapperMap;
 };
 
 } // namespace WebCore
 
 #endif // DOMDataStore_h