[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0926e572fd16254b09ab880aa937e15f33701d1c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 05:06:41 2010 +0000

    2010-01-21  Andrei Popescu  <andreip at google.com>
    
            Reviewed by David Levin.
    
            [Android] bindings/v8/ScriptController.cpp needs to include
            PlatformBridge.h instead of ChromiumBridge.h so that it can
            be used on both Chromium and Android.
            https://bugs.webkit.org/show_bug.cgi?id=33673
    
            Add "static NPObject* pluginScriptableObject(Widget*);" method
            to PlatformBridge.h
            Include PlatformBridge.h from ScriptController.cpp.
    
            No new tests, just platform code.
    
            * bindings/v8/ScriptController.cpp:
            (WebCore::ScriptController::createScriptInstanceForWidget):
            * platform/android/PlatformBridge.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53673 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a20372c..a1e2b4b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-01-21  Andrei Popescu  <andreip at google.com>
+
+        Reviewed by David Levin.
+
+        [Android] bindings/v8/ScriptController.cpp needs to include
+        PlatformBridge.h instead of ChromiumBridge.h so that it can
+        be used on both Chromium and Android.
+        https://bugs.webkit.org/show_bug.cgi?id=33673
+
+        Add "static NPObject* pluginScriptableObject(Widget*);" method
+        to PlatformBridge.h
+        Include PlatformBridge.h from ScriptController.cpp.
+
+        No new tests, just platform code.
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::createScriptInstanceForWidget):
+        * platform/android/PlatformBridge.h:
+
 2010-01-21  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Maciej Stachowiak.
diff --git a/WebCore/bindings/v8/ScriptController.cpp b/WebCore/bindings/v8/ScriptController.cpp
index 84a4d4b..5d3078d 100644
--- a/WebCore/bindings/v8/ScriptController.cpp
+++ b/WebCore/bindings/v8/ScriptController.cpp
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "ScriptController.h"
 
-#include "ChromiumBridge.h"
+#include "PlatformBridge.h"
 #include "CString.h"
 #include "Document.h"
 #include "DOMWindow.h"
@@ -302,7 +302,8 @@ PassScriptInstance ScriptController::createScriptInstanceForWidget(Widget* widge
     if (widget->isFrameView())
         return 0;
 
-    NPObject* npObject = ChromiumBridge::pluginScriptableObject(widget);
+    NPObject* npObject = PlatformBridge::pluginScriptableObject(widget);
+
     if (!npObject)
         return 0;
 
diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h
index d3cbc98..3f9105a 100644
--- a/WebCore/platform/android/PlatformBridge.h
+++ b/WebCore/platform/android/PlatformBridge.h
@@ -77,8 +77,12 @@
    static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
 
 
+class NPObject;
+
 namespace WebCore {
 
+class Widget;
+
 // An interface to the embedding layer, which has the ability to answer
 // questions about the system and so on...
 // This is very similar to ChromiumBridge and the two are likely to converge
@@ -98,6 +102,8 @@ public:
     static void setCookies(const KURL&, const String& value);
     static String cookies(const KURL&);
     static bool cookiesEnabled();
+    // Plugin
+    static NPObject* pluginScriptableObject(Widget*);
 };
 
 }

-- 
WebKit Debian packaging