diff options
Diffstat (limited to 'webkit')
48 files changed, 74 insertions, 74 deletions
diff --git a/webkit/DEPS b/webkit/DEPS index 68119e4..6a2d299 100644 --- a/webkit/DEPS +++ b/webkit/DEPS @@ -8,10 +8,10 @@ skip_child_includes = [ include_rules = [ # For bridge/c/c_utility.h in npruntime_util.cc "+bridge", - "+gfx", "+grit", # For generated headers "+third_party/sqlite", "+third_party/tcmalloc", + "+ui/gfx", # For databases/ "+app/sql", diff --git a/webkit/glue/image_decoder.h b/webkit/glue/image_decoder.h index 62d9253..b19c8ef 100644 --- a/webkit/glue/image_decoder.h +++ b/webkit/glue/image_decoder.h @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "gfx/size.h" +#include "ui/gfx/size.h" class SkBitmap; diff --git a/webkit/glue/image_resource_fetcher.cc b/webkit/glue/image_resource_fetcher.cc index b6f6620..65d80bd 100644 --- a/webkit/glue/image_resource_fetcher.cc +++ b/webkit/glue/image_resource_fetcher.cc @@ -5,8 +5,8 @@ #include "webkit/glue/image_resource_fetcher.h" #include "base/callback.h" -#include "gfx/size.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "ui/gfx/size.h" #include "webkit/glue/image_decoder.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/webkit/glue/media/video_renderer_impl.h b/webkit/glue/media/video_renderer_impl.h index 65396b1..b73c099 100644 --- a/webkit/glue/media/video_renderer_impl.h +++ b/webkit/glue/media/video_renderer_impl.h @@ -10,13 +10,13 @@ #ifndef WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_ #define WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_ -#include "gfx/rect.h" -#include "gfx/size.h" #include "media/base/buffers.h" #include "media/base/filters.h" #include "media/filters/video_renderer_base.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" #include "webkit/glue/media/web_video_renderer.h" #include "webkit/glue/webmediaplayer_impl.h" diff --git a/webkit/glue/web_io_operators.cc b/webkit/glue/web_io_operators.cc index b298ae9..c053863 100644 --- a/webkit/glue/web_io_operators.cc +++ b/webkit/glue/web_io_operators.cc @@ -4,10 +4,10 @@ #include "webkit/glue/web_io_operators.h" -#include "gfx/point.h" -#include "gfx/rect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" #if defined(WCHAR_T_IS_UTF32) #include "base/string16.h" diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h index daad15f..8fb6b9f 100644 --- a/webkit/glue/webcursor.h +++ b/webkit/glue/webcursor.h @@ -6,9 +6,9 @@ #define WEBKIT_GLUE_WEBCURSOR_H_ #include "base/basictypes.h" -#include "gfx/native_widget_types.h" -#include "gfx/point.h" -#include "gfx/size.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/point.h" +#include "ui/gfx/size.h" #include <vector> diff --git a/webkit/glue/webcursor_gtk.cc b/webkit/glue/webcursor_gtk.cc index 40dcd83..ca3555a 100644 --- a/webkit/glue/webcursor_gtk.cc +++ b/webkit/glue/webcursor_gtk.cc @@ -8,8 +8,8 @@ #include <gtk/gtk.h> #include "base/logging.h" -#include "gfx/gtk_util.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "ui/gfx/gtk_util.h" using WebKit::WebCursorInfo; diff --git a/webkit/glue/webcursor_win.cc b/webkit/glue/webcursor_win.cc index a0312aa..3399c7c 100644 --- a/webkit/glue/webcursor_win.cc +++ b/webkit/glue/webcursor_win.cc @@ -4,10 +4,10 @@ #include "base/logging.h" #include "base/pickle.h" -#include "gfx/gdi_util.h" #include "grit/webkit_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "ui/gfx/gdi_util.h" #include "webkit/glue/webcursor.h" using WebKit::WebCursorInfo; diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h index d388aef..cfc200f 100644 --- a/webkit/glue/webmediaplayer_impl.h +++ b/webkit/glue/webmediaplayer_impl.h @@ -59,14 +59,14 @@ #include "base/threading/thread.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "gfx/rect.h" -#include "gfx/size.h" #include "media/base/filters.h" #include "media/base/message_loop_factory.h" #include "media/base/pipeline.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" class GURL; diff --git a/webkit/glue/webthemeengine_impl_linux.cc b/webkit/glue/webthemeengine_impl_linux.cc index 067b203..6d9fc5b 100644 --- a/webkit/glue/webthemeengine_impl_linux.cc +++ b/webkit/glue/webthemeengine_impl_linux.cc @@ -4,10 +4,10 @@ #include "webkit/glue/webthemeengine_impl_linux.h" -#include "gfx/native_theme_linux.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#include "ui/gfx/native_theme_linux.h" using WebKit::WebCanvas; using WebKit::WebColor; diff --git a/webkit/glue/webthemeengine_impl_win.cc b/webkit/glue/webthemeengine_impl_win.cc index 0b9cbf8..a6344b6 100644 --- a/webkit/glue/webthemeengine_impl_win.cc +++ b/webkit/glue/webthemeengine_impl_win.cc @@ -4,10 +4,10 @@ #include "webkit/glue/webthemeengine_impl_win.h" -#include "gfx/native_theme_win.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/skia_utils_win.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" +#include "ui/gfx/native_theme_win.h" using WebKit::WebCanvas; using WebKit::WebColor; diff --git a/webkit/plugins/npapi/gtk_plugin_container_manager.cc b/webkit/plugins/npapi/gtk_plugin_container_manager.cc index 5b9876a..1c84bfb 100644 --- a/webkit/plugins/npapi/gtk_plugin_container_manager.cc +++ b/webkit/plugins/npapi/gtk_plugin_container_manager.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/logging.h" -#include "gfx/gtk_util.h" +#include "ui/gfx/gtk_util.h" #include "webkit/plugins/npapi/gtk_plugin_container.h" #include "webkit/plugins/npapi/webplugin.h" diff --git a/webkit/plugins/npapi/gtk_plugin_container_manager.h b/webkit/plugins/npapi/gtk_plugin_container_manager.h index c95d2c3..3152bc7 100644 --- a/webkit/plugins/npapi/gtk_plugin_container_manager.h +++ b/webkit/plugins/npapi/gtk_plugin_container_manager.h @@ -8,7 +8,7 @@ #include <gtk/gtk.h> #include <map> -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" typedef struct _GtkWidget GtkWidget; diff --git a/webkit/plugins/npapi/plugin_instance.h b/webkit/plugins/npapi/plugin_instance.h index 1161391..a30303f 100644 --- a/webkit/plugins/npapi/plugin_instance.h +++ b/webkit/plugins/npapi/plugin_instance.h @@ -17,12 +17,12 @@ #include "base/file_path.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "gfx/native_widget_types.h" -#include "gfx/point.h" -#include "gfx/rect.h" #include "googleurl/src/gurl.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/nphostapi.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" class MessageLoop; diff --git a/webkit/plugins/npapi/quickdraw_drawing_manager_mac.h b/webkit/plugins/npapi/quickdraw_drawing_manager_mac.h index 02d04d9..d574607 100644 --- a/webkit/plugins/npapi/quickdraw_drawing_manager_mac.h +++ b/webkit/plugins/npapi/quickdraw_drawing_manager_mac.h @@ -9,7 +9,7 @@ #import <Carbon/Carbon.h> -#include "gfx/rect.h" +#include "ui/gfx/rect.h" namespace webkit { namespace npapi { diff --git a/webkit/plugins/npapi/webplugin.h b/webkit/plugins/npapi/webplugin.h index afd2865..faf9a70 100644 --- a/webkit/plugins/npapi/webplugin.h +++ b/webkit/plugins/npapi/webplugin.h @@ -9,8 +9,8 @@ #include <vector> #include "base/basictypes.h" -#include "gfx/native_widget_types.h" -#include "gfx/rect.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/rect.h" // TODO(port): this typedef is obviously incorrect on non-Windows // platforms, but now a lot of code now accidentally depends on them diff --git a/webkit/plugins/npapi/webplugin_accelerated_surface_mac.h b/webkit/plugins/npapi/webplugin_accelerated_surface_mac.h index d26d523..5c528f3 100644 --- a/webkit/plugins/npapi/webplugin_accelerated_surface_mac.h +++ b/webkit/plugins/npapi/webplugin_accelerated_surface_mac.h @@ -6,8 +6,8 @@ #define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_ACCELERATED_SURFACE_MAC_H_ #pragma once -#include "gfx/native_widget_types.h" -#include "gfx/size.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/size.h" // Avoid having to include OpenGL headers here. typedef struct _CGLContextObject* CGLContextObj; diff --git a/webkit/plugins/npapi/webplugin_delegate.h b/webkit/plugins/npapi/webplugin_delegate.h index 41a0e3d..8412711 100644 --- a/webkit/plugins/npapi/webplugin_delegate.h +++ b/webkit/plugins/npapi/webplugin_delegate.h @@ -10,10 +10,10 @@ #include "base/string16.h" #include "build/build_config.h" -#include "gfx/native_widget_types.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npapi_extensions.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h" +#include "ui/gfx/native_widget_types.h" #include "webkit/plugins/npapi/webplugin_2d_device_delegate.h" #include "webkit/plugins/npapi/webplugin_3d_device_delegate.h" #include "webkit/plugins/npapi/webplugin_audio_device_delegate.h" diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h index edb319e..4fc5531 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl.h +++ b/webkit/plugins/npapi/webplugin_delegate_impl.h @@ -14,9 +14,9 @@ #include "base/time.h" #include "base/timer.h" #include "build/build_config.h" -#include "gfx/native_widget_types.h" -#include "gfx/rect.h" #include "third_party/npapi/bindings/npapi.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/rect.h" #include "webkit/plugins/npapi/webplugin_delegate.h" #include "webkit/glue/webcursor.h" diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc b/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc index adf5971..8e6d766 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc @@ -16,10 +16,10 @@ #include "base/process_util.h" #include "base/metrics/stats_counters.h" #include "base/string_util.h" -#include "gfx/blit.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "ui/gfx/blit.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/gtk_plugin_container.h" #include "webkit/plugins/npapi/plugin_constants_win.h" diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc index b43b7bd..51128da 100644 --- a/webkit/plugins/npapi/webplugin_impl.cc +++ b/webkit/plugins/npapi/webplugin_impl.cc @@ -10,7 +10,6 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" -#include "gfx/rect.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/net_errors.h" @@ -37,6 +36,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/gfx/rect.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/glue/multipart_response_delegate.h" #include "webkit/plugins/npapi/plugin_host.h" diff --git a/webkit/plugins/npapi/webplugin_impl.h b/webkit/plugins/npapi/webplugin_impl.h index 5d8c767..3476a0e 100644 --- a/webkit/plugins/npapi/webplugin_impl.h +++ b/webkit/plugins/npapi/webplugin_impl.h @@ -13,7 +13,6 @@ #include "base/file_path.h" #include "base/task.h" #include "base/weak_ptr.h" -#include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" @@ -21,6 +20,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" +#include "ui/gfx/native_widget_types.h" #include "webkit/plugins/npapi/webplugin.h" class WebViewDelegate; diff --git a/webkit/plugins/npapi/webplugin_page_delegate.h b/webkit/plugins/npapi/webplugin_page_delegate.h index 15aa730..7cc0200 100644 --- a/webkit/plugins/npapi/webplugin_page_delegate.h +++ b/webkit/plugins/npapi/webplugin_page_delegate.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_PAGE_DELEGATE_ #define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_PAGE_DELEGATE_ -#include "gfx/native_widget_types.h" +#include "ui/gfx/native_widget_types.h" class FilePath; class GURL; diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h index 8f36c3d..32bc025 100644 --- a/webkit/plugins/ppapi/plugin_delegate.h +++ b/webkit/plugins/ppapi/plugin_delegate.h @@ -12,12 +12,12 @@ #include "base/ref_counted.h" #include "base/shared_memory.h" #include "base/sync_socket.h" -#include "gfx/size.h" #include "googleurl/src/gurl.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_stdint.h" +#include "ui/gfx/size.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/plugins/ppapi/dir_contents.h" diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 7ab4713..9e673168 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -8,8 +8,6 @@ #include "base/metrics/histogram.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" -#include "gfx/rect.h" -#include "gfx/skia_util.h" #include "ppapi/c/dev/ppb_find_dev.h" #include "ppapi/c/dev/ppb_fullscreen_dev.h" #include "ppapi/c/dev/ppb_zoom_dev.h" @@ -39,6 +37,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/skia_util.h" #include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/event_conversion.h" #include "webkit/plugins/ppapi/fullscreen_container.h" @@ -60,8 +60,8 @@ #endif #if defined(OS_WIN) -#include "gfx/codec/jpeg_codec.h" -#include "gfx/gdi_util.h" +#include "ui/gfx/codec/jpeg_codec.h" +#include "ui/gfx/gdi_util.h" #endif using WebKit::WebBindings; diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h index f80402f..b876d1d 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.h +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h @@ -14,7 +14,6 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/string16.h" -#include "gfx/rect.h" #include "ppapi/c/dev/pp_cursor_type_dev.h" #include "ppapi/c/dev/ppp_graphics_3d_dev.h" #include "ppapi/c/dev/ppp_printing_dev.h" @@ -22,6 +21,7 @@ #include "ppapi/c/pp_resource.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h" +#include "ui/gfx/rect.h" #include "webkit/plugins/ppapi/plugin_delegate.h" typedef struct NPObject NPObject; diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.h b/webkit/plugins/ppapi/ppapi_webplugin_impl.h index ee51b1b..f9ef510 100644 --- a/webkit/plugins/ppapi/ppapi_webplugin_impl.h +++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.h @@ -11,8 +11,8 @@ #include "base/weak_ptr.h" #include "base/scoped_ptr.h" #include "base/task.h" -#include "gfx/rect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" +#include "ui/gfx/rect.h" namespace WebKit { struct WebPluginParams; diff --git a/webkit/plugins/ppapi/ppb_flash_menu_impl.cc b/webkit/plugins/ppapi/ppb_flash_menu_impl.cc index 67776fe..f41e941 100644 --- a/webkit/plugins/ppapi/ppb_flash_menu_impl.cc +++ b/webkit/plugins/ppapi/ppb_flash_menu_impl.cc @@ -5,8 +5,8 @@ #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h" #include "base/utf_string_conversions.h" -#include "gfx/point.h" #include "ppapi/c/pp_completion_callback.h" +#include "ui/gfx/point.h" #include "webkit/glue/webmenuitem.h" #include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/plugin_delegate.h" diff --git a/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc b/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc index 28c8a7b..43a3467 100644 --- a/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc +++ b/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc @@ -9,15 +9,15 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/task.h" -#include "gfx/blit.h" -#include "gfx/point.h" -#include "gfx/rect.h" #include "skia/ext/platform_canvas.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_rect.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/ppb_graphics_2d.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/blit.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" #include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" #include "webkit/plugins/ppapi/ppb_image_data_impl.h" diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.h b/webkit/plugins/ppapi/ppb_scrollbar_impl.h index 5e7fbd6..88c4308 100644 --- a/webkit/plugins/ppapi/ppb_scrollbar_impl.h +++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.h @@ -7,10 +7,10 @@ #include <vector> -#include "gfx/rect.h" #include "ppapi/c/dev/ppb_scrollbar_dev.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScrollbarClient.h" +#include "ui/gfx/rect.h" #include "webkit/plugins/ppapi/ppb_widget_impl.h" namespace webkit { diff --git a/webkit/support/platform_support_gtk.cc b/webkit/support/platform_support_gtk.cc index eef26fb..41b144c 100644 --- a/webkit/support/platform_support_gtk.cc +++ b/webkit/support/platform_support_gtk.cc @@ -10,9 +10,9 @@ #include "base/path_service.h" #include "base/string16.h" #include "base/string_piece.h" -#include "gfx/gfx_module.h" #include "grit/webkit_resources.h" #include "ui/base/resource/data_pack.h" +#include "ui/gfx/gfx_module.h" namespace { diff --git a/webkit/support/webkit_support_gfx.h b/webkit/support/webkit_support_gfx.h index 3ffc67d..60bb765 100644 --- a/webkit/support/webkit_support_gfx.h +++ b/webkit/support/webkit_support_gfx.h @@ -7,7 +7,7 @@ #include <vector> -#include "gfx/codec/png_codec.h" +#include "ui/gfx/codec/png_codec.h" namespace webkit_support { diff --git a/webkit/tools/test_shell/mac/test_shell_webview.mm b/webkit/tools/test_shell/mac/test_shell_webview.mm index 992a017..5730ae2 100644 --- a/webkit/tools/test_shell/mac/test_shell_webview.mm +++ b/webkit/tools/test_shell/mac/test_shell_webview.mm @@ -8,9 +8,9 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "gfx/rect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/gfx/rect.h" #include "webkit/tools/test_shell/test_shell.h" #include "webkit/tools/test_shell/webwidget_host.h" diff --git a/webkit/tools/test_shell/mac/webview_host.mm b/webkit/tools/test_shell/mac/webview_host.mm index 5aa59a5..ba51e17 100644 --- a/webkit/tools/test_shell/mac/webview_host.mm +++ b/webkit/tools/test_shell/mac/webview_host.mm @@ -7,11 +7,11 @@ #include "webkit/tools/test_shell/webview_host.h" #include "webkit/tools/test_shell/mac/test_shell_webview.h" -#include "gfx/rect.h" -#include "gfx/size.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" #include "webkit/glue/webpreferences.h" #include "webkit/tools/test_shell/test_shell.h" #include "webkit/tools/test_shell/test_webview_delegate.h" diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm index f5944dd..7677dbf 100644 --- a/webkit/tools/test_shell/mac/webwidget_host.mm +++ b/webkit/tools/test_shell/mac/webwidget_host.mm @@ -7,8 +7,6 @@ #include "webkit/tools/test_shell/webwidget_host.h" #include "base/logging.h" -#include "gfx/rect.h" -#include "gfx/size.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h" #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFactory.h" @@ -16,6 +14,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" #include "webkit/glue/webkit_glue.h" #include "webkit/tools/test_shell/test_shell.h" diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index a08f4ad4..8c9c1e1 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -18,8 +18,6 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" -#include "gfx/codec/png_codec.h" -#include "gfx/size.h" #include "googleurl/src/url_util.h" #include "grit/webkit_strings.h" #include "net/base/mime_util.h" @@ -43,6 +41,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/gfx/codec/png_codec.h" +#include "ui/gfx/size.h" #include "webkit/glue/glue_serialize.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h index 66adffb..77fd031 100644 --- a/webkit/tools/test_shell/test_shell.h +++ b/webkit/tools/test_shell/test_shell.h @@ -40,8 +40,8 @@ #endif #include "base/ref_counted.h" #include "base/weak_ptr.h" -#include "gfx/native_widget_types.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationPolicy.h" +#include "ui/gfx/native_widget_types.h" #include "webkit/tools/test_shell/layout_test_controller.h" #include "webkit/tools/test_shell/webview_host.h" #include "webkit/tools/test_shell/webwidget_host.h" diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index 7fed43c..b56121e 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -22,7 +22,6 @@ #include "base/string16.h" #include "base/string_piece.h" #include "base/utf_string_conversions.h" -#include "gfx/size.h" #include "grit/webkit_resources.h" #include "net/base/mime_util.h" #include "skia/ext/bitmap_platform_device.h" @@ -30,6 +29,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/base/resource/data_pack.h" +#include "ui/gfx/size.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index b5d1819..7cb00df 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -22,7 +22,6 @@ #include "base/string_number_conversions.h" #include "base/sys_info.h" #include "base/utf_string_conversions.h" -#include "gfx/gfx_module.h" #include "net/base/cookie_monster.h" #include "net/base/net_module.h" #include "net/base/net_util.h" @@ -32,6 +31,7 @@ #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/gfx_module.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/window_open_disposition.h" #include "webkit/extensions/v8/gc_extension.h" diff --git a/webkit/tools/test_shell/test_shell_platform_delegate_win.cc b/webkit/tools/test_shell/test_shell_platform_delegate_win.cc index 80c95ab..db3401b 100644 --- a/webkit/tools/test_shell/test_shell_platform_delegate_win.cc +++ b/webkit/tools/test_shell/test_shell_platform_delegate_win.cc @@ -11,7 +11,7 @@ #include "base/event_recorder.h" #include "base/resource_util.h" #include "base/win/win_util.h" -#include "gfx/native_theme_win.h" +#include "ui/gfx/native_theme_win.h" #include "webkit/tools/test_shell/foreground_helper.h" #include "webkit/tools/test_shell/test_shell.h" #include "webkit/tools/test_shell/test_shell_platform_delegate.h" diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 98bf6ef..8c571ce 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -16,8 +16,6 @@ #include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" -#include "gfx/native_widget_types.h" -#include "gfx/point.h" #include "media/base/filter_collection.h" #include "media/base/message_loop_factory_impl.h" #include "net/base/net_errors.h" @@ -55,6 +53,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/point.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/glue/glue_serialize.h" #include "webkit/glue/media/video_renderer_impl.h" diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc index 956c2ed..38e64cb 100644 --- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc +++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc @@ -13,14 +13,14 @@ #include "base/utf_string_conversions.h" #include "net/base/net_errors.h" #include "chrome/common/page_transition_types.h" -#include "gfx/gtk_util.h" -#include "gfx/point.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/gfx/gtk_util.h" +#include "ui/gfx/point.h" #include "webkit/glue/webcursor.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webpreferences.h" diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc index 791d5d8..6b0cf62 100644 --- a/webkit/tools/test_shell/test_webview_delegate_win.cc +++ b/webkit/tools/test_shell/test_webview_delegate_win.cc @@ -15,14 +15,14 @@ #include "base/debug/trace_event.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "gfx/native_widget_types.h" -#include "gfx/gdi_util.h" -#include "gfx/point.h" #include "net/base/net_errors.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/gfx/gdi_util.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/point.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/tools/test_shell/webview_host.h b/webkit/tools/test_shell/webview_host.h index 7a47ec3..4ea261a 100644 --- a/webkit/tools/test_shell/webview_host.h +++ b/webkit/tools/test_shell/webview_host.h @@ -6,8 +6,8 @@ #define WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_ #include "base/basictypes.h" -#include "gfx/native_widget_types.h" -#include "gfx/rect.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/rect.h" #include "webkit/tools/test_shell/webwidget_host.h" #if defined(TOOLKIT_USES_GTK) diff --git a/webkit/tools/test_shell/webview_host_gtk.cc b/webkit/tools/test_shell/webview_host_gtk.cc index 8c3cb9a..85c161d 100644 --- a/webkit/tools/test_shell/webview_host_gtk.cc +++ b/webkit/tools/test_shell/webview_host_gtk.cc @@ -7,10 +7,10 @@ #include "webkit/tools/test_shell/webview_host.h" #include "base/logging.h" -#include "gfx/rect.h" -#include "gfx/size.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" #include "webkit/glue/webpreferences.h" #include "webkit/plugins/npapi/gtk_plugin_container.h" #include "webkit/tools/test_shell/test_webview_delegate.h" diff --git a/webkit/tools/test_shell/webview_host_win.cc b/webkit/tools/test_shell/webview_host_win.cc index ac7e1c7..a40c8e2 100644 --- a/webkit/tools/test_shell/webview_host_win.cc +++ b/webkit/tools/test_shell/webview_host_win.cc @@ -4,11 +4,11 @@ #include "webkit/tools/test_shell/webview_host.h" -#include "gfx/rect.h" -#include "gfx/size.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/base/win/hwnd_util.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" #include "webkit/glue/webpreferences.h" #include "webkit/tools/test_shell/test_webview_delegate.h" diff --git a/webkit/tools/test_shell/webwidget_host.h b/webkit/tools/test_shell/webwidget_host.h index 02b2669..7e2a987 100644 --- a/webkit/tools/test_shell/webwidget_host.h +++ b/webkit/tools/test_shell/webwidget_host.h @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "base/task.h" #include "base/scoped_ptr.h" -#include "gfx/native_widget_types.h" -#include "gfx/rect.h" #include "skia/ext/platform_canvas.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/rect.h" namespace gfx { class Size; diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc index 4b49eaf..8056b46 100644 --- a/webkit/tools/test_shell/webwidget_host_win.cc +++ b/webkit/tools/test_shell/webwidget_host_win.cc @@ -5,7 +5,6 @@ #include "webkit/tools/test_shell/webwidget_host.h" #include "base/logging.h" -#include "gfx/rect.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" @@ -14,6 +13,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h" #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFactory.h" #include "ui/base/win/hwnd_util.h" +#include "ui/gfx/rect.h" #include "webkit/tools/test_shell/test_shell.h" using WebKit::WebInputEvent; |