diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-12 21:17:27 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-12 21:17:27 +0000 |
| commit | c9e2cbbbcad5f0ae5b9c5ccaf6a36a8a4a61e0e7 (patch) | |
| tree | e33d97dc2edae8702ddb6a17ba0d89a506412693 /gpu/gles2_conform_support | |
| parent | fc25fd35147b2d5e74d5450e8586592c6a10813d (diff) | |
| download | chromium_src-c9e2cbbbcad5f0ae5b9c5ccaf6a36a8a4a61e0e7.zip chromium_src-c9e2cbbbcad5f0ae5b9c5ccaf6a36a8a4a61e0e7.tar.gz chromium_src-c9e2cbbbcad5f0ae5b9c5ccaf6a36a8a4a61e0e7.tar.bz2 | |
ui: Move gl/ directory out of gfx/, up to ui/.
BUG=104040
R=ben@chromium.org
TBR=tony@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10392068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gles2_conform_support')
| -rw-r--r-- | gpu/gles2_conform_support/egl/display.h | 6 | ||||
| -rw-r--r-- | gpu/gles2_conform_support/egl/egl.cc | 6 | ||||
| -rw-r--r-- | gpu/gles2_conform_support/gles2_conform_support.gyp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gpu/gles2_conform_support/egl/display.h b/gpu/gles2_conform_support/egl/display.h index f7e20e8..1138fdf 100644 --- a/gpu/gles2_conform_support/egl/display.h +++ b/gpu/gles2_conform_support/egl/display.h @@ -10,11 +10,11 @@ #include "base/memory/scoped_ptr.h" #include "gpu/command_buffer/client/gles2_cmd_helper.h" #include "gpu/command_buffer/service/command_buffer_service.h" -#include "gpu/command_buffer/service/gpu_scheduler.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_surface.h" +#include "gpu/command_buffer/service/gpu_scheduler.h" #include "ui/gfx/native_widget_types.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface.h" namespace gpu { class CommandBufferService; diff --git a/gpu/gles2_conform_support/egl/egl.cc b/gpu/gles2_conform_support/egl/egl.cc index 1e414d3..b342b9d 100644 --- a/gpu/gles2_conform_support/egl/egl.cc +++ b/gpu/gles2_conform_support/egl/egl.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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 <EGL/egl.h> -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_surface.h" #include "base/command_line.h" #include "gpu/gles2_conform_support/egl/display.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface.h" namespace { void SetCurrentError(EGLint error_code) { diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp index 7f093aa..ee59476 100644 --- a/gpu/gles2_conform_support/gles2_conform_support.gyp +++ b/gpu/gles2_conform_support/gles2_conform_support.gyp @@ -34,7 +34,7 @@ '<(DEPTH)/gpu/gpu.gyp:gpu', '<(DEPTH)/gpu/gpu.gyp:gles2_implementation_client_side_arrays_no_check', '<(DEPTH)/gpu/gpu.gyp:command_buffer_service', - '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', + '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', ], 'include_dirs': ['<(DEPTH)/third_party/khronos'], |