[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 1fdcbdab7891002c2afe46d7dc22f09f7c0cd583
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 14 02:18:30 2009 +0000

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7d57adc..f037828 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-13  Adam Barth  <abarth at webkit.org>
+
+        Unreviewed partial build fix for Chromium.
+
+        * bindings/v8/ScriptController.h:
+        (WebCore::ScriptController::getAllWorlds):
+
 2009-11-13  Eric Seidel  <eric at webkit.org>
 
         No review, build fix only.
diff --git a/WebCore/bindings/v8/ScriptController.h b/WebCore/bindings/v8/ScriptController.h
index f92e2bd..eddc123 100644
--- a/WebCore/bindings/v8/ScriptController.h
+++ b/WebCore/bindings/v8/ScriptController.h
@@ -168,6 +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*>&) {}
 
     private:
         Frame* m_frame;

-- 
WebKit Debian packaging