diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h index e865d93..7cf9ead 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h @@ -78,6 +78,7 @@ public: const Vector<uint8_t>& httpBody, bool sendNotification, void* notificationData); NPError destroyStream(NPStream*, NPReason); void setIsWindowed(bool); + void setIsTransparent(bool); void setStatusbarText(const String&); static void setException(const String&); bool evaluate(NPObject*, const String&scriptString, NPVariant* result); @@ -145,6 +146,7 @@ private: #if PLATFORM(MAC) virtual PlatformLayer* pluginLayer(); #endif + virtual bool isTransparent(); virtual void geometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect); virtual void frameDidFinishLoading(uint64_t requestID); virtual void frameDidFail(uint64_t requestID, bool wasCancelled); @@ -203,12 +205,13 @@ private: bool m_isStarted; bool m_isWindowed; + bool m_isTransparent; bool m_inNPPNew; bool m_loadManually; RefPtr<NetscapePluginStream> m_manualStream; Vector<bool, 8> m_popupEnabledStates; -#if PLATFORM(MAC) +#if PLUGIN_ARCHITECTURE(MAC) NPDrawingModel m_drawingModel; NPEventModel m_eventModel; RetainPtr<PlatformLayer> m_pluginLayer; @@ -229,8 +232,11 @@ private: RunLoop::Timer<NetscapePlugin> m_nullEventTimer; NP_CGContext m_npCGContext; #endif -#elif PLATFORM(WIN) +#elif PLUGIN_ARCHITECTURE(WIN) HWND m_window; +#elif PLUGIN_ARCHITECTURE(X11) + Pixmap m_drawable; + Display* m_pluginDisplay; #endif }; |