Changeset 86317 in webkit

Timestamp:

May 12, 2011 12:32:51 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

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>.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PluginProxy.cpp (modified) (1 diff)
• WebProcess/Plugins/PluginProxy.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp

@@ -100 +100 @@
     // 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;

trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h

@@ -31 +31 @@
 #include "Connection.h"
 #include "Plugin.h"
+#include <WebCore/IntRect.h>
 
 #if PLATFORM(MAC)