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

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5a5a3e061fc01cd8fb68d725809833e4d8b4c0ad
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 14 02:29:50 2009 +0000

    2009-11-13  Adam Barth  <abarth at webkit.org>
    
            Unreviewed partial build fix for Chromium.  Should fix failure #4.
    
            * bindings/v8/ScriptController.cpp:
            (WebCore::ScriptController::getAllWorlds):
            * bindings/v8/ScriptController.h:
            * bindings/v8/V8Proxy.cpp:
            (WebCore::V8Proxy::initContextIfNeeded):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50988 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f037828..0a6d591 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2009-11-13  Adam Barth  <abarth at webkit.org>
 
+        Unreviewed partial build fix for Chromium.  Should fix failure #4.
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::getAllWorlds):
+        * bindings/v8/ScriptController.h:
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::initContextIfNeeded):
+
+2009-11-13  Adam Barth  <abarth at webkit.org>
+
         Unreviewed partial build fix for Chromium.
 
         * bindings/v8/ScriptController.h:
diff --git a/WebCore/bindings/v8/ScriptController.cpp b/WebCore/bindings/v8/ScriptController.cpp
index 14c1838..7bd29b1 100644
--- a/WebCore/bindings/v8/ScriptController.cpp
+++ b/WebCore/bindings/v8/ScriptController.cpp
@@ -349,6 +349,11 @@ void ScriptController::cleanupScriptObjectsForPlugin(Widget* nativeHandle)
     m_pluginObjects.remove(it);
 }
 
+void ScriptController::getAllWorlds(Vector<DOMWrapperWorld*>& worlds)
+{
+    worlds.append(mainThreadWorld());
+}
+
 static NPObject* createNoScriptObject()
 {
     notImplemented();
diff --git a/WebCore/bindings/v8/ScriptController.h b/WebCore/bindings/v8/ScriptController.h
index eddc123..0189faa 100644
--- a/WebCore/bindings/v8/ScriptController.h
+++ b/WebCore/bindings/v8/ScriptController.h
@@ -168,7 +168,7 @@ namespace WebCore {
 
         // Dummy method to avoid a bunch of ifdef's in WebCore.
         void evaluateInWorld(const ScriptSourceCode&, DOMWrapperWorld*) { }
-        static void getAllWorlds(Vector<DOMWrapperWorld*>&) {}
+        static void getAllWorlds(Vector<DOMWrapperWorld*>& worlds);
 
     private:
         Frame* m_frame;
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index de977b8..bb94465 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -1106,7 +1106,10 @@ void V8Proxy::initContextIfNeeded()
     setSecurityToken();
 
     m_frame->loader()->client()->didCreateScriptContextForFrame();
-    m_frame->loader()->dispatchWindowObjectAvailable();
+
+    // FIXME: This is wrong. We should actually do this for the proper world once
+    // we do isolated worlds the WebCore way.
+     m_frame->loader()->dispatchDidClearWindowObjectsInAllWorlds();
 }
 
 void V8Proxy::setDOMException(int exceptionCode)

-- 
WebKit Debian packaging