Index: content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc |
diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc |
index 57128427f65e5ed5168e0ed47d0145c9d1db6031..89dd90317e0b3cbbad987073fdadb9be028824d4 100644 |
--- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc |
+++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc |
@@ -229,6 +229,7 @@ WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl( |
const GURL& active_url, |
GpuChannelHost* host, |
const base::WeakPtr<WebGraphicsContext3DSwapBuffersClient>& swap_client, |
+ bool use_echo_for_swap_ack, |
const Attributes& attributes, |
bool bind_generates_resources, |
const SharedMemoryLimits& limits) |
@@ -251,15 +252,9 @@ WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl( |
gl_(NULL), |
frame_number_(0), |
bind_generates_resources_(bind_generates_resources), |
- use_echo_for_swap_ack_(true), |
+ use_echo_for_swap_ack_(use_echo_for_swap_ack), |
mem_limits_(limits), |
flush_id_(0) { |
-#if (defined(OS_MACOSX) || defined(OS_WIN)) && !defined(USE_AURA) |
- // Get ViewMsg_SwapBuffers_ACK from browser for single-threaded path. |
- const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
- use_echo_for_swap_ack_ = |
- command_line.HasSwitch(switches::kEnableThreadedCompositing); |
-#endif |
} |
WebGraphicsContext3DCommandBufferImpl:: |
@@ -1280,10 +1275,12 @@ WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext( |
if (!host) |
return NULL; |
base::WeakPtr<WebGraphicsContext3DSwapBuffersClient> null_client; |
+ bool use_echo_for_swap_ack = true; |
return new WebGraphicsContext3DCommandBufferImpl(0, |
active_url, |
host, |
null_client, |
+ use_echo_for_swap_ack, |
attributes, |
false, |
SharedMemoryLimits()); |