diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 14:45:04 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 14:45:05 +0200 |
| commit | cabbad3ff6732e07d614eb743a59496d73aabb28 (patch) | |
| tree | 0799683696ef54345680a799e9a5e5586082bf9e /Source/WebCore/plugins/PluginView.h | |
| parent | 289da5616df56912fa6f8c319d61fb4489c51add (diff) | |
| parent | 1810e3848d15ffbe9529f53866fc0ede8d947fef (diff) | |
| download | qtwebkit-cabbad3ff6732e07d614eb743a59496d73aabb28.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I66f94d7e3dea401f7a89a00fb474532377baf6c4
Diffstat (limited to 'Source/WebCore/plugins/PluginView.h')
| -rw-r--r-- | Source/WebCore/plugins/PluginView.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/Source/WebCore/plugins/PluginView.h b/Source/WebCore/plugins/PluginView.h index 84e62d8ae..361c286db 100644 --- a/Source/WebCore/plugins/PluginView.h +++ b/Source/WebCore/plugins/PluginView.h @@ -52,9 +52,6 @@ typedef struct HWND__* HWND; typedef HWND PlatformPluginWidget; #else typedef PlatformWidget PlatformPluginWidget; -#if defined(XP_MACOSX) && PLATFORM(QT) -#include <QPixmap> -#endif #endif #if PLATFORM(QT) #if USE(TEXTURE_MAPPER) @@ -323,16 +320,13 @@ namespace WebCore { void lifeSupportTimerFired(Timer<PluginView>*); Timer<PluginView> m_lifeSupportTimer; -#ifndef NP_NO_CARBON #if ENABLE(NETSCAPE_PLUGIN_API) 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 @@ -392,7 +386,7 @@ namespace WebCore { bool m_haveUpdatedPluginWidget; #endif -#if ((PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(WX)) && OS(WINDOWS)) || defined(XP_MACOSX) || PLATFORM(EFL) +#if ((PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(WX)) && OS(WINDOWS)) || PLATFORM(EFL) // On Mac OSX and Qt/Windows the plugin does not have its own native widget, // but is using the containing window as its reference for positioning/painting. PlatformPluginWidget m_window; @@ -411,20 +405,9 @@ private: void setNPWindowIfNeeded(); #elif defined(XP_MACOSX) NP_CGContext m_npCgContext; - OwnPtr<Timer<PluginView> > m_nullEventTimer; - NPDrawingModel m_drawingModel; - NPEventModel m_eventModel; CGContextRef m_contextRef; - WindowRef m_fakeWindow; -#if PLATFORM(QT) - QPixmap m_pixmap; -#endif - Point m_lastMousePos; void setNPWindowIfNeeded(); - void nullEventTimerFired(Timer<PluginView>*); - Point globalMousePosForPlugin() const; - Point mousePosForPlugin(MouseEvent* event = 0) const; #endif #if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API) |