diff options
author | rsimha@google.com <rsimha@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 00:18:25 +0000 |
---|---|---|
committer | rsimha@google.com <rsimha@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 00:18:25 +0000 |
commit | 84677847c10d0319d8d996aea9b310add85c0bd3 (patch) | |
tree | 12eceac742ce01154307bd86f28e8d87e95cf07a /webkit/gpu | |
parent | 973d44a198f2fa9314ecbe43b06f0a7d622dfc7e (diff) | |
download | chromium_src-84677847c10d0319d8d996aea9b310add85c0bd3.zip chromium_src-84677847c10d0319d8d996aea9b310add85c0bd3.tar.gz chromium_src-84677847c10d0319d8d996aea9b310add85c0bd3.tar.bz2 |
Revert 113479 - Revert "Revert 113250 - Add CommandBuffer::SetGetBuffer"
Reason for revert: Bot redness. See http://build.chromium.org/p/chromium/builders/Mac10.6%20Tests%20%281%29/builds/15717
Original checkin notes:
This reverts commit bd45bd252aeb8babac62547a5c605fbf64287cd3.
TEST=ran webkit tests in DRT and webgl tests in chrome
BUG=103989
Review URL: http://codereview.chromium.org/8758026
TBR=gman@chromium.org
Review URL: http://codereview.chromium.org/8865008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
-rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index dd1db2e..9daaa74 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -86,7 +86,6 @@ class GLInProcessContext : public base::SupportsWeakPtr<GLInProcessContext> { ~GLInProcessContext(); void PumpCommands(); - bool GetBufferChanged(int32 transfer_buffer_id); // Create a GLInProcessContext that renders directly to a view. The view and // the associated window must not be destroyed until the returned @@ -312,10 +311,6 @@ void GLInProcessContext::PumpCommands() { CHECK(state.error == ::gpu::error::kNoError); } -bool GLInProcessContext::GetBufferChanged(int32 transfer_buffer_id) { - return gpu_scheduler_->SetGetBuffer(transfer_buffer_id); -} - uint32 GLInProcessContext::GetParentTextureId() { return parent_texture_id_; } @@ -462,7 +457,7 @@ bool GLInProcessContext::Initialize(bool onscreen, } command_buffer_.reset(new CommandBufferService); - if (!command_buffer_->Initialize()) { + if (!command_buffer_->Initialize(kCommandBufferSize)) { LOG(ERROR) << "Could not initialize command buffer."; Destroy(); return false; @@ -528,9 +523,6 @@ bool GLInProcessContext::Initialize(bool onscreen, command_buffer_->SetPutOffsetChangeCallback( base::Bind(&GLInProcessContext::PumpCommands, base::Unretained(this))); - command_buffer_->SetGetBufferChangeCallback( - base::Bind( - &GLInProcessContext::GetBufferChanged, base::Unretained(this))); // Create the GLES2 helper, which writes the command buffer protocol. gles2_helper_.reset(new GLES2CmdHelper(command_buffer_.get())); |