summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/command_buffer_service.h
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/service/command_buffer_service.h
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/service/command_buffer_service.h')
-rw-r--r--gpu/command_buffer/service/command_buffer_service.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h
index 3e58d7e..f8be349 100644
--- a/gpu/command_buffer/service/command_buffer_service.h
+++ b/gpu/command_buffer/service/command_buffer_service.h
@@ -33,7 +33,7 @@ class CommandBufferService : public CommandBuffer {
virtual void DestroyTransferBuffer(int32 id);
virtual Buffer GetTransferBuffer(int32 handle);
virtual void SetToken(int32 token);
- virtual void SetParseError(parse_error::ParseError);
+ virtual void SetParseError(error::Error error);
// Sets a callback that should be posted on another thread whenever the put
// offset is changed. The callback must not return until some progress has
@@ -56,9 +56,9 @@ class CommandBufferService : public CommandBuffer {
std::vector<linked_ptr< base::SharedMemory> > registered_objects_;
std::set<int32> unused_registered_object_elements_;
int32 token_;
- parse_error::ParseError error_;
+ error::Error error_;
};
} // namespace gpu
-#endif // GPU_COMMAND_BUFFER_SERVICE_COMMAND_BUFFER_SERVICE_H_
+#endif // GPU_COMMAND_BUFFER_SERVICE_COMMAND_BUFFER_SERVICE_H_ \ No newline at end of file