Made CommandBuffer::GetLastState and SetContextLostReason pure virtual.

Required nacl changes are checked into the nacl repo and rolled into the chromium repo.

BUG=89127,89670
Review URL: http://codereview.chromium.org/7488031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94772 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 29 deletions

diff --git a/gpu/command_buffer/common/cmd_buffer_common.cc b/gpu/command_buffer/common/cmd_buffer_common.cc
index 9ddb1f3..0bfc9e1 100644
--- a/gpu/command_buffer/common/cmd_buffer_common.cc
+++ b/gpu/command_buffer/common/cmd_buffer_common.cc
@@ -31,27 +31,6 @@ const char* GetCommandName(CommandId command_id) {
 
 }  // namespace cmd
 
-// TODO(apatrick): this method body is here instead of command_buffer.cc
-// because NaCl currently compiles in this file but not the other.
-// Remove this method body and the includes of command_buffer.h and
-// logging.h above once NaCl defines SetContextLostReason() in its
-// CommandBuffer subclass and has been rolled forward. See
-// http://crbug.com/89670 .
-gpu::CommandBuffer::State CommandBuffer::GetLastState() {
-  GPU_NOTREACHED();
-  return gpu::CommandBuffer::State();
-}
-
-// TODO(kbr): this method body is here instead of command_buffer.cc
-// because NaCl currently compiles in this file but not the other.
-// Remove this method body and the includes of command_buffer.h and
-// logging.h above once NaCl defines SetContextLostReason() in its
-// CommandBuffer subclass and has been rolled forward. See
-// http://crbug.com/89127 .
-void CommandBuffer::SetContextLostReason(error::ContextLostReason) {
-  GPU_NOTREACHED();
-}
-
 }  // namespace gpu
 
 
diff --git a/gpu/command_buffer/common/command_buffer.h b/gpu/command_buffer/common/command_buffer.h
index b2997ee..76124c8 100644
--- a/gpu/command_buffer/common/command_buffer.h
+++ b/gpu/command_buffer/common/command_buffer.h
@@ -79,7 +79,7 @@ class CommandBuffer {
   virtual State GetState() = 0;
 
   // Returns the last state without synchronizing with the service.
-  virtual State GetLastState();
+  virtual State GetLastState() = 0;
 
   // The writer calls this to update its put offset. This ensures the reader
   // sees the latest added commands, and will eventually process them. On the
@@ -127,13 +127,7 @@ class CommandBuffer {
   // Allows the reader to set the current context lost reason.
   // NOTE: if calling this in conjunction with SetParseError,
   // call this first.
-  //
-  // TODO(kbr): this temporarily has a definition (i.e., is not pure
-  // virtual) to work around a difficult interdependency with the NaCl
-  // build. Make this pure virtual and remove the body once this is
-  // defined in CommandBufferNaCl and NaCl has rolled forward. See
-  // http://crbug.com/89127 .
-  virtual void SetContextLostReason(error::ContextLostReason);
+  virtual void SetContextLostReason(error::ContextLostReason) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CommandBuffer);