[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hamaji at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7f4308ea654b6060d803a1e94eba3ce99a1f5a19
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 28 05:33:49 2009 +0000

    2009-11-27  Shinichiro Hamaji  <hamaji at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51454 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1493c84..39b6844 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-27  Shinichiro Hamaji  <hamaji at 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 at webkit.org>
 
         Unreviewed, comment fix.
diff --git a/WebCore/bindings/v8/V8DOMMap.cpp b/WebCore/bindings/v8/V8DOMMap.cpp
index cd7f1e8..7512dff 100644
--- a/WebCore/bindings/v8/V8DOMMap.cpp
+++ b/WebCore/bindings/v8/V8DOMMap.cpp
@@ -48,38 +48,32 @@ DOMDataStoreHandle::~DOMDataStoreHandle()
 {
 }
 
-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();
 }
 
 #if ENABLE(SVG)
 
 DOMWrapperMap<SVGElementInstance>& getDOMSVGElementInstanceMap()
 {
-    return getDOMDataStore().domSvgElementInstanceMap();
+    return DOMData::getCurrent()->getStore().domSvgElementInstanceMap();
 }
 
 // Map of SVG objects with contexts to V8 objects
 DOMWrapperMap<void>& getDOMSVGObjectWithContextMap()
 {
-    return getDOMDataStore().domSvgObjectWithContextMap();
+    return DOMData::getCurrent()->getStore().domSvgObjectWithContextMap();
 }
 
 #endif // ENABLE(SVG)

-- 
WebKit Debian packaging