summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/android
diff options
context:
space:
mode:
authorAndrei Popescu <andreip@google.com>2010-01-25 03:38:53 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-25 03:38:53 -0800
commitb621c75b275a6b7ac0fd99772749aaadb3548815 (patch)
tree319a50f7b8805dc80336df49730c98a1aa87d5eb /WebCore/platform/android
parentce6ac5bde4fdfba3f020e3dc8264f0416160a3a8 (diff)
parentb9ca2665dcffd57d63df89bca0444f1cee8d0fee (diff)
downloadexternal_webkit-b621c75b275a6b7ac0fd99772749aaadb3548815.zip
external_webkit-b621c75b275a6b7ac0fd99772749aaadb3548815.tar.gz
external_webkit-b621c75b275a6b7ac0fd99772749aaadb3548815.tar.bz2
Merge "Prepare ScriptController class for upstreaming."
Diffstat (limited to 'WebCore/platform/android')
-rw-r--r--WebCore/platform/android/PlatformBridge.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h
index a73abab..8b08490 100644
--- a/WebCore/platform/android/PlatformBridge.h
+++ b/WebCore/platform/android/PlatformBridge.h
@@ -31,9 +31,12 @@
#include <wtf/Vector.h>
+class NPObject;
+
namespace WebCore {
class FrameView;
+class Widget;
// An interface to the embedding layer, which has the ability to answer
// questions about the system and so on...
@@ -54,6 +57,8 @@ public:
static void setCookies(const KURL&, const String& value);
static String cookies(const KURL&);
static bool cookiesEnabled();
+ // Plugin
+ static NPObject* pluginScriptableObject(Widget*);
// These ids need to be in sync with the constants in BrowserFrame.java
enum rawResId {
NoDomain = 1,