diff options
Diffstat (limited to 'content')
39 files changed, 68 insertions, 67 deletions
diff --git a/content/DEPS b/content/DEPS index 450d146..8936498 100644 --- a/content/DEPS +++ b/content/DEPS @@ -53,6 +53,7 @@ include_rules = [ "+ui/aura", "+ui/base", "+ui/gfx", + "+ui/surface", # Content knows about grd files, but the specifics of how to get a resource # given its id is left to the embedder. "-ui/base/l10n", diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index 66f152b..4900d2e 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -42,7 +42,7 @@ #endif #if defined(OS_WIN) && !defined(USE_AURA) -#include "ui/gfx/surface/accelerated_surface_win.h" +#include "ui/surface/accelerated_surface_win.h" #endif using content::BrowserThread; diff --git a/content/browser/renderer_host/accelerated_surface_container_mac.cc b/content/browser/renderer_host/accelerated_surface_container_mac.cc index 10b8292..40115e7 100644 --- a/content/browser/renderer_host/accelerated_surface_container_mac.cc +++ b/content/browser/renderer_host/accelerated_surface_container_mac.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "content/browser/renderer_host/accelerated_surface_container_manager_mac.h" -#include "ui/gfx/surface/io_surface_support_mac.h" +#include "ui/surface/io_surface_support_mac.h" #include "webkit/plugins/npapi/webplugin.h" AcceleratedSurfaceContainerMac::AcceleratedSurfaceContainerMac( diff --git a/content/browser/renderer_host/accelerated_surface_container_mac.h b/content/browser/renderer_host/accelerated_surface_container_mac.h index fab05ce..36204ff 100644 --- a/content/browser/renderer_host/accelerated_surface_container_mac.h +++ b/content/browser/renderer_host/accelerated_surface_container_mac.h @@ -34,7 +34,7 @@ #include "base/memory/scoped_ptr.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" namespace webkit { namespace npapi { diff --git a/content/browser/renderer_host/accelerated_surface_container_manager_mac.h b/content/browser/renderer_host/accelerated_surface_container_manager_mac.h index f7fb6ba..de2e344 100644 --- a/content/browser/renderer_host/accelerated_surface_container_manager_mac.h +++ b/content/browser/renderer_host/accelerated_surface_container_manager_mac.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/synchronization/lock.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" namespace gfx { class Rect; diff --git a/content/browser/renderer_host/backing_store.h b/content/browser/renderer_host/backing_store.h index 203f8de..580616a 100644 --- a/content/browser/renderer_host/backing_store.h +++ b/content/browser/renderer_host/backing_store.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. @@ -12,7 +12,7 @@ #include "base/callback_forward.h" #include "content/common/content_export.h" #include "ui/gfx/size.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" class RenderProcessHost; diff --git a/content/browser/renderer_host/backing_store_gtk.cc b/content/browser/renderer_host/backing_store_gtk.cc index d357968..4c235e4 100644 --- a/content/browser/renderer_host/backing_store_gtk.cc +++ b/content/browser/renderer_host/backing_store_gtk.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. @@ -16,9 +16,9 @@ #endif #include <algorithm> -#include <utility> #include <limits> #include <queue> +#include <utility> #include "base/compiler_specific.h" #include "base/logging.h" @@ -28,11 +28,11 @@ #include "content/browser/renderer_host/render_process_host_impl.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/gtk/gtk_signal.h" #include "ui/base/x/x11_util.h" #include "ui/base/x/x11_util_internal.h" -#include "ui/base/gtk/gtk_signal.h" #include "ui/gfx/rect.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" using content::RenderWidgetHost; diff --git a/content/browser/renderer_host/backing_store_mac.mm b/content/browser/renderer_host/backing_store_mac.mm index a7f46cf..42168e1 100644 --- a/content/browser/renderer_host/backing_store_mac.mm +++ b/content/browser/renderer_host/backing_store_mac.mm @@ -17,7 +17,7 @@ #include "third_party/skia/include/core/SkCanvas.h" #include "ui/gfx/rect.h" #include "ui/gfx/scoped_cg_context_save_gstate_mac.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" // Mac Backing Stores: // diff --git a/content/browser/renderer_host/backing_store_manager.h b/content/browser/renderer_host/backing_store_manager.h index 00f11e1..1282e66 100644 --- a/content/browser/renderer_host/backing_store_manager.h +++ b/content/browser/renderer_host/backing_store_manager.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. @@ -13,7 +13,7 @@ #include "base/process.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" class BackingStore; diff --git a/content/browser/renderer_host/backing_store_win.cc b/content/browser/renderer_host/backing_store_win.cc index 45e402e..631b24f 100644 --- a/content/browser/renderer_host/backing_store_win.cc +++ b/content/browser/renderer_host/backing_store_win.cc @@ -10,7 +10,7 @@ #include "content/public/common/content_switches.h" #include "skia/ext/platform_canvas.h" #include "ui/gfx/gdi_util.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" namespace { diff --git a/content/browser/renderer_host/compositing_iosurface_mac.mm b/content/browser/renderer_host/compositing_iosurface_mac.mm index 1786fb6..61133a7 100644 --- a/content/browser/renderer_host/compositing_iosurface_mac.mm +++ b/content/browser/renderer_host/compositing_iosurface_mac.mm @@ -14,7 +14,7 @@ #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/gfx/surface/io_surface_support_mac.h" +#include "ui/surface/io_surface_support_mac.h" #ifdef NDEBUG #define CHECK_GL_ERROR() diff --git a/content/browser/renderer_host/image_transport_client.h b/content/browser/renderer_host/image_transport_client.h index a3b40c7..0f01e0a 100644 --- a/content/browser/renderer_host/image_transport_client.h +++ b/content/browser/renderer_host/image_transport_client.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" namespace gfx { class Size; diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h index e9b151d..c3e7cdb 100644 --- a/content/browser/renderer_host/render_message_filter.h +++ b/content/browser/renderer_host/render_message_filter.h @@ -24,7 +24,7 @@ #include "media/base/channel_layout.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" #if defined(OS_MACOSX) #include "content/common/mac/font_loader.h" diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h index ef7e433..e559a5c 100644 --- a/content/browser/renderer_host/render_process_host_impl.h +++ b/content/browser/renderer_host/render_process_host_impl.h @@ -18,7 +18,7 @@ #include "content/common/content_export.h" #include "content/public/browser/render_process_host.h" #include "ipc/ipc_channel_proxy.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" class CommandLine; class GpuMessageFilter; diff --git a/content/browser/renderer_host/render_widget_helper.h b/content/browser/renderer_host/render_widget_helper.h index b2c4de5..b066979 100644 --- a/content/browser/renderer_host/render_widget_helper.h +++ b/content/browser/renderer_host/render_widget_helper.h @@ -20,7 +20,7 @@ #include "content/public/common/window_container_type.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" namespace IPC { class Message; diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index 155a2cfb..83f76a8 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/debug/trace_event.h" #include "base/logging.h" -#include "base/mac/mac_util.h" #include "base/mac/closure_blocks_leopard_compat.h" +#include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #import "base/mac/scoped_nsautorelease_pool.h" #import "base/memory/scoped_nsobject.h" @@ -49,7 +49,7 @@ #import "ui/base/cocoa/underlay_opengl_hosting_window.h" #include "ui/gfx/point.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" -#include "ui/gfx/surface/io_surface_support_mac.h" +#include "ui/surface/io_surface_support_mac.h" #include "webkit/glue/webaccessibility.h" #include "webkit/plugins/npapi/webplugin.h" diff --git a/content/browser/renderer_host/render_widget_host_view_win.h b/content/browser/renderer_host/render_widget_host_view_win.h index e117894..2ce5357 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.h +++ b/content/browser/renderer_host/render_widget_host_view_win.h @@ -27,8 +27,8 @@ #include "ui/base/win/ime_input.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" -#include "ui/gfx/surface/accelerated_surface_win.h" #include "ui/gfx/sys_color_change_listener.h" +#include "ui/surface/accelerated_surface_win.h" #include "webkit/glue/webcursor.h" class BackingStore; diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 05dafcd..fc024bf 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -58,14 +58,14 @@ #include "content/public/common/content_restriction.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" -#include "ui/base/ui_base_switches.h" -#include "ui/gfx/monitor.h" -#include "ui/gfx/screen.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_request_context_getter.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/ui_base_switches.h" +#include "ui/gfx/monitor.h" +#include "ui/gfx/screen.h" #include "webkit/glue/web_intent_data.h" #include "webkit/glue/webpreferences.h" @@ -77,7 +77,7 @@ #include "content/browser/web_contents/web_contents_view_gtk.h" #elif defined(OS_MACOSX) #include "content/browser/web_contents/web_contents_view_mac.h" -#include "ui/gfx/surface/io_surface_support_mac.h" +#include "ui/surface/io_surface_support_mac.h" #elif defined(OS_ANDROID) #include "content/browser/web_contents/web_contents_view_android.h" #endif diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h index 892c0d9..6a589fd 100644 --- a/content/common/gpu/gpu_command_buffer_stub.h +++ b/content/common/gpu/gpu_command_buffer_stub.h @@ -16,8 +16,8 @@ #include "base/observer_list.h" #include "content/common/content_export.h" #include "content/common/gpu/gpu_memory_allocation.h" -#include "content/common/gpu/media/gpu_video_decode_accelerator.h" #include "content/common/gpu/gpu_memory_allocation.h" +#include "content/common/gpu/media/gpu_video_decode_accelerator.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" @@ -29,10 +29,10 @@ #include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" #if defined(OS_MACOSX) -#include "ui/gfx/surface/accelerated_surface_mac.h" +#include "ui/surface/accelerated_surface_mac.h" #endif class GpuChannel; diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h index d921b3b..f6cd6cc 100644 --- a/content/common/gpu/gpu_messages.h +++ b/content/common/gpu/gpu_messages.h @@ -5,8 +5,8 @@ // Multiply-included message file, hence no include guard here, but see below // for a much smaller-than-usual include guard section. -#include <vector> #include <string> +#include <vector> #include "base/shared_memory.h" #include "content/common/content_export.h" @@ -23,7 +23,7 @@ #include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" #define IPC_MESSAGE_START GpuMsgStart diff --git a/content/common/gpu/image_transport_surface.h b/content/common/gpu/image_transport_surface.h index 9e1a05c..b437fcad 100644 --- a/content/common/gpu/image_transport_surface.h +++ b/content/common/gpu/image_transport_surface.h @@ -21,7 +21,7 @@ #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" class GpuChannelManager; class GpuCommandBufferStub; diff --git a/content/common/gpu/image_transport_surface_mac.cc b/content/common/gpu/image_transport_surface_mac.cc index ed9a4aa..5223ce1 100644 --- a/content/common/gpu/image_transport_surface_mac.cc +++ b/content/common/gpu/image_transport_surface_mac.cc @@ -9,12 +9,12 @@ #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_ptr.h" #include "content/common/gpu/gpu_messages.h" -#include "ui/gfx/gl/gl_context.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/gfx/surface/io_surface_support_mac.h" +#include "ui/surface/io_surface_support_mac.h" namespace { diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 99d6548..0fe3caa 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -15,7 +15,7 @@ '../third_party/speex/speex.gyp:libspeex', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../third_party/zlib/zlib.gyp:zlib', - '../ui/gfx/surface/surface.gyp:surface', + '../ui/surface/surface.gyp:surface', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', '../webkit/support/webkit_support.gyp:dom_storage', diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index b0a2037..b736f1c 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -16,7 +16,7 @@ '../third_party/libjingle/libjingle.gyp:libjingle_p2p', '../third_party/npapi/npapi.gyp:npapi', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', - '../ui/gfx/surface/surface.gyp:surface', + '../ui/surface/surface.gyp:surface', '../v8/tools/gyp/v8.gyp:v8', '../webkit/support/webkit_support.gyp:webkit_media', '../webkit/support/webkit_support.gyp:webkit_gpu', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index df47b5e0..5c9b46e 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -17,7 +17,7 @@ '../testing/gtest.gyp:gtest', '../third_party/libvpx/libvpx.gyp:libvpx', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', - '../ui/gfx/surface/surface.gyp:surface', + '../ui/surface/surface.gyp:surface', '../ui/ui.gyp:ui_test_support', '../webkit/support/webkit_support.gyp:appcache', ], diff --git a/content/plugin/webplugin_accelerated_surface_proxy_mac.cc b/content/plugin/webplugin_accelerated_surface_proxy_mac.cc index 65749f0..e891dbe 100644 --- a/content/plugin/webplugin_accelerated_surface_proxy_mac.cc +++ b/content/plugin/webplugin_accelerated_surface_proxy_mac.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. @@ -10,9 +10,9 @@ #include "base/command_line.h" #include "content/plugin/webplugin_proxy.h" #include "ui/base/ui_base_switches.h" -#include "ui/gfx/surface/accelerated_surface_mac.h" -#include "ui/gfx/surface/io_surface_support_mac.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/accelerated_surface_mac.h" +#include "ui/surface/io_surface_support_mac.h" +#include "ui/surface/transport_dib.h" WebPluginAcceleratedSurfaceProxy* WebPluginAcceleratedSurfaceProxy::Create( WebPluginProxy* plugin_proxy, diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h index cbf305a..b3d98fa 100644 --- a/content/plugin/webplugin_proxy.h +++ b/content/plugin/webplugin_proxy.h @@ -24,7 +24,7 @@ #include "ui/base/x/x11_util.h" #endif #include "ui/gfx/gl/gpu_preference.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" #include "webkit/plugins/npapi/webplugin.h" class PluginChannel; diff --git a/content/port/browser/render_widget_host_view_port.h b/content/port/browser/render_widget_host_view_port.h index 2c6b8cb..e30fc3f 100644 --- a/content/port/browser/render_widget_host_view_port.h +++ b/content/port/browser/render_widget_host_view_port.h @@ -13,8 +13,8 @@ #include "content/public/browser/render_widget_host_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" #include "ui/base/ime/text_input_type.h" -#include "ui/gfx/surface/transport_dib.h" #include "ui/base/range/range.h" +#include "ui/surface/transport_dib.h" class BackingStore; class WebCursor; diff --git a/content/public/browser/render_process_host.h b/content/public/browser/render_process_host.h index 194aa30..99ddab6 100644 --- a/content/public/browser/render_process_host.h +++ b/content/public/browser/render_process_host.h @@ -13,7 +13,7 @@ #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_message.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" class GURL; struct ViewMsg_SwapOut_Params; diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h index e4b7bd1..1bfd50c 100644 --- a/content/public/browser/render_widget_host.h +++ b/content/public/browser/render_widget_host.h @@ -14,7 +14,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" #include "ui/gfx/size.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" #if defined(TOOLKIT_GTK) #include "ui/base/x/x11_util.h" diff --git a/content/public/common/common_param_traits.h b/content/public/common/common_param_traits.h index 3c3182c..36417db 100644 --- a/content/public/common/common_param_traits.h +++ b/content/public/common/common_param_traits.h @@ -26,7 +26,7 @@ #include "net/url_request/url_request_status.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" #include "webkit/glue/resource_type.h" class SkBitmap; diff --git a/content/renderer/pepper/pepper_platform_image_2d_impl.cc b/content/renderer/pepper/pepper_platform_image_2d_impl.cc index a609ae8..ffea778 100644 --- a/content/renderer/pepper/pepper_platform_image_2d_impl.cc +++ b/content/renderer/pepper/pepper_platform_image_2d_impl.cc @@ -7,7 +7,7 @@ #include "build/build_config.h" #include "content/common/view_messages.h" #include "content/renderer/render_thread_impl.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" namespace content { diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc index ca56ce6..4eec091 100644 --- a/content/renderer/render_process_impl.cc +++ b/content/renderer/render_process_impl.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "content/renderer/render_process_impl.h" + #include "build/build_config.h" #if defined(OS_WIN) @@ -10,8 +12,6 @@ #include <mlang.h> #endif -#include "content/renderer/render_process_impl.h" - #include "base/basictypes.h" #include "base/command_line.h" #include "base/compiler_specific.h" @@ -25,10 +25,10 @@ #include "ipc/ipc_channel.h" #include "ipc/ipc_message_utils.h" #include "skia/ext/platform_canvas.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" +#include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/plugin_instance.h" #include "webkit/plugins/npapi/plugin_lib.h" -#include "webkit/glue/webkit_glue.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index 8030060..8e5522a 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -31,24 +31,24 @@ #include "content/public/common/stop_find_action.h" #include "content/public/renderer/render_view.h" #include "content/renderer/pepper/pepper_plugin_delegate_impl.h" -#include "content/renderer/renderer_webcookiejar_impl.h" #include "content/renderer/render_view_selection.h" #include "content/renderer/render_widget.h" +#include "content/renderer/renderer_webcookiejar_impl.h" #include "ipc/ipc_platform_file.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIconURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationType.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageVisibilityState.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationType.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" #include "ui/base/javascript_message_type.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" #include "webkit/glue/webpreferences.h" #include "webkit/media/webmediaplayer_delegate.h" #include "webkit/plugins/npapi/webplugin_page_delegate.h" diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 3ec1865..ed8eb0c 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -23,31 +23,31 @@ #include "content/renderer/renderer_webkitplatformsupport_impl.h" #include "ipc/ipc_sync_message.h" #include "skia/ext/platform_canvas.h" -#include "third_party/skia/include/core/SkShader.h" -#include "third_party/skia/include/effects/SkTableColorFilter.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPagePopup.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenuInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" #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/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/webplugin.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" #if defined(OS_POSIX) #include "ipc/ipc_channel_posix.h" -#include "third_party/skia/include/core/SkPixelRef.h" #include "third_party/skia/include/core/SkMallocPixelRef.h" +#include "third_party/skia/include/core/SkPixelRef.h" #endif // defined(OS_POSIX) #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index ffc0b8b..00ea03c 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h @@ -20,15 +20,15 @@ #include "ipc/ipc_channel.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidgetClient.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/ime/text_input_type.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" #include "webkit/glue/webcursor.h" struct ViewHostMsg_UpdateRect_Params; diff --git a/content/renderer/webplugin_delegate_proxy.h b/content/renderer/webplugin_delegate_proxy.h index 9d76001..2fb046f 100644 --- a/content/renderer/webplugin_delegate_proxy.h +++ b/content/renderer/webplugin_delegate_proxy.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. @@ -18,7 +18,7 @@ #include "ipc/ipc_message.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" #include "webkit/plugins/npapi/webplugin_delegate.h" #include "webkit/plugins/webplugininfo.h" diff --git a/content/test/mock_render_process.cc b/content/test/mock_render_process.cc index 3b2d03f..830f5b4 100644 --- a/content/test/mock_render_process.cc +++ b/content/test/mock_render_process.cc @@ -5,7 +5,7 @@ #include "content/test/mock_render_process.h" #include "ui/gfx/rect.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" MockRenderProcess::MockRenderProcess() : transport_dib_next_sequence_number_(0), diff --git a/content/test/render_widget_browsertest.cc b/content/test/render_widget_browsertest.cc index f9f034a..aff788a 100644 --- a/content/test/render_widget_browsertest.cc +++ b/content/test/render_widget_browsertest.cc @@ -17,7 +17,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/size.h" -#include "ui/gfx/surface/transport_dib.h" +#include "ui/surface/transport_dib.h" const int RenderWidgetTest::kNumBytesPerPixel = 4; const int RenderWidgetTest::kLargeWidth = 1024; |