diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/plugins/PluginView.h | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/plugins/PluginView.h')
| -rw-r--r-- | WebCore/plugins/PluginView.h | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index 3d4e13e..68325cd 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -32,9 +32,9 @@ #include "HaltablePlugin.h" #include "IntRect.h" #include "MediaCanStartListener.h" +#include "PluginViewBase.h" #include "ResourceRequest.h" #include "Timer.h" -#include "Widget.h" #include <wtf/HashMap.h> #include <wtf/HashSet.h> #include <wtf/OwnPtr.h> @@ -65,7 +65,8 @@ typedef PlatformWidget PlatformPluginWidget; #include <QPixmap> #endif #endif -#if PLATFORM(QT) && defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5) +#if PLATFORM(QT) +#include <QGraphicsItem> #include <QImage> class QPainter; #endif @@ -133,7 +134,7 @@ namespace WebCore { virtual void didFail(const ResourceError&) = 0; }; - class PluginView : public Widget + class PluginView : public PluginViewBase #if ENABLE(NETSCAPE_PLUGIN_API) , private PluginStreamClient #endif @@ -181,6 +182,9 @@ namespace WebCore { NPError getValue(NPNVariable variable, void* value); static NPError getValueStatic(NPNVariable variable, void* value); NPError setValue(NPPVariable variable, void* value); + NPError getValueForURL(NPNURLVariable variable, const char* url, char** value, uint32_t* len); + NPError setValueForURL(NPNURLVariable variable, const char* url, const char* value, uint32_t len); + NPError getAuthenticationInfo(const char* protocol, const char* host, int32_t port, const char* scheme, const char* realm, char** username, uint32_t* ulen, char** password, uint32_t* plen); void invalidateRect(NPRect*); void invalidateRegion(NPRegion); #endif @@ -269,6 +273,14 @@ namespace WebCore { #endif void keepAlive(); +#if USE(ACCELERATED_COMPOSITING) +#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(QT) + virtual PlatformLayer* platformLayer() const; +#else + virtual PlatformLayer* platformLayer() const { return 0; } +#endif +#endif + private: PluginView(Frame* parentFrame, const IntSize&, PluginPackage*, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually); @@ -448,11 +460,20 @@ private: void initXEvent(XEvent* event); #endif -#if PLATFORM(QT) && defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5) +#if PLATFORM(QT) +#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5) QImage m_image; bool m_renderToImage; void paintUsingImageSurfaceExtension(QPainter* painter, const IntRect& exposedRect); #endif +#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API) + void paintUsingXPixmap(QPainter* painter, const QRect &exposedRect); +#if USE(ACCELERATED_COMPOSITING) + OwnPtr<PlatformLayer> m_platformLayer; + friend class PluginGraphicsLayerQt; +#endif // USE(ACCELERATED_COMPOSITING) +#endif +#endif // PLATFORM(QT) IntRect m_clipRect; // The clip rect to apply to a windowed plug-in IntRect m_windowRect; // Our window rect. |