diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebKit2/PluginProcess/PluginControllerProxy.h | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/WebKit2/PluginProcess/PluginControllerProxy.h')
| -rw-r--r-- | Source/WebKit2/PluginProcess/PluginControllerProxy.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/WebKit2/PluginProcess/PluginControllerProxy.h b/Source/WebKit2/PluginProcess/PluginControllerProxy.h index c79211a8c..e860925c1 100644 --- a/Source/WebKit2/PluginProcess/PluginControllerProxy.h +++ b/Source/WebKit2/PluginProcess/PluginControllerProxy.h @@ -36,18 +36,13 @@ #include <WebCore/RunLoop.h> #include <wtf/Noncopyable.h> -#if PLATFORM(MAC) -#include <wtf/RetainPtr.h> - -typedef struct __WKCARemoteLayerClientRef *WKCARemoteLayerClientRef; -#endif - namespace CoreIPC { class DataReference; } namespace WebKit { +class LayerHostingContext; class ShareableBitmap; class WebProcessConnection; struct PluginCreationParameters; @@ -191,7 +186,7 @@ private: bool m_isComplexTextInputEnabled; // For CA plug-ins, this holds the information needed to export the layer hierarchy to the UI process. - RetainPtr<WKCARemoteLayerClientRef> m_remoteLayerClient; + OwnPtr<LayerHostingContext> m_layerHostingContext; #endif // The contents scale factor of this plug-in. |