Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7237)

Unified Diff: chrome/renderer/webplugin_delegate_pepper.cc

Issue 558054: Renamed ParseError -> Error, parse_error -> error, kParseNoError -> kNoError,... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/command_buffer_proxy.cc ('k') | gpu/command_buffer/build_gles2_cmd_buffer.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/webplugin_delegate_pepper.cc
===================================================================
--- chrome/renderer/webplugin_delegate_pepper.cc (revision 37731)
+++ chrome/renderer/webplugin_delegate_pepper.cc (working copy)
@@ -337,7 +337,7 @@
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 @@
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 @@
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
« no previous file with comments | « chrome/renderer/command_buffer_proxy.cc ('k') | gpu/command_buffer/build_gles2_cmd_buffer.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698