From 5ae0b28229648b8b5d26624a45f3fffca4e545fd Mon Sep 17 00:00:00 2001 From: "backer@chromium.org" Date: Mon, 28 Mar 2011 19:24:49 +0000 Subject: 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 --- webkit/gpu/webgraphicscontext3d_in_process_impl.cc | 8 ++++---- webkit/gpu/webkit_gpu.gypi | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'webkit/gpu') 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 #include -#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. -- cgit v1.1