Title: [133909] trunk/Source/WebCore
Revision
133909
Author
jsb...@chromium.org
Date
2012-11-08 09:35:11 -0800 (Thu, 08 Nov 2012)

Log Message

Unreviewed, rolling out r133892.
http://trac.webkit.org/changeset/133892
https://bugs.webkit.org/show_bug.cgi?id=101617

Compile failures on mac, android, linux (Requested by
jsbell|gardener on #webkit).

Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-11-08

* bindings/v8/DOMDataStore.cpp:
(WebCore::DOMDataStore::current):
* bindings/v8/DOMWrapperWorld.h:
(WebCore::DOMWrapperWorld::domDataStore):
(WebCore::DOMWrapperWorld::DOMWrapperWorld):
* bindings/v8/V8DOMWrapper.h:
(WebCore::V8DOMWrapper::getCachedWrapper):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (133908 => 133909)


--- trunk/Source/WebCore/ChangeLog	2012-11-08 17:28:38 UTC (rev 133908)
+++ trunk/Source/WebCore/ChangeLog	2012-11-08 17:35:11 UTC (rev 133909)
@@ -1,3 +1,20 @@
+2012-11-08  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r133892.
+        http://trac.webkit.org/changeset/133892
+        https://bugs.webkit.org/show_bug.cgi?id=101617
+
+        Compile failures on mac, android, linux (Requested by
+        jsbell|gardener on #webkit).
+
+        * bindings/v8/DOMDataStore.cpp:
+        (WebCore::DOMDataStore::current):
+        * bindings/v8/DOMWrapperWorld.h:
+        (WebCore::DOMWrapperWorld::domDataStore):
+        (WebCore::DOMWrapperWorld::DOMWrapperWorld):
+        * bindings/v8/V8DOMWrapper.h:
+        (WebCore::V8DOMWrapper::getCachedWrapper):
+
 2012-11-08  Andrey Adaikin  <aand...@chromium.org>
 
         Web Inspector: [Canvas] UI iterations: image on the top, auto replay

Modified: trunk/Source/WebCore/bindings/v8/DOMDataStore.cpp (133908 => 133909)


--- trunk/Source/WebCore/bindings/v8/DOMDataStore.cpp	2012-11-08 17:28:38 UTC (rev 133908)
+++ trunk/Source/WebCore/bindings/v8/DOMDataStore.cpp	2012-11-08 17:35:11 UTC (rev 133909)
@@ -54,14 +54,14 @@
 
 DOMDataStore* DOMDataStore::current(v8::Isolate* isolate)
 {
-    DEFINE_STATIC_LOCAL(DOMDataStore, mainWorldDOMDataStore, (MainWorld));
+    DEFINE_STATIC_LOCAL(DOMDataStore, defaultStore, (MainWorld));
     V8PerIsolateData* data = "" ? V8PerIsolateData::from(isolate) : V8PerIsolateData::current();
     if (UNLIKELY(!!data->domDataStore()))
         return data->domDataStore();
     V8DOMWindowShell* context = V8DOMWindowShell::getEntered();
     if (UNLIKELY(!!context))
-        return context->world()->isolatedWorldDOMDataStore();
-    return &mainWorldDOMDataStore;
+        return context->world()->domDataStore();
+    return &defaultStore;
 }
 
 void DOMDataStore::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const

Modified: trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.h (133908 => 133909)


--- trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.h	2012-11-08 17:28:38 UTC (rev 133908)
+++ trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.h	2012-11-08 17:35:11 UTC (rev 133909)
@@ -78,9 +78,9 @@
     bool isIsolatedWorld() { return isIsolatedWorldId(m_worldId); }
     int worldId() const { return m_worldId; }
     int extensionGroup() const { return m_extensionGroup; }
-    DOMDataStore* isolatedWorldDOMDataStore() const
+    DOMDataStore* domDataStore() const
     {
-        ASSERT(isIsolatedWorld());
+        ASSERT(m_worldId != uninitializedWorldId);
         return m_domDataStore.get();
     }
     void deref()
@@ -98,7 +98,7 @@
         : m_worldId(worldId)
         , m_extensionGroup(extensionGroup)
     {
-        if (isIsolatedWorld())
+        if (worldId != uninitializedWorldId)
             m_domDataStore = adoptPtr(new DOMDataStore(DOMDataStore::IsolatedWorld));
     }
 

Modified: trunk/Source/WebCore/bindings/v8/V8DOMWrapper.h (133908 => 133909)


--- trunk/Source/WebCore/bindings/v8/V8DOMWrapper.h	2012-11-08 17:28:38 UTC (rev 133908)
+++ trunk/Source/WebCore/bindings/v8/V8DOMWrapper.h	2012-11-08 17:35:11 UTC (rev 133909)
@@ -122,7 +122,7 @@
             if (LIKELY(!context))
                 return node->wrapper();
 
-            return context->world()->isolatedWorldDOMDataStore()->get(node);
+            return context->world()->domDataStore()->get(node);
         }
 
     private:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to