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

3 files changed, 13 insertions, 13 deletions

diff --git a/gpu/command_buffer/common/command_buffer.h b/gpu/command_buffer/common/command_buffer.h
index 85e7596..11ba280 100644
--- a/gpu/command_buffer/common/command_buffer.h
+++ b/gpu/command_buffer/common/command_buffer.h
@@ -20,7 +20,7 @@ class CommandBuffer {
           get_offset(0),
           put_offset(0),
           token(-1),
-          error(parse_error::kParseNoError) {
+          error(error::kNoError) {
     }
 
     // Size of the command buffer in command buffer entries.
@@ -40,7 +40,7 @@ class CommandBuffer {
     int32 token;
 
     // Error status.
-    parse_error::ParseError error;
+    error::Error error;
   };
 
   CommandBuffer() {
@@ -81,7 +81,7 @@ class CommandBuffer {
   virtual void SetToken(int32 token) = 0;
 
   // Allows the reader to set the current parse error.
-  virtual void SetParseError(parse_error::ParseError) = 0;
+  virtual void SetParseError(error::Error) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CommandBuffer);
diff --git a/gpu/command_buffer/common/command_buffer_mock.h b/gpu/command_buffer/common/command_buffer_mock.h
index 6795975..e65c090 100644
--- a/gpu/command_buffer/common/command_buffer_mock.h
+++ b/gpu/command_buffer/common/command_buffer_mock.h
@@ -30,7 +30,7 @@ class MockCommandBuffer : public CommandBuffer {
   MOCK_METHOD1(DestroyTransferBuffer, void(int32 handle));
   MOCK_METHOD1(GetTransferBuffer, Buffer(int32 handle));
   MOCK_METHOD1(SetToken, void(int32 token));
-  MOCK_METHOD1(SetParseError, void(parse_error::ParseError parse_error));
+  MOCK_METHOD1(SetParseError, void(error::Error error));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockCommandBuffer);
diff --git a/gpu/command_buffer/common/constants.h b/gpu/command_buffer/common/constants.h
index d6f9dfb..b208153 100644
--- a/gpu/command_buffer/common/constants.h
+++ b/gpu/command_buffer/common/constants.h
@@ -12,15 +12,15 @@ namespace gpu {
 typedef int32 CommandBufferOffset;
 const CommandBufferOffset kInvalidCommandBufferOffset = -1;
 
-// TODO(apatrick): rename to something more generic like just Error.
-namespace parse_error {
-  enum ParseError {
-    kParseNoError,
-    kParseInvalidSize,
-    kParseOutOfBounds,
-    kParseUnknownCommand,
-    kParseInvalidArguments,
-    kParseGenericError
+// This enum must stay in sync with NPDeviceContext3DError.
+namespace error {
+  enum Error {
+    kNoError,
+    kInvalidSize,
+    kOutOfBounds,
+    kUnknownCommand,
+    kInvalidArguments,
+    kGenericError
   };
 }