diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-17 05:12:31 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-17 05:12:31 +0000 |
| commit | 2255a9339bdc413c4c11b39a511e4a49871b0ed2 (patch) | |
| tree | 386bcab083b6163307be2310b878529d373a1948 /webkit | |
| parent | 1071fafce2c9d9158ce34db59873144a50e298bf (diff) | |
| download | chromium_src-2255a9339bdc413c4c11b39a511e4a49871b0ed2.zip chromium_src-2255a9339bdc413c4c11b39a511e4a49871b0ed2.tar.gz chromium_src-2255a9339bdc413c4c11b39a511e4a49871b0ed2.tar.bz2 | |
Update Blink include paths
This CL changes the majority of include paths from the old
Source/WebKit/chromium/public to the new public/web directory.
TBR=darin
BUG=239545
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/17148003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
103 files changed, 206 insertions, 206 deletions
diff --git a/webkit/DEPS b/webkit/DEPS index 4056b17..e07015a 100644 --- a/webkit/DEPS +++ b/webkit/DEPS @@ -19,7 +19,7 @@ include_rules = [ "+third_party/sqlite", "+third_party/tcmalloc", "+third_party/WebKit/public/platform", - "+third_party/WebKit/Source/WebKit/chromium", + "+third_party/WebKit/public/web", "+v8", # For databases/ diff --git a/webkit/base/origin_url_conversions.cc b/webkit/base/origin_url_conversions.cc index 1b2d7f2..db2da52 100644 --- a/webkit/base/origin_url_conversions.cc +++ b/webkit/base/origin_url_conversions.cc @@ -7,7 +7,7 @@ #include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" namespace webkit_base { diff --git a/webkit/browser/database/database_util.cc b/webkit/browser/database/database_util.cc index b5929cc..e7d5563 100644 --- a/webkit/browser/database/database_util.cc +++ b/webkit/browser/database/database_util.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "webkit/browser/database/database_tracker.h" #include "webkit/browser/database/vfs_backend.h" diff --git a/webkit/child/webkitplatformsupport_child_impl.cc b/webkit/child/webkitplatformsupport_child_impl.cc index 0e8d818..9eb20c1 100644 --- a/webkit/child/webkitplatformsupport_child_impl.cc +++ b/webkit/child/webkitplatformsupport_child_impl.cc @@ -4,7 +4,7 @@ #include "webkit/child/webkitplatformsupport_child_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "webkit/child/fling_curve_configuration.h" #include "webkit/child/webthread_impl.h" #include "webkit/child/worker_task_runner.h" diff --git a/webkit/common/cursors/webcursor.h b/webkit/common/cursors/webcursor.h index bbe275b..5782fee 100644 --- a/webkit/common/cursors/webcursor.h +++ b/webkit/common/cursors/webcursor.h @@ -6,7 +6,7 @@ #define WEBKIT_COMMON_CURSORS_WEBCURSOR_H_ #include "base/basictypes.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" #include "ui/gfx/size.h" diff --git a/webkit/common/cursors/webcursor_android.cc b/webkit/common/cursors/webcursor_android.cc index afb280b..c2dac24 100644 --- a/webkit/common/cursors/webcursor_android.cc +++ b/webkit/common/cursors/webcursor_android.cc @@ -5,7 +5,7 @@ #include "webkit/common/cursors/webcursor.h" #include "base/logging.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" void WebCursor::InitPlatformData() { } diff --git a/webkit/common/cursors/webcursor_aura.cc b/webkit/common/cursors/webcursor_aura.cc index aa003d4..e3f87ad 100644 --- a/webkit/common/cursors/webcursor_aura.cc +++ b/webkit/common/cursors/webcursor_aura.cc @@ -5,7 +5,7 @@ #include "webkit/common/cursors/webcursor.h" #include "base/logging.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" #include "ui/base/cursor/cursor.h" using WebKit::WebCursorInfo; diff --git a/webkit/common/cursors/webcursor_aurawin.cc b/webkit/common/cursors/webcursor_aurawin.cc index 755e924..e06bfcf 100644 --- a/webkit/common/cursors/webcursor_aurawin.cc +++ b/webkit/common/cursors/webcursor_aurawin.cc @@ -6,7 +6,7 @@ #include <windows.h> -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" #include "ui/gfx/icon_util.h" const ui::PlatformCursor WebCursor::GetPlatformCursor() { diff --git a/webkit/common/cursors/webcursor_aurax11.cc b/webkit/common/cursors/webcursor_aurax11.cc index a830ef7..4ec0419 100644 --- a/webkit/common/cursors/webcursor_aurax11.cc +++ b/webkit/common/cursors/webcursor_aurax11.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "skia/ext/image_operations.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" #include "ui/base/cursor/cursor.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/point_conversions.h" diff --git a/webkit/common/cursors/webcursor_gtk.cc b/webkit/common/cursors/webcursor_gtk.cc index 993ab5c..5b10db0 100644 --- a/webkit/common/cursors/webcursor_gtk.cc +++ b/webkit/common/cursors/webcursor_gtk.cc @@ -8,7 +8,7 @@ #include <gtk/gtk.h> #include "base/logging.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" #include "ui/gfx/gtk_util.h" using WebKit::WebCursorInfo; diff --git a/webkit/common/cursors/webcursor_mac.mm b/webkit/common/cursors/webcursor_mac.mm index a180f39..11fd937 100644 --- a/webkit/common/cursors/webcursor_mac.mm +++ b/webkit/common/cursors/webcursor_mac.mm @@ -12,7 +12,7 @@ #include "base/memory/scoped_nsobject.h" #include "grit/webkit_chromium_resources.h" #include "skia/ext/skia_utils_mac.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" #include "third_party/WebKit/public/platform/WebSize.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/point_conversions.h" diff --git a/webkit/common/cursors/webcursor_unittest.cc b/webkit/common/cursors/webcursor_unittest.cc index 80846f9..058da45 100644 --- a/webkit/common/cursors/webcursor_unittest.cc +++ b/webkit/common/cursors/webcursor_unittest.cc @@ -4,7 +4,7 @@ #include "base/pickle.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" #include "webkit/common/cursors/webcursor.h" using WebKit::WebCursorInfo; diff --git a/webkit/common/cursors/webcursor_win.cc b/webkit/common/cursors/webcursor_win.cc index ba3b716..e9bf3b3 100644 --- a/webkit/common/cursors/webcursor_win.cc +++ b/webkit/common/cursors/webcursor_win.cc @@ -6,7 +6,7 @@ #include "base/pickle.h" #include "grit/ui_unscaled_resources.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" #include "ui/gfx/icon_util.h" #include "webkit/common/cursors/webcursor.h" diff --git a/webkit/common/fileapi/file_system_util.h b/webkit/common/fileapi/file_system_util.h index adf9be4..1059f14 100644 --- a/webkit/common/fileapi/file_system_util.h +++ b/webkit/common/fileapi/file_system_util.h @@ -10,7 +10,7 @@ #include "base/files/file_path.h" #include "base/platform_file.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h" +#include "third_party/WebKit/public/web/WebFileError.h" #include "third_party/WebKit/public/platform/WebFileSystemType.h" #include "webkit/common/fileapi/file_system_types.h" #include "webkit/common/quota/quota_types.h" diff --git a/webkit/common/quota/quota_status_code.h b/webkit/common/quota/quota_status_code.h index aedef63..21b4701 100644 --- a/webkit/common/quota/quota_status_code.h +++ b/webkit/common/quota/quota_status_code.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_COMMON_QUOTA_QUOTA_STATUS_CODE_H_ #define WEBKIT_COMMON_QUOTA_QUOTA_STATUS_CODE_H_ -#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaError.h" +#include "third_party/WebKit/public/web/WebStorageQuotaError.h" #include "webkit/common/webkit_storage_common_export.h" namespace quota { diff --git a/webkit/common/webmenuitem.h b/webkit/common/webmenuitem.h index 0d03f9b..99d0498 100644 --- a/webkit/common/webmenuitem.h +++ b/webkit/common/webmenuitem.h @@ -8,7 +8,7 @@ #include <vector> #include "base/strings/string16.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMenuItemInfo.h" +#include "third_party/WebKit/public/web/WebMenuItemInfo.h" #include "webkit/common/webkit_common_export.h" // Container for information about entries in an HTML select popup menu and diff --git a/webkit/common/webpreferences.cc b/webkit/common/webpreferences.cc index f00f3ab..d0d8ac7 100644 --- a/webkit/common/webpreferences.cc +++ b/webkit/common/webpreferences.cc @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebSettings.h" #include "third_party/icu/public/common/unicode/uchar.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/glue/glue_serialize_deprecated.cc b/webkit/glue/glue_serialize_deprecated.cc index 750a46f..62d4c89 100644 --- a/webkit/glue/glue_serialize_deprecated.cc +++ b/webkit/glue/glue_serialize_deprecated.cc @@ -15,8 +15,8 @@ #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" +#include "third_party/WebKit/public/web/WebHistoryItem.h" +#include "third_party/WebKit/public/web/WebSerializedScriptValue.h" #include "ui/gfx/screen.h" #include "webkit/base/file_path_string_conversions.h" diff --git a/webkit/glue/glue_serialize_deprecated.h b/webkit/glue/glue_serialize_deprecated.h index 348b201..5d9c8cb 100644 --- a/webkit/glue/glue_serialize_deprecated.h +++ b/webkit/glue/glue_serialize_deprecated.h @@ -13,7 +13,7 @@ #include <string> #include "base/files/file_path.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" +#include "third_party/WebKit/public/web/WebHistoryItem.h" #include "webkit/glue/webkit_glue_export.h" class GURL; diff --git a/webkit/glue/npruntime_util.cc b/webkit/glue/npruntime_util.cc index 4c448ae..1b249db 100644 --- a/webkit/glue/npruntime_util.cc +++ b/webkit/glue/npruntime_util.cc @@ -5,7 +5,7 @@ #include "webkit/glue/npruntime_util.h" #include "base/pickle.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" using WebKit::WebBindings; diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 7617306..34d8b8a 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -40,17 +40,17 @@ #include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGlyphCache.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPrintParams.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebDevToolsAgent.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebGlyphCache.h" +#include "third_party/WebKit/public/web/WebHistoryItem.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebPrintParams.h" +#include "third_party/WebKit/public/web/WebView.h" #if defined(OS_WIN) -#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h" +#include "third_party/WebKit/public/web/win/WebInputEventFactory.h" #endif #include "third_party/skia/include/core/SkBitmap.h" #include "v8/include/v8.h" diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index e93b61e..466c4c9 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -31,9 +31,9 @@ #include "net/base/data_url.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/public/web/WebFrameClient.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebScreenInfo.h" #include "third_party/WebKit/public/platform/WebCookie.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebDiscardableMemory.h" diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc index d29c326..1ab32c6 100644 --- a/webkit/glue/weburlloader_impl.cc +++ b/webkit/glue/weburlloader_impl.cc @@ -28,7 +28,7 @@ #include "third_party/WebKit/public/platform/WebURLLoadTiming.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" +#include "third_party/WebKit/public/web/WebSecurityPolicy.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/glue/ftp_directory_listing_response_delegate.h" #include "webkit/glue/multipart_response_delegate.h" diff --git a/webkit/mocks/mock_webframeclient.h b/webkit/mocks/mock_webframeclient.h index 6f13811..c0d7040 100644 --- a/webkit/mocks/mock_webframeclient.h +++ b/webkit/mocks/mock_webframeclient.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_MOCKS_MOCK_WEBFRAMECLIENT_H_ #define WEBKIT_MOCKS_MOCK_WEBFRAMECLIENT_H_ -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" +#include "third_party/WebKit/public/web/WebFrameClient.h" namespace webkit_glue { diff --git a/webkit/mocks/test_media_stream_client.cc b/webkit/mocks/test_media_stream_client.cc index 3065612..126f74a 100644 --- a/webkit/mocks/test_media_stream_client.cc +++ b/webkit/mocks/test_media_stream_client.cc @@ -10,7 +10,7 @@ #include "third_party/WebKit/public/platform/WebMediaStream.h" #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h" +#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" #include "webkit/renderer/media/media_stream_audio_renderer.h" #include "webkit/renderer/media/simple_video_frame_provider.h" diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index 96491c3..2b66a73 100644 --- a/webkit/plugins/npapi/plugin_host.cc +++ b/webkit/plugins/npapi/plugin_host.cc @@ -14,8 +14,8 @@ #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "net/base/net_util.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/public/web/WebBindings.h" +#include "third_party/WebKit/public/web/WebKit.h" #include "third_party/npapi/bindings/npruntime.h" #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_implementation.h" diff --git a/webkit/plugins/npapi/plugin_web_event_converter_mac.mm b/webkit/plugins/npapi/plugin_web_event_converter_mac.mm index 8737ab9..c469c06 100644 --- a/webkit/plugins/npapi/plugin_web_event_converter_mac.mm +++ b/webkit/plugins/npapi/plugin_web_event_converter_mac.mm @@ -6,7 +6,7 @@ #include "base/logging.h" #include "webkit/plugins/npapi/plugin_web_event_converter_mac.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" using WebKit::WebInputEvent; using WebKit::WebKeyboardEvent; diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.cc b/webkit/plugins/npapi/webplugin_delegate_impl.cc index a9c82bc..40f3b66 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/process_util.h" #include "base/strings/string_util.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.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_delegate_impl_gtk.cc b/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc index 6b9e0c0..ec4d1a8 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl_gtk.cc @@ -12,7 +12,7 @@ #include "base/metrics/stats_counters.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/gtk/gtk_compat.h" #include "ui/gfx/blit.h" #include "webkit/common/cursors/webcursor.h" diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm index ae73c55..edb15dd 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm +++ b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm @@ -18,7 +18,7 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "skia/ext/skia_utils_mac.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" #include "webkit/common/cursors/webcursor.h" #include "webkit/plugins/npapi/plugin_instance.h" diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc index de727e1..30adfc4 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc @@ -22,7 +22,7 @@ #include "base/win/registry.h" #include "base/win/windows_version.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/win/dpi.h" #include "ui/base/win/hwnd_util.h" #include "webkit/common/cursors/webcursor.h" diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc index c57e13c..e110309 100644 --- a/webkit/plugins/npapi/webplugin_impl.cc +++ b/webkit/plugins/npapi/webplugin_impl.cc @@ -19,16 +19,16 @@ #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.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/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebConsoleMessage.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebPluginParams.h" +#include "third_party/WebKit/public/web/WebURLLoaderOptions.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebCookieJar.h" #include "third_party/WebKit/public/platform/WebData.h" diff --git a/webkit/plugins/npapi/webplugin_impl.h b/webkit/plugins/npapi/webplugin_impl.h index dbf3143..ba74eac 100644 --- a/webkit/plugins/npapi/webplugin_impl.h +++ b/webkit/plugins/npapi/webplugin_impl.h @@ -19,7 +19,7 @@ #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" +#include "third_party/WebKit/public/web/WebPlugin.h" #include "ui/gfx/native_widget_types.h" #include "webkit/plugins/npapi/webplugin.h" #include "webkit/plugins/webkit_plugins_export.h" diff --git a/webkit/plugins/ppapi/event_conversion.cc b/webkit/plugins/ppapi/event_conversion.cc index c08db71..9c40afd 100644 --- a/webkit/plugins/ppapi/event_conversion.cc +++ b/webkit/plugins/ppapi/event_conversion.cc @@ -19,7 +19,7 @@ #include "ppapi/shared_impl/time_conversion.h" #include "third_party/WebKit/public/platform/WebGamepads.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/usb_key_code_conversion.h" diff --git a/webkit/plugins/ppapi/event_conversion.h b/webkit/plugins/ppapi/event_conversion.h index f289012..057d911 100644 --- a/webkit/plugins/ppapi/event_conversion.h +++ b/webkit/plugins/ppapi/event_conversion.h @@ -9,7 +9,7 @@ #include "base/memory/linked_ptr.h" #include "ppapi/c/ppb_input_event.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "webkit/plugins/webkit_plugins_export.h" struct PP_InputEvent; diff --git a/webkit/plugins/ppapi/host_array_buffer_var.h b/webkit/plugins/ppapi/host_array_buffer_var.h index 646adf8..bb60a5e 100644 --- a/webkit/plugins/ppapi/host_array_buffer_var.h +++ b/webkit/plugins/ppapi/host_array_buffer_var.h @@ -9,7 +9,7 @@ #include "ppapi/c/pp_instance.h" #include "ppapi/shared_impl/host_resource.h" #include "ppapi/shared_impl/var.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebArrayBuffer.h" +#include "third_party/WebKit/public/web/WebArrayBuffer.h" namespace webkit { namespace ppapi { diff --git a/webkit/plugins/ppapi/host_globals.cc b/webkit/plugins/ppapi/host_globals.cc index 43f2933..2572b16 100644 --- a/webkit/plugins/ppapi/host_globals.cc +++ b/webkit/plugins/ppapi/host_globals.cc @@ -13,11 +13,11 @@ #include "ppapi/shared_impl/api_id.h" #include "ppapi/shared_impl/id_assignment.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebConsoleMessage.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" #include "webkit/plugins/plugin_switches.h" #include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" diff --git a/webkit/plugins/ppapi/host_var_tracker_unittest.cc b/webkit/plugins/ppapi/host_var_tracker_unittest.cc index f2be72c..c689851 100644 --- a/webkit/plugins/ppapi/host_var_tracker_unittest.cc +++ b/webkit/plugins/ppapi/host_var_tracker_unittest.cc @@ -8,7 +8,7 @@ #include "ppapi/c/pp_var.h" #include "ppapi/c/ppp_instance.h" #include "third_party/npapi/bindings/npruntime.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" #include "webkit/plugins/ppapi/host_globals.h" #include "webkit/plugins/ppapi/host_var_tracker.h" #include "webkit/plugins/ppapi/mock_plugin_delegate.h" diff --git a/webkit/plugins/ppapi/message_channel.cc b/webkit/plugins/ppapi/message_channel.cc index 1006d2d..2984a92 100644 --- a/webkit/plugins/ppapi/message_channel.cc +++ b/webkit/plugins/ppapi/message_channel.cc @@ -13,14 +13,14 @@ #include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/shared_impl/var.h" #include "ppapi/shared_impl/var_tracker.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMMessageEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" +#include "third_party/WebKit/public/web/WebBindings.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebDOMMessageEvent.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebSerializedScriptValue.h" #include "v8/include/v8.h" #include "webkit/plugins/ppapi/host_array_buffer_var.h" #include "webkit/plugins/ppapi/npapi_glue.h" diff --git a/webkit/plugins/ppapi/message_channel.h b/webkit/plugins/ppapi/message_channel.h index 2573097..c1e128e 100644 --- a/webkit/plugins/ppapi/message_channel.h +++ b/webkit/plugins/ppapi/message_channel.h @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "ppapi/shared_impl/resource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" +#include "third_party/WebKit/public/web/WebSerializedScriptValue.h" #include "third_party/npapi/bindings/npruntime.h" struct PP_Var; diff --git a/webkit/plugins/ppapi/npapi_glue.cc b/webkit/plugins/ppapi/npapi_glue.cc index 67af723..a8a8c2e 100644 --- a/webkit/plugins/ppapi/npapi_glue.cc +++ b/webkit/plugins/ppapi/npapi_glue.cc @@ -16,7 +16,7 @@ #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" using ppapi::NPObjectVar; using ppapi::PpapiGlobals; diff --git a/webkit/plugins/ppapi/npobject_var.cc b/webkit/plugins/ppapi/npobject_var.cc index 0616907..64b5591 100644 --- a/webkit/plugins/ppapi/npobject_var.cc +++ b/webkit/plugins/ppapi/npobject_var.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "ppapi/c/pp_var.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" #include "webkit/plugins/ppapi/host_globals.h" #include "webkit/plugins/ppapi/host_var_tracker.h" diff --git a/webkit/plugins/ppapi/plugin_object.cc b/webkit/plugins/ppapi/plugin_object.cc index 4ff6f9e..4106495 100644 --- a/webkit/plugins/ppapi/plugin_object.cc +++ b/webkit/plugins/ppapi/plugin_object.cc @@ -17,7 +17,7 @@ #include "ppapi/shared_impl/resource_tracker.h" #include "ppapi/shared_impl/var.h" #include "ppapi/shared_impl/var_tracker.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" #include "webkit/plugins/ppapi/npapi_glue.h" diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 7305d51..4d4e0ec1 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -53,20 +53,20 @@ #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPrintParams.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPrintScalingOption.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScopedUserGesture.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserGestureIndicator.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebBindings.h" +#include "third_party/WebKit/public/web/WebCompositionUnderline.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebPrintParams.h" +#include "third_party/WebKit/public/web/WebPrintScalingOption.h" +#include "third_party/WebKit/public/web/WebScopedUserGesture.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebUserGestureIndicator.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkRect.h" #include "ui/base/range/range.h" diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h index 3f4cb30..4b73f07 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.h +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h @@ -49,8 +49,8 @@ #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserGestureToken.h" +#include "third_party/WebKit/public/web/WebPlugin.h" +#include "third_party/WebKit/public/web/WebUserGestureToken.h" #include "ui/base/ime/text_input_type.h" #include "ui/gfx/rect.h" #include "webkit/plugins/ppapi/plugin_delegate.h" diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc index c43a64c..26dcbdd 100644 --- a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc +++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc @@ -15,15 +15,15 @@ #include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPrintParams.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPrintScalingOption.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebBindings.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebPluginParams.h" +#include "third_party/WebKit/public/web/WebPrintParams.h" +#include "third_party/WebKit/public/web/WebPrintScalingOption.h" +#include "third_party/WebKit/public/web/WebView.h" #include "webkit/plugins/ppapi/message_channel.h" #include "webkit/plugins/ppapi/npobject_var.h" #include "webkit/plugins/ppapi/plugin_module.h" diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.h b/webkit/plugins/ppapi/ppapi_webplugin_impl.h index b8bbffe..b317daa 100644 --- a/webkit/plugins/ppapi/ppapi_webplugin_impl.h +++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.h @@ -12,7 +12,7 @@ #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner_helpers.h" #include "ppapi/c/pp_var.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" +#include "third_party/WebKit/public/web/WebPlugin.h" #include "ui/gfx/rect.h" #include "webkit/plugins/webkit_plugins_export.h" diff --git a/webkit/plugins/ppapi/ppb_broker_impl.cc b/webkit/plugins/ppapi/ppb_broker_impl.cc index e8063f1..e760ad7 100644 --- a/webkit/plugins/ppapi/ppb_broker_impl.cc +++ b/webkit/plugins/ppapi/ppb_broker_impl.cc @@ -6,9 +6,9 @@ #include "base/logging.h" #include "ppapi/shared_impl/platform_file.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" #include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/ppapi/resource_helper.h" diff --git a/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc b/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc index ef5ddae..5c1191a 100644 --- a/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc +++ b/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc @@ -12,11 +12,11 @@ #include "ppapi/c/ppp_graphics_3d.h" #include "ppapi/thunk/enter.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebConsoleMessage.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" #include "webkit/plugins/plugin_switches.h" #include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc index f32c845..9eea9ac 100644 --- a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc +++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc @@ -13,8 +13,8 @@ #include "third_party/WebKit/public/platform/WebCanvas.h" #include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginScrollbar.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebPluginScrollbar.h" #include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/event_conversion.h" #include "webkit/plugins/ppapi/plugin_module.h" diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.h b/webkit/plugins/ppapi/ppb_scrollbar_impl.h index c610061..b3537fc 100644 --- a/webkit/plugins/ppapi/ppb_scrollbar_impl.h +++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.h @@ -12,7 +12,7 @@ #include "base/memory/weak_ptr.h" #include "ppapi/thunk/ppb_scrollbar_api.h" #include "third_party/WebKit/public/platform/WebRect.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginScrollbarClient.h" +#include "third_party/WebKit/public/web/WebPluginScrollbarClient.h" #include "ui/gfx/rect.h" #include "webkit/plugins/ppapi/ppb_widget_impl.h" diff --git a/webkit/plugins/ppapi/ppb_var_deprecated_impl.cc b/webkit/plugins/ppapi/ppb_var_deprecated_impl.cc index 63c024e..4934ae5 100644 --- a/webkit/plugins/ppapi/ppb_var_deprecated_impl.cc +++ b/webkit/plugins/ppapi/ppb_var_deprecated_impl.cc @@ -10,8 +10,8 @@ #include "ppapi/c/ppb_var.h" #include "ppapi/c/pp_var.h" #include "ppapi/shared_impl/ppb_var_shared.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScopedUserGesture.h" +#include "third_party/WebKit/public/web/WebBindings.h" +#include "third_party/WebKit/public/web/WebScopedUserGesture.h" #include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/host_globals.h" #include "webkit/plugins/ppapi/npapi_glue.h" diff --git a/webkit/plugins/ppapi/url_request_info_util.cc b/webkit/plugins/ppapi/url_request_info_util.cc index 91ef556..759db1b 100644 --- a/webkit/plugins/ppapi/url_request_info_util.cc +++ b/webkit/plugins/ppapi/url_request_info_util.cc @@ -16,8 +16,8 @@ #include "third_party/WebKit/public/platform/WebHTTPBody.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebURLRequest.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/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/glue/weburlrequest_extradata_impl.h" #include "webkit/plugins/ppapi/common.h" diff --git a/webkit/plugins/ppapi/usb_key_code_conversion_linux.cc b/webkit/plugins/ppapi/usb_key_code_conversion_linux.cc index 8ba6949..56105a9 100644 --- a/webkit/plugins/ppapi/usb_key_code_conversion_linux.cc +++ b/webkit/plugins/ppapi/usb_key_code_conversion_linux.cc @@ -5,7 +5,7 @@ #include "webkit/plugins/ppapi/usb_key_code_conversion.h" #include "base/basictypes.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" using WebKit::WebKeyboardEvent; diff --git a/webkit/plugins/ppapi/usb_key_code_conversion_mac.cc b/webkit/plugins/ppapi/usb_key_code_conversion_mac.cc index 82d109b..94a1e71 100644 --- a/webkit/plugins/ppapi/usb_key_code_conversion_mac.cc +++ b/webkit/plugins/ppapi/usb_key_code_conversion_mac.cc @@ -5,7 +5,7 @@ #include "webkit/plugins/ppapi/usb_key_code_conversion.h" #include "base/basictypes.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" using WebKit::WebKeyboardEvent; diff --git a/webkit/plugins/ppapi/usb_key_code_conversion_win.cc b/webkit/plugins/ppapi/usb_key_code_conversion_win.cc index c497f15..dfef1eb 100644 --- a/webkit/plugins/ppapi/usb_key_code_conversion_win.cc +++ b/webkit/plugins/ppapi/usb_key_code_conversion_win.cc @@ -5,7 +5,7 @@ #include "webkit/plugins/ppapi/usb_key_code_conversion.h" #include "base/basictypes.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" using WebKit::WebKeyboardEvent; diff --git a/webkit/plugins/ppapi/v8_var_converter.cc b/webkit/plugins/ppapi/v8_var_converter.cc index c895ca0..95b0e04 100644 --- a/webkit/plugins/ppapi/v8_var_converter.cc +++ b/webkit/plugins/ppapi/v8_var_converter.cc @@ -15,7 +15,7 @@ #include "ppapi/shared_impl/dictionary_var.h" #include "ppapi/shared_impl/var.h" #include "ppapi/shared_impl/var_tracker.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebArrayBuffer.h" +#include "third_party/WebKit/public/web/WebArrayBuffer.h" #include "webkit/plugins/ppapi/host_array_buffer_var.h" using ppapi::ArrayBufferVar; diff --git a/webkit/renderer/appcache/appcache_frontend_impl.cc b/webkit/renderer/appcache/appcache_frontend_impl.cc index 78e412f..519bcd5 100644 --- a/webkit/renderer/appcache/appcache_frontend_impl.cc +++ b/webkit/renderer/appcache/appcache_frontend_impl.cc @@ -5,8 +5,8 @@ #include "webkit/renderer/appcache/appcache_frontend_impl.h" #include "base/logging.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebApplicationCacheHost.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" +#include "third_party/WebKit/public/web/WebApplicationCacheHost.h" +#include "third_party/WebKit/public/web/WebConsoleMessage.h" #include "webkit/renderer/appcache/web_application_cache_host_impl.h" using WebKit::WebApplicationCacheHost; diff --git a/webkit/renderer/appcache/web_application_cache_host_impl.cc b/webkit/renderer/appcache/web_application_cache_host_impl.cc index 3b8f70f..db67df5 100644 --- a/webkit/renderer/appcache/web_application_cache_host_impl.cc +++ b/webkit/renderer/appcache/web_application_cache_host_impl.cc @@ -8,8 +8,8 @@ #include "base/id_map.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/public/web/WebDataSource.h" +#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" diff --git a/webkit/renderer/appcache/web_application_cache_host_impl.h b/webkit/renderer/appcache/web_application_cache_host_impl.h index eb471af..588a54c 100644 --- a/webkit/renderer/appcache/web_application_cache_host_impl.h +++ b/webkit/renderer/appcache/web_application_cache_host_impl.h @@ -8,7 +8,7 @@ #include <string> #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebApplicationCacheHostClient.h" +#include "third_party/WebKit/public/web/WebApplicationCacheHostClient.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/public/platform/WebVector.h" #include "webkit/common/appcache/appcache_interfaces.h" diff --git a/webkit/renderer/cpp_bound_class.cc b/webkit/renderer/cpp_bound_class.cc index 0fdcedf..d3b8d51 100644 --- a/webkit/renderer/cpp_bound_class.cc +++ b/webkit/renderer/cpp_bound_class.cc @@ -18,8 +18,8 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/public/web/WebBindings.h" +#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/platform/WebString.h" using WebKit::WebBindings; diff --git a/webkit/renderer/cpp_variant.cc b/webkit/renderer/cpp_variant.cc index 0f2c497..79d2d4b 100644 --- a/webkit/renderer/cpp_variant.cc +++ b/webkit/renderer/cpp_variant.cc @@ -9,7 +9,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" #include "webkit/renderer/cpp_variant.h" using WebKit::WebBindings; diff --git a/webkit/renderer/cpp_variant_unittest.cc b/webkit/renderer/cpp_variant_unittest.cc index 93b51c0..820f64a 100644 --- a/webkit/renderer/cpp_variant_unittest.cc +++ b/webkit/renderer/cpp_variant_unittest.cc @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/strings/string_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" #include "webkit/renderer/cpp_variant.h" using WebKit::WebBindings; diff --git a/webkit/renderer/cursor_utils.cc b/webkit/renderer/cursor_utils.cc index 87f305b..0897f28 100644 --- a/webkit/renderer/cursor_utils.cc +++ b/webkit/renderer/cursor_utils.cc @@ -4,7 +4,7 @@ #include "webkit/renderer/cursor_utils.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" using WebKit::WebCursorInfo; diff --git a/webkit/renderer/fileapi/webfilewriter_base.cc b/webkit/renderer/fileapi/webfilewriter_base.cc index 2ae8cdb..92c7ae1 100644 --- a/webkit/renderer/fileapi/webfilewriter_base.cc +++ b/webkit/renderer/fileapi/webfilewriter_base.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileWriterClient.h" +#include "third_party/WebKit/public/web/WebFileError.h" +#include "third_party/WebKit/public/web/WebFileWriterClient.h" #include "webkit/common/fileapi/file_system_util.h" namespace fileapi { diff --git a/webkit/renderer/fileapi/webfilewriter_base.h b/webkit/renderer/fileapi/webfilewriter_base.h index 455d133..1de6b0a 100644 --- a/webkit/renderer/fileapi/webfilewriter_base.h +++ b/webkit/renderer/fileapi/webfilewriter_base.h @@ -7,7 +7,7 @@ #include "base/platform_file.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileWriter.h" +#include "third_party/WebKit/public/web/WebFileWriter.h" #include "webkit/renderer/webkit_storage_renderer_export.h" namespace WebKit { diff --git a/webkit/renderer/fileapi/webfilewriter_base_unittest.cc b/webkit/renderer/fileapi/webfilewriter_base_unittest.cc index 7e2f4b2..d7405b6 100644 --- a/webkit/renderer/fileapi/webfilewriter_base_unittest.cc +++ b/webkit/renderer/fileapi/webfilewriter_base_unittest.cc @@ -11,8 +11,8 @@ #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileWriterClient.h" +#include "third_party/WebKit/public/web/WebFileError.h" +#include "third_party/WebKit/public/web/WebFileWriterClient.h" namespace fileapi { diff --git a/webkit/renderer/media/android/media_source_delegate.cc b/webkit/renderer/media/android/media_source_delegate.cc index 687a3fb..5c30c5d 100644 --- a/webkit/renderer/media/android/media_source_delegate.cc +++ b/webkit/renderer/media/android/media_source_delegate.cc @@ -12,8 +12,8 @@ #include "media/base/media_log.h" #include "media/filters/chunk_demuxer.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" +#include "third_party/WebKit/public/web/WebMediaSource.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "webkit/renderer/media/android/webmediaplayer_proxy_android.h" #include "webkit/renderer/media/crypto/key_systems.h" #include "webkit/renderer/media/webmediaplayer_util.h" diff --git a/webkit/renderer/media/android/media_source_delegate.h b/webkit/renderer/media/android/media_source_delegate.h index b0db476..00467d6 100644 --- a/webkit/renderer/media/android/media_source_delegate.h +++ b/webkit/renderer/media/android/media_source_delegate.h @@ -16,7 +16,7 @@ #include "media/base/pipeline_status.h" #include "media/base/ranges.h" #include "media/base/text_track.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" +#include "third_party/WebKit/public/web/WebMediaPlayer.h" namespace media { class ChunkDemuxer; diff --git a/webkit/renderer/media/android/webmediaplayer_android.cc b/webkit/renderer/media/android/webmediaplayer_android.cc index e9ba542..bd1f1f0 100644 --- a/webkit/renderer/media/android/webmediaplayer_android.cc +++ b/webkit/renderer/media/android/webmediaplayer_android.cc @@ -18,12 +18,12 @@ #include "media/base/video_frame.h" #include "net/base/mime_util.h" #include "third_party/WebKit/public/platform/WebString.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/WebMediaPlayerClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebMediaPlayerClient.h" +#include "third_party/WebKit/public/web/WebMediaSource.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" +#include "third_party/WebKit/public/web/WebView.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" #include "webkit/renderer/media/android/webmediaplayer_manager_android.h" #include "webkit/renderer/media/android/webmediaplayer_proxy_android.h" diff --git a/webkit/renderer/media/android/webmediaplayer_android.h b/webkit/renderer/media/android/webmediaplayer_android.h index 90b0885..799909b 100644 --- a/webkit/renderer/media/android/webmediaplayer_android.h +++ b/webkit/renderer/media/android/webmediaplayer_android.h @@ -20,7 +20,7 @@ #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" +#include "third_party/WebKit/public/web/WebMediaPlayer.h" #include "ui/gfx/rect_f.h" #include "webkit/renderer/media/android/media_source_delegate.h" #include "webkit/renderer/media/android/stream_texture_factory_android.h" diff --git a/webkit/renderer/media/buffered_data_source_unittest.cc b/webkit/renderer/media/buffered_data_source_unittest.cc index 63895b3..1a7589c 100644 --- a/webkit/renderer/media/buffered_data_source_unittest.cc +++ b/webkit/renderer/media/buffered_data_source_unittest.cc @@ -9,7 +9,7 @@ #include "media/base/mock_filters.h" #include "media/base/test_helpers.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebView.h" #include "webkit/mocks/mock_webframeclient.h" #include "webkit/mocks/mock_weburlloader.h" #include "webkit/renderer/media/buffered_data_source.h" diff --git a/webkit/renderer/media/buffered_resource_loader.cc b/webkit/renderer/media/buffered_resource_loader.cc index 73f67a8..9538d15 100644 --- a/webkit/renderer/media/buffered_resource_loader.cc +++ b/webkit/renderer/media/buffered_resource_loader.cc @@ -16,8 +16,8 @@ #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebURLLoaderOptions.h" #include "webkit/renderer/media/cache_util.h" using WebKit::WebFrame; diff --git a/webkit/renderer/media/buffered_resource_loader.h b/webkit/renderer/media/buffered_resource_loader.h index b01b2d2..89d2b79 100644 --- a/webkit/renderer/media/buffered_resource_loader.h +++ b/webkit/renderer/media/buffered_resource_loader.h @@ -15,7 +15,7 @@ #include "third_party/WebKit/public/platform/WebURLLoader.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/public/web/WebFrame.h" #include "webkit/renderer/media/active_loader.h" namespace media { diff --git a/webkit/renderer/media/buffered_resource_loader_unittest.cc b/webkit/renderer/media/buffered_resource_loader_unittest.cc index 5a1c0dd..14ece25 100644 --- a/webkit/renderer/media/buffered_resource_loader_unittest.cc +++ b/webkit/renderer/media/buffered_resource_loader_unittest.cc @@ -18,8 +18,8 @@ #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebView.h" #include "webkit/mocks/mock_webframeclient.h" #include "webkit/mocks/mock_weburlloader.h" #include "webkit/renderer/media/buffered_resource_loader.h" diff --git a/webkit/renderer/media/crypto/proxy_decryptor.cc b/webkit/renderer/media/crypto/proxy_decryptor.cc index 4bf7374..398a286 100644 --- a/webkit/renderer/media/crypto/proxy_decryptor.cc +++ b/webkit/renderer/media/crypto/proxy_decryptor.cc @@ -12,8 +12,8 @@ #if defined(ENABLE_PEPPER_CDMS) #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebMediaPlayerClient.h" #include "webkit/renderer/media/crypto/ppapi_decryptor.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" diff --git a/webkit/renderer/media/media_info_loader.cc b/webkit/renderer/media/media_info_loader.cc index 5db2e6d..9aeba1f 100644 --- a/webkit/renderer/media/media_info_loader.cc +++ b/webkit/renderer/media/media_info_loader.cc @@ -7,7 +7,7 @@ #include "base/bits.h" #include "base/callback_helpers.h" #include "base/metrics/histogram.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLLoader.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" diff --git a/webkit/renderer/media/media_info_loader.h b/webkit/renderer/media/media_info_loader.h index a0a85a8..0e403bd 100644 --- a/webkit/renderer/media/media_info_loader.h +++ b/webkit/renderer/media/media_info_loader.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" +#include "third_party/WebKit/public/web/WebMediaPlayer.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "webkit/renderer/media/active_loader.h" diff --git a/webkit/renderer/media/media_info_loader_unittest.cc b/webkit/renderer/media/media_info_loader_unittest.cc index 0ff79a8..45d7f99 100644 --- a/webkit/renderer/media/media_info_loader_unittest.cc +++ b/webkit/renderer/media/media_info_loader_unittest.cc @@ -4,8 +4,8 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebMediaPlayer.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" diff --git a/webkit/renderer/media/texttrack_impl.cc b/webkit/renderer/media/texttrack_impl.cc index ac6a640..5ac2d7e 100644 --- a/webkit/renderer/media/texttrack_impl.cc +++ b/webkit/renderer/media/texttrack_impl.cc @@ -4,7 +4,7 @@ #include "webkit/renderer/media/texttrack_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInbandTextTrackClient.h" +#include "third_party/WebKit/public/web/WebInbandTextTrackClient.h" #include "webkit/renderer/media/webinbandtexttrack_impl.h" namespace webkit_media { diff --git a/webkit/renderer/media/webaudiosourceprovider_impl.cc b/webkit/renderer/media/webaudiosourceprovider_impl.cc index 44fd63b..9b0e941 100644 --- a/webkit/renderer/media/webaudiosourceprovider_impl.cc +++ b/webkit/renderer/media/webaudiosourceprovider_impl.cc @@ -7,7 +7,7 @@ #include <vector> #include "base/logging.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProviderClient.h" +#include "third_party/WebKit/public/web/WebAudioSourceProviderClient.h" using WebKit::WebVector; diff --git a/webkit/renderer/media/webaudiosourceprovider_impl.h b/webkit/renderer/media/webaudiosourceprovider_impl.h index 242c8d7..0f39553 100644 --- a/webkit/renderer/media/webaudiosourceprovider_impl.h +++ b/webkit/renderer/media/webaudiosourceprovider_impl.h @@ -8,7 +8,7 @@ #include "base/synchronization/lock.h" #include "media/base/audio_renderer_sink.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h" +#include "third_party/WebKit/public/web/WebAudioSourceProvider.h" namespace WebKit { class WebAudioSourceProviderClient; diff --git a/webkit/renderer/media/webaudiosourceprovider_impl_unittest.cc b/webkit/renderer/media/webaudiosourceprovider_impl_unittest.cc index 5d84960..00de2fc 100644 --- a/webkit/renderer/media/webaudiosourceprovider_impl_unittest.cc +++ b/webkit/renderer/media/webaudiosourceprovider_impl_unittest.cc @@ -7,7 +7,7 @@ #include "media/base/mock_audio_renderer_sink.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProviderClient.h" +#include "third_party/WebKit/public/web/WebAudioSourceProviderClient.h" #include "webkit/renderer/media/webaudiosourceprovider_impl.h" namespace webkit_media { diff --git a/webkit/renderer/media/webinbandtexttrack_impl.h b/webkit/renderer/media/webinbandtexttrack_impl.h index db4eb7a..293b895 100644 --- a/webkit/renderer/media/webinbandtexttrack_impl.h +++ b/webkit/renderer/media/webinbandtexttrack_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_RENDERER_MEDIA_WEBINBANDTEXTTRACK_IMPL_H_ #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInbandTextTrack.h" +#include "third_party/WebKit/public/web/WebInbandTextTrack.h" namespace webkit_media { diff --git a/webkit/renderer/media/webmediaplayer_impl.cc b/webkit/renderer/media/webmediaplayer_impl.cc index a6aaa5a..091ef7b 100644 --- a/webkit/renderer/media/webmediaplayer_impl.cc +++ b/webkit/renderer/media/webmediaplayer_impl.cc @@ -39,9 +39,9 @@ #include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebMediaSource.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" +#include "third_party/WebKit/public/web/WebView.h" #include "v8/include/v8.h" #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" diff --git a/webkit/renderer/media/webmediaplayer_impl.h b/webkit/renderer/media/webmediaplayer_impl.h index 9bb8044..6bc8df1 100644 --- a/webkit/renderer/media/webmediaplayer_impl.h +++ b/webkit/renderer/media/webmediaplayer_impl.h @@ -37,9 +37,9 @@ #include "media/filters/skcanvas_video_renderer.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h" +#include "third_party/WebKit/public/web/WebAudioSourceProvider.h" +#include "third_party/WebKit/public/web/WebMediaPlayer.h" +#include "third_party/WebKit/public/web/WebMediaPlayerClient.h" #include "webkit/renderer/media/crypto/key_systems.h" #include "webkit/renderer/media/crypto/proxy_decryptor.h" diff --git a/webkit/renderer/media/webmediaplayer_ms.cc b/webkit/renderer/media/webmediaplayer_ms.cc index 82609bf..12b8fcc1 100644 --- a/webkit/renderer/media/webmediaplayer_ms.cc +++ b/webkit/renderer/media/webmediaplayer_ms.cc @@ -16,9 +16,9 @@ #include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebMediaPlayerClient.h" +#include "third_party/WebKit/public/web/WebView.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" #include "webkit/renderer/media/media_stream_audio_renderer.h" #include "webkit/renderer/media/media_stream_client.h" diff --git a/webkit/renderer/media/webmediaplayer_ms.h b/webkit/renderer/media/webmediaplayer_ms.h index 70d2082..d428cb6 100644 --- a/webkit/renderer/media/webmediaplayer_ms.h +++ b/webkit/renderer/media/webmediaplayer_ms.h @@ -13,7 +13,7 @@ #include "googleurl/src/gurl.h" #include "media/filters/skcanvas_video_renderer.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" +#include "third_party/WebKit/public/web/WebMediaPlayer.h" namespace WebKit { class WebFrame; diff --git a/webkit/renderer/media/webmediaplayer_util.h b/webkit/renderer/media/webmediaplayer_util.h index 1b63acf..aa891ac 100644 --- a/webkit/renderer/media/webmediaplayer_util.h +++ b/webkit/renderer/media/webmediaplayer_util.h @@ -8,8 +8,8 @@ #include "base/time.h" #include "media/base/pipeline_status.h" #include "media/base/ranges.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebTimeRange.h" +#include "third_party/WebKit/public/web/WebMediaPlayer.h" +#include "third_party/WebKit/public/web/WebTimeRange.h" namespace webkit_media { diff --git a/webkit/renderer/media/webmediasourceclient_impl.h b/webkit/renderer/media/webmediasourceclient_impl.h index 181634e..07dd698 100644 --- a/webkit/renderer/media/webmediasourceclient_impl.h +++ b/webkit/renderer/media/webmediasourceclient_impl.h @@ -9,7 +9,7 @@ #include <vector> #include "media/base/media_log.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSourceClient.h" +#include "third_party/WebKit/public/web/WebMediaSourceClient.h" namespace media { class ChunkDemuxer; diff --git a/webkit/renderer/media/websourcebuffer_impl.h b/webkit/renderer/media/websourcebuffer_impl.h index 88e6579..004b348 100644 --- a/webkit/renderer/media/websourcebuffer_impl.h +++ b/webkit/renderer/media/websourcebuffer_impl.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSourceBuffer.h" +#include "third_party/WebKit/public/web/WebSourceBuffer.h" namespace media { class ChunkDemuxer; diff --git a/webkit/renderer/webpreferences_renderer.cc b/webkit/renderer/webpreferences_renderer.cc index 9e0e517..9267ae2 100644 --- a/webkit/renderer/webpreferences_renderer.cc +++ b/webkit/renderer/webpreferences_renderer.cc @@ -5,11 +5,11 @@ #include "webkit/renderer/webpreferences_renderer.h" #include "base/strings/utf_string_conversions.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebNetworkStateNotifier.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" +#include "third_party/WebKit/public/web/WebSettings.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/icu/public/common/unicode/uchar.h" diff --git a/webkit/support/simple_database_system.cc b/webkit/support/simple_database_system.cc index 9bd7429..0605541 100644 --- a/webkit/support/simple_database_system.cc +++ b/webkit/support/simple_database_system.cc @@ -14,7 +14,7 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" +#include "third_party/WebKit/public/web/WebDatabase.h" #include "third_party/sqlite/sqlite3.h" #include "webkit/browser/database/database_util.h" #include "webkit/browser/database/vfs_backend.h" diff --git a/webkit/support/simple_database_system.h b/webkit/support/simple_database_system.h index 43bd466..e325476 100644 --- a/webkit/support/simple_database_system.h +++ b/webkit/support/simple_database_system.h @@ -13,7 +13,7 @@ #include "base/strings/string16.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabaseObserver.h" +#include "third_party/WebKit/public/web/WebDatabaseObserver.h" #include "webkit/browser/database/database_tracker.h" #include "webkit/common/database/database_connections.h" diff --git a/webkit/support/simple_dom_storage_system.cc b/webkit/support/simple_dom_storage_system.cc index b7eb545..2938138 100644 --- a/webkit/support/simple_dom_storage_system.cc +++ b/webkit/support/simple_dom_storage_system.cc @@ -9,7 +9,7 @@ #include "third_party/WebKit/public/platform/WebStorageArea.h" #include "third_party/WebKit/public/platform/WebStorageNamespace.h" #include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h" +#include "third_party/WebKit/public/web/WebStorageEventDispatcher.h" #include "webkit/browser/database/database_util.h" #include "webkit/browser/dom_storage/dom_storage_area.h" #include "webkit/browser/dom_storage/dom_storage_host.h" diff --git a/webkit/support/simple_file_system.cc b/webkit/support/simple_file_system.cc index 0011e41..cc2fbb2 100644 --- a/webkit/support/simple_file_system.cc +++ b/webkit/support/simple_file_system.cc @@ -15,10 +15,10 @@ #include "third_party/WebKit/public/platform/WebFileInfo.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemEntry.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFileSystemCallbacks.h" +#include "third_party/WebKit/public/web/WebFileSystemEntry.h" +#include "third_party/WebKit/public/web/WebFrame.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/browser/blob/blob_storage_controller.h" #include "webkit/browser/fileapi/file_permission_policy.h" diff --git a/webkit/support/test_media_stream_client.cc b/webkit/support/test_media_stream_client.cc index 16a87d2..60c23c8 100644 --- a/webkit/support/test_media_stream_client.cc +++ b/webkit/support/test_media_stream_client.cc @@ -9,7 +9,7 @@ #include "third_party/WebKit/public/platform/WebMediaStream.h" #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h" +#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" #include "webkit/renderer/media/media_stream_audio_renderer.h" #include "webkit/renderer/media/simple_video_frame_provider.h" diff --git a/webkit/support/test_shell_request_context.cc b/webkit/support/test_shell_request_context.cc index a7801de..58061ea 100644 --- a/webkit/support/test_shell_request_context.cc +++ b/webkit/support/test_shell_request_context.cc @@ -28,7 +28,7 @@ #include "net/url_request/http_user_agent_settings.h" #include "net/url_request/url_request_job_factory_impl.h" #include "third_party/WebKit/public/platform/Platform.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/public/web/WebKit.h" #include "webkit/browser/blob/blob_storage_controller.h" #include "webkit/browser/blob/blob_url_request_job_factory.h" #include "webkit/browser/fileapi/file_system_context.h" diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc index 83b3276..9a2ae8ee 100644 --- a/webkit/support/test_webkit_platform_support.cc +++ b/webkit/support/test_webkit_platform_support.cc @@ -16,12 +16,12 @@ #include "net/cookies/cookie_monster.h" #include "net/http/http_cache.h" #include "net/test/spawned_test_server/spawned_test_server.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#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 "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h" +#include "third_party/WebKit/public/web/WebDatabase.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" +#include "third_party/WebKit/public/web/WebScriptController.h" +#include "third_party/WebKit/public/web/WebSecurityPolicy.h" +#include "third_party/WebKit/public/web/WebStorageEventDispatcher.h" #include "third_party/WebKit/public/platform/WebAudioDevice.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebFileSystem.h" diff --git a/webkit/support/test_webplugin_page_delegate.cc b/webkit/support/test_webplugin_page_delegate.cc index a7628e9..f9a7cd9 100644 --- a/webkit/support/test_webplugin_page_delegate.cc +++ b/webkit/support/test_webplugin_page_delegate.cc @@ -5,7 +5,7 @@ #include "webkit/support/test_webplugin_page_delegate.h" #include "third_party/WebKit/public/platform/Platform.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/public/web/WebKit.h" namespace webkit_support { diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 4fc73c1..a9dbe95c 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -37,11 +37,11 @@ #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebCache.h" +#include "third_party/WebKit/public/web/WebFileSystemCallbacks.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebPluginParams.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/platform/WebStorageNamespace.h" #include "third_party/WebKit/public/platform/WebURLError.h" #if defined(TOOLKIT_GTK) diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h index c782bb7..85396dc 100644 --- a/webkit/support/webkit_support.h +++ b/webkit/support/webkit_support.h @@ -15,7 +15,7 @@ #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgentClient.h" +#include "third_party/WebKit/public/web/WebDevToolsAgentClient.h" #include "ui/base/keycodes/keyboard_codes.h" namespace base { diff --git a/webkit/support/weburl_loader_mock_factory.cc b/webkit/support/weburl_loader_mock_factory.cc index 9de3a88..1ac9bd49 100644 --- a/webkit/support/weburl_loader_mock_factory.cc +++ b/webkit/support/weburl_loader_mock_factory.cc @@ -10,7 +10,7 @@ #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" +#include "third_party/WebKit/public/web/WebCache.h" #include "webkit/support/webkit_support.h" #include "webkit/support/weburl_loader_mock.h" |