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

webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc

 // Copyright (c) 2013 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 "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h"
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
+#include "gpu/blink/webgraphicscontext3d_impl.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
-#include "webkit/common/gpu/webgraphicscontext3d_impl.h"
 
 namespace webkit {
 namespace gpu {
 
 namespace {
 
 // Singleton used to initialize and terminate the gles2 library.
 class GLES2Initializer {
  public:
   GLES2Initializer() { gles2::Initialize(); }
 
   ~GLES2Initializer() { gles2::Terminate(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GLES2Initializer);
 };
 
 base::LazyInstance<GLES2Initializer> g_gles2_initializer =
     LAZY_INSTANCE_INITIALIZER;
 
 void BindWebGraphicsContext3DGLContextCallback(const GrGLInterface* interface) {
-  gles2::SetGLContext(reinterpret_cast<WebGraphicsContext3DImpl*>(
+  gles2::SetGLContext(reinterpret_cast<gpu_blink::WebGraphicsContext3DImpl*>(
                           interface->fCallbackData)->GetGLInterface());
 }
 
-}  // namespace anonymous
+}  // namespace
 
 GrContextForWebGraphicsContext3D::GrContextForWebGraphicsContext3D(
-    WebGraphicsContext3DImpl* context3d) {
+    gpu_blink::WebGraphicsContext3DImpl* context3d) {
   if (!context3d)
     return;
 
   // Ensure the gles2 library is initialized first in a thread safe way.
   g_gles2_initializer.Get();
   gles2::SetGLContext(context3d->GetGLInterface());
   skia::RefPtr<GrGLInterface> interface = skia::AdoptRef(
       context3d->createGrGLInterface());
   if (!interface)
     return;
@@ skipping 29 matching lines @@
 void GrContextForWebGraphicsContext3D::FreeGpuResources() {
   if (gr_context_) {
     TRACE_EVENT_INSTANT0("gpu", "GrContext::freeGpuResources", \
         TRACE_EVENT_SCOPE_THREAD);
     gr_context_->freeGpuResources();
   }
 }
 
 }  // namespace gpu
 }  // namespace webkit