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 | |
| 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
79 files changed, 342 insertions, 272 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index 9c50598..db8cceb 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -56,7 +56,6 @@ 'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE', 'variables': { 'app_base_target': 1, - 'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/app', }, 'dependencies': [ # app resources and ui_strings should be shared with the 64-bit @@ -74,17 +73,11 @@ '../ui/base/strings/ui_strings.gyp:ui_strings', '<(libjpeg_gyp_path):libjpeg', ], - 'include_dirs': [ - '../third_party/mesa/MesaLib/include', - '<(gl_binding_output_dir)', - ], # TODO(gregoryd): The direct_dependent_settings should be shared with # the 64-bit target, but it doesn't work due to a bug in gyp 'direct_dependent_settings': { 'include_dirs': [ '..', - '../third_party/mesa/MesaLib/include', - '<(gl_binding_output_dir)', ], }, 'sources': [ @@ -200,25 +193,6 @@ '../ui/base/x/x11_util.cc', '../ui/base/x/x11_util.h', '../ui/base/x/x11_util_internal.h', - 'gfx/gl/gl_bindings.h', - 'gfx/gl/gl_bindings_skia.cc', - 'gfx/gl/gl_bindings_skia.h', - 'gfx/gl/gl_context.cc', - 'gfx/gl/gl_context.h', - 'gfx/gl/gl_context_linux.cc', - 'gfx/gl/gl_context_mac.cc', - 'gfx/gl/gl_context_osmesa.cc', - 'gfx/gl/gl_context_osmesa.h', - 'gfx/gl/gl_context_stub.cc', - 'gfx/gl/gl_context_stub.h', - 'gfx/gl/gl_context_win.cc', - 'gfx/gl/gl_implementation.cc', - 'gfx/gl/gl_implementation.h', - 'gfx/gl/gl_implementation_linux.cc', - 'gfx/gl/gl_implementation_mac.cc', - 'gfx/gl/gl_implementation_win.cc', - 'gfx/gl/gl_interface.h', - 'gfx/gl/gl_interface.cc', 'mac/nsimage_cache.h', 'mac/nsimage_cache.mm', 'mac/scoped_nsdisable_screen_updates.h', @@ -240,42 +214,6 @@ 'win/scoped_prop.h', 'win/shell.cc', 'win/shell.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h', - ], - # hard_dependency is necessary for this target because it has actions - # that generate header files included by dependent targtets. The header - # files must be generated before the dependents are compiled. The usual - # semantics are to allow the two targets to build concurrently. - 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'generate_gl_bindings', - 'inputs': [ - 'gfx/gl/generate_bindings.py', - ], - 'outputs': [ - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h', - ], - 'action': [ - 'python', - 'gfx/gl/generate_bindings.py', - '<(gl_binding_output_dir)', - ], - }, ], 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { @@ -331,27 +269,12 @@ ], }], ['OS=="linux"', { - 'sources': [ - 'gfx/gl/gl_context_egl.cc', - 'gfx/gl/gl_context_egl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h', - ], 'sources!': [ '../ui/base/keycodes/keyboard_code_conversion_mac.mm', '../ui/base/keycodes/keyboard_code_conversion_mac.h', '../ui/base/keycodes/keyboard_codes_win.h', ], - 'include_dirs': [ - # We don't use angle, but pull the EGL/GLES headers from there. - '../third_party/angle/include', - ], 'all_dependent_settings': { - 'defines': [ - 'GL_GLEXT_PROTOTYPES', - ], 'ldflags': [ '-L<(PRODUCT_DIR)', ], @@ -368,7 +291,6 @@ 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', - '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], }, 'sources!': [ @@ -382,17 +304,6 @@ ], }], ['OS=="win"', { - 'include_dirs': [ - '../third_party/angle/include', - ], - 'sources': [ - 'gfx/gl/gl_context_egl.cc', - 'gfx/gl/gl_context_egl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h', - ], 'sources!': [ '../ui/base/keycodes/keyboard_code_conversion_gtk.cc', '../ui/base/keycodes/keyboard_code_conversion_gtk.h', diff --git a/chrome/browser/gpu_data_manager.cc b/chrome/browser/gpu_data_manager.cc index 1ef345b..d708f3d 100644 --- a/chrome/browser/gpu_data_manager.cc +++ b/chrome/browser/gpu_data_manager.cc @@ -4,7 +4,6 @@ #include "chrome/browser/gpu_data_manager.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/command_line.h" #include "base/logging.h" #include "base/metrics/histogram.h" @@ -18,6 +17,7 @@ #include "content/gpu/gpu_info_collector.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/gl/gl_switches.h" GpuDataManager::GpuDataManager() diff --git a/chrome/browser/gpu_process_host_ui_shim.cc b/chrome/browser/gpu_process_host_ui_shim.cc index 1f7ed04..2f72eda 100644 --- a/chrome/browser/gpu_process_host_ui_shim.cc +++ b/chrome/browser/gpu_process_host_ui_shim.cc @@ -7,7 +7,6 @@ #include "chrome/browser/gpu_process_host_ui_shim.h" -#include "app/gfx/gl/gl_context.h" #include "base/command_line.h" #include "base/id_map.h" #include "base/process_util.h" @@ -22,6 +21,7 @@ #include "content/common/content_switches.h" #include "content/common/gpu_messages.h" #include "gpu/common/gpu_trace_event.h" +#include "ui/gfx/gl/gl_context.h" #if defined(OS_LINUX) // These two #includes need to come after gpu_messages.h. diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc index 865b1e2..3a835a4 100644 --- a/chrome/browser/media_uitest.cc +++ b/chrome/browser/media_uitest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/gl/gl_implementation.h" #include "base/basictypes.h" #include "base/file_path.h" #include "base/string_util.h" @@ -13,6 +12,7 @@ #include "chrome/test/ui/ui_layout_test.h" #include "chrome/test/ui/ui_test.h" #include "net/base/net_util.h" +#include "ui/gfx/gl/gl_implementation.h" class MediaTest : public UITest { protected: diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index a5346ca..a3979cf 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1137,6 +1137,7 @@ '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', + '../ui/gfx/gl/gl.gyp:gl', ], 'include_dirs': [ '..', diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h index ae2330f..9e631a6 100644 --- a/chrome/common/render_messages_params.h +++ b/chrome/common/render_messages_params.h @@ -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. diff --git a/chrome/test/gpu/gpu_browsertest.cc b/chrome/test/gpu/gpu_browsertest.cc index d96915b..d3d6879 100644 --- a/chrome/test/gpu/gpu_browsertest.cc +++ b/chrome/test/gpu/gpu_browsertest.cc @@ -1,8 +1,7 @@ -// 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. -#include "app/gfx/gl/gl_implementation.h" #include "base/command_line.h" #include "base/path_service.h" #include "base/string16.h" @@ -17,6 +16,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" +#include "ui/gfx/gl/gl_implementation.h" class GPUBrowserTest : public InProcessBrowserTest { protected: diff --git a/chrome/test/gpu/gpu_crash.cc b/chrome/test/gpu/gpu_crash.cc index 8f134ee..b0d090b 100644 --- a/chrome/test/gpu/gpu_crash.cc +++ b/chrome/test/gpu/gpu_crash.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/gl/gl_implementation.h" #include "base/command_line.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" @@ -15,6 +14,7 @@ #include "chrome/test/ui_test_utils.h" #include "content/browser/tab_contents/tab_contents.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/gl/gl_implementation.h" namespace { diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index 1afa3a6..862d0ba 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -5,7 +5,6 @@ #include <string> #include <vector> -#include "app/gfx/gl/gl_implementation.h" #include "base/callback.h" #include "base/command_line.h" #include "base/file_path.h" @@ -31,6 +30,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/codec/png_codec.h" +#include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/size.h" diff --git a/chrome/test/gpu/gpu_uitest.cc b/chrome/test/gpu/gpu_uitest.cc index a392982..65b738e 100644 --- a/chrome/test/gpu/gpu_uitest.cc +++ b/chrome/test/gpu/gpu_uitest.cc @@ -1,15 +1,15 @@ -// 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. #include <string> -#include "app/gfx/gl/gl_implementation.h" #include "build/build_config.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/test_launcher_utils.h" #include "chrome/test/ui/ui_test.h" #include "net/base/net_util.h" +#include "ui/gfx/gl/gl_implementation.h" class GPUUITest : public UITest { protected: diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index c2f5891..2e47340 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -12,7 +12,6 @@ #include <set> #include <vector> -#include "app/gfx/gl/gl_implementation.h" #include "app/sql/connection.h" #include "base/base_switches.h" #include "base/command_line.h" @@ -50,6 +49,7 @@ #include "content/common/debug_flags.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" +#include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/gl/gl_switches.h" #if defined(OS_WIN) diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm index 1d1d36f..723a55a 100644 --- a/content/common/sandbox_mac.mm +++ b/content/common/sandbox_mac.mm @@ -13,7 +13,6 @@ extern "C" { #include <signal.h> #include <sys/param.h> -#include "app/gfx/gl/gl_context.h" #include "base/basictypes.h" #include "base/command_line.h" #include "base/file_util.h" @@ -29,6 +28,7 @@ extern "C" { #include "content/common/chrome_application_mac.h" #include "content/common/content_switches.h" #include "unicode/uchar.h" +#include "ui/gfx/gl/gl_context.h" namespace { diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index fec3a08..74ab725 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -13,10 +13,10 @@ 'msvs_guid': 'F10F1ECD-D84D-4C33-8468-9DDFE19F4D8A', 'dependencies': [ 'content_common', - '../app/app.gyp:app_base', '../base/base.gyp:base', '../media/media.gyp:media', '../skia/skia.gyp:skia', + '../ui/gfx/gl/gl.gyp:gl', ], 'sources': [ 'gpu/content_gpu_client.h', diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index 12a8ec9..9597c0c 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -7,8 +7,6 @@ #include <string> #include <vector> -#include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_implementation.h" #include "app/win/scoped_com_initializer.h" #include "base/command_line.h" #include "base/threading/worker_pool.h" @@ -20,6 +18,8 @@ #include "content/gpu/gpu_info_collector.h" #include "content/gpu/gpu_watchdog_thread.h" #include "ipc/ipc_channel_handle.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_implementation.h" #if defined(OS_MACOSX) #include "content/common/sandbox_init_wrapper.h" diff --git a/content/gpu/gpu_info_collector.cc b/content/gpu/gpu_info_collector.cc index 13b293e..6b37c27 100644 --- a/content/gpu/gpu_info_collector.cc +++ b/content/gpu/gpu_info_collector.cc @@ -7,12 +7,12 @@ #include <string> #include <vector> -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_context.h" #include "base/logging.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_split.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_context.h" namespace { diff --git a/content/gpu/gpu_info_collector_linux.cc b/content/gpu/gpu_info_collector_linux.cc index a627468..64087d2 100644 --- a/content/gpu/gpu_info_collector_linux.cc +++ b/content/gpu/gpu_info_collector_linux.cc @@ -7,9 +7,6 @@ #include <dlfcn.h> #include <vector> -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -17,6 +14,9 @@ #include "base/string_split.h" #include "base/string_tokenizer.h" #include "base/string_util.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_implementation.h" namespace { diff --git a/content/gpu/gpu_info_collector_mac.mm b/content/gpu/gpu_info_collector_mac.mm index d1edf3c..dd9b663 100644 --- a/content/gpu/gpu_info_collector_mac.mm +++ b/content/gpu/gpu_info_collector_mac.mm @@ -4,14 +4,14 @@ #include "content/gpu/gpu_info_collector.h" -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_implementation.h" -#include "app/gfx/gl/gl_interface.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/string_piece.h" #include "base/sys_string_conversions.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gfx/gl/gl_interface.h" #import <Cocoa/Cocoa.h> #import <Foundation/Foundation.h> diff --git a/content/gpu/gpu_info_collector_unittest.cc b/content/gpu/gpu_info_collector_unittest.cc index 0085c62..d787e89 100644 --- a/content/gpu/gpu_info_collector_unittest.cc +++ b/content/gpu/gpu_info_collector_unittest.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/gl/gl_implementation.h" #include "base/memory/scoped_ptr.h" #include "content/common/gpu_info.h" #include "content/gpu/gpu_info_collector.h" #include "gpu/command_buffer/common/gl_mock.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/gl/gl_implementation.h" using ::gfx::MockGLInterface; using ::testing::Return; diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc index 3e86f1c8..69da85f 100644 --- a/content/gpu/gpu_info_collector_win.cc +++ b/content/gpu/gpu_info_collector_win.cc @@ -8,13 +8,13 @@ #include <setupapi.h> #include <windows.h> -#include "app/gfx/gl/gl_context_egl.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/file_path.h" #include "base/logging.h" #include "base/memory/scoped_native_library.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "ui/gfx/gl/gl_context_egl.h" +#include "ui/gfx/gl/gl_implementation.h" // ANGLE seems to require that main.h be included before any other ANGLE header. #include "libEGL/main.h" diff --git a/content/gpu/gpu_render_thread.cc b/content/gpu/gpu_render_thread.cc index 7930337..784d3e5 100644 --- a/content/gpu/gpu_render_thread.cc +++ b/content/gpu/gpu_render_thread.cc @@ -7,8 +7,6 @@ #include <string> #include <vector> -#include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_implementation.h" #include "app/win/scoped_com_initializer.h" #include "base/command_line.h" #include "base/threading/worker_pool.h" @@ -21,6 +19,8 @@ #include "content/gpu/gpu_info_collector.h" #include "content/gpu/gpu_watchdog_thread.h" #include "ipc/ipc_channel_handle.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_implementation.h" GpuRenderThread::GpuRenderThread(IPC::Message::Sender* browser_channel, GpuWatchdogThread* gpu_watchdog_thread, diff --git a/content/gpu/media/fake_gl_video_device.cc b/content/gpu/media/fake_gl_video_device.cc index f4e8746e6..18fb09e 100644 --- a/content/gpu/media/fake_gl_video_device.cc +++ b/content/gpu/media/fake_gl_video_device.cc @@ -4,8 +4,8 @@ #include "content/gpu/media/fake_gl_video_device.h" -#include "app/gfx/gl/gl_bindings.h" #include "media/base/video_frame.h" +#include "ui/gfx/gl/gl_bindings.h" void* FakeGlVideoDevice::GetDevice() { // No actual hardware device should be used. diff --git a/gpu/command_buffer/client/gles2_demo.cc b/gpu/command_buffer/client/gles2_demo.cc index 888b9ce..daa51d2 100644 --- a/gpu/command_buffer/client/gles2_demo.cc +++ b/gpu/command_buffer/client/gles2_demo.cc @@ -12,7 +12,6 @@ #include <shellapi.h> #include <stdlib.h> #include <stdio.h> -#include "app/gfx/gl/gl_context.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/callback.h" @@ -26,6 +25,7 @@ #include "gpu/command_buffer/client/gles2_lib.h" #include "gpu/command_buffer/client/gles2_demo_c.h" #include "gpu/command_buffer/client/gles2_demo_cc.h" +#include "ui/gfx/gl/gl_context.h" using base::SharedMemory; using gpu::Buffer; diff --git a/gpu/command_buffer/common/gl_mock.h b/gpu/command_buffer/common/gl_mock.h index fc20541..1a7e474 100644 --- a/gpu/command_buffer/common/gl_mock.h +++ b/gpu/command_buffer/common/gl_mock.h @@ -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,8 +9,8 @@ #define GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_ #pragma once -#include "app/gfx/gl/gl_interface.h" #include "testing/gmock/include/gmock/gmock.h" +#include "ui/gfx/gl/gl_interface.h" namespace gfx { diff --git a/gpu/command_buffer/common/unittest_main.cc b/gpu/command_buffer/common/unittest_main.cc index 86eb589..b9277db 100644 --- a/gpu/command_buffer/common/unittest_main.cc +++ b/gpu/command_buffer/common/unittest_main.cc @@ -1,11 +1,11 @@ -// 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. #include "base/at_exit.h" -#include "app/gfx/gl/gl_implementation.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/gl/gl_implementation.h" int main(int argc, char** argv) { base::AtExitManager exit_manager; diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc index 764cc64..70e8f17 100644 --- a/gpu/command_buffer/service/context_group.cc +++ b/gpu/command_buffer/service/context_group.cc @@ -1,8 +1,7 @@ -// 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. -#include "app/gfx/gl/gl_implementation.h" #include "gpu/command_buffer/service/context_group.h" #include "gpu/command_buffer/common/id_allocator.h" #include "gpu/command_buffer/service/buffer_manager.h" @@ -13,6 +12,7 @@ #include "gpu/command_buffer/service/shader_manager.h" #include "gpu/command_buffer/service/texture_manager.h" #include "gpu/GLES2/gles2_command_buffer.h" +#include "ui/gfx/gl/gl_implementation.h" namespace gpu { namespace gles2 { diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc index 19e71fc..aa0f51b 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -4,10 +4,10 @@ #include <set> #include <string> -#include "app/gfx/gl/gl_implementation.h" #include "gpu/command_buffer/service/feature_info.h" #include "gpu/command_buffer/service/gl_utils.h" #include "gpu/GLES2/gles2_command_buffer.h" +#include "ui/gfx/gl/gl_implementation.h" namespace gpu { namespace gles2 { diff --git a/gpu/command_buffer/service/gl_utils.h b/gpu/command_buffer/service/gl_utils.h index f7a5f8f..3091ee7 100644 --- a/gpu/command_buffer/service/gl_utils.h +++ b/gpu/command_buffer/service/gl_utils.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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,7 +9,7 @@ #define GPU_COMMAND_BUFFER_SERVICE_GL_UTILS_H_ #include "build/build_config.h" -#include "app/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_bindings.h" // GLES2 defines not part of Desktop GL // Shader Precision-Specified Types diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 94f3ad0..e2bfc7a 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -12,8 +12,6 @@ #include <string> #include <vector> -#include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/atomicops.h" #include "base/at_exit.h" #include "base/callback.h" @@ -37,6 +35,8 @@ #include "gpu/command_buffer/service/shader_translator.h" #include "gpu/command_buffer/service/texture_manager.h" #include "gpu/GLES2/gles2_command_buffer.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_implementation.h" #if !defined(GL_DEPTH24_STENCIL8) #define GL_DEPTH24_STENCIL8 0x88F0 diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h index 6496c3f..ed1f025 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h @@ -5,7 +5,6 @@ #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_ #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_ -#include "app/gfx/gl/gl_context_stub.h" #include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/common/gles2_cmd_format.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" @@ -20,6 +19,7 @@ #include "gpu/command_buffer/service/texture_manager.h" #include "gpu/GLES2/gles2_command_buffer.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/gl/gl_context_stub.h" namespace gpu { namespace gles2 { diff --git a/gpu/command_buffer/service/gpu_processor.cc b/gpu/command_buffer/service/gpu_processor.cc index b43b98e..c2363b8 100644 --- a/gpu/command_buffer/service/gpu_processor.cc +++ b/gpu/command_buffer/service/gpu_processor.cc @@ -4,12 +4,12 @@ #include "gpu/command_buffer/service/gpu_processor.h" -#include "app/gfx/gl/gl_bindings.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/message_loop.h" -#include "app/gfx/gl/gl_context.h" #include "gpu/common/gpu_trace_event.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_bindings.h" using ::base::SharedMemory; diff --git a/gpu/command_buffer/service/gpu_processor_linux.cc b/gpu/command_buffer/service/gpu_processor_linux.cc index 5627d63..87f694e 100644 --- a/gpu/command_buffer/service/gpu_processor_linux.cc +++ b/gpu/command_buffer/service/gpu_processor_linux.cc @@ -1,9 +1,9 @@ -// Copyright (c) 2009 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. -#include "app/gfx/gl/gl_context.h" #include "gpu/command_buffer/service/gpu_processor.h" +#include "ui/gfx/gl/gl_context.h" using ::base::SharedMemory; diff --git a/gpu/command_buffer/service/gpu_processor_mac.cc b/gpu/command_buffer/service/gpu_processor_mac.cc index 757de57..4d250ac 100644 --- a/gpu/command_buffer/service/gpu_processor_mac.cc +++ b/gpu/command_buffer/service/gpu_processor_mac.cc @@ -1,9 +1,9 @@ -// 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. -#include "app/gfx/gl/gl_context.h" #include "gpu/command_buffer/service/gpu_processor.h" +#include "ui/gfx/gl/gl_context.h" using ::base::SharedMemory; diff --git a/gpu/command_buffer/service/gpu_processor_win.cc b/gpu/command_buffer/service/gpu_processor_win.cc index 465cf5a..fb48f74 100644 --- a/gpu/command_buffer/service/gpu_processor_win.cc +++ b/gpu/command_buffer/service/gpu_processor_win.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2009 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. #include <windows.h> -#include "app/gfx/gl/gl_context.h" #include "gpu/command_buffer/service/gpu_processor.h" +#include "ui/gfx/gl/gl_context.h" using ::base::SharedMemory; diff --git a/gpu/demos/framework/main_exe.cc b/gpu/demos/framework/main_exe.cc index 5dd1341..93fc51e 100644 --- a/gpu/demos/framework/main_exe.cc +++ b/gpu/demos/framework/main_exe.cc @@ -1,12 +1,12 @@ -// 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. -#include "app/gfx/gl/gl_context.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/logging.h" #include "gpu/demos/framework/window.h" +#include "ui/gfx/gl/gl_context.h" #if defined(OS_LINUX) #include <gtk/gtk.h> diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 4b25208..547c670 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -178,10 +178,10 @@ 'dependencies': [ 'command_buffer_common', 'gpu_common', - '../app/app.gyp:app_base', '../base/base.gyp:base', - '../ui/ui.gyp:ui_gfx', + '../ui/gfx/gl/gl.gyp:gl', '../ui/gfx/surface/surface.gyp:surface', + '../ui/ui.gyp:ui_gfx', '../third_party/angle/src/build_angle.gyp:translator_glsl', ], 'sources': [ @@ -244,6 +244,7 @@ '../testing/gmock.gyp:gmock', '../testing/gmock.gyp:gmock_main', '../testing/gtest.gyp:gtest', + '../ui/gfx/gl/gl.gyp:gl', 'command_buffer_client', 'command_buffer_common', 'command_buffer_service', @@ -307,9 +308,9 @@ 'target_name': 'gpu_unittest_utils', 'type': 'static_library', 'dependencies': [ - '../app/app.gyp:app_base', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', + '../ui/gfx/gl/gl.gyp:gl', ], 'include_dirs': [ '..', diff --git a/media/media.gyp b/media/media.gyp index 4df272c..7b560676 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -573,7 +573,7 @@ 'type': 'executable', 'dependencies': [ 'media', - '../app/app.gyp:app_base', + '../ui/gfx/gl/gl.gyp:gl', ], 'sources': [ 'tools/shader_bench/shader_bench.cc', @@ -618,8 +618,8 @@ 'target_name': 'tile_render_bench', 'type': 'executable', 'dependencies': [ - '../app/app.gyp:app_base', '../base/base.gyp:base', + '../ui/gfx/gl/gl.gyp:gl', ], 'libraries': [ '-lGL', @@ -737,7 +737,7 @@ }], ['player_x11_renderer == "gl"', { 'dependencies': [ - '../app/app.gyp:app_base', + '../ui/gfx/gl/gl.gyp:gl', ], 'sources': [ 'tools/player_x11/gl_video_renderer.cc', diff --git a/media/tools/player_x11/gl_video_renderer.cc b/media/tools/player_x11/gl_video_renderer.cc index 68b317f..590f39a 100644 --- a/media/tools/player_x11/gl_video_renderer.cc +++ b/media/tools/player_x11/gl_video_renderer.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. @@ -6,10 +6,10 @@ #include <X11/Xutil.h> -#include "app/gfx/gl/gl_implementation.h" #include "media/base/buffers.h" #include "media/base/video_frame.h" #include "media/base/yuv_convert.h" +#include "ui/gfx/gl/gl_implementation.h" GlVideoRenderer* GlVideoRenderer::instance_ = NULL; diff --git a/media/tools/player_x11/gl_video_renderer.h b/media/tools/player_x11/gl_video_renderer.h index bfe0a3b..01fcdbf 100644 --- a/media/tools/player_x11/gl_video_renderer.h +++ b/media/tools/player_x11/gl_video_renderer.h @@ -5,10 +5,10 @@ #ifndef MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_ #define MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_ -#include "app/gfx/gl/gl_bindings.h" #include "base/memory/scoped_ptr.h" #include "media/base/filters.h" #include "media/filters/video_renderer_base.h" +#include "ui/gfx/gl/gl_bindings.h" class GlVideoRenderer : public media::VideoRendererBase { public: diff --git a/media/tools/shader_bench/gpu_color_painter.cc b/media/tools/shader_bench/gpu_color_painter.cc index b02160d..01c1eb4 100644 --- a/media/tools/shader_bench/gpu_color_painter.cc +++ b/media/tools/shader_bench/gpu_color_painter.cc @@ -1,9 +1,9 @@ -// 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. -#include "app/gfx/gl/gl_context.h" #include "media/tools/shader_bench/gpu_color_painter.h" +#include "ui/gfx/gl/gl_context.h" // Matrix used for the YUV to RGB conversion. static const float kYUV2RGB[9] = { diff --git a/media/tools/shader_bench/gpu_color_painter.h b/media/tools/shader_bench/gpu_color_painter.h index fed69539..ab23072 100644 --- a/media/tools/shader_bench/gpu_color_painter.h +++ b/media/tools/shader_bench/gpu_color_painter.h @@ -5,10 +5,10 @@ #ifndef MEDIA_TOOLS_SHADER_BENCH_GPU_COLOR_PAINTER_H_ #define MEDIA_TOOLS_SHADER_BENCH_GPU_COLOR_PAINTER_H_ -#include "app/gfx/gl/gl_context.h" #include "base/memory/scoped_ptr.h" #include "media/base/video_frame.h" #include "media/tools/shader_bench/gpu_painter.h" +#include "ui/gfx/gl/gl_context.h" // Does color space conversion using luminance textures on GPU, // renders using GPU. diff --git a/media/tools/shader_bench/gpu_color_painter_exp.h b/media/tools/shader_bench/gpu_color_painter_exp.h index a10a514..b5c6caa 100644 --- a/media/tools/shader_bench/gpu_color_painter_exp.h +++ b/media/tools/shader_bench/gpu_color_painter_exp.h @@ -5,10 +5,10 @@ #ifndef MEDIA_TOOLS_SHADER_BENCH_GPU_COLOR_PAINTER_EXP_H_ #define MEDIA_TOOLS_SHADER_BENCH_GPU_COLOR_PAINTER_EXP_H_ -#include "app/gfx/gl/gl_context.h" #include "base/memory/scoped_ptr.h" #include "media/base/video_frame.h" #include "media/tools/shader_bench/gpu_painter.h" +#include "ui/gfx/gl/gl_context.h" // Does color space conversion using RGBA textures acting as // luminance textures (experimental shader hack) for YUV->RGBA diff --git a/media/tools/shader_bench/gpu_painter.h b/media/tools/shader_bench/gpu_painter.h index a8d4caf..20b8643 100644 --- a/media/tools/shader_bench/gpu_painter.h +++ b/media/tools/shader_bench/gpu_painter.h @@ -1,14 +1,14 @@ -// 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. #ifndef MEDIA_TOOLS_SHADER_BENCH_GPU_PAINTER_H_ #define MEDIA_TOOLS_SHADER_BENCH_GPU_PAINTER_H_ -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_implementation.h" #include "media/tools/shader_bench/painter.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_implementation.h" // Class that renders video frames to a window via GPU. class GPUPainter : public Painter { diff --git a/media/tools/shader_bench/shader_bench.cc b/media/tools/shader_bench/shader_bench.cc index a7e3eb3..557d18d 100644 --- a/media/tools/shader_bench/shader_bench.cc +++ b/media/tools/shader_bench/shader_bench.cc @@ -7,9 +7,6 @@ #include <stdio.h> #include <stdlib.h> -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/memory/scoped_ptr.h" @@ -22,6 +19,9 @@ #include "media/tools/shader_bench/gpu_color_painter_exp.h" #include "media/tools/shader_bench/painter.h" #include "media/tools/shader_bench/window.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/native_widget_types.h" #if defined(OS_LINUX) diff --git a/media/tools/tile_render_bench/tile_render_bench.cc b/media/tools/tile_render_bench/tile_render_bench.cc index 15773f7..d961ea1 100644 --- a/media/tools/tile_render_bench/tile_render_bench.cc +++ b/media/tools/tile_render_bench/tile_render_bench.cc @@ -12,13 +12,13 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/at_exit.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/task.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_implementation.h" // Initial size of the window and the texture. static const int kStartSize = 1024; diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp index d003694..f739b93 100644 --- a/ui/gfx/compositor/compositor.gyp +++ b/ui/gfx/compositor/compositor.gyp @@ -10,7 +10,7 @@ 'msvs_guid': '21CEE0E3-6F4E-4F01-B8C9-F7751CC21AA9', 'dependencies': [ '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/app/app.gyp:app_base', + '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui_gfx', ], 'sources': [ diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc index 6fa426a..f152ffc 100644 --- a/ui/gfx/compositor/compositor_gl.cc +++ b/ui/gfx/compositor/compositor_gl.cc @@ -4,14 +4,14 @@ #include "ui/gfx/compositor/compositor.h" -#include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/transform.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_implementation.h" namespace ui { diff --git a/app/gfx/gl/generate_bindings.py b/ui/gfx/gl/generate_bindings.py index 5ad51f7..41038cc 100644 --- a/app/gfx/gl/generate_bindings.py +++ b/ui/gfx/gl/generate_bindings.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# 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. @@ -437,14 +437,14 @@ def GenerateHeader(file, functions, set_name): """Generates gl_binding_autogen_x.h""" # Write file header. - file.write('// Copyright (c) 2010 The Chromium Authors. All rights reserved.\n') + file.write('// Copyright (c) 2011 The Chromium Authors. All rights reserved.\n') file.write('// Use of this source code is governed by a BSD-style license that can be\n') file.write('// found in the LICENSE file.\n') file.write('\n') file.write('// This file is automatically generated.\n') file.write('\n') - file.write('#ifndef APP_GFX_GL_GL_BINDINGS_AUTOGEN_%s_H_\n' % set_name.upper()) - file.write('#define APP_GFX_GL_GL_BINDINGS_AUTOGEN_%s_H_\n' % set_name.upper()) + file.write('#ifndef UI_GFX_GL_GL_BINDINGS_AUTOGEN_%s_H_\n' % set_name.upper()) + file.write('#define UI_GFX_GL_GL_BINDINGS_AUTOGEN_%s_H_\n' % set_name.upper()) # Write prototype for initialization function. file.write('\n') @@ -476,7 +476,7 @@ def GenerateHeader(file, functions, set_name): (names[0], names[0])) file.write('\n') - file.write('#endif // APP_GFX_GL_GL_BINDINGS_AUTOGEN_%s_H_\n' % + file.write('#endif // UI_GFX_GL_GL_BINDINGS_AUTOGEN_%s_H_\n' % set_name.upper()) @@ -484,14 +484,14 @@ def GenerateSource(file, functions, set_name): """Generates gl_binding_autogen_x.cc""" # Write file header. - file.write('// Copyright (c) 2010 The Chromium Authors. All rights reserved.\n') + file.write('// Copyright (c) 2011 The Chromium Authors. All rights reserved.\n') file.write('// Use of this source code is governed by a BSD-style license that can be\n') file.write('// found in the LICENSE file.\n') file.write('\n') file.write('// This file is automatically generated.\n') file.write('\n') - file.write('#include "app/gfx/gl/gl_bindings.h"\n') - file.write('#include "app/gfx/gl/gl_implementation.h"\n') + file.write('#include "ui/gfx/gl/gl_bindings.h"\n') + file.write('#include "ui/gfx/gl/gl_implementation.h"\n') # Write definitions of function pointers. file.write('\n') @@ -566,7 +566,7 @@ def GenerateSource(file, functions, set_name): def GenerateMockSource(file, functions): """Generates functions that invoke a mock GLInterface""" - file.write('// Copyright (c) 2010 The Chromium Authors. All rights reserved.\n') + file.write('// Copyright (c) 2011 The Chromium Authors. All rights reserved.\n') file.write('// Use of this source code is governed by a BSD-style license that can be\n') file.write('// found in the LICENSE file.\n') file.write('\n') @@ -574,7 +574,7 @@ def GenerateMockSource(file, functions): file.write('\n') file.write('#include <string.h>\n') file.write('\n') - file.write('#include "app/gfx/gl/gl_interface.h"\n') + file.write('#include "ui/gfx/gl/gl_interface.h"\n') file.write('\n') file.write('namespace gfx {\n') diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp new file mode 100644 index 0000000..f64804b --- /dev/null +++ b/ui/gfx/gl/gl.gyp @@ -0,0 +1,160 @@ +# 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. + +{ + 'target_defaults': { + 'sources/': [ + ['exclude', '/(cocoa|gtk|win)/'], + ['exclude', '_(cocoa|gtk|linux|mac|posix|win|x)\\.(cc|mm?)$'], + ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'], + ], + 'conditions': [ + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [ + ['include', '/gtk/'], + ['include', '_(gtk|linux|posix|skia|x)\\.cc$'], + ['include', '/(gtk|x11)_[^/]*\\.cc$'], + ]}], + ['OS=="mac"', {'sources/': [ + ['include', '/cocoa/'], + ['include', '_(cocoa|mac|posix)\\.(cc|mm?)$'], + ]}, { # else: OS != "mac" + 'sources/': [ + ['exclude', '\\.mm?$'], + ], + }], + ['OS=="win"', + {'sources/': [ + ['include', '_(win)\\.cc$'], + ['include', '/win/'], + ['include', '/win_[^/]*\\.cc$'], + ]}], + ], + }, + 'targets': [ + { + 'target_name': 'gl', + 'type': '<(library)', + 'dependencies': [ + '<(DEPTH)/app/app.gyp:app_base', + '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/ui/ui.gyp:ui_gfx', + ], + 'variables': { + 'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gl', + }, + 'include_dirs': [ + '<(DEPTH)/third_party/mesa/MesaLib/include', + '<(gl_binding_output_dir)', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(DEPTH)/third_party/mesa/MesaLib/include', + '<(gl_binding_output_dir)', + ], + }, + 'sources': [ + 'gl_bindings.gypi', + 'gl_bindings.h', + 'gl_bindings_skia.cc', + 'gl_bindings_skia.h', + 'gl_context.cc', + 'gl_context.h', + 'gl_context_linux.cc', + 'gl_context_mac.cc', + 'gl_context_osmesa.cc', + 'gl_context_osmesa.h', + 'gl_context_stub.cc', + 'gl_context_stub.h', + 'gl_context_win.cc', + 'gl_implementation.cc', + 'gl_implementation.h', + 'gl_implementation_linux.cc', + 'gl_implementation_mac.cc', + 'gl_implementation_win.cc', + 'gl_interface.cc', + 'gl_interface.h', + 'gl_switches.cc', + 'gl_switches.h', + '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h', + '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h', + ], + # hard_dependency is necessary for this target because it has actions + # that generate header files included by dependent targets. The header + # files must be generated before the dependents are compiled. The usual + # semantics are to allow the two targets to build concurrently. + 'hard_dependency': 1, + 'actions': [ + { + 'action_name': 'generate_gl_bindings', + 'inputs': [ + 'generate_bindings.py', + ], + 'outputs': [ + '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', + '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h', + '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h', + '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h', + '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h', + ], + 'action': [ + 'python', + 'generate_bindings.py', + '<(gl_binding_output_dir)', + ], + }, + ], + 'conditions': [ + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + 'sources': [ + 'gl_context_egl.cc', + 'gl_context_egl.h', + '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', + '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h', + ], + 'include_dirs': [ + # We don't use angle, but pull the EGL/GLES headers from there. + '<(DEPTH)/third_party/angle/include', + ], + 'all_dependent_settings': { + 'defines': [ + 'GL_GLEXT_PROTOTYPES', + ], + }, + }], + ['OS=="mac"', { + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], + }, + }], + ['OS=="win"', { + 'sources': [ + 'gl_context_egl.cc', + 'gl_context_egl.h', + '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', + '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc', + '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h', + ], + 'include_dirs': [ + '<(DEPTH)/third_party/angle/include', + ], + }], + ], + }, + ], +}
\ No newline at end of file diff --git a/app/gfx/gl/gl_bindings.h b/ui/gfx/gl/gl_bindings.h index 6b1d22c..8c16a97 100644 --- a/app/gfx/gl/gl_bindings.h +++ b/ui/gfx/gl/gl_bindings.h @@ -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. @@ -7,8 +7,8 @@ // the X11 headers on linux, which define all kinds of macros that are // liable to cause conflicts. -#ifndef APP_GFX_GL_GL_BINDINGS_H_ -#define APP_GFX_GL_GL_BINDINGS_H_ +#ifndef UI_GFX_GL_GL_BINDINGS_H_ +#define UI_GFX_GL_GL_BINDINGS_H_ #pragma once #include <GL/gl.h> @@ -95,4 +95,4 @@ void* GL_BINDING_CALL GetMockGLProcAddress(const char* name); } // namespace gfx -#endif // APP_GFX_GL_GL_BINDINGS_H_ +#endif // UI_GFX_GL_GL_BINDINGS_H_ diff --git a/app/gfx/gl/gl_bindings_skia.cc b/ui/gfx/gl/gl_bindings_skia.cc index fe484a61..4f861aa 100644 --- a/app/gfx/gl/gl_bindings_skia.cc +++ b/ui/gfx/gl/gl_bindings_skia.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. -#include "app/gfx/gl/gl_bindings_skia.h" +#include "ui/gfx/gl/gl_bindings_skia.h" -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/logging.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_implementation.h" // Skia is built against the headers in gpu\GLES. These functions // are exported without any call-type modifiers. diff --git a/app/gfx/gl/gl_bindings_skia.h b/ui/gfx/gl/gl_bindings_skia.h index f6490a9..4433c73 100644 --- a/app/gfx/gl/gl_bindings_skia.h +++ b/ui/gfx/gl/gl_bindings_skia.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef APP_GFX_GL_GL_BINDINGS_SKIA_H_ -#define APP_GFX_GL_GL_BINDINGS_SKIA_H_ +#ifndef UI_GFX_GL_GL_BINDINGS_SKIA_H_ +#define UI_GFX_GL_GL_BINDINGS_SKIA_H_ #pragma once namespace gfx { // The GPU back-end for skia normally makes direct calls to GLES2\gl. Call // this routine to bind the skia GL implementation to that exported by the -// app/gfx/gl entry points. +// ui/gfx/gl entry points. // Note: This override is required to allow the skia gl calls to be correctly // routed around the command buffers during execution of the DumpRenderTree // layout tests. @@ -18,4 +18,4 @@ void BindSkiaToHostGL(); } -#endif // APP_GFX_GL_GL_BINDINGS_SKIA_H_ +#endif // UI_GFX_GL_GL_BINDINGS_SKIA_H_ diff --git a/app/gfx/gl/gl_context.cc b/ui/gfx/gl/gl_context.cc index ee33669..769f28c 100644 --- a/app/gfx/gl/gl_context.cc +++ b/ui/gfx/gl/gl_context.cc @@ -4,11 +4,11 @@ #include <string> -#include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/command_line.h" #include "base/logging.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/gl/gl_switches.h" namespace gfx { diff --git a/app/gfx/gl/gl_context.h b/ui/gfx/gl/gl_context.h index 08653f3..67bba0b 100644 --- a/app/gfx/gl/gl_context.h +++ b/ui/gfx/gl/gl_context.h @@ -1,9 +1,9 @@ -// 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. -#ifndef APP_GFX_GL_GL_CONTEXT_H_ -#define APP_GFX_GL_GL_CONTEXT_H_ +#ifndef UI_GFX_GL_GL_CONTEXT_H_ +#define UI_GFX_GL_GL_CONTEXT_H_ #pragma once #include <string> @@ -79,4 +79,4 @@ class GLContext { } // namespace gfx -#endif // APP_GFX_GL_GL_CONTEXT_H_ +#endif // UI_GFX_GL_GL_CONTEXT_H_ diff --git a/app/gfx/gl/gl_context_egl.cc b/ui/gfx/gl/gl_context_egl.cc index e42315b..2b1565f 100644 --- a/app/gfx/gl/gl_context_egl.cc +++ b/ui/gfx/gl/gl_context_egl.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/gl/gl_context_egl.h" #include "build/build_config.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "third_party/angle/include/EGL/egl.h" +#include "ui/gfx/gl/gl_context_egl.h" // This header must come after the above third-party include, as // it brings in #defines that cause conflicts. -#include "app/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_bindings.h" #if defined(OS_LINUX) extern "C" { diff --git a/app/gfx/gl/gl_context_egl.h b/ui/gfx/gl/gl_context_egl.h index 50f5fce..4250457 100644 --- a/app/gfx/gl/gl_context_egl.h +++ b/ui/gfx/gl/gl_context_egl.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef APP_GFX_GL_GL_CONTEXT_EGL_H_ -#define APP_GFX_GL_GL_CONTEXT_EGL_H_ +#ifndef UI_GFX_GL_GL_CONTEXT_EGL_H_ +#define UI_GFX_GL_GL_CONTEXT_EGL_H_ #pragma once -#include "app/gfx/gl/gl_context.h" #include "base/memory/ref_counted.h" +#include "ui/gfx/gl/gl_context.h" #include "ui/gfx/size.h" typedef void* EGLDisplay; @@ -116,4 +116,4 @@ class SecondaryEGLContext : public BaseEGLContext { } // namespace gfx -#endif // APP_GFX_GL_GL_CONTEXT_EGL_H_ +#endif // UI_GFX_GL_GL_CONTEXT_EGL_H_ diff --git a/app/gfx/gl/gl_context_linux.cc b/ui/gfx/gl/gl_context_linux.cc index ec1d957..430bba5 100644 --- a/app/gfx/gl/gl_context_linux.cc +++ b/ui/gfx/gl/gl_context_linux.cc @@ -4,7 +4,7 @@ // This file implements the ViewGLContext and PbufferGLContext classes. -#include "app/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_context.h" extern "C" { #include <X11/Xlib.h> @@ -12,15 +12,15 @@ extern "C" { #include <GL/osmesa.h> -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_context_egl.h" -#include "app/gfx/gl/gl_context_osmesa.h" -#include "app/gfx/gl/gl_context_stub.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "ui/base/x/x11_util.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_context_egl.h" +#include "ui/gfx/gl/gl_context_osmesa.h" +#include "ui/gfx/gl/gl_context_stub.h" +#include "ui/gfx/gl/gl_implementation.h" namespace { diff --git a/app/gfx/gl/gl_context_mac.cc b/ui/gfx/gl/gl_context_mac.cc index 3a5e922..10e8bf3 100644 --- a/app/gfx/gl/gl_context_mac.cc +++ b/ui/gfx/gl/gl_context_mac.cc @@ -4,18 +4,18 @@ // This file implements the ViewGLContext and PbufferGLContext classes. -#include "app/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_context.h" #include <GL/osmesa.h> #include <OpenGL/OpenGL.h> -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_context_osmesa.h" -#include "app/gfx/gl/gl_context_stub.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_context_osmesa.h" +#include "ui/gfx/gl/gl_context_stub.h" +#include "ui/gfx/gl/gl_implementation.h" namespace gfx { diff --git a/app/gfx/gl/gl_context_osmesa.cc b/ui/gfx/gl/gl_context_osmesa.cc index f92da9e..9d1e802 100644 --- a/app/gfx/gl/gl_context_osmesa.cc +++ b/ui/gfx/gl/gl_context_osmesa.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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. @@ -6,9 +6,9 @@ #include <algorithm> -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_context_osmesa.h" #include "base/logging.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_context_osmesa.h" namespace gfx { diff --git a/app/gfx/gl/gl_context_osmesa.h b/ui/gfx/gl/gl_context_osmesa.h index 9214b65..77ca820 100644 --- a/app/gfx/gl/gl_context_osmesa.h +++ b/ui/gfx/gl/gl_context_osmesa.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef APP_GFX_GL_GL_CONTEXT_OSMESA_H_ -#define APP_GFX_GL_GL_CONTEXT_OSMESA_H_ +#ifndef UI_GFX_GL_GL_CONTEXT_OSMESA_H_ +#define UI_GFX_GL_GL_CONTEXT_OSMESA_H_ #pragma once -#include "app/gfx/gl/gl_context.h" #include "base/memory/scoped_ptr.h" +#include "ui/gfx/gl/gl_context.h" #include "ui/gfx/size.h" typedef struct osmesa_context *OSMesaContext; @@ -51,4 +51,4 @@ class OSMesaGLContext : public GLContext { } // namespace gfx -#endif // APP_GFX_GL_GL_CONTEXT_OSMESA_H_ +#endif // UI_GFX_GL_GL_CONTEXT_OSMESA_H_ diff --git a/app/gfx/gl/gl_context_stub.cc b/ui/gfx/gl/gl_context_stub.cc index 62825c7..6462f61 100644 --- a/app/gfx/gl/gl_context_stub.cc +++ b/ui/gfx/gl/gl_context_stub.cc @@ -1,8 +1,8 @@ -// 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. -#include "app/gfx/gl/gl_context_stub.h" +#include "ui/gfx/gl/gl_context_stub.h" namespace gfx { diff --git a/app/gfx/gl/gl_context_stub.h b/ui/gfx/gl/gl_context_stub.h index 907d8459..03e5cf4 100644 --- a/app/gfx/gl/gl_context_stub.h +++ b/ui/gfx/gl/gl_context_stub.h @@ -1,14 +1,14 @@ -// 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. // This file implements the StubGLContext. -#ifndef APP_GFX_GL_GL_CONTEXT_STUB_H_ -#define APP_GFX_GL_GL_CONTEXT_STUB_H_ +#ifndef UI_GFX_GL_GL_CONTEXT_STUB_H_ +#define UI_GFX_GL_GL_CONTEXT_STUB_H_ #pragma once -#include "app/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_context.h" namespace gfx { @@ -36,4 +36,4 @@ class StubGLContext : public gfx::GLContext { } // namespace gfx -#endif // APP_GFX_GL_GL_CONTEXT_STUB_H_ +#endif // UI_GFX_GL_GL_CONTEXT_STUB_H_ diff --git a/app/gfx/gl/gl_context_win.cc b/ui/gfx/gl/gl_context_win.cc index 0c2fef5..23f98b2 100644 --- a/app/gfx/gl/gl_context_win.cc +++ b/ui/gfx/gl/gl_context_win.cc @@ -4,20 +4,19 @@ // This file implements the NativeViewGLContext and PbufferGLContext classes. -#include "app/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_context.h" #include <GL/osmesa.h> #include <algorithm> -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_context_egl.h" -#include "app/gfx/gl/gl_context_osmesa.h" -#include "app/gfx/gl/gl_context_stub.h" -#include "app/gfx/gl/gl_implementation.h" - #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_context_egl.h" +#include "ui/gfx/gl/gl_context_osmesa.h" +#include "ui/gfx/gl/gl_context_stub.h" +#include "ui/gfx/gl/gl_implementation.h" namespace gfx { diff --git a/app/gfx/gl/gl_implementation.cc b/ui/gfx/gl/gl_implementation.cc index be31fc5..b38b2647 100644 --- a/app/gfx/gl/gl_implementation.cc +++ b/ui/gfx/gl/gl_implementation.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/gl/gl_implementation.h" +#include "ui/gfx/gl/gl_implementation.h" #include <algorithm> #include <string> diff --git a/app/gfx/gl/gl_implementation.h b/ui/gfx/gl/gl_implementation.h index 04d914c..f357b31 100644 --- a/app/gfx/gl/gl_implementation.h +++ b/ui/gfx/gl/gl_implementation.h @@ -1,9 +1,9 @@ -// 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. -#ifndef APP_GFX_GL_GL_IMPLEMENTATION_H_ -#define APP_GFX_GL_GL_IMPLEMENTATION_H_ +#ifndef UI_GFX_GL_GL_IMPLEMENTATION_H_ +#define UI_GFX_GL_GL_IMPLEMENTATION_H_ #pragma once #include <string> @@ -71,4 +71,4 @@ void* GetGLProcAddress(const char* name); } // namespace gfx -#endif // APP_GFX_GL_GL_IMPLEMENTATION_H_ +#endif // UI_GFX_GL_GL_IMPLEMENTATION_H_ diff --git a/app/gfx/gl/gl_implementation_linux.cc b/ui/gfx/gl/gl_implementation_linux.cc index 913429b..34069cf 100644 --- a/app/gfx/gl/gl_implementation_linux.cc +++ b/ui/gfx/gl/gl_implementation_linux.cc @@ -1,17 +1,17 @@ -// 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. #include <vector> -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/file_path.h" #include "base/logging.h" #include "base/native_library.h" #include "base/path_service.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_implementation.h" namespace gfx { namespace { diff --git a/app/gfx/gl/gl_implementation_mac.cc b/ui/gfx/gl/gl_implementation_mac.cc index 33f9ea8..00ed6bb 100644 --- a/app/gfx/gl/gl_implementation_mac.cc +++ b/ui/gfx/gl/gl_implementation_mac.cc @@ -1,14 +1,14 @@ -// 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. -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/base_paths.h" #include "base/file_path.h" #include "base/logging.h" #include "base/native_library.h" #include "base/path_service.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_implementation.h" namespace gfx { namespace { diff --git a/app/gfx/gl/gl_implementation_win.cc b/ui/gfx/gl/gl_implementation_win.cc index 4ee01c5..ee07cfc 100644 --- a/app/gfx/gl/gl_implementation_win.cc +++ b/ui/gfx/gl/gl_implementation_win.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,8 +9,8 @@ #include "base/logging.h" #include "base/native_library.h" #include "base/path_service.h" -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_implementation.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_implementation.h" namespace gfx { diff --git a/app/gfx/gl/gl_interface.cc b/ui/gfx/gl/gl_interface.cc index 22edd3d..a671973 100644 --- a/app/gfx/gl/gl_interface.cc +++ b/ui/gfx/gl/gl_interface.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2009 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. -#include "app/gfx/gl/gl_interface.h" +#include "ui/gfx/gl/gl_interface.h" namespace gfx { diff --git a/app/gfx/gl/gl_interface.h b/ui/gfx/gl/gl_interface.h index f670db1..bbd2b63 100644 --- a/app/gfx/gl/gl_interface.h +++ b/ui/gfx/gl/gl_interface.h @@ -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. @@ -6,11 +6,11 @@ // testing. It has to be Desktop GL, not GLES2 as it is used to test the service // side code. -#ifndef APP_GFX_GL_GL_INTERFACE_H_ -#define APP_GFX_GL_GL_INTERFACE_H_ +#ifndef UI_GFX_GL_GL_INTERFACE_H_ +#define UI_GFX_GL_GL_INTERFACE_H_ #pragma once -#include "app/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_bindings.h" namespace gfx { @@ -433,4 +433,4 @@ class GLInterface { } // namespace gfx -#endif // APP_GFX_GL_GL_INTERFACE_H_ +#endif // UI_GFX_GL_GL_INTERFACE_H_ diff --git a/ui/gfx/surface/accelerated_surface_mac.cc b/ui/gfx/surface/accelerated_surface_mac.cc index 59919f8..4007c03 100644 --- a/ui/gfx/surface/accelerated_surface_mac.cc +++ b/ui/gfx/surface/accelerated_surface_mac.cc @@ -4,10 +4,10 @@ #include "ui/gfx/surface/accelerated_surface_mac.h" -#include "app/gfx/gl/gl_bindings.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/logging.h" #include "base/mac/scoped_cftyperef.h" +#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/rect.h" #include "ui/gfx/surface/io_surface_support_mac.h" diff --git a/ui/gfx/surface/accelerated_surface_mac.h b/ui/gfx/surface/accelerated_surface_mac.h index 004f49a..8491091 100644 --- a/ui/gfx/surface/accelerated_surface_mac.h +++ b/ui/gfx/surface/accelerated_surface_mac.h @@ -8,12 +8,12 @@ #include <CoreFoundation/CoreFoundation.h> -#include "app/gfx/gl/gl_context.h" #include "base/callback.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" +#include "ui/gfx/gl/gl_context.h" #include "ui/gfx/surface/transport_dib.h" // Should not include GL headers in a header file. Forward declare these types diff --git a/ui/gfx/surface/surface.gyp b/ui/gfx/surface/surface.gyp index c7d1dca..0cbfe94 100644 --- a/ui/gfx/surface/surface.gyp +++ b/ui/gfx/surface/surface.gyp @@ -38,8 +38,8 @@ 'msvs_guid': '6C99567D-6F02-43B5-BB35-D8E3F8D0D6D2', 'dependencies': [ '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/app/app.gyp:app_base', '<(DEPTH)/skia/skia.gyp:skia', + '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui_gfx', ], 'sources': [ diff --git a/ui/ui_gfx.gypi b/ui/ui_gfx.gypi index 4e6d2ee..0fffbec 100644 --- a/ui/ui_gfx.gypi +++ b/ui/ui_gfx.gypi @@ -76,8 +76,6 @@ 'gfx/gfx_paths.h', 'gfx/gfx_module.cc', 'gfx/gfx_module.h', - 'gfx/gl/gl_switches.cc', - 'gfx/gl/gl_switches.h', 'gfx/image.cc', 'gfx/image.h', 'gfx/image_mac.mm', 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. diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index 54ff5d7..b6021d46 100644 --- a/webkit/plugins/npapi/plugin_host.cc +++ b/webkit/plugins/npapi/plugin_host.cc @@ -4,8 +4,6 @@ #include "webkit/plugins/npapi/plugin_host.h" -#include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -19,6 +17,8 @@ #include "third_party/npapi/bindings/npruntime.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_implementation.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/default_plugin_shared.h" #include "webkit/plugins/npapi/npapi_extension_thunk.h" diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc index d6a2039..4d9347d 100644 --- a/webkit/support/test_webkit_client.cc +++ b/webkit/support/test_webkit_client.cc @@ -4,7 +4,6 @@ #include "webkit/support/test_webkit_client.h" -#include "app/gfx/gl/gl_bindings_skia.h" #include "base/file_util.h" #include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" @@ -32,6 +31,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "ui/gfx/gl/gl_bindings_skia.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/database/vfs_backend.h" #include "webkit/extensions/v8/gc_extension.h" diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 8ac70bc..4ef59f5 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -4,8 +4,6 @@ #include "webkit/support/webkit_support.h" -#include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_implementation.h" #include "base/at_exit.h" #include "base/base64.h" #include "base/command_line.h" @@ -36,6 +34,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" +#include "ui/gfx/gl/gl_context.h" +#include "ui/gfx/gl/gl_implementation.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/glue/media/video_renderer_impl.h" #include "webkit/glue/webkit_constants.h" diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index a65770c..0b26419 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/gl/gl_implementation.h" #include "base/at_exit.h" #include "base/basictypes.h" #include "base/command_line.h" @@ -31,6 +30,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" #include "ui/gfx/gfx_module.h" +#include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/gl/gl_switches.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/window_open_disposition.h" |