2011-05-12 Carlos Garcia Campos <cgarcia@igalia.com>
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 May 2011 07:32:51 +0000 (07:32 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 May 2011 07:32:51 +0000 (07:32 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@86317 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
Source/WebKit2/WebProcess/Plugins/PluginProxy.h

index d03f34a..38a719b 100644 (file)
@@ -1,3 +1,15 @@
+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.
index 9339abc..62f8373 100644 (file)
@@ -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;
     }
index 604248f..de62800 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "Connection.h"
 #include "Plugin.h"
+#include <WebCore/IntRect.h>
 
 #if PLATFORM(MAC)
 #include <wtf/RetainPtr.h>