diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 14:00:49 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 14:00:49 -0700 |
| commit | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (patch) | |
| tree | 5298ee7f87a0f97f06d5b2e66c37dedd88238ccf /WebCore/plugins/PluginView.h | |
| parent | ad9f76210e4cbae75d762b7a65b39af424879b6b (diff) | |
| parent | 36747fa778285f57f2f53c047028be83e9d8776d (diff) | |
| download | external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.zip external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.tar.gz external_webkit-c9c4d65c1547996ed3748026904d6e7f09aec2b4.tar.bz2 | |
Merge commit 'goog/master' into webkit_merge
Resolved conflicts:
WebCore/Android.mk
WebCore/storage/LocalStorageArea.h
WebCore/storage/SessionStorageArea.cpp
WebCore/storage/StorageEvent.cpp
Diffstat (limited to 'WebCore/plugins/PluginView.h')
| -rw-r--r-- | WebCore/plugins/PluginView.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index 9853eb7..d0cfacb 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -73,6 +73,9 @@ namespace WebCore { class Frame; class KeyboardEvent; class MouseEvent; +#ifdef ANDROID_PLUGINS + class TouchEvent; +#endif class KURL; #if PLATFORM(WIN_OS) && !PLATFORM(WX) && ENABLE(NETSCAPE_PLUGIN_API) class PluginMessageThrottlerWin; @@ -211,6 +214,11 @@ namespace WebCore { static bool isCallingPlugin(); +#ifdef ANDROID_PLUGINS + Frame* getParentFrame() const { return m_parentFrame; } + Element* getElement() const { return m_element; } +#endif + private: PluginView(Frame* parentFrame, const IntSize&, PluginPackage*, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually); @@ -262,6 +270,7 @@ namespace WebCore { void handleMouseEvent(MouseEvent*); #ifdef ANDROID_PLUGINS + void handleTouchEvent(TouchEvent*); // called at the end of the base constructor void platformInit(); #endif |