From aa79d18199498d33bbf4364b0560a133959d5150 Mon Sep 17 00:00:00 2001 From: "scottmg@chromium.org" Date: Fri, 2 Nov 2012 22:42:11 +0000 Subject: [PATCH] Fix swap ack to always be echo on aura Regressed here: https://chromiumcodereview.appspot.com/11341033/ Previous attempt here: http://codereview.chromium.org/11363018/ R=kbr@chromium.org Review URL: https://chromiumcodereview.appspot.com/11312071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165782 0039d316-1c4b-4281-b951-d872f2087c98 --- .../gpu/client/webgraphicscontext3d_command_buffer_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc index 92f26e9ccea1a5..72bfcdfccaffc3 100644 --- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc @@ -149,7 +149,7 @@ WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl( frame_number_(0), bind_generates_resources_(false), use_echo_for_swap_ack_(true) { -#if defined(OS_MACOSX) || defined(OS_WIN) +#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_ =