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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5d8553122800a7309c27b6358b263d3115121318
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 26 13:20:26 2009 +0000

    2009-11-26  Anton Muhin  <antonm at chromium.org>
    
            Reviewed by Adam Barth.
    
            Do not check if the thread is main or not when accessing DOMDataStore as currently in Chromium WebKit is used in main thread only.
            https://bugs.webkit.org/show_bug.cgi?id=31877
    
            Covered by layout tests and buildbots.
    
            * bindings/v8/V8DOMMap.cpp:
            (WebCore::getDOMNodeMap):
            (WebCore::getDOMObjectMap):
            (WebCore::getActiveDOMObjectMap):
            (WebCore::getDOMSVGElementInstanceMap):
            (WebCore::getDOMSVGObjectWithContextMap):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51413 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7100d10..4b54cce 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-26  Anton Muhin  <antonm at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Do not check if the thread is main or not when accessing DOMDataStore as currently in Chromium WebKit is used in main thread only.
+        https://bugs.webkit.org/show_bug.cgi?id=31877
+
+        Covered by layout tests and buildbots.
+
+        * bindings/v8/V8DOMMap.cpp:
+        (WebCore::getDOMNodeMap):
+        (WebCore::getDOMObjectMap):
+        (WebCore::getActiveDOMObjectMap):
+        (WebCore::getDOMSVGElementInstanceMap):
+        (WebCore::getDOMSVGObjectWithContextMap):
+
 2009-11-26  Girish Ramakrishnan  <girish at forwardbias.in>
 
         Reviewed by Holger Freyther.
diff --git a/WebCore/bindings/v8/V8DOMMap.cpp b/WebCore/bindings/v8/V8DOMMap.cpp
index 7512dff..cd7f1e8 100644
--- a/WebCore/bindings/v8/V8DOMMap.cpp
+++ b/WebCore/bindings/v8/V8DOMMap.cpp
@@ -48,32 +48,38 @@ 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 MainThreadDOMData::getCurrentMainThreadStore().domNodeMap();
+    return getDOMDataStore().domNodeMap();
 }
 
 DOMWrapperMap<void>& getDOMObjectMap()
 {
-    return DOMData::getCurrent()->getStore().domObjectMap();
+    return getDOMDataStore().domObjectMap();
 }
 
 DOMWrapperMap<void>& getActiveDOMObjectMap()
 {
-    return DOMData::getCurrent()->getStore().activeDomObjectMap();
+    return getDOMDataStore().activeDomObjectMap();
 }
 
 #if ENABLE(SVG)
 
 DOMWrapperMap<SVGElementInstance>& getDOMSVGElementInstanceMap()
 {
-    return DOMData::getCurrent()->getStore().domSvgElementInstanceMap();
+    return getDOMDataStore().domSvgElementInstanceMap();
 }
 
 // Map of SVG objects with contexts to V8 objects
 DOMWrapperMap<void>& getDOMSVGObjectWithContextMap()
 {
-    return DOMData::getCurrent()->getStore().domSvgObjectWithContextMap();
+    return getDOMDataStore().domSvgObjectWithContextMap();
 }
 
 #endif // ENABLE(SVG)

-- 
WebKit Debian packaging