Changeset 51454 in webkit

Timestamp:

Nov 27, 2009 9:33:49 PM (14 years ago)

Author:

hamaji@chromium.org

Message:

2009-11-27 Shinichiro Hamaji <​hamaji@chromium.org>

Unreviewed Chromium test fix by reverting r51413.

[v8] Do not check the thread when accessing DOMDataStore
​https://bugs.webkit.org/show_bug.cgi?id=31877

• bindings/v8/V8DOMMap.cpp: (WebCore::getDOMNodeMap): (WebCore::getDOMObjectMap): (WebCore::getActiveDOMObjectMap): (WebCore::getDOMSVGElementInstanceMap): (WebCore::getDOMSVGObjectWithContextMap):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8DOMMap.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-27  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Unreviewed Chromium test fix by reverting r51413.
+
+        [v8] Do not check the thread when accessing DOMDataStore
+        https://bugs.webkit.org/show_bug.cgi?id=31877
+
+        * bindings/v8/V8DOMMap.cpp:
+        (WebCore::getDOMNodeMap):
+        (WebCore::getDOMObjectMap):
+        (WebCore::getActiveDOMObjectMap):
+        (WebCore::getDOMSVGElementInstanceMap):
+        (WebCore::getDOMSVGObjectWithContextMap):
+
 2009-11-27  Daniel Bates  <dbates@webkit.org>
 

trunk/WebCore/bindings/v8/V8DOMMap.cpp

@@ -49 +49 @@
 }
 
-static inline DOMDataStore& getDOMDataStore()
-{
-    ASSERT(WTF::isMainThread());  // As of now, we must be always on the main thread.
-    return MainThreadDOMData::getCurrentMainThreadStore();
-}
-
 DOMWrapperMap<Node>& getDOMNodeMap()
 {
-    return getDOMDataStore().domNodeMap();
+    return MainThreadDOMData::getCurrentMainThreadStore().domNodeMap();
 }
 
 DOMWrapperMap<void>& getDOMObjectMap()
 {
-    return getDOMDataStore().domObjectMap();
+    return DOMData::getCurrent()->getStore().domObjectMap();
 }
 
 DOMWrapperMap<void>& getActiveDOMObjectMap()
 {
-    return getDOMDataStore().activeDomObjectMap();
+    return DOMData::getCurrent()->getStore().activeDomObjectMap();
 }
 
@@ -74 +68 @@
 DOMWrapperMap<SVGElementInstance>& getDOMSVGElementInstanceMap()
 {
-    return getDOMDataStore().domSvgElementInstanceMap();
+    return DOMData::getCurrent()->getStore().domSvgElementInstanceMap();
 }
 
@@ -80 +74 @@
 DOMWrapperMap<void>& getDOMSVGObjectWithContextMap()
 {
-    return getDOMDataStore().domSvgObjectWithContextMap();
+    return DOMData::getCurrent()->getStore().domSvgObjectWithContextMap();
 }