diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 19:24:49 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 19:24:49 +0000 |
| commit | 5ae0b28229648b8b5d26624a45f3fffca4e545fd (patch) | |
| tree | a97b457285d90a49521a360e7cad015fbd7e2474 /webkit/gpu | |
| parent | 2f4aec1e3e10cac458f44747d650c2336e220554 (diff) | |
| download | chromium_src-5ae0b28229648b8b5d26624a45f3fffca4e545fd.zip chromium_src-5ae0b28229648b8b5d26624a45f3fffca4e545fd.tar.gz chromium_src-5ae0b28229648b8b5d26624a45f3fffca4e545fd.tar.bz2 | |
Refactor: Move app/gfx/gl ==> ui/gfx/gl
This is the final patch in the sequence. Note that gl.gyp is introduced because dependency checking on the Mac is done on a per file (rather than per target) basis.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/6722026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_impl.cc | 8 | ||||
| -rw-r--r-- | webkit/gpu/webkit_gpu.gypi | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc index 835611b..5c72367 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -9,13 +9,13 @@ #include <algorithm> #include <string> -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/logging.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_implementation.h" namespace webkit { namespace gpu { diff --git a/webkit/gpu/webkit_gpu.gypi b/webkit/gpu/webkit_gpu.gypi index dbe9571..e870aaf 100644 --- a/webkit/gpu/webkit_gpu.gypi +++ b/webkit/gpu/webkit_gpu.gypi @@ -8,10 +8,10 @@ 'target_name': 'webkit_gpu', 'type': '<(library)', 'dependencies': [ - '<(DEPTH)/app/app.gyp:app_base', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_common', '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_glsl', + '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', ], 'sources': [ # This list contains all .h and .cc in gpu except for test code. |