Changeset 134029 in webkit

Timestamp:

Nov 9, 2012 1:11:12 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[V8] Main world should have one DOMDataStore
​https://bugs.webkit.org/show_bug.cgi?id=101470

Patch by Dan Carney <​dcarney@google.com> on 2012-11-09
Reviewed by Kentaro Hara.

The main world DOMWrapperWorld held onto a DOMDataStore that should
never be used, as there is a static one optimized for speed in
DOMDataStore.

No new tests. No change in functionality.

• bindings/v8/DOMDataStore.cpp:

(WebCore::DOMDataStore::current):

• bindings/v8/DOMWrapperWorld.h:

(WebCore::DOMWrapperWorld::isolatedWorldDomDataStore):
(WebCore::DOMWrapperWorld::DOMWrapperWorld):

• bindings/v8/V8DOMWrapper.h:

(WebCore::V8DOMWrapper::getCachedWrapper):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/DOMDataStore.cpp (modified) (2 diffs)
• bindings/v8/DOMWrapperWorld.h (modified) (2 diffs)
• bindings/v8/V8DOMWrapper.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-09  Dan Carney  <dcarney@google.com>
+
+        [V8] Main world should have one DOMDataStore
+        https://bugs.webkit.org/show_bug.cgi?id=101470
+
+        Reviewed by Kentaro Hara.
+
+        The main world DOMWrapperWorld held onto a DOMDataStore that should
+        never be used, as there is a static one optimized for speed in
+        DOMDataStore.
+
+        No new tests. No change in functionality.
+
+        * bindings/v8/DOMDataStore.cpp:
+        (WebCore::DOMDataStore::current):
+        * bindings/v8/DOMWrapperWorld.h:
+        (WebCore::DOMWrapperWorld::isolatedWorldDomDataStore):
+        (WebCore::DOMWrapperWorld::DOMWrapperWorld):
+        * bindings/v8/V8DOMWrapper.h:
+        (WebCore::V8DOMWrapper::getCachedWrapper):
+
 2012-11-09  Alexei Filippov  <alph@chromium.org>
 

trunk/Source/WebCore/bindings/v8/DOMDataStore.cpp

@@ -55 +55 @@
 DOMDataStore* DOMDataStore::current(v8::Isolate* isolate)
 {
-    DEFINE_STATIC_LOCAL(DOMDataStore, defaultStore, (MainWorld));
+    DEFINE_STATIC_LOCAL(DOMDataStore, mainWorldDOMDataStore, (MainWorld));
     V8PerIsolateData* data = isolate ? V8PerIsolateData::from(isolate) : V8PerIsolateData::current();
     if (UNLIKELY(!!data->domDataStore()))
@@ -61 +61 @@
     V8DOMWindowShell* context = V8DOMWindowShell::getEntered();
     if (UNLIKELY(!!context))
-        return context->world()->domDataStore();
-    return &defaultStore;
+        return context->world()->isolatedWorldDOMDataStore();
+    return &mainWorldDOMDataStore;
 }
 

trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.h

@@ -75 +75 @@
     static PassRefPtr<DOMWrapperWorld> createUninitializedWorld();
 
-    bool isMainWorld() { return m_worldId == mainWorldId; }
-    bool isIsolatedWorld() { return isIsolatedWorldId(m_worldId); }
+    bool isMainWorld() const { return m_worldId == mainWorldId; }
+    bool isIsolatedWorld() const { return isIsolatedWorldId(m_worldId); }
     int worldId() const { return m_worldId; }
     int extensionGroup() const { return m_extensionGroup; }
-    DOMDataStore* domDataStore() const
+    DOMDataStore* isolatedWorldDOMDataStore() const
     {
-        ASSERT(m_worldId != uninitializedWorldId);
+        ASSERT(isIsolatedWorld());
         return m_domDataStore.get();
     }
@@ -99 +99 @@
         , m_extensionGroup(extensionGroup)
     {
-        if (worldId != uninitializedWorldId)
+        if (isIsolatedWorld())
             m_domDataStore = adoptPtr(new DOMDataStore(DOMDataStore::IsolatedWorld));
     }

trunk/Source/WebCore/bindings/v8/V8DOMWrapper.h

@@ -123 +123 @@
                 return node->wrapper();
 
-            return context->world()->domDataStore()->get(node);
+            return context->world()->isolatedWorldDOMDataStore()->get(node);
         }