summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 14:04:12 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 14:04:12 +0000
commitb9b751f2681d39b11a692a655eb16a9e1e4eba97 (patch)
treeef152fd04b0a9730f9088aa1b968e6096097127e /gpu
parent13ffb98bc729794380228ebdc09b18687d2d1d74 (diff)
downloadchromium_src-b9b751f2681d39b11a692a655eb16a9e1e4eba97.zip
chromium_src-b9b751f2681d39b11a692a655eb16a9e1e4eba97.tar.gz
chromium_src-b9b751f2681d39b11a692a655eb16a9e1e4eba97.tar.bz2
Refactor: Move app/surface to ui/gfx/surface.
This is progress towards moving app/gfx/gl to ui/gfx/gl. Currently, surface depends on gl, but gl depends on app_base (which contains surface). This refactor gets rid of this potential cyclic dependency. surface.gyp is in a separate file (not a .gypi include) because cyclic dependency checking is at the file level (not target level). BUG=none TEST=by hand and try bots Review URL: http://codereview.chromium.org/6718027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/gpu_processor.h4
-rw-r--r--gpu/gpu.gyp1
2 files changed, 3 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/gpu_processor.h b/gpu/command_buffer/service/gpu_processor.h
index 1682ad8..7dfba2a 100644
--- a/gpu/command_buffer/service/gpu_processor.h
+++ b/gpu/command_buffer/service/gpu_processor.h
@@ -8,7 +8,6 @@
#include <queue>
#include <vector>
-#include "app/surface/transport_dib.h"
#include "base/callback.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
@@ -20,9 +19,10 @@
#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/size.h"
+#include "ui/gfx/surface/transport_dib.h"
#if defined(OS_MACOSX)
-#include "app/surface/accelerated_surface_mac.h"
+#include "ui/gfx/surface/accelerated_surface_mac.h"
#endif
namespace gfx {
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 0ebacf8..4b25208 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -181,6 +181,7 @@
'../app/app.gyp:app_base',
'../base/base.gyp:base',
'../ui/ui.gyp:ui_gfx',
+ '../ui/gfx/surface/surface.gyp:surface',
'../third_party/angle/src/build_angle.gyp:translator_glsl',
],
'sources': [