diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebKit2/PluginProcess/PluginControllerProxy.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebKit2/PluginProcess/PluginControllerProxy.h')
| -rw-r--r-- | Source/WebKit2/PluginProcess/PluginControllerProxy.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/WebKit2/PluginProcess/PluginControllerProxy.h b/Source/WebKit2/PluginProcess/PluginControllerProxy.h index 65be39e..a6207df 100644 --- a/Source/WebKit2/PluginProcess/PluginControllerProxy.h +++ b/Source/WebKit2/PluginProcess/PluginControllerProxy.h @@ -31,6 +31,7 @@ #include "Connection.h" #include "Plugin.h" #include "PluginController.h" +#include "PluginControllerProxyMessages.h" #include "RunLoop.h" #include "ShareableBitmap.h" #include <wtf/Noncopyable.h> @@ -115,7 +116,7 @@ private: void manualStreamDidReceiveData(const CoreIPC::DataReference& data); void manualStreamDidFinishLoading(); void manualStreamDidFail(bool wasCancelled); - void handleMouseEvent(const WebMouseEvent&, bool& handled); + void handleMouseEvent(const WebMouseEvent&, PassRefPtr<Messages::PluginControllerProxy::HandleMouseEvent::DelayedReply>); void handleWheelEvent(const WebWheelEvent&, bool& handled); void handleMouseEnterEvent(const WebMouseEvent&, bool& handled); void handleMouseLeaveEvent(const WebMouseEvent&, bool& handled); @@ -137,7 +138,7 @@ private: void platformInitialize(); void platformDestroy(); - void platformGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect); + void platformGeometryDidChange(); WebProcessConnection* m_connection; uint64_t m_pluginInstanceID; @@ -182,6 +183,12 @@ private: // The backing store that this plug-in draws into. RefPtr<ShareableBitmap> m_backingStore; + + // The window NPObject. + NPObject* m_windowNPObject; + + // The plug-in element NPObject. + NPObject* m_pluginElementNPObject; }; } // namespace WebKit |