mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
Merge pull request #2404 from abarth/mv_ganesh_canvas
Move ganesh_canvas to sky/shell/gpu/direct/
This commit is contained in:
commit
3fdf0e5bca
@ -4,8 +4,6 @@
|
||||
|
||||
source_set("common") {
|
||||
sources = [
|
||||
"gpu/ganesh_canvas.cc",
|
||||
"gpu/ganesh_canvas.h",
|
||||
"gpu/picture_serializer.cc",
|
||||
"gpu/picture_serializer.h",
|
||||
"rasterizer.cc",
|
||||
@ -68,6 +66,8 @@ source_set("gpu_direct") {
|
||||
"gpu/direct/surface_notifications_direct.h",
|
||||
"gpu/direct/rasterizer_direct.cc",
|
||||
"gpu/direct/rasterizer_direct.h",
|
||||
"gpu/direct/ganesh_canvas.cc",
|
||||
"gpu/direct/ganesh_canvas.h",
|
||||
]
|
||||
|
||||
deps = [
|
||||
|
||||
@ -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_canvas.h"
|
||||
#include "sky/shell/gpu/direct/ganesh_canvas.h"
|
||||
|
||||
#include "base/logging.h"
|
||||
#include "third_party/skia/include/gpu/gl/GrGLInterface.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_CANVAS_H_
|
||||
#define SKY_SHELL_GPU_GANESH_CANVAS_H_
|
||||
#ifndef SKY_SHELL_GPU_DIRECT_GANESH_CANVAS_H_
|
||||
#define SKY_SHELL_GPU_DIRECT_GANESH_CANVAS_H_
|
||||
|
||||
#include "base/basictypes.h"
|
||||
#include "skia/ext/refptr.h"
|
||||
@ -38,4 +38,4 @@ class GaneshCanvas {
|
||||
} // namespace shell
|
||||
} // namespace sky
|
||||
|
||||
#endif // SKY_SHELL_GPU_GANESH_CANVAS_H_
|
||||
#endif // SKY_SHELL_GPU_DIRECT_GANESH_CANVAS_H_
|
||||
@ -8,7 +8,7 @@
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "flow/paint_context.h"
|
||||
#include "skia/ext/refptr.h"
|
||||
#include "sky/shell/gpu/ganesh_canvas.h"
|
||||
#include "sky/shell/gpu/direct/ganesh_canvas.h"
|
||||
#include "sky/shell/rasterizer.h"
|
||||
#include "ui/gfx/native_widget_types.h"
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user