summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/client/cmd_buffer_helper.cc
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-01 22:24:14 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-01 22:24:14 +0000
commitf7a64eee4a7c9556a2199bebb4110f7cef9b6d3c (patch)
tree487908060385ef696fdcf5dc9078cbb4b5dcdf2b /gpu/command_buffer/client/cmd_buffer_helper.cc
parentc0c4565b3c287e7aca0ed2b913f82a74155fb813 (diff)
downloadchromium_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 'gpu/command_buffer/client/cmd_buffer_helper.cc')
-rw-r--r--gpu/command_buffer/client/cmd_buffer_helper.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/command_buffer/client/cmd_buffer_helper.cc b/gpu/command_buffer/client/cmd_buffer_helper.cc
index d58338e..2fe8b66 100644
--- a/gpu/command_buffer/client/cmd_buffer_helper.cc
+++ b/gpu/command_buffer/client/cmd_buffer_helper.cc
@@ -38,7 +38,7 @@ CommandBufferHelper::~CommandBufferHelper() {
bool CommandBufferHelper::Flush() {
CommandBuffer::State state = command_buffer_->Flush(put_);
SynchronizeState(state);
- return state.error == parse_error::kParseNoError;
+ return state.error == error::kNoError;
}
// Calls Flush() and then waits until the buffer is empty. Break early if the
@@ -142,10 +142,10 @@ CommandBufferEntry* CommandBufferHelper::GetSpace(uint32 entries) {
return space;
}
-parse_error::ParseError CommandBufferHelper::GetError() {
+error::Error CommandBufferHelper::GetError() {
CommandBuffer::State state = command_buffer_->GetState();
SynchronizeState(state);
- return static_cast<parse_error::ParseError>(state.error);
+ return static_cast<error::Error>(state.error);
}
void CommandBufferHelper::SynchronizeState(CommandBuffer::State state) {