diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 22:45:41 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 22:45:41 +0000 |
| commit | d353541f29a517a93d1b0fec023f5d12a05eade2 (patch) | |
| tree | ed89daef5725a582ca4957f9b237c64113529501 /gpu | |
| parent | 724b3891cefbc629f9db168f9b39943dabc1cfe2 (diff) | |
| download | chromium_src-d353541f29a517a93d1b0fec023f5d12a05eade2.zip chromium_src-d353541f29a517a93d1b0fec023f5d12a05eade2.tar.gz chromium_src-d353541f29a517a93d1b0fec023f5d12a05eade2.tar.bz2 | |
ui: Move surface/ directory out of gfx/, up to ui/.
BUG=104040
R=ben@chromium.org
TBR=brettw@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10351002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/DEPS | 1 | ||||
| -rw-r--r-- | gpu/command_buffer/service/feature_info.cc | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 4 | ||||
| -rw-r--r-- | gpu/command_buffer_service.gypi | 2 |
4 files changed, 5 insertions, 4 deletions
@@ -9,4 +9,5 @@ include_rules = [ "+../service", "+crypto", "+ui/gfx", + "+ui/surface", ] diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc index 1e27efd..6be40c4 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -11,7 +11,7 @@ #include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_implementation.h" #if defined(OS_MACOSX) -#include "ui/gfx/surface/io_surface_support_mac.h" +#include "ui/surface/io_surface_support_mac.h" #endif namespace gpu { diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index e683128..9568ce1 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/atomicops.h" #include "base/at_exit.h" +#include "base/atomicops.h" #include "base/bind.h" #include "base/command_line.h" #include "base/debug/trace_event.h" @@ -51,7 +51,7 @@ #include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/gl/gl_surface.h" #if defined(OS_MACOSX) -#include "ui/gfx/surface/io_surface_support_mac.h" +#include "ui/surface/io_surface_support_mac.h" #endif #if !defined(GL_DEPTH24_STENCIL8) diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi index d9e0121..d7a182e 100644 --- a/gpu/command_buffer_service.gypi +++ b/gpu/command_buffer_service.gypi @@ -17,7 +17,7 @@ '../base/base.gyp:base', '../crypto/crypto.gyp:crypto', '../ui/gfx/gl/gl.gyp:gl', - '../ui/gfx/surface/surface.gyp:surface', + '../ui/surface/surface.gyp:surface', '../ui/ui.gyp:ui', '../third_party/angle/src/build_angle.gyp:translator_glsl', ], |