Commit 189c2d54 authored by carlosgc@webkit.org's avatar carlosgc@webkit.org
Browse files

2011-05-12 Carlos Garcia Campos <cgarcia@igalia.com>

        Reviewed by Martin Robinson.

        Fix the build with ENABLE_PLUGIN_PROCESS
        https://bugs.webkit.org/show_bug.cgi?id=60628

        * WebProcess/Plugins/PluginProxy.cpp:
        (WebKit::PluginProxy::initialize): Move the call to
        pluginController->isAcceleratedCompositingEnabled() to a #ifdef block.
        * WebProcess/Plugins/PluginProxy.h: Add include for <WebCore/IntRect.h>.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@86317 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 96624d14
2011-05-12 Carlos Garcia Campos <cgarcia@igalia.com>
Reviewed by Martin Robinson.
Fix the build with ENABLE_PLUGIN_PROCESS
https://bugs.webkit.org/show_bug.cgi?id=60628
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::initialize): Move the call to
pluginController->isAcceleratedCompositingEnabled() to a #ifdef block.
* WebProcess/Plugins/PluginProxy.h: Add include for <WebCore/IntRect.h>.
2011-05-11 Damian Kaleta <dkaleta@apple.com>
 
Reviewed by Brady Eidson.
......
......@@ -99,9 +99,13 @@ bool PluginProxy::initialize(PluginController* pluginController, const Parameter
// Ask the plug-in process to create a plug-in.
bool result = false;
bool isAcceleratedCompositingEnabled = false;
#if USE(ACCELERATED_COMPOSITING)
isAcceleratedCompositingEnabled = pluginController->isAcceleratedCompositingEnabled();
#endif
uint32_t remoteLayerClientID = 0;
if (!m_connection->connection()->sendSync(Messages::WebProcessConnection::CreatePlugin(m_pluginInstanceID, parameters, pluginController->userAgent(), pluginController->isPrivateBrowsingEnabled(), pluginController->isAcceleratedCompositingEnabled()), Messages::WebProcessConnection::CreatePlugin::Reply(result, remoteLayerClientID), 0) || !result) {
if (!m_connection->connection()->sendSync(Messages::WebProcessConnection::CreatePlugin(m_pluginInstanceID, parameters, pluginController->userAgent(), pluginController->isPrivateBrowsingEnabled(), isAcceleratedCompositingEnabled), Messages::WebProcessConnection::CreatePlugin::Reply(result, remoteLayerClientID), 0) || !result) {
m_connection->removePluginProxy(this);
return false;
}
......
......@@ -30,6 +30,7 @@
#include "Connection.h"
#include "Plugin.h"
#include <WebCore/IntRect.h>
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment