New experimental Pepper device API....

gpu/pgl/pgl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <build/build_config.h>
 
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/common/constants.h"
@@ skipping 105 matching lines @@
 
   gpu::ThreadLocalSetValue(g_pgl_context_key, pgl_context);
   if (pgl_context) {
     gles2::SetGLContext(pgl_context->gles2_implementation_);
 
     // Don't request latest error status from service. Just use the locally
     // cached information from the last flush.
     // TODO(apatrick): I'm not sure if this should actually change the
     // current context if it fails. For now it gets changed even if it fails
     // becuase making GL calls with a NULL context crashes.
+#if defined(ENABLE_NEW_NPDEVICE_API)
+    if (pgl_context->command_buffer_->GetCachedError() != gpu::error::kNoError)
+      return PGL_FALSE;
+#else
     if (pgl_context->device_context_->error != NPDeviceContext3DError_NoError)
       return PGL_FALSE;
+#endif
   }
   else {
     gles2::SetGLContext(NULL);
   }
 
   return PGL_TRUE;
 }
 
 PGLBoolean PGLContextImpl::SwapBuffers() {
   // Don't request latest error status from service. Just use the locally cached
   // information from the last flush.
+#if defined(ENABLE_NEW_NPDEVICE_API)
+  if (command_buffer_->GetCachedError() != gpu::error::kNoError)
+    return PGL_FALSE;
+#else
   if (device_context_->error != NPDeviceContext3DError_NoError)
     return PGL_FALSE;
+#endif
 
   gles2_implementation_->SwapBuffers();
   return PGL_TRUE;
 }
 
 PGLInt PGLContextImpl::GetError() {
   gpu::CommandBuffer::State state = command_buffer_->GetState();
   if (state.error == gpu::error::kNoError) {
     return PGL_SUCCESS;
   } else {
@@ skipping 83 matching lines @@
     return PGL_NOT_INITIALIZED;
 
   PGLContextImpl* context = static_cast<PGLContextImpl*>(
       pglGetCurrentContext());
   if (!context)
     return PGL_BAD_CONTEXT;
 
   return context->GetError();
 }
 }  // extern "C"