Changeset 86317 in webkit
- Timestamp:
- May 12, 2011 12:32:51 AM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r86305 r86317 1 2011-05-12 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Reviewed by Martin Robinson. 4 5 Fix the build with ENABLE_PLUGIN_PROCESS 6 https://bugs.webkit.org/show_bug.cgi?id=60628 7 8 * WebProcess/Plugins/PluginProxy.cpp: 9 (WebKit::PluginProxy::initialize): Move the call to 10 pluginController->isAcceleratedCompositingEnabled() to a #ifdef block. 11 * WebProcess/Plugins/PluginProxy.h: Add include for <WebCore/IntRect.h>. 12 1 13 2011-05-11 Damian Kaleta <dkaleta@apple.com> 2 14 -
trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
r86169 r86317 100 100 // Ask the plug-in process to create a plug-in. 101 101 bool result = false; 102 bool isAcceleratedCompositingEnabled = false; 103 #if USE(ACCELERATED_COMPOSITING) 104 isAcceleratedCompositingEnabled = pluginController->isAcceleratedCompositingEnabled(); 105 #endif 102 106 103 107 uint32_t remoteLayerClientID = 0; 104 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) {108 if (!m_connection->connection()->sendSync(Messages::WebProcessConnection::CreatePlugin(m_pluginInstanceID, parameters, pluginController->userAgent(), pluginController->isPrivateBrowsingEnabled(), isAcceleratedCompositingEnabled), Messages::WebProcessConnection::CreatePlugin::Reply(result, remoteLayerClientID), 0) || !result) { 105 109 m_connection->removePluginProxy(this); 106 110 return false; -
trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h
r86169 r86317 31 31 #include "Connection.h" 32 32 #include "Plugin.h" 33 #include <WebCore/IntRect.h> 33 34 34 35 #if PLATFORM(MAC)
Note: See TracChangeset
for help on using the changeset viewer.