diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 22:24:14 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 22:24:14 +0000 |
| commit | f7a64eee4a7c9556a2199bebb4110f7cef9b6d3c (patch) | |
| tree | 487908060385ef696fdcf5dc9078cbb4b5dcdf2b /chrome/renderer | |
| parent | c0c4565b3c287e7aca0ed2b913f82a74155fb813 (diff) | |
| download | chromium_src-f7a64eee4a7c9556a2199bebb4110f7cef9b6d3c.zip chromium_src-f7a64eee4a7c9556a2199bebb4110f7cef9b6d3c.tar.gz chromium_src-f7a64eee4a7c9556a2199bebb4110f7cef9b6d3c.tar.bz2 | |
Renamed ParseError -> Error, parse_error -> error, kParseNoError -> kNoError, commandBufferEntries -> commandBufferSize.
Added NPDevice3DContextError enumeration.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/558054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/command_buffer_proxy.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/command_buffer_proxy.h | 2 | ||||
| -rw-r--r-- | chrome/renderer/webplugin_delegate_pepper.cc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/renderer/command_buffer_proxy.cc b/chrome/renderer/command_buffer_proxy.cc index e63ca5a..2b08090 100644 --- a/chrome/renderer/command_buffer_proxy.cc +++ b/chrome/renderer/command_buffer_proxy.cc @@ -165,7 +165,7 @@ void CommandBufferProxy::SetToken(int32 token) { } void CommandBufferProxy::SetParseError( - gpu::parse_error::ParseError parse_error) { + gpu::error::Error error) { // Not implemented in proxy. NOTREACHED(); } diff --git a/chrome/renderer/command_buffer_proxy.h b/chrome/renderer/command_buffer_proxy.h index 849f540..077b0c5 100644 --- a/chrome/renderer/command_buffer_proxy.h +++ b/chrome/renderer/command_buffer_proxy.h @@ -42,7 +42,7 @@ class CommandBufferProxy : public gpu::CommandBuffer, virtual void DestroyTransferBuffer(int32 id); virtual gpu::Buffer GetTransferBuffer(int32 handle); virtual void SetToken(int32 token); - virtual void SetParseError(gpu::parse_error::ParseError parse_error); + virtual void SetParseError(gpu::error::Error error); private: // As with the service, the client takes ownership of the ring buffer. diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc index b9b61fe..4a17fc8 100644 --- a/chrome/renderer/webplugin_delegate_pepper.cc +++ b/chrome/renderer/webplugin_delegate_pepper.cc @@ -337,7 +337,7 @@ NPError WebPluginDelegatePepper::Device3DInitializeContext( command_buffer_.reset(nested_delegate_->CreateCommandBuffer()); if (command_buffer_.get()) { // Initialize the proxy command buffer. - if (command_buffer_->Initialize(config->commandBufferEntries)) { + if (command_buffer_->Initialize(config->commandBufferSize)) { // Get the initial command buffer state. gpu::CommandBuffer::State state = command_buffer_->GetState(); @@ -345,7 +345,7 @@ NPError WebPluginDelegatePepper::Device3DInitializeContext( context->reserved = NULL; Buffer ring_buffer = command_buffer_->GetRingBuffer(); context->commandBuffer = ring_buffer.ptr; - context->commandBufferEntries = state.size; + context->commandBufferSize = state.size; Synchronize3DContext(context, state); // Ensure the service knows the window size before rendering anything. @@ -700,6 +700,6 @@ void WebPluginDelegatePepper::Synchronize3DContext( context->getOffset = state.get_offset; context->putOffset = state.put_offset; context->token = state.token; - context->error = static_cast<int32>(state.error); + context->error = static_cast<NPDeviceContext3DError>(state.error); } #endif // ENABLE_GPU |