diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebKit2/WebProcess/Plugins/Plugin.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebKit2/WebProcess/Plugins/Plugin.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/Plugins/Plugin.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/WebKit2/WebProcess/Plugins/Plugin.cpp b/Source/WebKit2/WebProcess/Plugins/Plugin.cpp index 119d5ab78..ec23fcf31 100644 --- a/Source/WebKit2/WebProcess/Plugins/Plugin.cpp +++ b/Source/WebKit2/WebProcess/Plugins/Plugin.cpp @@ -33,7 +33,7 @@ using namespace WebCore; namespace WebKit { -void Plugin::Parameters::encode(IPC::ArgumentEncoder& encoder) const +void Plugin::Parameters::encode(IPC::Encoder& encoder) const { encoder << url.string(); encoder << names; @@ -41,12 +41,12 @@ void Plugin::Parameters::encode(IPC::ArgumentEncoder& encoder) const encoder << mimeType; encoder << isFullFramePlugin; encoder << shouldUseManualLoader; -#if PLATFORM(MAC) +#if PLATFORM(COCOA) encoder.encodeEnum(layerHostingMode); #endif } -bool Plugin::Parameters::decode(IPC::ArgumentDecoder& decoder, Parameters& parameters) +bool Plugin::Parameters::decode(IPC::Decoder& decoder, Parameters& parameters) { String urlString; if (!decoder.decode(urlString)) @@ -64,7 +64,7 @@ bool Plugin::Parameters::decode(IPC::ArgumentDecoder& decoder, Parameters& param return false; if (!decoder.decode(parameters.shouldUseManualLoader)) return false; -#if PLATFORM(MAC) +#if PLATFORM(COCOA) if (!decoder.decodeEnum(parameters.layerHostingMode)) return false; #endif @@ -76,8 +76,9 @@ bool Plugin::Parameters::decode(IPC::ArgumentDecoder& decoder, Parameters& param return true; } -Plugin::Plugin() - : m_pluginController(0) +Plugin::Plugin(PluginType type) + : m_type(type) + , m_pluginController(0) { } @@ -102,7 +103,7 @@ void Plugin::destroyPlugin() m_pluginController = 0; } -void Plugin::updateControlTints(GraphicsContext*) +void Plugin::updateControlTints(GraphicsContext&) { } |