diff options
| author | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
| commit | 5f1ab04193ad0130ca8204aadaceae083aca9881 (patch) | |
| tree | 5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/plugins/PluginView.h | |
| parent | 194315e5a908cc8ed67d597010544803eef1ac59 (diff) | |
| download | external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2 | |
Get WebKit r44544.
Diffstat (limited to 'WebCore/plugins/PluginView.h')
| -rw-r--r-- | WebCore/plugins/PluginView.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index d007d64..9853eb7 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -193,6 +193,10 @@ namespace WebCore { virtual bool isPluginView() const { return true; } + Frame* parentFrame() const { return m_parentFrame; } + + void focusPluginElement(); + #if PLATFORM(WIN_OS) && !PLATFORM(WX) && ENABLE(NETSCAPE_PLUGIN_API) static LRESULT CALLBACK PluginViewWndProc(HWND, UINT, WPARAM, LPARAM); LRESULT wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); @@ -273,7 +277,7 @@ namespace WebCore { CString m_mimeType; CString m_userAgent; - + NPP m_instance; NPP_t m_instanceStruct; NPWindow m_npWindow; @@ -321,7 +325,9 @@ public: private: -#if defined(XP_MACOSX) +#if PLATFORM(GTK) || defined(Q_WS_X11) + void setNPWindowIfNeeded(); +#elif defined(XP_MACOSX) NP_CGContext m_npCgContext; OwnPtr<Timer<PluginView> > m_nullEventTimer; @@ -329,8 +335,9 @@ private: void nullEventTimerFired(Timer<PluginView>*); Point globalMousePosForPlugin() const; #endif -#if PLATFORM(GTK) || defined(Q_WS_X11) - void setNPWindowIfNeeded(); + +#if defined(Q_WS_X11) + bool m_hasPendingGeometryChange; #endif IntRect m_clipRect; // The clip rect to apply to a windowed plug-in @@ -346,4 +353,4 @@ private: } // namespace WebCore -#endif +#endif |