diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-30 16:58:06 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-30 17:03:09 +0100 |
| commit | 32ea33253afbbdefd2680aa95ab5f57455272ae7 (patch) | |
| tree | 2389569585b666c310fbb36d3fb8e6ab94462967 /Source/WebCore/plugins/PluginView.h | |
| parent | 41c25f231cbca1babc445187283524cc6c751c71 (diff) | |
| download | qtwebkit-32ea33253afbbdefd2680aa95ab5f57455272ae7.tar.gz | |
Imported WebKit commit 6a4a1d32e1d779548c726c4826cba9d69eb87601 (http://svn.webkit.org/repository/webkit/trunk@136242)
Final import for the Qt 5.x series that implements the QtWebKit / QtWebKitWidgets split
Extra fixes will be cherry-picked.
Change-Id: I844f1ebb99c6d6b75db31d6538c2acd628e79681
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebCore/plugins/PluginView.h')
| -rw-r--r-- | Source/WebCore/plugins/PluginView.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Source/WebCore/plugins/PluginView.h b/Source/WebCore/plugins/PluginView.h index 63ac151fa..84e62d8ae 100644 --- a/Source/WebCore/plugins/PluginView.h +++ b/Source/WebCore/plugins/PluginView.h @@ -98,6 +98,7 @@ namespace WebCore { class PluginStream; class ResourceError; class ResourceResponse; + class WheelEvent; enum PluginStatus { PluginStatusCanNotFindPlugin, @@ -229,6 +230,10 @@ namespace WebCore { const String& mimeType() const { return m_mimeType; } const KURL& url() const { return m_url; } +#if defined(XP_MACOSX) && ENABLE(NETSCAPE_PLUGIN_API) + bool popUpContextMenu(NPMenu*); +#endif + #if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API) static LRESULT CALLBACK PluginViewWndProc(HWND, UINT, WPARAM, LPARAM); LRESULT wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); @@ -323,6 +328,17 @@ namespace WebCore { bool dispatchNPEvent(NPEvent&); #endif // ENABLE(NETSCAPE_PLUGIN_API) #endif +#if defined(XP_MACOSX) && ENABLE(NETSCAPE_PLUGIN_API) + int16_t dispatchNPCocoaEvent(NPCocoaEvent&); + bool m_updatedCocoaTextInputRequested; + bool m_keyDownSent; + bool m_usePixmap; + uint16_t m_disregardKeyUpCounter; +#endif + +#if defined(XP_MACOSX) + void handleWheelEvent(WheelEvent*); +#endif void updatePluginWidget(); void paintMissingPluginIcon(GraphicsContext*, const IntRect&); |