Revert "Revert of Extract WebGraphicsContext3DImpl from webkit/common/gpu. (patchset #12 id:220001 …

gpu/blink/webgraphicscontext3d_impl.h

Index: gpu/blink/webgraphicscontext3d_impl.h
diff --git a/webkit/common/gpu/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h
similarity index 97%
rename from webkit/common/gpu/webgraphicscontext3d_impl.h
rename to gpu/blink/webgraphicscontext3d_impl.h
index 3ed0dd97269b502022db5751f1d0417f7aa6e72e..d8a8fbfeb0850092f03871b69bf98ade8656aed7 100644
--- a/webkit/common/gpu/webgraphicscontext3d_impl.h
+++ b/gpu/blink/webgraphicscontext3d_impl.h
@@ -2,17 +2,32 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IMPL_H_
-#define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IMPL_H_
+#ifndef GPU_BLINK_WEBGRAPHICSCONTEXT3D_IMPL_H_
+#define GPU_BLINK_WEBGRAPHICSCONTEXT3D_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
+#include "gpu/blink/gpu_blink_export.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/platform/WebString.h"
-#include "webkit/common/gpu/webkit_gpu_export.h"
+
+// TODO(tfarina): Remove these 'using' declarations. crbug.com/438860
+using blink::WGC3Dbitfield;
+using blink::WGC3Dboolean;
+using blink::WGC3Dbyte;
+using blink::WGC3Dchar;
+using blink::WGC3Dclampf;
+using blink::WGC3Denum;
+using blink::WGC3Dfloat;
+using blink::WGC3Dint;
+using blink::WGC3Dintptr;
+using blink::WGC3Dsizei;
+using blink::WGC3Dsizeiptr;
+using blink::WGC3Duint;
+using blink::WebGLId;
 
 namespace gpu {
 
@@ -23,27 +38,11 @@ struct ContextCreationAttribHelper;
 }
 }
 
-using blink::WebGLId;
-
-using blink::WGC3Dbyte;
-using blink::WGC3Dchar;
-using blink::WGC3Denum;
-using blink::WGC3Dboolean;
-using blink::WGC3Dbitfield;
-using blink::WGC3Dint;
-using blink::WGC3Dsizei;
-using blink::WGC3Duint;
-using blink::WGC3Dfloat;
-using blink::WGC3Dclampf;
-using blink::WGC3Dintptr;
-using blink::WGC3Dsizeiptr;
-
-namespace webkit {
-namespace gpu {
+namespace gpu_blink {
 
 class WebGraphicsContext3DErrorMessageCallback;
 
-class WEBKIT_GPU_EXPORT WebGraphicsContext3DImpl
+class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
     : public NON_EXPORTED_BASE(blink::WebGraphicsContext3D) {
  public:
   virtual ~WebGraphicsContext3DImpl();
@@ -566,7 +565,7 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DImpl
 
   virtual GrGLInterface* createGrGLInterface();
 
-  ::gpu::gles2::GLES2Interface* GetGLInterface() {
+  gpu::gles2::GLES2Interface* GetGLInterface() {
     return gl_;
   }
 
@@ -574,18 +573,18 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DImpl
   // requests.
   static void ConvertAttributes(
       const blink::WebGraphicsContext3D::Attributes& attributes,
-      ::gpu::gles2::ContextCreationAttribHelper* output_attribs);
+      gpu::gles2::ContextCreationAttribHelper* output_attribs);
 
  protected:
   friend class WebGraphicsContext3DErrorMessageCallback;
 
   WebGraphicsContext3DImpl();
 
-  ::gpu::gles2::GLES2ImplementationErrorMessageCallback*
+  gpu::gles2::GLES2ImplementationErrorMessageCallback*
       getErrorMessageCallback();
   virtual void OnErrorMessage(const std::string& message, int id);
 
-  void setGLInterface(::gpu::gles2::GLES2Interface* gl) {
+  void setGLInterface(gpu::gles2::GLES2Interface* gl) {
     gl_ = gl;
   }
 
@@ -603,12 +602,11 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DImpl
   // Errors raised by synthesizeGLError().
   std::vector<WGC3Denum> synthetic_errors_;
 
-  ::gpu::gles2::GLES2Interface* gl_;
+  gpu::gles2::GLES2Interface* gl_;
   bool lose_context_when_out_of_memory_;
   uint32_t flush_id_;
 };
 
-}  // namespace gpu
-}  // namespace webkit
+}  // namespace gpu_blink
 
-#endif  // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IMPL_H_
+#endif  // GPU_BLINK_WEBGRAPHICSCONTEXT3D_IMPL_H_