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

Unified Diff: gpu/pgl/command_buffer_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 | « gpu/pgl/command_buffer_pepper.h ('k') | third_party/npapi/bindings/npapi_extensions.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/pgl/command_buffer_pepper.cc
===================================================================
--- gpu/pgl/command_buffer_pepper.cc (revision 37750)
+++ gpu/pgl/command_buffer_pepper.cc (working copy)
@@ -36,13 +36,13 @@
Buffer CommandBufferPepper::GetRingBuffer() {
Buffer buffer;
buffer.ptr = context_->commandBuffer;
- buffer.size = context_->commandBufferEntries * sizeof(int32);
+ buffer.size = context_->commandBufferSize * sizeof(int32);
return buffer;
}
CommandBuffer::State CommandBufferPepper::GetState() {
if (NPERR_NO_ERROR != device_->flushContext(npp_, context_, NULL, NULL))
- context_->error = gpu::parse_error::kParseGenericError;
+ context_->error = NPDeviceContext3DError_GenericError;
return ConvertState();
}
@@ -51,7 +51,7 @@
context_->putOffset = put_offset;
if (NPERR_NO_ERROR != device_->flushContext(npp_, context_, NULL, NULL))
- context_->error = gpu::parse_error::kParseGenericError;
+ context_->error = NPDeviceContext3DError_GenericError;
return ConvertState();
}
@@ -90,18 +90,18 @@
}
void CommandBufferPepper::SetParseError(
- gpu::parse_error::ParseError parse_error) {
+ gpu::error::Error error) {
// Not implemented by proxy.
NOTREACHED();
}
CommandBuffer::State CommandBufferPepper::ConvertState() {
CommandBuffer::State state;
- state.size = context_->commandBufferEntries;
+ state.size = context_->commandBufferSize;
state.get_offset = context_->getOffset;
state.put_offset = context_->putOffset;
state.token = context_->token;
- state.error = static_cast<gpu::parse_error::ParseError>(
+ state.error = static_cast<gpu::error::Error>(
context_->error);
return state;
}
« no previous file with comments | « gpu/pgl/command_buffer_pepper.h ('k') | third_party/npapi/bindings/npapi_extensions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698