Merge pull request #2045 from abarth/gpu_direct

Move GPU code into direct

sky/shell/BUILD.gn

@@ -43,12 +43,12 @@ if (is_linux || is_mac) {
 
 source_set("common") {
   sources = [
-    "gpu/ganesh_context.cc",
-    "gpu/ganesh_context.h",
-    "gpu/ganesh_surface.cc",
-    "gpu/ganesh_surface.h",
-    "gpu/rasterizer.cc",
-    "gpu/rasterizer.h",
+    "gpu/direct/ganesh_context.cc",
+    "gpu/direct/ganesh_context.h",
+    "gpu/direct/ganesh_surface.cc",
+    "gpu/direct/ganesh_surface.h",
+    "gpu/direct/rasterizer.cc",
+    "gpu/direct/rasterizer.h",
     "gpu_delegate.cc",
     "gpu_delegate.h",
     "platform_view.cc",

sky/shell/gpu/ganesh_context.cc → sky/shell/gpu/direct/ganesh_context.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/gpu/ganesh_context.h"
+#include "sky/shell/gpu/direct/ganesh_context.h"
 
 #include "base/logging.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"

sky/shell/gpu/ganesh_context.h → sky/shell/gpu/direct/ganesh_context.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_SHELL_GPU_GANESH_CONTEXT_H_
-#define SKY_SHELL_GPU_GANESH_CONTEXT_H_
+#ifndef SKY_SHELL_GPU_DIRECT_GANESH_CONTEXT_H_
+#define SKY_SHELL_GPU_DIRECT_GANESH_CONTEXT_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ -34,4 +34,4 @@ class GaneshContext {
 }  // namespace shell
 }  // namespace sky
 
-#endif  // SKY_SHELL_GPU_GANESH_CONTEXT_H_
+#endif  // SKY_SHELL_GPU_DIRECT_GANESH_CONTEXT_H_

sky/shell/gpu/ganesh_surface.cc → sky/shell/gpu/direct/ganesh_surface.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/gpu/ganesh_surface.h"
+#include "sky/shell/gpu/direct/ganesh_surface.h"
 
 #include "base/logging.h"
 #include "third_party/skia/include/gpu/GrContext.h"

sky/shell/gpu/ganesh_surface.h → sky/shell/gpu/direct/ganesh_surface.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_SHELL_GPU_GANESH_SURFACE_H_
-#define SKY_SHELL_GPU_GANESH_SURFACE_H_
+#ifndef SKY_SHELL_GPU_DIRECT_GANESH_SURFACE_H_
+#define SKY_SHELL_GPU_DIRECT_GANESH_SURFACE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "sky/engine/wtf/RefPtr.h"
-#include "sky/shell/gpu/ganesh_context.h"
+#include "sky/shell/gpu/direct/ganesh_context.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -38,4 +38,4 @@ class GaneshSurface {
 }  // namespace shell
 }  // namespace sky
 
-#endif  // SKY_SHELL_GPU_GANESH_SURFACE_H_
+#endif  // SKY_SHELL_GPU_DIRECT_GANESH_SURFACE_H_

sky/shell/gpu/rasterizer.cc → sky/shell/gpu/direct/rasterizer.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/shell/gpu/rasterizer.h"
+#include "sky/shell/gpu/direct/rasterizer.h"
 
 #include "base/trace_event/trace_event.h"
 #include "sky/compositor/container_layer.h"
 #include "sky/compositor/layer.h"
 #include "sky/compositor/paint_context.h"
 #include "sky/compositor/picture_layer.h"
-#include "sky/shell/gpu/ganesh_context.h"
-#include "sky/shell/gpu/ganesh_surface.h"
+#include "sky/shell/gpu/direct/ganesh_context.h"
+#include "sky/shell/gpu/direct/ganesh_surface.h"
 #include "sky/shell/shell.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"

sky/shell/gpu/rasterizer.h → sky/shell/gpu/direct/rasterizer.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_SHELL_GPU_RASTERIZER_H_
-#define SKY_SHELL_GPU_RASTERIZER_H_
+#ifndef SKY_SHELL_GPU_DIRECT_RASTERIZER_H_
+#define SKY_SHELL_GPU_DIRECT_RASTERIZER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ -58,4 +58,4 @@ class Rasterizer : public GPUDelegate {
 }  // namespace shell
 }  // namespace sky
 
-#endif  // SKY_SHELL_GPU_RASTERIZER_H_
+#endif  // SKY_SHELL_GPU_DIRECT_RASTERIZER_H_

sky/shell/shell_view.cc

@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"
-#include "sky/shell/gpu/rasterizer.h"
+#include "sky/shell/gpu/direct/rasterizer.h"
 #include "sky/shell/platform_view.h"
 #include "sky/shell/shell.h"
 #include "sky/shell/ui/engine.h"