diff options
187 files changed, 571 insertions, 546 deletions
@@ -286,7 +286,7 @@ 'filepath': 'ui/compositor/.*' }, 'browser_gl': { - 'filepath': 'ui/gfx/gl/.*' + 'filepath': 'ui/gl/.*' }, 'textinput': { 'filepath': 'content/browser/renderer_host/gtk_im.*'\ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 3c99393..629daa9 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -23,7 +23,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/ui_base_switches.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" #if defined(USE_ASH) #include "ash/ash_switches.h" diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index a39e889..51d691c 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -85,7 +85,7 @@ #include "net/url_request/url_request_context_getter.h" #include "ui/base/ui_base_switches.h" #include "ui/compositor/compositor_switches.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" #include "webkit/plugins/plugin_switches.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/extension_webstore_private_apitest.cc b/chrome/browser/extensions/extension_webstore_private_apitest.cc index b037687..b37fe3d 100644 --- a/chrome/browser/extensions/extension_webstore_private_apitest.cc +++ b/chrome/browser/extensions/extension_webstore_private_apitest.cc @@ -26,7 +26,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "net/base/mock_host_resolver.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" using content::GpuFeatureType; diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 42301eb..78bd8c0 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -4362,7 +4362,7 @@ }], ['ui_compositor_image_transport==1', { 'dependencies': [ - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', ], }], ['use_virtual_keyboard==0', { diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 74ec4fe..d4897b3 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -996,7 +996,7 @@ '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libxml/libxml.gyp:libxml', '../tools/json_schema_compiler/test/json_schema_compiler_tests.gyp:json_schema_compiler_tests', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', '../ui/ui.gyp:ui_resources', '../ui/ui.gyp:ui_resources_standard', '../ui/ui.gyp:ui_test_support', diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 22f3b44..8571b3a 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -17,7 +17,7 @@ namespace switches { // ----------------------------------------------------------------------------- // Can't find the switch you are looking for? Try looking in -// ui/gfx/gl/gl_switches.cc or base/base_switches.cc or +// ui/gl/gl_switches.cc or base/base_switches.cc or // content/public/common/content_switches.cc or media/base/media_switches.cc // instead. // ----------------------------------------------------------------------------- diff --git a/chrome/test/base/test_launcher_utils.cc b/chrome/test/base/test_launcher_utils.cc index e76b682..3895ee7 100644 --- a/chrome/test/base/test_launcher_utils.cc +++ b/chrome/test/base/test_launcher_utils.cc @@ -12,7 +12,7 @@ #include "base/string_number_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" #if defined(USE_ASH) #include "ash/ash_switches.h" diff --git a/chrome/test/gpu/gpu_crash_browsertest.cc b/chrome/test/gpu/gpu_crash_browsertest.cc index 5e3a2836..fc8b4af 100644 --- a/chrome/test/gpu/gpu_crash_browsertest.cc +++ b/chrome/test/gpu/gpu_crash_browsertest.cc @@ -13,7 +13,7 @@ #include "chrome/test/base/test_launcher_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_implementation.h" namespace { diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index d57d617..b40a140 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -21,7 +21,7 @@ #include "content/test/gpu/gpu_test_config.h" #include "content/test/gpu/test_switches.h" #include "net/base/net_util.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" #if defined(OS_MACOSX) #include "ui/surface/io_surface_support_mac.h" #endif diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index e9269f1..be2facb 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -28,8 +28,8 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/compositor/compositor_setup.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_switches.h" namespace { diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc index f947e13..09e1612 100644 --- a/chrome/test/perf/frame_rate/frame_rate_tests.cc +++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc @@ -19,8 +19,8 @@ #include "chrome/test/ui/javascript_test_util.h" #include "chrome/test/ui/ui_perf_test.h" #include "net/base/net_util.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_switches.h" namespace { diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index 2266de9..3d1bd49 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -8,8 +8,8 @@ #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" +#include "base/stringprintf.h" #include "base/test/trace_event_analyzer.h" #include "base/values.h" #include "chrome/browser/net/url_fixer_upper.h" @@ -33,7 +33,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_switches.h" +#include "ui/gl/gl_switches.h" namespace { diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 36e70ef..b60f361 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -50,7 +50,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/gl/gl_implementation.h" #if defined(OS_WIN) #include "base/win/windows_version.h" diff --git a/content/DEPS b/content/DEPS index 79aa707..eec777d 100644 --- a/content/DEPS +++ b/content/DEPS @@ -54,6 +54,7 @@ include_rules = [ "+ui/base", "+ui/compositor", "+ui/gfx", + "+ui/gl", "+ui/surface", # Content knows about grd files, but the specifics of how to get a resource # given its id is left to the embedder. diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc index f43dd53..06201a8 100644 --- a/content/browser/gpu/gpu_data_manager_impl.cc +++ b/content/browser/gpu/gpu_data_manager_impl.cc @@ -19,8 +19,8 @@ #include "content/public/browser/gpu_data_manager_observer.h" #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_switches.h" #include "webkit/plugins/plugin_switches.h" using content::BrowserThread; diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index 0cdb387..2dab6a4 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -33,9 +33,9 @@ #include "gpu/command_buffer/service/gpu_switches.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_switches.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_switches.h" #if defined(TOOLKIT_GTK) #include "ui/gfx/gtk_native_view_id_manager.h" diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc index bf62796..e8cd609 100644 --- a/content/browser/gpu/gpu_process_host_ui_shim.cc +++ b/content/browser/gpu/gpu_process_host_ui_shim.cc @@ -21,7 +21,7 @@ #include "content/common/gpu/gpu_messages.h" #include "content/port/browser/render_widget_host_view_port.h" #include "content/public/browser/browser_thread.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" #if defined(TOOLKIT_GTK) // These two #includes need to come after gpu_messages.h. diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index f462a39..7a976e0 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -35,8 +35,8 @@ #include "content/public/common/process_type.h" #include "ipc/ipc_switches.h" #include "ui/base/ui_base_switches.h" -#include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/native_widget_types.h" +#include "ui/gl/gl_switches.h" using content::BrowserThread; using content::ChildProcessData; diff --git a/content/browser/renderer_host/accelerated_plugin_view_mac.mm b/content/browser/renderer_host/accelerated_plugin_view_mac.mm index a0a1a4e..dfb9891 100644 --- a/content/browser/renderer_host/accelerated_plugin_view_mac.mm +++ b/content/browser/renderer_host/accelerated_plugin_view_mac.mm @@ -11,9 +11,9 @@ #include "content/browser/renderer_host/render_widget_host_view_mac.h" #include "content/public/browser/browser_thread.h" #import "ui/base/cocoa/underlay_opengl_hosting_window.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_switches.h" using content::BrowserThread; diff --git a/content/browser/renderer_host/compositing_iosurface_mac.mm b/content/browser/renderer_host/compositing_iosurface_mac.mm index 3c038f4..0424515 100644 --- a/content/browser/renderer_host/compositing_iosurface_mac.mm +++ b/content/browser/renderer_host/compositing_iosurface_mac.mm @@ -12,9 +12,9 @@ #include "content/browser/renderer_host/render_widget_host_view_mac.h" #include "content/public/browser/browser_thread.h" #include "gpu/command_buffer/service/gpu_switches.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_switches.h" #include "ui/surface/io_surface_support_mac.h" #ifdef NDEBUG diff --git a/content/browser/renderer_host/image_transport_client_linux.cc b/content/browser/renderer_host/image_transport_client_linux.cc index 779e1eb..a3425f2 100644 --- a/content/browser/renderer_host/image_transport_client_linux.cc +++ b/content/browser/renderer_host/image_transport_client_linux.cc @@ -14,12 +14,12 @@ #include "content/browser/renderer_host/image_transport_factory.h" #include "third_party/angle/include/EGL/egl.h" #include "third_party/angle/include/EGL/eglext.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_egl.h" -#include "ui/gfx/gl/gl_surface_glx.h" -#include "ui/gfx/gl/scoped_make_current.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_egl.h" +#include "ui/gl/gl_surface_glx.h" +#include "ui/gl/scoped_make_current.h" namespace { diff --git a/content/browser/renderer_host/image_transport_factory.cc b/content/browser/renderer_host/image_transport_factory.cc index de8b039..98b81a6 100644 --- a/content/browser/renderer_host/image_transport_factory.cc +++ b/content/browser/renderer_host/image_transport_factory.cc @@ -23,9 +23,9 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" #include "ui/compositor/compositor.h" #include "ui/compositor/compositor_setup.h" -#include "ui/gfx/gl/scoped_make_current.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/scoped_make_current.h" using content::BrowserGpuChannelHostFactory; using content::GLHelper; diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index a93fa1d..5d54b17 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -105,7 +105,7 @@ #include "media/base/media_switches.h" #include "net/url_request/url_request_context_getter.h" #include "ui/base/ui_base_switches.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" #include "webkit/fileapi/sandbox_mount_point_provider.h" #include "webkit/glue/resource_type.h" #include "webkit/plugins/plugin_switches.h" diff --git a/content/common/gpu/client/gl_helper.cc b/content/common/gpu/client/gl_helper.cc index a8bcbbc25..5b2a37d 100644 --- a/content/common/gpu/client/gl_helper.cc +++ b/content/common/gpu/client/gl_helper.cc @@ -17,8 +17,8 @@ #include "base/threading/thread_restrictions.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" -#include "ui/gfx/gl/gl_bindings.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_bindings.h" using WebKit::WebGLId; using WebKit::WebGraphicsContext3D; diff --git a/content/common/gpu/client/gpu_channel_host.h b/content/common/gpu/client/gpu_channel_host.h index 179a780..2f9fe68 100644 --- a/content/common/gpu/client/gpu_channel_host.h +++ b/content/common/gpu/client/gpu_channel_host.h @@ -17,16 +17,16 @@ #include "base/process_util.h" #include "base/synchronization/lock.h" #include "content/common/content_export.h" +#include "content/common/gpu/client/gpu_video_decode_accelerator_host.h" #include "content/common/gpu/gpu_process_launch_causes.h" #include "content/common/message_router.h" #include "content/public/common/gpu_info.h" -#include "content/common/gpu/client/gpu_video_decode_accelerator_host.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_sync_channel.h" -#include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/gpu_preference.h" class CommandBufferProxy; class CommandBufferProxyImpl; diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h index 1a744c4..2cabdd3 100644 --- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h +++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h @@ -17,7 +17,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "ui/gfx/gl/gpu_preference.h" +#include "ui/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #if defined(USE_SKIA) diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc index 4657972..a228305 100644 --- a/content/common/gpu/gpu_channel.cc +++ b/content/common/gpu/gpu_channel.cc @@ -19,8 +19,8 @@ #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "gpu/command_buffer/service/mailbox_manager.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface.h" #if defined(OS_POSIX) #include "ipc/ipc_channel_posix.h" diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h index 67d856e..6080e6b 100644 --- a/content/common/gpu/gpu_channel.h +++ b/content/common/gpu/gpu_channel.h @@ -19,10 +19,10 @@ #include "content/common/gpu/gpu_memory_manager.h" #include "content/common/message_router.h" #include "ipc/ipc_sync_channel.h" -#include "ui/gfx/gl/gl_share_group.h" -#include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_share_group.h" +#include "ui/gl/gpu_preference.h" class GpuChannelManager; struct GPUCreateCommandBufferConfig; diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc index e602d43..46b6d8c 100644 --- a/content/common/gpu/gpu_channel_manager.cc +++ b/content/common/gpu/gpu_channel_manager.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "content/common/child_thread.h" #include "content/common/gpu/gpu_channel.h" -#include "content/common/gpu/gpu_messages.h" #include "content/common/gpu/gpu_memory_manager.h" -#include "ui/gfx/gl/gl_share_group.h" +#include "content/common/gpu/gpu_messages.h" +#include "ui/gl/gl_share_group.h" GpuChannelManager::GpuChannelManager(ChildThread* gpu_child_thread, GpuWatchdog* watchdog, diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc index d25af66..d2f2849 100644 --- a/content/common/gpu/gpu_command_buffer_stub.cc +++ b/content/common/gpu/gpu_command_buffer_stub.cc @@ -20,8 +20,8 @@ #include "content/common/gpu/image_transport_surface.h" #include "gpu/command_buffer/common/constants.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_switches.h" #if defined(OS_WIN) #include "content/public/common/sandbox_init.h" diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h index abbd455..711c98c 100644 --- a/content/common/gpu/gpu_command_buffer_stub.h +++ b/content/common/gpu/gpu_command_buffer_stub.h @@ -24,11 +24,11 @@ #include "gpu/command_buffer/service/gpu_scheduler.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_surface.h" -#include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface.h" +#include "ui/gl/gpu_preference.h" #include "ui/surface/transport_dib.h" #if defined(OS_MACOSX) diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h index 90089dd..a264aab 100644 --- a/content/common/gpu/gpu_messages.h +++ b/content/common/gpu/gpu_messages.h @@ -20,9 +20,9 @@ #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message_macros.h" #include "media/video/video_decode_accelerator.h" -#include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/gpu_preference.h" #include "ui/surface/transport_dib.h" #define IPC_MESSAGE_START GpuMsgStart diff --git a/content/common/gpu/image_transport_surface.cc b/content/common/gpu/image_transport_surface.cc index d7640ba..419ed4a 100644 --- a/content/common/gpu/image_transport_surface.cc +++ b/content/common/gpu/image_transport_surface.cc @@ -15,7 +15,7 @@ #include "content/common/gpu/gpu_command_buffer_stub.h" #include "content/common/gpu/gpu_messages.h" #include "gpu/command_buffer/service/gpu_scheduler.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" ImageTransportSurface::ImageTransportSurface() {} diff --git a/content/common/gpu/image_transport_surface.h b/content/common/gpu/image_transport_surface.h index b437fcad..ce44081 100644 --- a/content/common/gpu/image_transport_surface.h +++ b/content/common/gpu/image_transport_surface.h @@ -17,10 +17,10 @@ #include "base/memory/weak_ptr.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message.h" -#include "ui/gfx/gl/gl_surface.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_surface.h" #include "ui/surface/transport_dib.h" class GpuChannelManager; diff --git a/content/common/gpu/image_transport_surface_linux.cc b/content/common/gpu/image_transport_surface_linux.cc index 90341b5..9fe3d80 100644 --- a/content/common/gpu/image_transport_surface_linux.cc +++ b/content/common/gpu/image_transport_surface_linux.cc @@ -7,10 +7,10 @@ // This conflicts with the defines in Xlib.h and must come first. #include "content/common/gpu/gpu_messages.h" -#include <map> -#include <vector> #include <X11/Xlib.h> #include <X11/extensions/Xcomposite.h> +#include <map> +#include <vector> // Note: these must be included before anything that includes gl_bindings.h // They're effectively standard library headers. @@ -19,20 +19,20 @@ #include "third_party/mesa/MesaLib/include/GL/osmesa.h" #include "base/bind.h" -#include "base/memory/weak_ptr.h" #include "base/debug/trace_event.h" +#include "base/memory/weak_ptr.h" #include "content/common/gpu/gpu_channel.h" #include "content/common/gpu/gpu_channel_manager.h" #include "content/common/gpu/gpu_command_buffer_stub.h" #include "content/common/gpu/texture_image_transport_surface.h" #include "gpu/command_buffer/service/gpu_scheduler.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_surface_egl.h" -#include "ui/gfx/gl/gl_surface_glx.h" -#include "ui/gfx/gl/gl_surface_osmesa.h" #include "ui/gfx/rect.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_egl.h" +#include "ui/gl/gl_surface_glx.h" +#include "ui/gl/gl_surface_osmesa.h" namespace { diff --git a/content/common/gpu/image_transport_surface_mac.cc b/content/common/gpu/image_transport_surface_mac.cc index 5223ce1..6628098 100644 --- a/content/common/gpu/image_transport_surface_mac.cc +++ b/content/common/gpu/image_transport_surface_mac.cc @@ -9,11 +9,11 @@ #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_ptr.h" #include "content/common/gpu/gpu_messages.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_surface_cgl.h" #include "ui/gfx/native_widget_types.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_cgl.h" #include "ui/surface/io_surface_support_mac.h" namespace { diff --git a/content/common/gpu/image_transport_surface_win.cc b/content/common/gpu/image_transport_surface_win.cc index 32e9d8a..1241009 100644 --- a/content/common/gpu/image_transport_surface_win.cc +++ b/content/common/gpu/image_transport_surface_win.cc @@ -15,11 +15,11 @@ #include "content/common/gpu/gpu_messages.h" #include "content/public/common/content_switches.h" #include "third_party/angle/include/EGL/egl.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_surface_egl.h" #include "ui/gfx/native_widget_types.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_egl.h" namespace { diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.cc b/content/common/gpu/media/dxva_video_decode_accelerator.cc index 05afbad..28f5f66 100644 --- a/content/common/gpu/media/dxva_video_decode_accelerator.cc +++ b/content/common/gpu/media/dxva_video_decode_accelerator.cc @@ -27,8 +27,8 @@ #include "media/video/video_decode_accelerator.h" #include "third_party/angle/include/EGL/egl.h" #include "third_party/angle/include/EGL/eglext.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_surface.h" // We only request 5 picture buffers from the client which are used to hold the // decoded samples. These buffers are then reused when the client tells us that diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc index 0ef9d87..6ad1329 100644 --- a/content/common/gpu/media/gpu_video_decode_accelerator.cc +++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc @@ -14,12 +14,12 @@ #include "base/win/windows_version.h" #endif // OS_WIN -#include "gpu/command_buffer/common/command_buffer.h" -#include "ipc/ipc_message_macros.h" -#include "ipc/ipc_message_utils.h" #include "content/common/gpu/gpu_channel.h" #include "content/common/gpu/gpu_command_buffer_stub.h" #include "content/common/gpu/gpu_messages.h" +#include "gpu/command_buffer/common/command_buffer.h" +#include "ipc/ipc_message_macros.h" +#include "ipc/ipc_message_utils.h" #if (defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)) || defined(OS_WIN) #if defined(OS_WIN) @@ -27,8 +27,8 @@ #else // OS_WIN #include "content/common/gpu/media/omx_video_decode_accelerator.h" #endif // OS_WIN -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_surface_egl.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface_egl.h" #endif #include "gpu/command_buffer/service/texture_manager.h" diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc index 9dc6325..8e96c0d 100644 --- a/content/common/gpu/media/video_decode_accelerator_unittest.cc +++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc @@ -52,10 +52,10 @@ #include "third_party/angle/include/EGL/egl.h" #if defined(OS_WIN) -#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_surface.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" #else // OS_WIN #include "third_party/angle/include/GLES2/gl2.h" #endif // OS_WIN diff --git a/content/common/gpu/texture_image_transport_surface.cc b/content/common/gpu/texture_image_transport_surface.cc index de9d335..a19a743 100644 --- a/content/common/gpu/texture_image_transport_surface.cc +++ b/content/common/gpu/texture_image_transport_surface.cc @@ -10,7 +10,7 @@ #include "gpu/command_buffer/service/context_group.h" #include "gpu/command_buffer/service/gpu_scheduler.h" #include "gpu/command_buffer/service/texture_manager.h" -#include "ui/gfx/gl/scoped_make_current.h" +#include "ui/gl/scoped_make_current.h" using gpu::gles2::ContextGroup; using gpu::gles2::TextureManager; diff --git a/content/common/gpu/texture_image_transport_surface.h b/content/common/gpu/texture_image_transport_surface.h index 4d77725..913854c 100644 --- a/content/common/gpu/texture_image_transport_surface.h +++ b/content/common/gpu/texture_image_transport_surface.h @@ -10,7 +10,7 @@ #include "content/common/gpu/gpu_command_buffer_stub.h" #include "content/common/gpu/image_transport_surface.h" #include "gpu/command_buffer/service/texture_manager.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_surface.h" class GpuChannelManager; diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm index 7034bbc..679fddf 100644 --- a/content/common/sandbox_mac.mm +++ b/content/common/sandbox_mac.mm @@ -17,10 +17,10 @@ extern "C" { #include "base/compiler_specific.h" #include "base/file_util.h" #include "base/mac/mac_util.h" -#include "base/rand_util_c.h" #include "base/mac/scoped_cftyperef.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/memory/scoped_nsobject.h" +#include "base/rand_util_c.h" #include "base/string16.h" #include "base/string_piece.h" #include "base/string_util.h" @@ -31,8 +31,8 @@ extern "C" { #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "grit/content_resources.h" +#include "ui/gl/gl_surface.h" #include "unicode/uchar.h" -#include "ui/gfx/gl/gl_surface.h" namespace { diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc index bae313b..bdd50db 100644 --- a/content/common/sandbox_policy.cc +++ b/content/common/sandbox_policy.cc @@ -14,8 +14,8 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/win/iat_patch_function.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_process_information.h" @@ -28,7 +28,7 @@ #include "sandbox/src/sandbox.h" #include "sandbox/src/sandbox_nt_util.h" #include "sandbox/src/win_utils.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" static sandbox::BrokerServices* g_broker_services = NULL; static sandbox::TargetServices* g_target_services = NULL; diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 77488ba..74f19ab 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -917,7 +917,7 @@ }], ['ui_compositor_image_transport==1', { 'dependencies': [ - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', ], 'link_settings': { 'libraries': [ diff --git a/content/content_common.gypi b/content/content_common.gypi index a0ee418..b3aaaff 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -15,7 +15,7 @@ '../third_party/icu/icu.gyp:icuuc', '../third_party/npapi/npapi.gyp:npapi', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', '../ui/ui.gyp:ui', '../webkit/support/webkit_support.gyp:appcache', '../webkit/support/webkit_support.gyp:blob', @@ -392,7 +392,7 @@ ['OS=="win"', { 'dependencies': [ '../media/media.gyp:media', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', ], 'link_settings': { 'libraries': [ diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index c31b081..cda9ae0 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -6,7 +6,7 @@ 'dependencies': [ '../base/base.gyp:base', '../skia/skia.gyp:skia', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', ], 'sources': [ 'gpu/gpu_dx_diagnostics_win.cc', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 3ed669d..89ab73c 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -187,7 +187,7 @@ '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libvpx/libvpx.gyp:libvpx', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', '../ui/ui.gyp:ui', '../v8/tools/gyp/v8.gyp:v8', '../webkit/support/webkit_support.gyp:database', @@ -487,7 +487,7 @@ '../third_party/angle/src/build_angle.gyp:libEGL', '../third_party/angle/src/build_angle.gyp:libGLESv2', '../media/media.gyp:media', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', '../ui/ui.gyp:ui', ], 'conditions': [ diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index 9f482a9..7735275 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -13,12 +13,12 @@ #include "build/build_config.h" #include "content/common/child_process.h" #include "content/common/gpu/gpu_messages.h" -#include "content/public/common/content_switches.h" #include "content/gpu/gpu_info_collector.h" #include "content/gpu/gpu_watchdog_thread.h" +#include "content/public/common/content_switches.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_sync_message_filter.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_implementation.h" const int kGpuTimeout = 10000; diff --git a/content/gpu/gpu_info_collector.cc b/content/gpu/gpu_info_collector.cc index ecdb189..86ae2f5 100644 --- a/content/gpu/gpu_info_collector.cc +++ b/content/gpu/gpu_info_collector.cc @@ -1,4 +1,4 @@ -// 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. @@ -7,14 +7,14 @@ #include <string> #include <vector> -#include "base/memory/scoped_ptr.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.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" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface.h" namespace { diff --git a/content/gpu/gpu_info_collector_linux.cc b/content/gpu/gpu_info_collector_linux.cc index 0fc224b..6608bb3 100644 --- a/content/gpu/gpu_info_collector_linux.cc +++ b/content/gpu/gpu_info_collector_linux.cc @@ -15,11 +15,11 @@ #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" -#include "ui/gfx/gl/gl_surface.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" +#include "ui/gl/gl_switches.h" namespace { diff --git a/content/gpu/gpu_info_collector_mac.mm b/content/gpu/gpu_info_collector_mac.mm index bf284f6..8853bcd 100644 --- a/content/gpu/gpu_info_collector_mac.mm +++ b/content/gpu/gpu_info_collector_mac.mm @@ -11,10 +11,10 @@ #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" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/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 0d2b710..b21c514 100644 --- a/content/gpu/gpu_info_collector_unittest.cc +++ b/content/gpu/gpu_info_collector_unittest.cc @@ -8,7 +8,7 @@ #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" +#include "ui/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 2ea0915..d17e0ef 100644 --- a/content/gpu/gpu_info_collector_win.cc +++ b/content/gpu/gpu_info_collector_win.cc @@ -17,8 +17,8 @@ #include "base/string_util.h" #include "base/win/scoped_com_initializer.h" #include "base/win/scoped_comptr.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_egl.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_egl.h" // ANGLE seems to require that main.h be included before any other ANGLE header. #include "libEGL/Display.h" diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 2694e76..c3882e1 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -16,15 +16,15 @@ #include "base/win/scoped_com_initializer.h" #include "build/build_config.h" #include "content/common/gpu/gpu_config.h" -#include "content/public/common/content_client.h" -#include "content/public/common/content_switches.h" -#include "content/public/common/main_function_params.h" #include "content/gpu/gpu_child_thread.h" #include "content/gpu/gpu_info_collector.h" #include "content/gpu/gpu_process.h" +#include "content/public/common/content_client.h" +#include "content/public/common/content_switches.h" +#include "content/public/common/main_function_params.h" #include "crypto/hmac.h" -#include "ui/gfx/gl/gl_surface.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_surface.h" +#include "ui/gl/gl_switches.h" #if defined(OS_WIN) #include "content/common/gpu/media/dxva_video_decode_accelerator.h" diff --git a/content/plugin/webplugin_accelerated_surface_proxy_mac.h b/content/plugin/webplugin_accelerated_surface_proxy_mac.h index 6abf39f..c23082d 100644 --- a/content/plugin/webplugin_accelerated_surface_proxy_mac.h +++ b/content/plugin/webplugin_accelerated_surface_proxy_mac.h @@ -1,4 +1,4 @@ -// 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. @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "ui/gfx/gl/gpu_preference.h" +#include "ui/gl/gpu_preference.h" #include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h" class WebPluginProxy; diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h index b3d98fa..a4915f9 100644 --- a/content/plugin/webplugin_proxy.h +++ b/content/plugin/webplugin_proxy.h @@ -23,7 +23,7 @@ #if defined(USE_X11) #include "ui/base/x/x11_util.h" #endif -#include "ui/gfx/gl/gpu_preference.h" +#include "ui/gl/gpu_preference.h" #include "ui/surface/transport_dib.h" #include "webkit/plugins/npapi/webplugin.h" diff --git a/content/renderer/pepper/pepper_platform_context_3d_impl.cc b/content/renderer/pepper/pepper_platform_context_3d_impl.cc index d0cc174..8e2f96a 100644 --- a/content/renderer/pepper/pepper_platform_context_3d_impl.cc +++ b/content/renderer/pepper/pepper_platform_context_3d_impl.cc @@ -14,7 +14,7 @@ #include "gpu/command_buffer/client/gles2_implementation.h" #include "gpu/ipc/command_buffer_proxy.h" #include "ppapi/c/pp_graphics_3d.h" -#include "ui/gfx/gl/gpu_preference.h" +#include "ui/gl/gpu_preference.h" #ifdef ENABLE_GPU diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index c439a52..7d38cb2 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -34,10 +34,10 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/skia/include/core/SkShader.h" #include "third_party/skia/include/effects/SkTableColorFilter.h" -#include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/point.h" #include "ui/gfx/size.h" #include "ui/gfx/skia_util.h" +#include "ui/gl/gl_switches.h" #include "ui/surface/transport_dib.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/webplugin.h" diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index 48280745..27293e1 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc @@ -15,7 +15,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" -#include "ui/gfx/gl/gpu_preference.h" +#include "ui/gl/gpu_preference.h" #include "webkit/plugins/ppapi/plugin_delegate.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" @@ -9,5 +9,6 @@ include_rules = [ "+../service", "+crypto", "+ui/gfx", + "+ui/gl", "+ui/surface", ] diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index ad3ab11..466e854 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -22,7 +22,7 @@ #endif #if defined(GPU_CLIENT_DEBUG) -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" #include "base/command_line.h" #endif diff --git a/gpu/command_buffer/common/gl_mock.h b/gpu/command_buffer/common/gl_mock.h index 8acc132..a6350a3 100644 --- a/gpu/command_buffer/common/gl_mock.h +++ b/gpu/command_buffer/common/gl_mock.h @@ -10,7 +10,7 @@ #pragma once #include "testing/gmock/include/gmock/gmock.h" -#include "ui/gfx/gl/gl_interface.h" +#include "ui/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 c305c1c..7539d9f 100644 --- a/gpu/command_buffer/common/unittest_main.cc +++ b/gpu/command_buffer/common/unittest_main.cc @@ -1,4 +1,4 @@ -// 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. @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/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 8916801..2a47fd4 100644 --- a/gpu/command_buffer/service/context_group.cc +++ b/gpu/command_buffer/service/context_group.cc @@ -18,7 +18,7 @@ #include "gpu/command_buffer/service/renderbuffer_manager.h" #include "gpu/command_buffer/service/shader_manager.h" #include "gpu/command_buffer/service/texture_manager.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/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 6be40c4..fede5a6 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -8,8 +8,8 @@ #include "base/string_number_conversions.h" #include "gpu/command_buffer/service/gl_utils.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" #if defined(OS_MACOSX) #include "ui/surface/io_surface_support_mac.h" #endif diff --git a/gpu/command_buffer/service/gl_utils.h b/gpu/command_buffer/service/gl_utils.h index 89b5f9d..3f95b1c 100644 --- a/gpu/command_buffer/service/gl_utils.h +++ b/gpu/command_buffer/service/gl_utils.h @@ -9,7 +9,7 @@ #define GPU_COMMAND_BUFFER_SERVICE_GL_UTILS_H_ #include "build/build_config.h" -#include "ui/gfx/gl/gl_bindings.h" +#include "ui/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 c7b56b8..0af984b 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -47,9 +47,9 @@ #include "gpu/command_buffer/service/texture_definition.h" #include "gpu/command_buffer/service/texture_manager.h" #include "gpu/command_buffer/service/vertex_attrib_manager.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" #if defined(OS_MACOSX) #include "ui/surface/io_surface_support_mac.h" #endif diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc index 861a838..c489347 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc @@ -5,21 +5,21 @@ #include "gpu/command_buffer/service/gles2_cmd_decoder.h" #include "base/atomicops.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" -#include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/common/id_allocator.h" -#include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" #include "gpu/command_buffer/service/cmd_buffer_engine.h" #include "gpu/command_buffer/service/context_group.h" +#include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" #include "gpu/command_buffer/service/mailbox_manager.h" -#include "gpu/command_buffer/service/stream_texture_mock.h" -#include "gpu/command_buffer/service/stream_texture_manager_mock.h" #include "gpu/command_buffer/service/program_manager.h" +#include "gpu/command_buffer/service/stream_texture_manager_mock.h" +#include "gpu/command_buffer/service/stream_texture_mock.h" #include "gpu/command_buffer/service/test_helper.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_stub.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_stub.h" #if !defined(GL_DEPTH24_STENCIL8) #define GL_DEPTH24_STENCIL8 0x88F0 diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc index 71d6a30..3ef8466 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc @@ -16,7 +16,7 @@ #include "gpu/command_buffer/service/program_manager.h" #include "gpu/command_buffer/service/test_helper.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_implementation.h" using ::gfx::MockGLInterface; using ::testing::_; 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 0b621dd..37debd3 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h @@ -20,8 +20,8 @@ #include "gpu/command_buffer/service/test_helper.h" #include "gpu/command_buffer/service/texture_manager.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/gl/gl_context_stub.h" -#include "ui/gfx/gl/gl_surface_stub.h" +#include "ui/gl/gl_context_stub.h" +#include "ui/gl/gl_surface_stub.h" namespace gpu { namespace gles2 { diff --git a/gpu/command_buffer/service/gpu_scheduler.cc b/gpu/command_buffer/service/gpu_scheduler.cc index 65b357c..d56b727 100644 --- a/gpu/command_buffer/service/gpu_scheduler.cc +++ b/gpu/command_buffer/service/gpu_scheduler.cc @@ -10,9 +10,9 @@ #include "base/debug/trace_event.h" #include "base/message_loop.h" #include "base/time.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_fence.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_fence.h" +#include "ui/gl/gl_switches.h" using ::base::SharedMemory; diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc index 05dfd42..be5cca2 100644 --- a/gpu/command_buffer/tests/gl_manager.cc +++ b/gpu/command_buffer/tests/gl_manager.cc @@ -2,21 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "gpu/command_buffer/tests/gl_manager.h" #include "base/at_exit.h" #include "base/bind.h" -#include "gpu/command_buffer/client/gles2_lib.h" #include "gpu/command_buffer/client/gles2_implementation.h" +#include "gpu/command_buffer/client/gles2_lib.h" #include "gpu/command_buffer/client/transfer_buffer.h" #include "gpu/command_buffer/common/constants.h" #include "gpu/command_buffer/service/command_buffer_service.h" #include "gpu/command_buffer/service/context_group.h" #include "gpu/command_buffer/service/gpu_scheduler.h" #include "gpu/command_buffer/service/mailbox_manager.h" +#include "gpu/command_buffer/tests/gl_manager.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_share_group.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_share_group.h" +#include "ui/gl/gl_surface.h" namespace gpu { diff --git a/gpu/command_buffer/tests/gl_tests_main.cc b/gpu/command_buffer/tests/gl_tests_main.cc index 544f8b3..7ffe61a 100644 --- a/gpu/command_buffer/tests/gl_tests_main.cc +++ b/gpu/command_buffer/tests/gl_tests_main.cc @@ -10,7 +10,7 @@ #endif #include "gpu/command_buffer/client/gles2_lib.h" #include "gpu/command_buffer/tests/gl_test_utils.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_surface.h" #if defined(TOOLKIT_GTK) #include "ui/gfx/gtk_util.h" diff --git a/gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc b/gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc index 2dbcafe..f79f221 100644 --- a/gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc +++ b/gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc @@ -9,7 +9,7 @@ #include "gpu/command_buffer/tests/gl_manager.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/gl/gl_share_group.h" +#include "ui/gl/gl_share_group.h" namespace gpu { diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi index d7a182e..6a67075 100644 --- a/gpu/command_buffer_service.gypi +++ b/gpu/command_buffer_service.gypi @@ -16,7 +16,7 @@ 'dependencies': [ '../base/base.gyp:base', '../crypto/crypto.gyp:crypto', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', '../ui/surface/surface.gyp:surface', '../ui/ui.gyp:ui', '../third_party/angle/src/build_angle.gyp:translator_glsl', diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp index 5b2fdb4..c0c6bb5 100644 --- a/gpu/demos/demos.gyp +++ b/gpu/demos/demos.gyp @@ -44,7 +44,7 @@ '../gpu.gyp:gles2_implementation', '../../base/base.gyp:base', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../../ui/gfx/gl/gl.gyp:gl', + '../../ui/gl/gl.gyp:gl', '../../ui/ui.gyp:ui', ], 'sources': [ diff --git a/gpu/demos/framework/main_exe.cc b/gpu/demos/framework/main_exe.cc index 12d3828..2794381 100644 --- a/gpu/demos/framework/main_exe.cc +++ b/gpu/demos/framework/main_exe.cc @@ -1,4 +1,4 @@ -// 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. @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "gpu/demos/framework/window.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_surface.h" #if defined(TOOLKIT_GTK) #include <gtk/gtk.h> diff --git a/gpu/demos/framework/window.h b/gpu/demos/framework/window.h index 956f60f1..e9c9802 100644 --- a/gpu/demos/framework/window.h +++ b/gpu/demos/framework/window.h @@ -8,11 +8,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 { 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'], diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi index 4d24613..03f097d 100644 --- a/gpu/gpu_common.gypi +++ b/gpu/gpu_common.gypi @@ -10,7 +10,7 @@ 'type': '<(component)', 'dependencies': [ '../base/base.gyp:base', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', 'command_buffer/command_buffer.gyp:gles2_utils', 'gles2_cmd_helper', ], @@ -37,7 +37,7 @@ ], 'dependencies': [ '../base/base.gyp:base', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', 'command_buffer/command_buffer.gyp:gles2_utils', 'gles2_cmd_helper', ], @@ -124,7 +124,7 @@ '../testing/gmock.gyp:gmock_main', '../testing/gtest.gyp:gtest', '../third_party/angle/src/build_angle.gyp:translator_glsl', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', '../ui/ui.gyp:ui', 'command_buffer/command_buffer.gyp:gles2_utils', 'command_buffer_client', @@ -238,7 +238,7 @@ 'dependencies': [ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', ], 'include_dirs': [ '..', diff --git a/gpu/tools/compositor_model_bench/render_tree.h b/gpu/tools/compositor_model_bench/render_tree.h index cc476fd..5ac01e5 100644 --- a/gpu/tools/compositor_model_bench/render_tree.h +++ b/gpu/tools/compositor_model_bench/render_tree.h @@ -1,4 +1,4 @@ -// 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. @@ -14,8 +14,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_vector.h" #include "gpu/tools/compositor_model_bench/shaders.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" // These are fairly arbitrary values based on how big my actual browser // window was. diff --git a/gpu/tools/tools.gyp b/gpu/tools/tools.gyp index 0f1a9d2..05807a61 100644 --- a/gpu/tools/tools.gyp +++ b/gpu/tools/tools.gyp @@ -1,4 +1,4 @@ -# 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. @@ -16,7 +16,7 @@ 'type': 'executable', 'dependencies': [ '../../base/base.gyp:base', - '../../ui/gfx/gl/gl.gyp:gl', + '../../ui/gl/gl.gyp:gl', ], 'libraries': [ '-lGL', @@ -4,5 +4,5 @@ include_rules = [ "+third_party/openmax", "+third_party/skia", "+ui/gfx", - "+ui/gfx/gl", + "+ui/gl", ] diff --git a/media/media.gyp b/media/media.gyp index 66b04e3..d42fe5e 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -838,7 +838,7 @@ 'media', 'yuv_convert', '../base/base.gyp:base', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', ], 'sources': [ 'tools/shader_bench/shader_bench.cc', @@ -882,7 +882,7 @@ 'type': 'executable', 'dependencies': [ '../base/base.gyp:base', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', ], 'libraries': [ '-lGL', @@ -903,7 +903,7 @@ 'media', 'yuv_convert', '../base/base.gyp:base', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', ], 'link_settings': { 'libraries': [ diff --git a/media/tools/player_x11/gl_video_renderer.cc b/media/tools/player_x11/gl_video_renderer.cc index ee3c59b..f39a464 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) 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. @@ -11,7 +11,7 @@ #include "media/base/buffers.h" #include "media/base/video_frame.h" #include "media/base/yuv_convert.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_implementation.h" enum { kNumYUVPlanes = 3 }; diff --git a/media/tools/player_x11/gl_video_renderer.h b/media/tools/player_x11/gl_video_renderer.h index 7403e6a..28d3ffb 100644 --- a/media/tools/player_x11/gl_video_renderer.h +++ b/media/tools/player_x11/gl_video_renderer.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gl/gl_bindings.h" class MessageLoop; diff --git a/media/tools/shader_bench/gpu_color_painter.cc b/media/tools/shader_bench/gpu_color_painter.cc index 82d3056..2c81d2b 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) 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 "media/tools/shader_bench/gpu_color_painter.h" -#include "ui/gfx/gl/gl_context.h" +#include "ui/gl/gl_context.h" enum { kNumYUVPlanes = 3 }; diff --git a/media/tools/shader_bench/gpu_color_painter.h b/media/tools/shader_bench/gpu_color_painter.h index 5a000e2..5ca82bc 100644 --- a/media/tools/shader_bench/gpu_color_painter.h +++ b/media/tools/shader_bench/gpu_color_painter.h @@ -1,4 +1,4 @@ -// 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. @@ -9,7 +9,7 @@ #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" +#include "ui/gl/gl_context.h" // Does color space conversion using luminance textures on GPU, // renders using GPU. diff --git a/media/tools/shader_bench/gpu_painter.h b/media/tools/shader_bench/gpu_painter.h index 1fcfb8a..edeeda8 100644 --- a/media/tools/shader_bench/gpu_painter.h +++ b/media/tools/shader_bench/gpu_painter.h @@ -1,4 +1,4 @@ -// 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. @@ -6,10 +6,10 @@ #define MEDIA_TOOLS_SHADER_BENCH_GPU_PAINTER_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" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.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 83a2bb1..22c7fa5 100644 --- a/media/tools/shader_bench/shader_bench.cc +++ b/media/tools/shader_bench/shader_bench.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <deque> -#include <ostream> #include <stdio.h> #include <stdlib.h> +#include <deque> +#include <ostream> #include "base/at_exit.h" #include "base/bind.h" @@ -18,11 +18,11 @@ #include "media/tools/shader_bench/gpu_color_painter.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/gl/gl_surface.h" #include "ui/gfx/native_widget_types.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" #if defined(TOOLKIT_GTK) #include <gtk/gtk.h> diff --git a/media/tools/tile_render_bench/tile_render_bench.cc b/media/tools/tile_render_bench/tile_render_bench.cc index 1f19b40..c067ca3 100644 --- a/media/tools/tile_render_bench/tile_render_bench.cc +++ b/media/tools/tile_render_bench/tile_render_bench.cc @@ -1,4 +1,4 @@ -// 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. @@ -8,17 +8,17 @@ #include <iostream> -#include <X11/keysym.h> #include <X11/Xlib.h> #include <X11/Xutil.h> +#include <X11/keysym.h> #include "base/at_exit.h" #include "base/basictypes.h" #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" // Initial size of the window and the texture. static const int kStartSize = 1024; diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index 2edd11c..abf0466 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -225,7 +225,7 @@ '../../testing/gtest.gyp:gtest', '../compositor/compositor.gyp:compositor_test_support', '../compositor/compositor.gyp:compositor', - '../gfx/gl/gl.gyp:gl', + '../gl/gl.gyp:gl', '../ui.gyp:gfx_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc index 4d1d333..f74757d 100644 --- a/ui/aura/test/test_suite.cc +++ b/ui/aura/test/test_suite.cc @@ -12,7 +12,7 @@ #include "ui/compositor/compositor_setup.h" #include "ui/compositor/test/compositor_test_support.h" #include "ui/gfx/gfx_paths.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_implementation.h" namespace aura { namespace test { diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc index 4b23d86..5dc61aa1 100644 --- a/ui/compositor/compositor.cc +++ b/ui/compositor/compositor.cc @@ -17,9 +17,9 @@ #include "ui/compositor/dip_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/test_web_graphics_context_3d.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" #include "webkit/glue/webthread_impl.h" #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index 4640b4d0..99eebe9 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -15,7 +15,7 @@ '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', - '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', + '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/webkit/support/webkit_support.gyp:fileapi', '<(DEPTH)/webkit/support/webkit_support.gyp:glue', @@ -100,7 +100,7 @@ '<(DEPTH)/base/base.gyp:test_support_base', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/testing/gtest.gyp:gtest', - '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', + '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', 'compositor', 'compositor_test_support', diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h index ef72de0..33f6d6b 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -13,10 +13,10 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h" #include "ui/compositor/compositor_export.h" -#include "ui/gfx/gl/gl_share_group.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" #include "ui/gfx/transform.h" +#include "ui/gl/gl_share_group.h" class SkBitmap; diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc index fd749bb..4279c0b 100644 --- a/ui/compositor/test/test_suite.cc +++ b/ui/compositor/test/test_suite.cc @@ -10,7 +10,7 @@ #include "ui/compositor/compositor.h" #include "ui/compositor/test/compositor_test_support.h" #include "ui/gfx/gfx_paths.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_implementation.h" CompositorTestSuite::CompositorTestSuite(int argc, char** argv) : TestSuite(argc, argv) {} diff --git a/ui/compositor/test_web_graphics_context_3d.cc b/ui/compositor/test_web_graphics_context_3d.cc index 7d13815..0031da0 100644 --- a/ui/compositor/test_web_graphics_context_3d.cc +++ b/ui/compositor/test_web_graphics_context_3d.cc @@ -4,8 +4,8 @@ #include "ui/compositor/test_web_graphics_context_3d.h" -#include "ui/gfx/gl/gl_context_stub.h" -#include "ui/gfx/gl/gl_surface_stub.h" +#include "ui/gl/gl_context_stub.h" +#include "ui/gl/gl_surface_stub.h" namespace ui { diff --git a/ui/compositor/test_web_graphics_context_3d.h b/ui/compositor/test_web_graphics_context_3d.h index a136ddc..d8193a8 100644 --- a/ui/compositor/test_web_graphics_context_3d.h +++ b/ui/compositor/test_web_graphics_context_3d.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" -#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gl/gl_bindings.h" namespace gfx { class GLContext; diff --git a/ui/gfx/gl/DEPS b/ui/gl/DEPS index 9a48305..4d34aad 100644 --- a/ui/gfx/gl/DEPS +++ b/ui/gl/DEPS @@ -1,3 +1,4 @@ include_rules = [ + "+third_party/angle/include", "+third_party/mesa/MesaLib/include", ] diff --git a/ui/gfx/gl/OWNERS b/ui/gl/OWNERS index 9ce8991..9ce8991 100644 --- a/ui/gfx/gl/OWNERS +++ b/ui/gl/OWNERS diff --git a/ui/gfx/gl/android_native_window.cc b/ui/gl/android_native_window.cc index c32444cf..f75b753 100644 --- a/ui/gfx/gl/android_native_window.cc +++ b/ui/gl/android_native_window.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 "ui/gfx/gl/android_native_window.h" +#include "ui/gl/android_native_window.h" #include <android/native_window.h> diff --git a/ui/gfx/gl/android_native_window.h b/ui/gl/android_native_window.h index 4a8eab5..bde5904 100644 --- a/ui/gfx/gl/android_native_window.h +++ b/ui/gl/android_native_window.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_GL_ANDROID_NATIVE_WINDOW_H_ -#define UI_GFX_GL_ANDROID_NATIVE_WINDOW_H_ +#ifndef UI_GL_ANDROID_NATIVE_WINDOW_H_ +#define UI_GL_ANDROID_NATIVE_WINDOW_H_ #pragma once #include "base/basictypes.h" @@ -29,4 +29,4 @@ class AndroidNativeWindow { } // namespace gfx -#endif // UI_GFX_GL_ANDROID_NATIVE_WINDOW_H_ +#endif // UI_GL_ANDROID_NATIVE_WINDOW_H_ diff --git a/ui/gfx/gl/egl_util.cc b/ui/gl/egl_util.cc index cec4d3b..91d1b12 100644 --- a/ui/gfx/gl/egl_util.cc +++ b/ui/gl/egl_util.cc @@ -1,8 +1,8 @@ -// 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 "ui/gfx/gl/egl_util.h" +#include "ui/gl/egl_util.h" #if defined(OS_ANDROID) #include <EGL/egl.h> @@ -11,7 +11,7 @@ #endif // This needs to be after the EGL includes -#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gl/gl_bindings.h" namespace gfx { diff --git a/ui/gfx/gl/egl_util.h b/ui/gl/egl_util.h index 71f471f..bf6a019 100644 --- a/ui/gfx/gl/egl_util.h +++ b/ui/gl/egl_util.h @@ -1,9 +1,10 @@ -// 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. -#ifndef UI_GFX_GL_EGL_UTIL_H_ -#define UI_GFX_GL_EGL_UTIL_H_ +#ifndef UI_GL_EGL_UTIL_H_ +#define UI_GL_EGL_UTIL_H_ +#pragma once namespace gfx { @@ -12,4 +13,4 @@ const char* GetLastEGLErrorString(); } // namespace gfx -#endif // UI_GFX_GL_EGL_UTIL_H_ +#endif // UI_GL_EGL_UTIL_H_ diff --git a/ui/gfx/gl/generate_bindings.py b/ui/gl/generate_bindings.py index b01fea7..22ab46a 100755 --- a/ui/gfx/gl/generate_bindings.py +++ b/ui/gl/generate_bindings.py @@ -1056,18 +1056,18 @@ GLX_FUNCTIONS = [ ] FUNCTION_SETS = [ - [GL_FUNCTIONS, 'gl', ['../../../third_party/mesa/MesaLib/include/GL/glext.h', - '../../../third_party/khronos/GLES2/gl2ext.h'], []], + [GL_FUNCTIONS, 'gl', ['../../third_party/mesa/MesaLib/include/GL/glext.h', + '../../third_party/khronos/GLES2/gl2ext.h'], []], [OSMESA_FUNCTIONS, 'osmesa', [], []], - [EGL_FUNCTIONS, 'egl', ['../../../third_party/khronos/EGL/eglext.h'], + [EGL_FUNCTIONS, 'egl', ['../../third_party/khronos/EGL/eglext.h'], [ 'EGL_ANGLE_d3d_share_handle_client_buffer', ], ], [WGL_FUNCTIONS, 'wgl', [ - '../../../third_party/mesa/MesaLib/include/GL/wglext.h'], []], + '../../third_party/mesa/MesaLib/include/GL/wglext.h'], []], [GLX_FUNCTIONS, 'glx', [ - '../../../third_party/mesa/MesaLib/include/GL/glxext.h'], []], + '../../third_party/mesa/MesaLib/include/GL/glxext.h'], []], ] def GenerateHeader(file, functions, set_name, used_extension_functions): @@ -1140,9 +1140,9 @@ def GenerateSource(file, functions, set_name, used_extension_functions): file.write('\n') file.write('#include <string>\n') file.write('#include "gpu/command_buffer/common/gles2_cmd_utils.h"\n') - file.write('#include "ui/gfx/gl/gl_bindings.h"\n') - file.write('#include "ui/gfx/gl/gl_context.h"\n') - file.write('#include "ui/gfx/gl/gl_implementation.h"\n') + file.write('#include "ui/gl/gl_bindings.h"\n') + file.write('#include "ui/gl/gl_context.h"\n') + file.write('#include "ui/gl/gl_implementation.h"\n') # Write definitions for booleans indicating which extensions are available. file.write('\n') @@ -1332,7 +1332,7 @@ def GenerateMockSource(file, functions): file.write('\n') file.write('#include <string.h>\n') file.write('\n') - file.write('#include "ui/gfx/gl/gl_interface.h"\n') + file.write('#include "ui/gl/gl_interface.h"\n') file.write('\n') file.write('namespace gfx {\n') diff --git a/ui/gfx/gl/gl.gyp b/ui/gl/gl.gyp index 45fe1e2..87f9803 100644 --- a/ui/gfx/gl/gl.gyp +++ b/ui/gl/gl.gyp @@ -20,7 +20,7 @@ '<(DEPTH)/ui/ui.gyp:ui', ], 'variables': { - 'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gl', + 'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gl', }, 'defines': [ 'GL_IMPLEMENTATION', diff --git a/ui/gfx/gl/gl_bindings.h b/ui/gl/gl_bindings.h index 751c7af..625dac9 100644 --- a/ui/gfx/gl/gl_bindings.h +++ b/ui/gl/gl_bindings.h @@ -2,21 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#ifndef UI_GL_GL_BINDINGS_H_ +#define UI_GL_GL_BINDINGS_H_ +#pragma once + // Includes the platform independent and platform dependent GL headers. // Only include this in cc files. It pulls in system headers, including // the X11 headers on linux, which define all kinds of macros that are // liable to cause conflicts. -#ifndef UI_GFX_GL_GL_BINDINGS_H_ -#define UI_GFX_GL_GL_BINDINGS_H_ -#pragma once - #include <GL/gl.h> #include <GL/glext.h> -#include "build/build_config.h" #include "base/logging.h" -#include "ui/gfx/gl/gl_export.h" +#include "build/build_config.h" +#include "ui/gl/gl_export.h" // The standard OpenGL native extension headers are also included. #if defined(OS_WIN) @@ -102,4 +102,4 @@ void* GL_BINDING_CALL GetMockGLProcAddress(const char* name); } // namespace gfx -#endif // UI_GFX_GL_GL_BINDINGS_H_ +#endif // UI_GL_GL_BINDINGS_H_ diff --git a/ui/gfx/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc index eeae0d2..a2f6433 100644 --- a/ui/gfx/gl/gl_bindings_skia_in_process.cc +++ b/ui/gl/gl_bindings_skia_in_process.cc @@ -1,14 +1,14 @@ -// 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 "ui/gfx/gl/gl_bindings_skia_in_process.h" +#include "ui/gl/gl_bindings_skia_in_process.h" #include "base/logging.h" #include "third_party/skia/include/gpu/gl/GrGLInterface.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" namespace { diff --git a/ui/gfx/gl/gl_bindings_skia_in_process.h b/ui/gl/gl_bindings_skia_in_process.h index 4ae208c..5bd356a 100644 --- a/ui/gfx/gl/gl_bindings_skia_in_process.h +++ b/ui/gl/gl_bindings_skia_in_process.h @@ -1,12 +1,12 @@ -// 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. -#ifndef UI_GFX_GL_GL_BINDINGS_SKIA_IN_PROCESS_H_ -#define UI_GFX_GL_GL_BINDINGS_SKIA_IN_PROCESS_H_ +#ifndef UI_GL_GL_BINDINGS_SKIA_IN_PROCESS_H_ +#define UI_GL_GL_BINDINGS_SKIA_IN_PROCESS_H_ #pragma once -#include "ui/gfx/gl/gl_export.h" +#include "ui/gl/gl_export.h" struct GrGLInterface; @@ -16,7 +16,6 @@ namespace gfx { // creates a binding for skia-gpu to the in-process GL GL_EXPORT GrGLInterface* CreateInProcessSkiaGLBinding(); -} - -#endif // UI_GFX_GL_GL_BINDINGS_SKIA_IN_PROCESS_H_ +} // namespace gfx +#endif // UI_GL_GL_BINDINGS_SKIA_IN_PROCESS_H_ diff --git a/ui/gfx/gl/gl_context.cc b/ui/gl/gl_context.cc index dc94b04..8652e25 100644 --- a/ui/gfx/gl/gl_context.cc +++ b/ui/gl/gl_context.cc @@ -8,11 +8,11 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/threading/thread_local.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_surface.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" +#include "ui/gl/gl_switches.h" namespace gfx { diff --git a/ui/gfx/gl/gl_context.h b/ui/gl/gl_context.h index 67fe57e..dc76c00 100644 --- a/ui/gfx/gl/gl_context.h +++ b/ui/gl/gl_context.h @@ -1,17 +1,17 @@ -// 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. -#ifndef UI_GFX_GL_GL_CONTEXT_H_ -#define UI_GFX_GL_GL_CONTEXT_H_ +#ifndef UI_GL_GL_CONTEXT_H_ +#define UI_GL_GL_CONTEXT_H_ #pragma once #include <string> #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "ui/gfx/gl/gl_share_group.h" -#include "ui/gfx/gl/gpu_preference.h" +#include "ui/gl/gl_share_group.h" +#include "ui/gl/gpu_preference.h" namespace gfx { @@ -83,11 +83,13 @@ class GL_EXPORT GLContext : public base::RefCounted<GLContext> { bool InitializeExtensionBindings(); private: - scoped_refptr<GLShareGroup> share_group_; friend class base::RefCounted<GLContext>; + + scoped_refptr<GLShareGroup> share_group_; + DISALLOW_COPY_AND_ASSIGN(GLContext); }; } // namespace gfx -#endif // UI_GFX_GL_GL_CONTEXT_H_ +#endif // UI_GL_GL_CONTEXT_H_ diff --git a/ui/gfx/gl/gl_context_android.cc b/ui/gl/gl_context_android.cc index efae3ba..38d91e8 100644 --- a/ui/gfx/gl/gl_context_android.cc +++ b/ui/gl/gl_context_android.cc @@ -1,15 +1,15 @@ -// 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 "ui/gfx/gl/gl_context.h" +#include "ui/gl/gl_context.h" #include "base/logging.h" #include "base/memory/ref_counted.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_context_egl.h" -#include "ui/gfx/gl/gl_context_stub.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context_egl.h" +#include "ui/gl/gl_context_stub.h" +#include "ui/gl/gl_implementation.h" namespace gfx { diff --git a/ui/gfx/gl/gl_context_cgl.cc b/ui/gl/gl_context_cgl.cc index 46bb7ab..790baad 100644 --- a/ui/gfx/gl/gl_context_cgl.cc +++ b/ui/gl/gl_context_cgl.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 "ui/gfx/gl/gl_context_cgl.h" +#include "ui/gl/gl_context_cgl.h" #include <OpenGL/CGLRenderers.h> #include <vector> #include "base/debug/trace_event.h" #include "base/logging.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_cgl.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_cgl.h" namespace gfx { diff --git a/ui/gfx/gl/gl_context_cgl.h b/ui/gl/gl_context_cgl.h index a33e2ad..0331568 100644 --- a/ui/gfx/gl/gl_context_cgl.h +++ b/ui/gl/gl_context_cgl.h @@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/gl/gl_context.h" +#ifndef UI_GL_GL_CONTEXT_CGL_H_ +#define UI_GL_GL_CONTEXT_CGL_H_ +#pragma once + +#include "ui/gl/gl_context.h" namespace gfx { @@ -43,3 +47,5 @@ class GLContextCGL : public GLContext { }; } // namespace gfx + +#endif // UI_GL_GL_CONTEXT_CGL_H_ diff --git a/ui/gfx/gl/gl_context_egl.cc b/ui/gl/gl_context_egl.cc index b41fea7..fa655a0 100644 --- a/ui/gfx/gl/gl_context_egl.cc +++ b/ui/gl/gl_context_egl.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/gl/gl_context_egl.h" +#include "ui/gl/gl_context_egl.h" #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "third_party/angle/include/EGL/egl.h" -#include "ui/gfx/gl/egl_util.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/egl_util.h" +#include "ui/gl/gl_surface.h" // This header must come after the above third-party include, as // it brings in #defines that cause conflicts. -#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gl/gl_bindings.h" #if defined(USE_X11) extern "C" { diff --git a/ui/gfx/gl/gl_context_egl.h b/ui/gl/gl_context_egl.h index 7c8c62c..4e98da8 100644 --- a/ui/gfx/gl/gl_context_egl.h +++ b/ui/gl/gl_context_egl.h @@ -1,15 +1,15 @@ -// 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. -#ifndef UI_GFX_GL_GL_CONTEXT_EGL_H_ -#define UI_GFX_GL_GL_CONTEXT_EGL_H_ +#ifndef UI_GL_GL_CONTEXT_EGL_H_ +#define UI_GL_GL_CONTEXT_EGL_H_ #pragma once #include <string> #include "base/compiler_specific.h" -#include "ui/gfx/gl/gl_context.h" +#include "ui/gl/gl_context.h" typedef void* EGLContext; typedef void* EGLDisplay; @@ -46,4 +46,4 @@ class GLContextEGL : public GLContext { } // namespace gfx -#endif // UI_GFX_GL_GL_CONTEXT_EGL_H_ +#endif // UI_GL_GL_CONTEXT_EGL_H_ diff --git a/ui/gfx/gl/gl_context_glx.cc b/ui/gl/gl_context_glx.cc index 8cb65db..af94040 100644 --- a/ui/gfx/gl/gl_context_glx.cc +++ b/ui/gl/gl_context_glx.cc @@ -6,15 +6,15 @@ extern "C" { #include <X11/Xlib.h> } -#include "ui/gfx/gl/gl_context_glx.h" +#include "ui/gl/gl_context_glx.h" #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "third_party/mesa/MesaLib/include/GL/osmesa.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_glx.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_glx.h" namespace gfx { diff --git a/ui/gfx/gl/gl_context_glx.h b/ui/gl/gl_context_glx.h index 9b35152..60155df 100644 --- a/ui/gfx/gl/gl_context_glx.h +++ b/ui/gl/gl_context_glx.h @@ -2,14 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_GL_GL_CONTEXT_GLX_H_ -#define UI_GFX_GL_GL_CONTEXT_GLX_H_ +#ifndef UI_GL_GL_CONTEXT_GLX_H_ +#define UI_GL_GL_CONTEXT_GLX_H_ +#pragma once #include <string> #include "base/compiler_specific.h" #include "ui/base/x/x11_util.h" -#include "ui/gfx/gl/gl_context.h" +#include "ui/gl/gl_context.h" namespace gfx { @@ -44,4 +45,4 @@ class GLContextGLX : public GLContext { } // namespace gfx -#endif //UI_GFX_GL_GL_CONTEXT_GLX_H_ +#endif // UI_GL_GL_CONTEXT_GLX_H_ diff --git a/ui/gfx/gl/gl_context_linux.cc b/ui/gl/gl_context_linux.cc index 121abee..2b5d16f 100644 --- a/ui/gfx/gl/gl_context_linux.cc +++ b/ui/gl/gl_context_linux.cc @@ -2,21 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/gl/gl_context.h" +#include "ui/gl/gl_context.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "third_party/mesa/MesaLib/include/GL/osmesa.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_context_egl.h" -#include "ui/gfx/gl/gl_context_glx.h" -#include "ui/gfx/gl/gl_context_osmesa.h" -#include "ui/gfx/gl/gl_context_stub.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_egl.h" -#include "ui/gfx/gl/gl_surface_glx.h" -#include "ui/gfx/gl/gl_surface_stub.h" -#include "ui/gfx/gl/gl_surface_osmesa.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context_egl.h" +#include "ui/gl/gl_context_glx.h" +#include "ui/gl/gl_context_osmesa.h" +#include "ui/gl/gl_context_stub.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_egl.h" +#include "ui/gl/gl_surface_glx.h" +#include "ui/gl/gl_surface_osmesa.h" +#include "ui/gl/gl_surface_stub.h" namespace gfx { diff --git a/ui/gfx/gl/gl_context_mac.mm b/ui/gl/gl_context_mac.mm index 2e556e0..06829be 100644 --- a/ui/gfx/gl/gl_context_mac.mm +++ b/ui/gl/gl_context_mac.mm @@ -9,16 +9,16 @@ #include "base/memory/scoped_generic_obj.h" #include "base/memory/scoped_ptr.h" #include "third_party/mesa/MesaLib/include/GL/osmesa.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_context_cgl.h" -#include "ui/gfx/gl/gl_context_osmesa.h" -#include "ui/gfx/gl/gl_context_stub.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context_cgl.h" +#include "ui/gl/gl_context_osmesa.h" +#include "ui/gl/gl_context_stub.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" +#include "ui/gl/gl_switches.h" #if defined(USE_AURA) -#include "ui/gfx/gl/gl_context_nsview.h" +#include "ui/gl/gl_context_nsview.h" #endif namespace { diff --git a/ui/gfx/gl/gl_context_nsview.h b/ui/gl/gl_context_nsview.h index 674df63..3c54157f 100644 --- a/ui/gfx/gl/gl_context_nsview.h +++ b/ui/gl/gl_context_nsview.h @@ -1,16 +1,16 @@ -// 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. -#ifndef UI_GFX_GL_GL_CONTEXT_NSVIEW_H_ -#define UI_GFX_GL_GL_CONTEXT_NSVIEW_H_ +#ifndef UI_GL_GL_CONTEXT_NSVIEW_H_ +#define UI_GL_GL_CONTEXT_NSVIEW_H_ #pragma once #import <AppKit/NSOpenGL.h> #include "base/compiler_specific.h" #include "base/memory/scoped_nsobject.h" -#include "ui/gfx/gl/gl_context.h" +#include "ui/gl/gl_context.h" namespace gfx { @@ -45,4 +45,4 @@ class GLContextNSView : public GLContext { } // namespace gfx -#endif // UI_GFX_GL_GL_CONTEXT_NSVIEW_H_ +#endif // UI_GL_GL_CONTEXT_NSVIEW_H_ diff --git a/ui/gfx/gl/gl_context_nsview.mm b/ui/gl/gl_context_nsview.mm index 03e3c03..898bf01 100644 --- a/ui/gfx/gl/gl_context_nsview.mm +++ b/ui/gl/gl_context_nsview.mm @@ -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 "ui/gfx/gl/gl_context_nsview.h" +#include "ui/gl/gl_context_nsview.h" #include <vector> @@ -11,7 +11,7 @@ #include "base/debug/trace_event.h" #include "base/logging.h" -#include "ui/gfx/gl/gl_surface_nsview.h" +#include "ui/gl/gl_surface_nsview.h" namespace gfx { diff --git a/ui/gfx/gl/gl_context_osmesa.cc b/ui/gl/gl_context_osmesa.cc index b7a7618..1787ef9 100644 --- a/ui/gfx/gl/gl_context_osmesa.cc +++ b/ui/gl/gl_context_osmesa.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <GL/osmesa.h> +#include "ui/gl/gl_context_osmesa.h" -#include "ui/gfx/gl/gl_context_osmesa.h" +#include <GL/osmesa.h> #include "base/logging.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_surface.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_surface.h" namespace gfx { diff --git a/ui/gfx/gl/gl_context_osmesa.h b/ui/gl/gl_context_osmesa.h index 2e21c4b..cef3fd9 100644 --- a/ui/gfx/gl/gl_context_osmesa.h +++ b/ui/gl/gl_context_osmesa.h @@ -2,13 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_GL_GL_CONTEXT_OSMESA_H_ -#define UI_GFX_GL_GL_CONTEXT_OSMESA_H_ +#ifndef UI_GL_GL_CONTEXT_OSMESA_H_ +#define UI_GL_GL_CONTEXT_OSMESA_H_ #pragma once -#include "ui/gfx/gl/gl_context.h" +#include "base/basictypes.h" +#include "base/compiler_specific.h" +#include "ui/gl/gl_context.h" -typedef struct osmesa_context *OSMesaContext; +typedef struct osmesa_context* OSMesaContext; namespace gfx { @@ -41,4 +43,4 @@ class GLContextOSMesa : public GLContext { } // namespace gfx -#endif // UI_GFX_GL_GL_CONTEXT_OSMESA_H_ +#endif // UI_GL_GL_CONTEXT_OSMESA_H_ diff --git a/ui/gfx/gl/gl_context_stub.cc b/ui/gl/gl_context_stub.cc index 6361124..d1364c4 100644 --- a/ui/gfx/gl/gl_context_stub.cc +++ b/ui/gl/gl_context_stub.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 "ui/gfx/gl/gl_context_stub.h" +#include "ui/gl/gl_context_stub.h" namespace gfx { diff --git a/ui/gfx/gl/gl_context_stub.h b/ui/gl/gl_context_stub.h index f9e81835..a602f4b 100644 --- a/ui/gfx/gl/gl_context_stub.h +++ b/ui/gl/gl_context_stub.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_GL_GL_CONTEXT_STUB_H_ -#define UI_GFX_GL_GL_CONTEXT_STUB_H_ +#ifndef UI_GL_GL_CONTEXT_STUB_H_ +#define UI_GL_GL_CONTEXT_STUB_H_ #pragma once -#include "ui/gfx/gl/gl_context.h" +#include "ui/gl/gl_context.h" namespace gfx { @@ -35,4 +35,4 @@ class GL_EXPORT GLContextStub : public GLContext { } // namespace gfx -#endif // UI_GFX_GL_GL_CONTEXT_STUB_H_ +#endif // UI_GL_GL_CONTEXT_STUB_H_ diff --git a/ui/gfx/gl/gl_context_wgl.cc b/ui/gl/gl_context_wgl.cc index d977302..e6b8307 100644 --- a/ui/gfx/gl/gl_context_wgl.cc +++ b/ui/gl/gl_context_wgl.cc @@ -4,13 +4,13 @@ // This file implements the GLContextWGL and PbufferGLContext classes. -#include "ui/gfx/gl/gl_context_wgl.h" +#include "ui/gl/gl_context_wgl.h" #include "base/debug/trace_event.h" #include "base/logging.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_wgl.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_wgl.h" namespace gfx { diff --git a/ui/gfx/gl/gl_context_wgl.h b/ui/gl/gl_context_wgl.h index 4d20bc7..1fc6177 100644 --- a/ui/gfx/gl/gl_context_wgl.h +++ b/ui/gl/gl_context_wgl.h @@ -1,14 +1,15 @@ -// 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. -#ifndef UI_GFX_GL_GL_CONTEXT_WGL_H_ -#define UI_GFX_GL_GL_CONTEXT_WGL_H_ +#ifndef UI_GL_GL_CONTEXT_WGL_H_ +#define UI_GL_GL_CONTEXT_WGL_H_ +#pragma once #include <string> -#include "ui/gfx/gl/gl_context.h" #include "ui/gfx/native_widget_types.h" +#include "ui/gl/gl_context.h" namespace gfx { @@ -39,4 +40,4 @@ class GLContextWGL : public GLContext { } // namespace gfx -#endif // UI_GFX_GL_GL_CONTEXT_WGL_H_ +#endif // UI_GL_GL_CONTEXT_WGL_H_ diff --git a/ui/gfx/gl/gl_context_win.cc b/ui/gl/gl_context_win.cc index 65ce32d..c42daa9 100644 --- a/ui/gfx/gl/gl_context_win.cc +++ b/ui/gl/gl_context_win.cc @@ -1,22 +1,22 @@ -// 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 "ui/gfx/gl/gl_context.h" +#include "ui/gl/gl_context.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "third_party/mesa/MesaLib/include/GL/osmesa.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_context_wgl.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_egl.h" -#include "ui/gfx/gl/gl_surface_osmesa.h" -#include "ui/gfx/gl/gl_surface_stub.h" -#include "ui/gfx/gl/gl_surface_wgl.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context_egl.h" +#include "ui/gl/gl_context_osmesa.h" +#include "ui/gl/gl_context_stub.h" +#include "ui/gl/gl_context_wgl.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_egl.h" +#include "ui/gl/gl_surface_osmesa.h" +#include "ui/gl/gl_surface_stub.h" +#include "ui/gl/gl_surface_wgl.h" namespace gfx { diff --git a/ui/gfx/gl/gl_export.h b/ui/gl/gl_export.h index a9cbe98..30e6979 100644 --- a/ui/gfx/gl/gl_export.h +++ b/ui/gl/gl_export.h @@ -1,9 +1,9 @@ -// 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. -#ifndef UI_GFX_GL_GL_EXPORT_H_ -#define UI_GFX_GL_GL_EXPORT_H_ +#ifndef UI_GL_GL_EXPORT_H_ +#define UI_GL_GL_EXPORT_H_ #pragma once #if defined(COMPONENT_BUILD) @@ -23,4 +23,4 @@ #define GL_EXPORT #endif -#endif // UI_GFX_GL_GL_EXPORT_H_ +#endif // UI_GL_GL_EXPORT_H_ diff --git a/ui/gfx/gl/gl_fence.cc b/ui/gl/gl_fence.cc index ae09115..82cdf30 100644 --- a/ui/gfx/gl/gl_fence.cc +++ b/ui/gl/gl_fence.cc @@ -1,12 +1,12 @@ -// 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 "ui/gfx/gl/gl_fence.h" +#include "ui/gl/gl_fence.h" #include "base/compiler_specific.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_context.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" namespace { diff --git a/ui/gfx/gl/gl_fence.h b/ui/gl/gl_fence.h index c901707..62a7116 100644 --- a/ui/gfx/gl/gl_fence.h +++ b/ui/gl/gl_fence.h @@ -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. -#ifndef UI_GFX_GL_GL_FENCE_H_ -#define UI_GFX_GL_GL_FENCE_H_ +#ifndef UI_GL_GL_FENCE_H_ +#define UI_GL_GL_FENCE_H_ +#pragma once #include "base/basictypes.h" -#include "base/memory/ref_counted.h" -#include "ui/gfx/gl/gl_export.h" +#include "ui/gl/gl_export.h" namespace gfx { @@ -28,4 +28,4 @@ class GL_EXPORT GLFence { } // namespace gfx -#endif // UI_GFX_GL_GL_FENCE_H_ +#endif // UI_GL_GL_FENCE_H_ diff --git a/ui/gfx/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc index d225d57..0a10f22 100644 --- a/ui/gfx/gl/gl_implementation.cc +++ b/ui/gl/gl_implementation.cc @@ -1,8 +1,8 @@ -// 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 "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_implementation.h" #include <algorithm> #include <string> diff --git a/ui/gfx/gl/gl_implementation.h b/ui/gl/gl_implementation.h index cd27dff..9ee1f2d 100644 --- a/ui/gfx/gl/gl_implementation.h +++ b/ui/gl/gl_implementation.h @@ -1,9 +1,9 @@ -// 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. -#ifndef UI_GFX_GL_GL_IMPLEMENTATION_H_ -#define UI_GFX_GL_GL_IMPLEMENTATION_H_ +#ifndef UI_GL_GL_IMPLEMENTATION_H_ +#define UI_GL_GL_IMPLEMENTATION_H_ #pragma once #include <string> @@ -11,8 +11,8 @@ #include "base/native_library.h" #include "build/build_config.h" -#include "ui/gfx/gl/gl_export.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_export.h" +#include "ui/gl/gl_switches.h" namespace gfx { @@ -83,4 +83,4 @@ void* GetGLProcAddress(const char* name); } // namespace gfx -#endif // UI_GFX_GL_GL_IMPLEMENTATION_H_ +#endif // UI_GL_GL_IMPLEMENTATION_H_ diff --git a/ui/gfx/gl/gl_implementation_android.cc b/ui/gl/gl_implementation_android.cc index f1aa6dd..254c037 100644 --- a/ui/gfx/gl/gl_implementation_android.cc +++ b/ui/gl/gl_implementation_android.cc @@ -8,8 +8,8 @@ #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" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" namespace gfx { diff --git a/ui/gfx/gl/gl_implementation_linux.cc b/ui/gl/gl_implementation_linux.cc index 378321a..35f68ac 100644 --- a/ui/gfx/gl/gl_implementation_linux.cc +++ b/ui/gl/gl_implementation_linux.cc @@ -11,9 +11,9 @@ #include "base/native_library.h" #include "base/path_service.h" #include "base/threading/thread_restrictions.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_switches.h" namespace gfx { namespace { diff --git a/ui/gfx/gl/gl_implementation_mac.cc b/ui/gl/gl_implementation_mac.cc index c2ba2e2..f05e3eb9 100644 --- a/ui/gfx/gl/gl_implementation_mac.cc +++ b/ui/gl/gl_implementation_mac.cc @@ -1,16 +1,16 @@ -// 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 "base/base_paths.h" #include "base/file_path.h" #include "base/logging.h" -#include "base/threading/thread_restrictions.h" #include "base/mac/foundation_util.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" +#include "base/threading/thread_restrictions.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" namespace gfx { namespace { diff --git a/ui/gfx/gl/gl_implementation_win.cc b/ui/gl/gl_implementation_win.cc index 25122de..7625b20 100644 --- a/ui/gfx/gl/gl_implementation_win.cc +++ b/ui/gl/gl_implementation_win.cc @@ -16,8 +16,8 @@ #include "base/path_service.h" #include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" #if defined(ENABLE_SWIFTSHADER) #include "software_renderer.h" diff --git a/ui/gfx/gl/gl_interface.cc b/ui/gl/gl_interface.cc index a671973..0cb61e7 100644 --- a/ui/gfx/gl/gl_interface.cc +++ b/ui/gl/gl_interface.cc @@ -1,8 +1,8 @@ -// 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 "ui/gfx/gl/gl_interface.h" +#include "ui/gl/gl_interface.h" namespace gfx { diff --git a/ui/gfx/gl/gl_interface.h b/ui/gl/gl_interface.h index e5f1b46..db120b6 100644 --- a/ui/gfx/gl/gl_interface.h +++ b/ui/gl/gl_interface.h @@ -2,22 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#ifndef UI_GL_GL_INTERFACE_H_ +#define UI_GL_GL_INTERFACE_H_ +#pragma once + // This file implements glue to a GL interface so we can mock it for unit // testing. It has to be Desktop GL, not GLES2 as it is used to test the service // side code. -#ifndef UI_GFX_GL_GL_INTERFACE_H_ -#define UI_GFX_GL_GL_INTERFACE_H_ -#pragma once - -#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gl/gl_bindings.h" namespace gfx { class GL_EXPORT GLInterface { public: - virtual ~GLInterface() { - } + virtual ~GLInterface() {} static void SetGLInterface(GLInterface* gl_interface); @@ -638,4 +637,4 @@ class GL_EXPORT GLInterface { } // namespace gfx -#endif // UI_GFX_GL_GL_INTERFACE_H_ +#endif // UI_GL_GL_INTERFACE_H_ diff --git a/ui/gfx/gl/gl_share_group.cc b/ui/gl/gl_share_group.cc index 21c175e..8ab0cc7 100644 --- a/ui/gfx/gl/gl_share_group.cc +++ b/ui/gl/gl_share_group.cc @@ -1,10 +1,10 @@ -// 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 "ui/gfx/gl/gl_share_group.h" +#include "ui/gl/gl_share_group.h" -#include "ui/gfx/gl/gl_context.h" +#include "ui/gl/gl_context.h" namespace gfx { diff --git a/ui/gfx/gl/gl_share_group.h b/ui/gl/gl_share_group.h index 8df2fb2..2b39ba5 100644 --- a/ui/gfx/gl/gl_share_group.h +++ b/ui/gl/gl_share_group.h @@ -1,16 +1,16 @@ -// 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. -#ifndef UI_GFX_GL_GL_SHARE_GROUP_H_ -#define UI_GFX_GL_GL_SHARE_GROUP_H_ +#ifndef UI_GL_GL_SHARE_GROUP_H_ +#define UI_GL_GL_SHARE_GROUP_H_ #pragma once #include <set> #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "ui/gfx/gl/gl_export.h" +#include "ui/gl/gl_export.h" namespace gfx { @@ -36,15 +36,17 @@ class GL_EXPORT GLShareGroup : public base::RefCounted<GLShareGroup> { private: friend class base::RefCounted<GLShareGroup>; + ~GLShareGroup(); // References to GLContext are by raw pointer to avoid a reference count // cycle. typedef std::set<GLContext*> ContextSet; ContextSet contexts_; + DISALLOW_COPY_AND_ASSIGN(GLShareGroup); }; } // namespace gfx -#endif // UI_GFX_GL_GL_SHARE_GROUP_H_ +#endif // UI_GL_GL_SHARE_GROUP_H_ diff --git a/ui/gfx/gl/gl_surface.cc b/ui/gl/gl_surface.cc index 401ecb2..cc6c3b3 100644 --- a/ui/gfx/gl/gl_surface.cc +++ b/ui/gl/gl_surface.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 "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_surface.h" #include <algorithm> #include <vector> @@ -11,8 +11,8 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/threading/thread_local.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" namespace gfx { diff --git a/ui/gfx/gl/gl_surface.h b/ui/gl/gl_surface.h index 92a2d39..efa4f23 100644 --- a/ui/gfx/gl/gl_surface.h +++ b/ui/gl/gl_surface.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 UI_GFX_GL_GL_SURFACE_H_ -#define UI_GFX_GL_GL_SURFACE_H_ +#ifndef UI_GL_GL_SURFACE_H_ +#define UI_GL_GL_SURFACE_H_ #pragma once #include "base/memory/ref_counted.h" #include "build/build_config.h" -#include "ui/gfx/gl/gl_export.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_export.h" namespace gfx { @@ -114,6 +114,7 @@ class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> { private: friend class base::RefCounted<GLSurface>; friend class GLContext; + DISALLOW_COPY_AND_ASSIGN(GLSurface); }; @@ -147,9 +148,10 @@ class GL_EXPORT GLSurfaceAdapter : public GLSurface { private: scoped_refptr<GLSurface> surface_; + DISALLOW_COPY_AND_ASSIGN(GLSurfaceAdapter); }; } // namespace gfx -#endif // UI_GFX_GL_GL_SURFACE_H_ +#endif // UI_GL_GL_SURFACE_H_ diff --git a/ui/gfx/gl/gl_surface_android.cc b/ui/gl/gl_surface_android.cc index 7f66fd8..5500ba0 100644 --- a/ui/gfx/gl/gl_surface_android.cc +++ b/ui/gl/gl_surface_android.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/gl/gl_surface_android.h" +#include "ui/gl/gl_surface_android.h" #include <EGL/egl.h> #include "base/logging.h" #include "base/memory/ref_counted.h" -#include "ui/gfx/gl/egl_util.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/android_native_window.h" +#include "ui/gl/android_native_window.h" +#include "ui/gl/egl_util.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" namespace gfx { diff --git a/ui/gfx/gl/gl_surface_android.h b/ui/gl/gl_surface_android.h index d46d9fd..904274e 100644 --- a/ui/gfx/gl/gl_surface_android.h +++ b/ui/gl/gl_surface_android.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 UI_GFX_GL_GL_SURFACE_ANDROID_H_ -#define UI_GFX_GL_GL_SURFACE_ANDROID_H_ +#ifndef UI_GL_GL_SURFACE_ANDROID_H_ +#define UI_GL_GL_SURFACE_ANDROID_H_ #pragma once #include "base/memory/ref_counted.h" -#include "ui/gfx/gl/gl_surface_egl.h" +#include "ui/gl/gl_surface_egl.h" namespace gfx { @@ -33,6 +33,7 @@ class AndroidViewSurface : public NativeViewGLSurfaceEGL { private: bool CreateWindowSurface(AndroidNativeWindow* window); + scoped_refptr<PbufferGLSurfaceEGL> pbuffer_surface_; AndroidNativeWindow* window_; @@ -41,4 +42,4 @@ class AndroidViewSurface : public NativeViewGLSurfaceEGL { } // namespace gfx -#endif /* UI_GFX_GL_GL_SURFACE_ANDROID_H_ */ +#endif // UI_GL_GL_SURFACE_ANDROID_H_ diff --git a/ui/gfx/gl/gl_surface_cgl.cc b/ui/gl/gl_surface_cgl.cc index a453b5a..4f2fba2 100644 --- a/ui/gfx/gl/gl_surface_cgl.cc +++ b/ui/gl/gl_surface_cgl.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 "ui/gfx/gl/gl_surface_cgl.h" +#include "ui/gl/gl_surface_cgl.h" #include <OpenGL/CGLRenderers.h> #include "base/basictypes.h" #include "base/logging.h" #include "base/mac/mac_util.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" namespace gfx { diff --git a/ui/gfx/gl/gl_surface_cgl.h b/ui/gl/gl_surface_cgl.h index e6a6d06..00886cf 100644 --- a/ui/gfx/gl/gl_surface_cgl.h +++ b/ui/gl/gl_surface_cgl.h @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_GL_GL_SURFACE_CGL_H_ -#define UI_GFX_GL_GL_SURFACE_CGL_H_ +#ifndef UI_GL_GL_SURFACE_CGL_H_ +#define UI_GL_GL_SURFACE_CGL_H_ +#pragma once -#include "ui/gfx/gl/gl_surface.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_surface.h" namespace gfx { @@ -52,4 +53,4 @@ class GL_EXPORT NoOpGLSurfaceCGL : public GLSurfaceCGL { } // namespace gfx -#endif // UI_GFX_GL_GL_SURFACE_CGL_H_ +#endif // UI_GL_GL_SURFACE_CGL_H_ diff --git a/ui/gfx/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc index 99a689b..f3d3e0f 100644 --- a/ui/gfx/gl/gl_surface_egl.cc +++ b/ui/gl/gl_surface_egl.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 "ui/gfx/gl/gl_surface_egl.h" +#include "ui/gl/gl_surface_egl.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -12,8 +12,8 @@ #include "third_party/angle/include/EGL/egl.h" #include "third_party/angle/include/EGL/eglext.h" #endif -#include "ui/gfx/gl/egl_util.h" -#include "ui/gfx/gl/gl_context.h" +#include "ui/gl/egl_util.h" +#include "ui/gl/gl_context.h" #if defined(OS_ANDROID) #include <EGL/egl.h> @@ -21,7 +21,7 @@ // This header must come after the above third-party include, as // it brings in #defines that cause conflicts. -#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gl/gl_bindings.h" #if defined(USE_X11) extern "C" { diff --git a/ui/gfx/gl/gl_surface_egl.h b/ui/gl/gl_surface_egl.h index a4a010b..423ef06 100644 --- a/ui/gfx/gl/gl_surface_egl.h +++ b/ui/gl/gl_surface_egl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_GL_GL_SURFACE_EGL_H_ -#define UI_GFX_GL_GL_SURFACE_EGL_H_ +#ifndef UI_GL_GL_SURFACE_EGL_H_ +#define UI_GL_GL_SURFACE_EGL_H_ #pragma once #if defined(OS_WIN) @@ -11,9 +11,9 @@ #endif #include "base/compiler_specific.h" -#include "ui/gfx/gl/gl_surface.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_surface.h" typedef void* EGLConfig; typedef void* EGLDisplay; @@ -103,4 +103,4 @@ class GL_EXPORT PbufferGLSurfaceEGL : public GLSurfaceEGL { } // namespace gfx -#endif // UI_GFX_GL_GL_SURFACE_EGL_H_ +#endif // UI_GL_GL_SURFACE_EGL_H_ diff --git a/ui/gfx/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc index 1440e5c..ba8ce92 100644 --- a/ui/gfx/gl/gl_surface_glx.cc +++ b/ui/gl/gl_surface_glx.cc @@ -6,7 +6,7 @@ extern "C" { #include <X11/Xlib.h> } -#include "ui/gfx/gl/gl_surface_glx.h" +#include "ui/gl/gl_surface_glx.h" #include "base/basictypes.h" #include "base/logging.h" @@ -15,8 +15,8 @@ extern "C" { #include "base/process_util.h" #include "third_party/mesa/MesaLib/include/GL/osmesa.h" #include "ui/base/x/x11_util.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" namespace gfx { diff --git a/ui/gfx/gl/gl_surface_glx.h b/ui/gl/gl_surface_glx.h index bad9cd7..ac4655e 100644 --- a/ui/gfx/gl/gl_surface_glx.h +++ b/ui/gl/gl_surface_glx.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_GL_GL_SURFACE_GLX_H_ -#define UI_GFX_GL_GL_SURFACE_GLX_H_ - -#include "ui/gfx/gl/gl_surface.h" +#ifndef UI_GL_GL_SURFACE_GLX_H_ +#define UI_GL_GL_SURFACE_GLX_H_ +#pragma once #include "base/compiler_specific.h" #include "ui/base/x/x11_util.h" -#include "ui/gfx/gl/gl_export.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_export.h" +#include "ui/gl/gl_surface.h" namespace gfx { @@ -66,6 +66,7 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX { private: void* config_; gfx::Size size_; + DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX); }; @@ -88,9 +89,10 @@ class GL_EXPORT PbufferGLSurfaceGLX : public GLSurfaceGLX { gfx::Size size_; void* config_; XID pbuffer_; + DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX); }; } // namespace gfx -#endif // UI_GFX_GL_GL_SURFACE_GLX_H_ +#endif // UI_GL_GL_SURFACE_GLX_H_ diff --git a/ui/gfx/gl/gl_surface_linux.cc b/ui/gl/gl_surface_linux.cc index 23164b9..a7dbdf0 100644 --- a/ui/gfx/gl/gl_surface_linux.cc +++ b/ui/gl/gl_surface_linux.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_surface.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "third_party/mesa/MesaLib/include/GL/osmesa.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_egl.h" -#include "ui/gfx/gl/gl_surface_glx.h" -#include "ui/gfx/gl/gl_surface_osmesa.h" -#include "ui/gfx/gl/gl_surface_stub.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_egl.h" +#include "ui/gl/gl_surface_glx.h" +#include "ui/gl/gl_surface_osmesa.h" +#include "ui/gl/gl_surface_stub.h" namespace gfx { diff --git a/ui/gfx/gl/gl_surface_mac.cc b/ui/gl/gl_surface_mac.cc index 30ad6b7..0431628 100644 --- a/ui/gfx/gl/gl_surface_mac.cc +++ b/ui/gl/gl_surface_mac.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_surface.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "third_party/mesa/MesaLib/include/GL/osmesa.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_cgl.h" -#include "ui/gfx/gl/gl_surface_osmesa.h" -#include "ui/gfx/gl/gl_surface_stub.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_cgl.h" +#include "ui/gl/gl_surface_osmesa.h" +#include "ui/gl/gl_surface_stub.h" #if defined(USE_AURA) -#include "ui/gfx/gl/gl_surface_nsview.h" +#include "ui/gl/gl_surface_nsview.h" #endif namespace gfx { diff --git a/ui/gfx/gl/gl_surface_nsview.h b/ui/gl/gl_surface_nsview.h index 67b4e26..440458b 100644 --- a/ui/gfx/gl/gl_surface_nsview.h +++ b/ui/gl/gl_surface_nsview.h @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_GL_GL_SURFACE_NSVIEW_H_ -#define UI_GFX_GL_GL_SURFACE_NSVIEW_H_ +#ifndef UI_GL_GL_SURFACE_NSVIEW_H_ +#define UI_GL_GL_SURFACE_NSVIEW_H_ +#pragma once #include "base/compiler_specific.h" -#include "ui/gfx/gl/gl_surface.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_surface.h" namespace gfx { @@ -43,4 +44,4 @@ class GLSurfaceNSView : public GLSurface { } // namespace gfx -#endif // UI_GFX_GL_GL_SURFACE_NSVIEW_H_ +#endif // UI_GL_GL_SURFACE_NSVIEW_H_ diff --git a/ui/gfx/gl/gl_surface_nsview.mm b/ui/gl/gl_surface_nsview.mm index 455be56..ded0719 100644 --- a/ui/gfx/gl/gl_surface_nsview.mm +++ b/ui/gl/gl_surface_nsview.mm @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/gl/gl_surface_nsview.h" +#include "ui/gl/gl_surface_nsview.h" #import <AppKit/NSOpenGL.h> #import <AppKit/NSView.h> -#include "ui/gfx/gl/gl_context_nsview.h" +#include "ui/gl/gl_context_nsview.h" namespace gfx { diff --git a/ui/gfx/gl/gl_surface_osmesa.cc b/ui/gl/gl_surface_osmesa.cc index f416432..a1fd360 100644 --- a/ui/gfx/gl/gl_surface_osmesa.cc +++ b/ui/gl/gl_surface_osmesa.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/gl/gl_surface_osmesa.h" #include "base/logging.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_context.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface_osmesa.h" namespace gfx { diff --git a/ui/gfx/gl/gl_surface_osmesa.h b/ui/gl/gl_surface_osmesa.h index 8d8c224..ab3feec 100644 --- a/ui/gfx/gl/gl_surface_osmesa.h +++ b/ui/gl/gl_surface_osmesa.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_GL_GL_SURFACE_OSMESA_H_ -#define UI_GFX_GL_GL_SURFACE_OSMESA_H_ +#ifndef UI_GL_GL_SURFACE_OSMESA_H_ +#define UI_GL_GL_SURFACE_OSMESA_H_ #pragma once #include "base/memory/scoped_ptr.h" -#include "ui/gfx/gl/gl_surface.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_surface.h" namespace gfx { @@ -42,4 +42,4 @@ class GL_EXPORT GLSurfaceOSMesa : public GLSurface { } // namespace gfx -#endif // UI_GFX_GL_GL_SURFACE_OSMESA_H_ +#endif // UI_GL_GL_SURFACE_OSMESA_H_ diff --git a/ui/gfx/gl/gl_surface_stub.cc b/ui/gl/gl_surface_stub.cc index 15ec1b2..a27d2af 100644 --- a/ui/gfx/gl/gl_surface_stub.cc +++ b/ui/gl/gl_surface_stub.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 "ui/gfx/gl/gl_surface_stub.h" +#include "ui/gl/gl_surface_stub.h" namespace gfx { diff --git a/ui/gfx/gl/gl_surface_stub.h b/ui/gl/gl_surface_stub.h index 404d699..86bbd15 100644 --- a/ui/gfx/gl/gl_surface_stub.h +++ b/ui/gl/gl_surface_stub.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_GL_GL_SURFACE_STUB_H_ -#define UI_GFX_GL_GL_SURFACE_STUB_H_ +#ifndef UI_GL_GL_SURFACE_STUB_H_ +#define UI_GL_GL_SURFACE_STUB_H_ #pragma once -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_surface.h" namespace gfx { @@ -31,4 +31,4 @@ class GL_EXPORT GLSurfaceStub : public GLSurface { } // namespace gfx -#endif // UI_GFX_GL_GL_SURFACE_STUB_H_ +#endif // UI_GL_GL_SURFACE_STUB_H_ diff --git a/ui/gfx/gl/gl_surface_wgl.cc b/ui/gl/gl_surface_wgl.cc index 3d7571d..a72c825 100644 --- a/ui/gfx/gl/gl_surface_wgl.cc +++ b/ui/gl/gl_surface_wgl.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/gl/gl_surface_wgl.h" +#include "ui/gl/gl_surface_wgl.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "ui/gfx/gl/gl_bindings.h" +#include "ui/gl/gl_bindings.h" namespace gfx { diff --git a/ui/gfx/gl/gl_surface_wgl.h b/ui/gl/gl_surface_wgl.h index 4082a26..6e4f0cd 100644 --- a/ui/gfx/gl/gl_surface_wgl.h +++ b/ui/gl/gl_surface_wgl.h @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_GL_GL_SURFACE_WGL_H_ -#define UI_GFX_GL_GL_SURFACE_WGL_H_ +#ifndef UI_GL_GL_SURFACE_WGL_H_ +#define UI_GL_GL_SURFACE_WGL_H_ +#pragma once -#include "ui/gfx/gl/gl_surface.h" #include "ui/gfx/native_widget_types.h" +#include "ui/gl/gl_surface.h" namespace gfx { @@ -73,4 +74,4 @@ class PbufferGLSurfaceWGL : public GLSurfaceWGL { } // namespace gfx -#endif // UI_GFX_GL_GL_SURFACE_WGL_H_ +#endif // UI_GL_GL_SURFACE_WGL_H_ diff --git a/ui/gfx/gl/gl_surface_win.cc b/ui/gl/gl_surface_win.cc index 73f074d..ae55568 100644 --- a/ui/gfx/gl/gl_surface_win.cc +++ b/ui/gl/gl_surface_win.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_surface.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "third_party/mesa/MesaLib/include/GL/osmesa.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_egl.h" -#include "ui/gfx/gl/gl_surface_osmesa.h" -#include "ui/gfx/gl/gl_surface_stub.h" -#include "ui/gfx/gl/gl_surface_wgl.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_egl.h" +#include "ui/gl/gl_surface_osmesa.h" +#include "ui/gl/gl_surface_stub.h" +#include "ui/gl/gl_surface_wgl.h" namespace gfx { diff --git a/ui/gfx/gl/gl_switches.cc b/ui/gl/gl_switches.cc index 0e29f33..d30c958 100644 --- a/ui/gfx/gl/gl_switches.cc +++ b/ui/gl/gl_switches.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 "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" namespace gfx { diff --git a/ui/gfx/gl/gl_switches.h b/ui/gl/gl_switches.h index 922c58b..ffda704 100644 --- a/ui/gfx/gl/gl_switches.h +++ b/ui/gl/gl_switches.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Defines all the command-line switches used by ui/gfx/gl. - -#ifndef UI_GFX_GL_GL_SWITCHES_H_ -#define UI_GFX_GL_GL_SWITCHES_H_ +#ifndef UI_GL_GL_SWITCHES_H_ +#define UI_GL_GL_SWITCHES_H_ #pragma once -#include "ui/gfx/gl/gl_export.h" +// Defines all the command-line switches used by ui/gl. + +#include "ui/gl/gl_export.h" namespace gfx { @@ -36,4 +36,4 @@ GL_EXPORT extern const char kTestGLLib[]; } // namespace switches -#endif // UI_GFX_GL_GL_SWITCHES_H_ +#endif // UI_GL_GL_SWITCHES_H_ diff --git a/ui/gfx/gl/gpu_preference.h b/ui/gl/gpu_preference.h index 189ed3d..54f814a 100644 --- a/ui/gfx/gl/gpu_preference.h +++ b/ui/gl/gpu_preference.h @@ -1,9 +1,9 @@ -// 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. -#ifndef UI_GFX_GL_GPU_PREFERENCE_H_ -#define UI_GFX_GL_GPU_PREFERENCE_H_ +#ifndef UI_GL_GPU_PREFERENCE_H_ +#define UI_GL_GPU_PREFERENCE_H_ #pragma once namespace gfx { @@ -22,4 +22,4 @@ enum GpuPreference { } // namespace gfx -#endif // UI_GFX_GL_GPU_PREFERENCE_H_ +#endif // UI_GL_GPU_PREFERENCE_H_ diff --git a/ui/gfx/gl/scoped_make_current.cc b/ui/gl/scoped_make_current.cc index 6939861..54dac6d 100644 --- a/ui/gfx/gl/scoped_make_current.cc +++ b/ui/gl/scoped_make_current.cc @@ -1,8 +1,8 @@ -// 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 "ui/gfx/gl/scoped_make_current.h" +#include "ui/gl/scoped_make_current.h" #include "base/logging.h" diff --git a/ui/gfx/gl/scoped_make_current.h b/ui/gl/scoped_make_current.h index d0d74f7..3c336f3 100644 --- a/ui/gfx/gl/scoped_make_current.h +++ b/ui/gl/scoped_make_current.h @@ -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. -#ifndef UI_GFX_GL_SCOPED_MAKE_CURRENT_H_ -#define UI_GFX_GL_SCOPED_MAKE_CURRENT_H_ +#ifndef UI_GL_SCOPED_MAKE_CURRENT_H_ +#define UI_GL_SCOPED_MAKE_CURRENT_H_ #pragma once -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface.h" namespace gfx { @@ -24,10 +24,10 @@ class GL_EXPORT ScopedMakeCurrent { scoped_refptr<GLContext> context_; scoped_refptr<GLSurface> surface_; bool succeeded_; + DISALLOW_COPY_AND_ASSIGN(ScopedMakeCurrent); }; } // namespace gfx -#endif // UI_GFX_GL_SCOPED_MAKE_CURRENT_H_ - +#endif // UI_GL_SCOPED_MAKE_CURRENT_H_ diff --git a/ui/surface/accelerated_surface_mac.cc b/ui/surface/accelerated_surface_mac.cc index 5f2f12f..5714420 100644 --- a/ui/surface/accelerated_surface_mac.cc +++ b/ui/surface/accelerated_surface_mac.cc @@ -6,12 +6,12 @@ #include "base/logging.h" #include "base/mac/scoped_cftyperef.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_surface.h" -#include "ui/gfx/gl/scoped_make_current.h" #include "ui/gfx/rect.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" +#include "ui/gl/scoped_make_current.h" #include "ui/surface/io_surface_support_mac.h" AcceleratedSurface::AcceleratedSurface() diff --git a/ui/surface/accelerated_surface_mac.h b/ui/surface/accelerated_surface_mac.h index fc37640..73a90fc 100644 --- a/ui/surface/accelerated_surface_mac.h +++ b/ui/surface/accelerated_surface_mac.h @@ -11,11 +11,11 @@ #include "base/callback.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_ptr.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_surface.h" -#include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface.h" +#include "ui/gl/gpu_preference.h" #include "ui/surface/surface_export.h" #include "ui/surface/transport_dib.h" diff --git a/ui/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc index ee1b6c6..4f2bb0e 100644 --- a/ui/surface/accelerated_surface_win.cc +++ b/ui/surface/accelerated_surface_win.cc @@ -25,7 +25,7 @@ #include "base/tracked_objects.h" #include "base/win/wrapped_window_proc.h" #include "ui/base/win/hwnd_util.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" namespace { diff --git a/ui/surface/surface.gyp b/ui/surface/surface.gyp index af52fef..4858b54 100644 --- a/ui/surface/surface.gyp +++ b/ui/surface/surface.gyp @@ -24,7 +24,7 @@ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/skia/skia.gyp:skia', - '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', + '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', ], 'sources': [ diff --git a/webkit/DEPS b/webkit/DEPS index 1c45bea..5228326 100644 --- a/webkit/DEPS +++ b/webkit/DEPS @@ -24,6 +24,7 @@ include_rules = [ # For gpu/ "+ui/gfx", + "+ui/gl", "+gpu/command_buffer/client", "+gpu/command_buffer/common", "+gpu/command_buffer/service", diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 856888b..d2fca69 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -130,7 +130,7 @@ '<(DEPTH)/third_party/icu/icu.gyp:icui18n', '<(DEPTH)/third_party/icu/icu.gyp:icuuc', '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', - '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', + '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 86bee21..6693a04 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -24,19 +24,19 @@ #include "base/metrics/histogram.h" #include "base/string_tokenizer.h" #include "base/synchronization/lock.h" -#include "gpu/command_buffer/client/gles2_lib.h" #include "gpu/command_buffer/client/gles2_implementation.h" +#include "gpu/command_buffer/client/gles2_lib.h" #include "gpu/command_buffer/client/transfer_buffer.h" #include "gpu/command_buffer/common/constants.h" +#include "gpu/command_buffer/service/command_buffer_service.h" #include "gpu/command_buffer/service/context_group.h" #include "gpu/command_buffer/service/gpu_scheduler.h" -#include "gpu/command_buffer/service/command_buffer_service.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_share_group.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_share_group.h" +#include "ui/gl/gl_surface.h" #include "webkit/glue/gl_bindings_skia_cmd_buffer.h" using gpu::Buffer; diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc index 2f6c6da..a6ccfb4 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc @@ -11,17 +11,17 @@ #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/string_split.h" #include "base/memory/scoped_ptr.h" +#include "base/string_split.h" #include "base/synchronization/lock.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_bindings_skia_in_process.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_bindings_skia_in_process.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" namespace webkit { namespace gpu { diff --git a/webkit/gpu/webkit_gpu.gypi b/webkit/gpu/webkit_gpu.gypi index 8e76e89..a770c2a 100644 --- a/webkit/gpu/webkit_gpu.gypi +++ b/webkit/gpu/webkit_gpu.gypi @@ -16,7 +16,7 @@ '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_glsl', - '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', + '<(DEPTH)/ui/gl/gl.gyp:gl', ], 'include_dirs': [ '<(DEPTH)/skia/config', diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index 7b8cea7..276e7b0 100644 --- a/webkit/plugins/npapi/plugin_host.cc +++ b/webkit/plugins/npapi/plugin_host.cc @@ -14,12 +14,12 @@ #include "base/utf_string_conversions.h" #include "build/build_config.h" #include "net/base/net_util.h" -#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 "third_party/npapi/bindings/npruntime.h" #include "ui/base/ui_base_switches.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/plugin_instance.h" #include "webkit/plugins/npapi/plugin_lib.h" diff --git a/webkit/plugins/npapi/webplugin.h b/webkit/plugins/npapi/webplugin.h index 1c20d23..4c5d41c 100644 --- a/webkit/plugins/npapi/webplugin.h +++ b/webkit/plugins/npapi/webplugin.h @@ -9,9 +9,9 @@ #include <vector> #include "base/basictypes.h" -#include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" +#include "ui/gl/gpu_preference.h" #include "webkit/plugins/webkit_plugins_export.h" // TODO(port): this typedef is obviously incorrect on non-Windows diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index fa6fb30..738b748 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -45,9 +45,9 @@ #if defined(TOOLKIT_GTK) #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" #endif -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/fileapi/isolated_context.h" #include "webkit/glue/user_agent.h" @@ -55,8 +55,8 @@ #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkitplatformsupport_impl.h" #include "webkit/glue/weburlrequest_extradata_impl.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" #include "webkit/media/webmediaplayer_impl.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/webplugin_impl.h" diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 9752901..2d66087 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -28,8 +28,8 @@ #include "net/url_request/url_request_context.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_switches.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/window_open_disposition.h" diff --git a/webkit/tools/test_shell/test_shell_webkit_init.cc b/webkit/tools/test_shell/test_shell_webkit_init.cc index fb494ca..0d69802 100644 --- a/webkit/tools/test_shell/test_shell_webkit_init.cc +++ b/webkit/tools/test_shell/test_shell_webkit_init.cc @@ -13,7 +13,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" -#include "ui/gfx/gl/gl_bindings_skia_in_process.h" +#include "ui/gl/gl_bindings_skia_in_process.h" #include "v8/include/v8.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/webplugininfo.h" |