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

[levin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 0e940f9c1a580ccddf80d5cb19135120c297b14a
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 13 09:34:01 2009 +0000

    Chromium build fix.
    
    Reviewed by NOBODY.
    
    * bindings/v8/ScriptController.h:
    (WebCore::ScriptController::evaluateInWorld): Add a dummy
     method which isn't called in chromium to make things compile.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50932 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0870ee7..c80a199 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-12  David Levin  <levin at chromium.org>
+
+        Reviewed by NOBODY.
+
+        Chromium build fix.
+
+        * bindings/v8/ScriptController.h:
+        (WebCore::ScriptController::evaluateInWorld): Add a dummy
+         method which isn't called in chromium to make things compile.
+
 2009-11-12  Anantanarayanan G Iyengar  <ananta at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/bindings/v8/ScriptController.h b/WebCore/bindings/v8/ScriptController.h
index a958ead..f92e2bd 100644
--- a/WebCore/bindings/v8/ScriptController.h
+++ b/WebCore/bindings/v8/ScriptController.h
@@ -39,6 +39,7 @@
 #include <v8.h>
 
 #include <wtf/HashMap.h>
+#include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
@@ -165,6 +166,9 @@ namespace WebCore {
         NPObject* windowScriptNPObject();
 #endif
 
+        // Dummy method to avoid a bunch of ifdef's in WebCore.
+        void evaluateInWorld(const ScriptSourceCode&, DOMWrapperWorld*) { }
+
     private:
         Frame* m_frame;
         const String* m_sourceURL;
@@ -191,6 +195,10 @@ namespace WebCore {
 
     DOMWrapperWorld* mainThreadNormalWorld();
 
+    // Dummy class to avoid a bunch of ifdef's in WebCore.
+    class DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
+    };
+
 } // namespace WebCore
 
 #endif // ScriptController_h

-- 
WebKit Debian packaging