Changeset 53673 in webkit

Timestamp:

Jan 21, 2010 9:06:41 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-21 Andrei Popescu <​andreip@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:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/ScriptController.cpp (modified) (2 diffs)
• platform/android/PlatformBridge.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-21  Andrei Popescu  <andreip@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@apple.com>
 

trunk/WebCore/bindings/v8/ScriptController.cpp

@@ -33 +33 @@
 #include "ScriptController.h"
 
-#include "ChromiumBridge.h"
+#include "PlatformBridge.h"
 #include "CString.h"
 #include "Document.h"
@@ -303 +303 @@
         return 0;
 
-    NPObject* npObject = ChromiumBridge::pluginScriptableObject(widget);
+    NPObject* npObject = PlatformBridge::pluginScriptableObject(widget);
+
     if (!npObject)
         return 0;

trunk/WebCore/platform/android/PlatformBridge.h

@@ -78 +78 @@
 
 
+class NPObject;
+
 namespace WebCore {
+
+class Widget;
 
 // An interface to the embedding layer, which has the ability to answer
@@ -99 +103 @@
     static String cookies(const KURL&);
     static bool cookiesEnabled();
+    // Plugin
+    static NPObject* pluginScriptableObject(Widget*);
 };