diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 00:22:09 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 00:22:09 +0000 |
| commit | c1088446ddc0571f98a2d40c1a8cfe86c715ffc1 (patch) | |
| tree | 089aa4fe1e448cf03fb6aff1f4d58993cbbfbb19 | |
| parent | 99d618856b2fd530f88c2431aaa5588367d360f9 (diff) | |
| download | chromium_src-c1088446ddc0571f98a2d40c1a8cfe86c715ffc1.zip chromium_src-c1088446ddc0571f98a2d40c1a8cfe86c715ffc1.tar.gz chromium_src-c1088446ddc0571f98a2d40c1a8cfe86c715ffc1.tar.bz2 | |
Update refernces to Blink's Platform API (webkit)
These headers have moved from Source/Platform/chromium/public to
public/platform. This CL updates src/webkit's references to the old location to
point to the new location. After this CL lands, I'll remove the forwarding
headers that are letting these references still work.
TBR=jamesr@chromium.org
BUG=239545
Review URL: https://chromiumcodereview.appspot.com/15937016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203020 0039d316-1c4b-4281-b951-d872f2087c98
169 files changed, 393 insertions, 393 deletions
diff --git a/webkit/DEPS b/webkit/DEPS index b52056e..d1f6f33 100644 --- a/webkit/DEPS +++ b/webkit/DEPS @@ -17,7 +17,7 @@ include_rules = [ "+third_party/skia", "+third_party/sqlite", "+third_party/tcmalloc", - "+third_party/WebKit/Source/Platform/chromium", + "+third_party/WebKit/public/platform", "+third_party/WebKit/Source/WebKit/chromium", "+v8", diff --git a/webkit/appcache/web_application_cache_host_impl.cc b/webkit/appcache/web_application_cache_host_impl.cc index 2b9eafb..0b44238 100644 --- a/webkit/appcache/web_application_cache_host_impl.cc +++ b/webkit/appcache/web_application_cache_host_impl.cc @@ -8,9 +8,9 @@ #include "base/id_map.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.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" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/webkit/appcache/web_application_cache_host_impl.h b/webkit/appcache/web_application_cache_host_impl.h index d855d95..90bccbc 100644 --- a/webkit/appcache/web_application_cache_host_impl.h +++ b/webkit/appcache/web_application_cache_host_impl.h @@ -8,8 +8,8 @@ #include <string> #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebApplicationCacheHostClient.h" #include "webkit/appcache/appcache_interfaces.h" #include "webkit/storage/webkit_storage_export.h" diff --git a/webkit/base/file_path_string_conversions.cc b/webkit/base/file_path_string_conversions.cc index 1206ae2..e7d8986 100644 --- a/webkit/base/file_path_string_conversions.cc +++ b/webkit/base/file_path_string_conversions.cc @@ -6,7 +6,7 @@ #include "base/strings/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" namespace webkit_base { diff --git a/webkit/base/origin_url_conversions.cc b/webkit/base/origin_url_conversions.cc index ac26bd8..82bef21 100644 --- a/webkit/base/origin_url_conversions.cc +++ b/webkit/base/origin_url_conversions.cc @@ -6,7 +6,7 @@ #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" namespace webkit_base { diff --git a/webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc index df2ebe3..ad46cb9 100644 --- a/webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc +++ b/webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc @@ -12,9 +12,9 @@ #include "base/synchronization/lock.h" #include "base/utf_string_conversions.h" #include "chromeos/dbus/cros_disks_client.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebCString.h" +#include "third_party/WebKit/public/platform/WebFileSystem.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "webkit/browser/chromeos/fileapi/file_access_permissions.h" #include "webkit/browser/chromeos/fileapi/remote_file_stream_writer.h" #include "webkit/browser/chromeos/fileapi/remote_file_system_operation.h" diff --git a/webkit/browser/database/database_util.cc b/webkit/browser/database/database_util.cc index 6c98d4e..b2b1cde 100644 --- a/webkit/browser/database/database_util.cc +++ b/webkit/browser/database/database_util.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/utf_string_conversions.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "webkit/browser/database/database_tracker.h" #include "webkit/browser/database/vfs_backend.h" diff --git a/webkit/common/fileapi/file_system_types.h b/webkit/common/fileapi/file_system_types.h index b2d1f83..6872dc8 100644 --- a/webkit/common/fileapi/file_system_types.h +++ b/webkit/common/fileapi/file_system_types.h @@ -5,8 +5,8 @@ #ifndef WEBKIT_COMMON_FILEAPI_FILE_SYSTEM_TYPES_H_ #define WEBKIT_COMMON_FILEAPI_FILE_SYSTEM_TYPES_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h" +#include "third_party/WebKit/public/platform/WebFileSystem.h" +#include "third_party/WebKit/public/platform/WebFileSystemType.h" namespace fileapi { diff --git a/webkit/common/fileapi/file_system_util.h b/webkit/common/fileapi/file_system_util.h index 45859f9..9eb3c33 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/Platform/chromium/public/WebFileSystemType.h" +#include "third_party/WebKit/public/platform/WebFileSystemType.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h" #include "webkit/common/fileapi/file_system_types.h" #include "webkit/quota/quota_types.h" diff --git a/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc b/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc index c1e9a20..c70503e 100644 --- a/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc +++ b/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc @@ -4,7 +4,7 @@ #include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" +#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/skia/include/gpu/GrContext.h" #include "third_party/skia/include/gpu/gl/GrGLInterface.h" diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h index 6e2beef..de1ef9f 100644 --- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h @@ -12,8 +12,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "gpu/command_buffer/client/gpu_memory_buffer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "ui/gfx/native_widget_types.h" #include "webkit/common/gpu/webkit_gpu_export.h" diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/common/gpu/webgraphicscontext3d_in_process_impl.cc index 3129947..782a750 100644 --- a/webkit/common/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_impl.cc @@ -15,7 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_split.h" #include "base/synchronization/lock.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_bindings_skia_in_process.h" #include "ui/gl/gl_context.h" diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/common/gpu/webgraphicscontext3d_in_process_impl.h index a631c29..4a26265 100644 --- a/webkit/common/gpu/webgraphicscontext3d_in_process_impl.h +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_impl.h @@ -11,8 +11,8 @@ #include "base/compiler_specific.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/angle/include/GLSLANG/ShaderLang.h" #include "ui/gfx/native_widget_types.h" #include "webkit/common/gpu/webkit_gpu_export.h" diff --git a/webkit/common/gpu/webgraphicscontext3d_provider_impl.h b/webkit/common/gpu/webgraphicscontext3d_provider_impl.h index 8dc28e8..da52123 100644 --- a/webkit/common/gpu/webgraphicscontext3d_provider_impl.h +++ b/webkit/common/gpu/webgraphicscontext3d_provider_impl.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3DProvider.h" +#include "third_party/WebKit/public/platform/WebGraphicsContext3DProvider.h" #include "webkit/common/gpu/webkit_gpu_export.h" namespace cc { class ContextProvider; } diff --git a/webkit/dom_storage/dom_storage_area.cc b/webkit/dom_storage/dom_storage_area.cc index d87fa5e..269f3f7 100644 --- a/webkit/dom_storage/dom_storage_area.cc +++ b/webkit/dom_storage/dom_storage_area.cc @@ -10,7 +10,7 @@ #include "base/metrics/histogram.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/base/origin_url_conversions.h" #include "webkit/browser/database/database_util.h" diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc index d81a548..8a4afe4 100644 --- a/webkit/glue/cpp_bound_class.cc +++ b/webkit/glue/cpp_bound_class.cc @@ -18,7 +18,7 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/utf_string_conversions.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/webkit/glue/fling_animator_impl_android.cc b/webkit/glue/fling_animator_impl_android.cc index 3189fed..85ef6e1 100644 --- a/webkit/glue/fling_animator_impl_android.cc +++ b/webkit/glue/fling_animator_impl_android.cc @@ -8,8 +8,8 @@ #include "base/android/scoped_java_ref.h" #include "base/logging.h" #include "jni/OverScroller_jni.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurveTarget.h" +#include "third_party/WebKit/public/platform/WebFloatSize.h" +#include "third_party/WebKit/public/platform/WebGestureCurveTarget.h" #include "ui/gfx/screen.h" #include "ui/gfx/vector2d.h" diff --git a/webkit/glue/fling_animator_impl_android.h b/webkit/glue/fling_animator_impl_android.h index 5b41d1e..63d4e0c 100644 --- a/webkit/glue/fling_animator_impl_android.h +++ b/webkit/glue/fling_animator_impl_android.h @@ -6,9 +6,9 @@ #define WEBKIT_GLUE_FLING_ANIMATOR_IMPL_ANDROID_H_ #include "base/android/scoped_java_ref.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "ui/gfx/point.h" #include "ui/gfx/point_f.h" #include "webkit/glue/webkit_glue_export.h" diff --git a/webkit/glue/fling_curve_configuration.cc b/webkit/glue/fling_curve_configuration.cc index 5d30715..1b0a63a 100644 --- a/webkit/glue/fling_curve_configuration.cc +++ b/webkit/glue/fling_curve_configuration.cc @@ -5,7 +5,7 @@ #include "webkit/glue/fling_curve_configuration.h" #include "base/logging.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" #include "webkit/glue/touch_fling_gesture_curve.h" namespace webkit_glue { diff --git a/webkit/glue/fling_curve_configuration.h b/webkit/glue/fling_curve_configuration.h index 548c530..d229ee8 100644 --- a/webkit/glue/fling_curve_configuration.h +++ b/webkit/glue/fling_curve_configuration.h @@ -8,8 +8,8 @@ #include <vector> #include "base/synchronization/lock.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebSize.h" namespace WebKit { class WebGestureCurve; diff --git a/webkit/glue/ftp_directory_listing_response_delegate.cc b/webkit/glue/ftp_directory_listing_response_delegate.cc index 325e169..dd56ce4 100644 --- a/webkit/glue/ftp_directory_listing_response_delegate.cc +++ b/webkit/glue/ftp_directory_listing_response_delegate.cc @@ -17,8 +17,8 @@ #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/ftp/ftp_directory_listing_parser.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "webkit/glue/weburlresponse_extradata_impl.h" using net::FtpDirectoryListingEntry; diff --git a/webkit/glue/ftp_directory_listing_response_delegate.h b/webkit/glue/ftp_directory_listing_response_delegate.h index a5cea90..0562049 100644 --- a/webkit/glue/ftp_directory_listing_response_delegate.h +++ b/webkit/glue/ftp_directory_listing_response_delegate.h @@ -11,7 +11,7 @@ #include <string> #include "base/basictypes.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" namespace WebKit { class WebURLLoader; diff --git a/webkit/glue/glue_serialize_deprecated.cc b/webkit/glue/glue_serialize_deprecated.cc index b85eed8..0582801 100644 --- a/webkit/glue/glue_serialize_deprecated.cc +++ b/webkit/glue/glue_serialize_deprecated.cc @@ -9,12 +9,12 @@ #include "base/pickle.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebHTTPBody.h" +#include "third_party/WebKit/public/platform/WebPoint.h" +#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 "ui/gfx/screen.h" diff --git a/webkit/glue/glue_serialize_unittest.cc b/webkit/glue/glue_serialize_unittest.cc index 3f0dd37..1e9265a 100644 --- a/webkit/glue/glue_serialize_unittest.cc +++ b/webkit/glue/glue_serialize_unittest.cc @@ -7,9 +7,9 @@ #include "base/pickle.h" #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebHTTPBody.h" +#include "third_party/WebKit/public/platform/WebPoint.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "ui/gfx/screen.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/glue/glue_serialize_deprecated.h" diff --git a/webkit/glue/image_decoder.cc b/webkit/glue/image_decoder.cc index 1429b09..2c30ba1 100644 --- a/webkit/glue/image_decoder.cc +++ b/webkit/glue/image_decoder.cc @@ -4,9 +4,9 @@ #include "webkit/glue/image_decoder.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebImage.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/skia/include/core/SkBitmap.h" using WebKit::WebData; diff --git a/webkit/glue/multipart_response_delegate.cc b/webkit/glue/multipart_response_delegate.cc index e15cfb3..b1aa070 100644 --- a/webkit/glue/multipart_response_delegate.cc +++ b/webkit/glue/multipart_response_delegate.cc @@ -9,10 +9,10 @@ #include "base/strings/string_number_conversions.h" #include "net/base/net_util.h" #include "net/http/http_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPHeaderVisitor.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" +#include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" using WebKit::WebHTTPHeaderVisitor; using WebKit::WebString; diff --git a/webkit/glue/multipart_response_delegate.h b/webkit/glue/multipart_response_delegate.h index e0282b0..10b3171 100644 --- a/webkit/glue/multipart_response_delegate.h +++ b/webkit/glue/multipart_response_delegate.h @@ -52,7 +52,7 @@ #include <string> #include "base/basictypes.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" #include "webkit/glue/webkit_glue_export.h" namespace WebKit { diff --git a/webkit/glue/multipart_response_delegate_unittest.cc b/webkit/glue/multipart_response_delegate_unittest.cc index 7522f1f..8e43d85 100644 --- a/webkit/glue/multipart_response_delegate_unittest.cc +++ b/webkit/glue/multipart_response_delegate_unittest.cc @@ -5,10 +5,10 @@ #include <vector> #include "base/basictypes.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" #include "webkit/glue/multipart_response_delegate.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h index f914bec..3389394 100644 --- a/webkit/glue/resource_loader_bridge.h +++ b/webkit/glue/resource_loader_bridge.h @@ -33,8 +33,8 @@ #include "net/base/load_timing_info.h" #include "net/base/request_priority.h" #include "net/url_request/url_request_status.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebReferrerPolicy.h" +#include "third_party/WebKit/public/platform/WebURLRequest.h" #include "webkit/glue/resource_type.h" #include "webkit/glue/webkit_glue_export.h" diff --git a/webkit/glue/resource_type.h b/webkit/glue/resource_type.h index 0bd80ea..f083806 100644 --- a/webkit/glue/resource_type.h +++ b/webkit/glue/resource_type.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_RESOURCE_TYPE_H__ #include "base/basictypes.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebURLRequest.h" #include "webkit/glue/webkit_glue_export.h" class ResourceType { diff --git a/webkit/glue/simple_webmimeregistry_impl.cc b/webkit/glue/simple_webmimeregistry_impl.cc index 7faae4a..6e02693 100644 --- a/webkit/glue/simple_webmimeregistry_impl.cc +++ b/webkit/glue/simple_webmimeregistry_impl.cc @@ -9,7 +9,7 @@ #include "base/utf_string_conversions.h" #include "media/filters/stream_parser_factory.h" #include "net/base/mime_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/media/crypto/key_systems.h" diff --git a/webkit/glue/simple_webmimeregistry_impl.h b/webkit/glue/simple_webmimeregistry_impl.h index 78eb1f7..cdf6232 100644 --- a/webkit/glue/simple_webmimeregistry_impl.h +++ b/webkit/glue/simple_webmimeregistry_impl.h @@ -6,7 +6,7 @@ #define WEBMIMEREGISTRY_IMPL_H_ #include "base/compiler_specific.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebMimeRegistry.h" +#include "third_party/WebKit/public/platform/WebMimeRegistry.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/glue/touch_fling_gesture_curve.cc b/webkit/glue/touch_fling_gesture_curve.cc index 88a8280..861a0b6 100644 --- a/webkit/glue/touch_fling_gesture_curve.cc +++ b/webkit/glue/touch_fling_gesture_curve.cc @@ -8,11 +8,11 @@ #include "base/debug/trace_event.h" #include "base/logging.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurveTarget.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebFloatSize.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebGestureCurveTarget.h" +#include "third_party/WebKit/public/platform/WebSize.h" using WebKit::WebFloatPoint; using WebKit::WebFloatSize; diff --git a/webkit/glue/touch_fling_gesture_curve.h b/webkit/glue/touch_fling_gesture_curve.h index 599a4ee..24fda60 100644 --- a/webkit/glue/touch_fling_gesture_curve.h +++ b/webkit/glue/touch_fling_gesture_curve.h @@ -5,10 +5,10 @@ #ifndef WEBKIT_GLUE_TOUCH_FLING_GESTURE_CURVE_H_ #define WEBKIT_GLUE_TOUCH_FLING_GESTURE_CURVE_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebFloatSize.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "webkit/glue/webkit_glue_export.h" namespace WebKit { diff --git a/webkit/glue/touch_fling_gesture_curve_unittest.cc b/webkit/glue/touch_fling_gesture_curve_unittest.cc index 300b565..b8ed1a5 100644 --- a/webkit/glue/touch_fling_gesture_curve_unittest.cc +++ b/webkit/glue/touch_fling_gesture_curve_unittest.cc @@ -8,11 +8,11 @@ #include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurveTarget.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebFloatSize.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebGestureCurveTarget.h" +#include "third_party/WebKit/public/platform/WebSize.h" using WebKit::WebFloatPoint; using WebKit::WebFloatSize; diff --git a/webkit/glue/web_discardable_memory_impl.h b/webkit/glue/web_discardable_memory_impl.h index 7f92aff..ced8afe 100644 --- a/webkit/glue/web_discardable_memory_impl.h +++ b/webkit/glue/web_discardable_memory_impl.h @@ -7,7 +7,7 @@ #include "base/memory/discardable_memory.h" #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebDiscardableMemory.h" +#include "third_party/WebKit/public/platform/WebDiscardableMemory.h" #include "webkit/glue/webkit_glue_export.h" namespace WebKit { diff --git a/webkit/glue/web_io_operators.cc b/webkit/glue/web_io_operators.cc index 60e441b..c763479 100644 --- a/webkit/glue/web_io_operators.cc +++ b/webkit/glue/web_io_operators.cc @@ -6,14 +6,14 @@ #include <ostream> -#include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" +#include "third_party/WebKit/public/platform/WebPoint.h" +#include "third_party/WebKit/public/platform/WebRect.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #if defined(WCHAR_T_IS_UTF32) #include "base/string16.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #endif // defined(WCHAR_T_IS_UTF32) namespace WebKit { diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc index 302c81e..a6442d1 100644 --- a/webkit/glue/webclipboard_impl.cc +++ b/webkit/glue/webclipboard_impl.cc @@ -10,13 +10,13 @@ #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebDragData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebDragData.h" +#include "third_party/WebKit/public/platform/WebImage.h" +#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/public/platform/WebVector.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/custom_data_helper.h" diff --git a/webkit/glue/webclipboard_impl.h b/webkit/glue/webclipboard_impl.h index f9f4498..3943d20 100644 --- a/webkit/glue/webclipboard_impl.h +++ b/webkit/glue/webclipboard_impl.h @@ -6,7 +6,7 @@ #define WEBCLIPBOARD_IMPL_H_ #include "base/compiler_specific.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebClipboard.h" +#include "third_party/WebKit/public/platform/WebClipboard.h" #include "ui/base/clipboard/clipboard.h" #include "webkit/glue/webkit_glue_export.h" diff --git a/webkit/glue/webcursor.cc b/webkit/glue/webcursor.cc index 622e29d..ddeb8ea 100644 --- a/webkit/glue/webcursor.cc +++ b/webkit/glue/webcursor.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/pickle.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" +#include "third_party/WebKit/public/platform/WebImage.h" using WebKit::WebCursorInfo; diff --git a/webkit/glue/webcursor_mac.mm b/webkit/glue/webcursor_mac.mm index 95e545f..d511463 100644 --- a/webkit/glue/webcursor_mac.mm +++ b/webkit/glue/webcursor_mac.mm @@ -12,8 +12,8 @@ #include "base/memory/scoped_nsobject.h" #include "grit/webkit_chromium_resources.h" #include "skia/ext/skia_utils_mac.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebImage.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/point_conversions.h" diff --git a/webkit/glue/webdropdata.cc b/webkit/glue/webdropdata.cc index 5cbfa8a..71d79c1 100644 --- a/webkit/glue/webdropdata.cc +++ b/webkit/glue/webdropdata.cc @@ -9,11 +9,11 @@ #include "base/string_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebDragData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebDragData.h" +#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 "ui/base/clipboard/clipboard.h" using WebKit::WebData; diff --git a/webkit/glue/webdropdata.h b/webkit/glue/webdropdata.h index 0df68f0..19b9fae 100644 --- a/webkit/glue/webdropdata.h +++ b/webkit/glue/webdropdata.h @@ -16,7 +16,7 @@ #include "base/nullable_string16.h" #include "base/string16.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" +#include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "webkit/glue/webkit_glue_export.h" struct IDataObject; diff --git a/webkit/glue/webfallbackthemeengine_impl.cc b/webkit/glue/webfallbackthemeengine_impl.cc index 213e3a7..6a7319e 100644 --- a/webkit/glue/webfallbackthemeengine_impl.cc +++ b/webkit/glue/webfallbackthemeengine_impl.cc @@ -5,8 +5,8 @@ #include "webkit/glue/webfallbackthemeengine_impl.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "ui/native_theme/fallback_theme.h" using WebKit::WebCanvas; diff --git a/webkit/glue/webfallbackthemeengine_impl.h b/webkit/glue/webfallbackthemeengine_impl.h index 0887774..fbdcb8c 100644 --- a/webkit/glue/webfallbackthemeengine_impl.h +++ b/webkit/glue/webfallbackthemeengine_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_WEBFALLBACKTHEMEENGINE_IMPL_H_ #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFallbackThemeEngine.h" +#include "third_party/WebKit/public/platform/WebFallbackThemeEngine.h" namespace ui { class FallbackTheme; diff --git a/webkit/glue/webfileutilities_impl.cc b/webkit/glue/webfileutilities_impl.cc index fb0b831..17b6ef5 100644 --- a/webkit/glue/webfileutilities_impl.cc +++ b/webkit/glue/webfileutilities_impl.cc @@ -9,9 +9,9 @@ #include "base/logging.h" #include "net/base/file_stream.h" #include "net/base/net_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileInfo.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebFileInfo.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/glue/webfileutilities_impl.h b/webkit/glue/webfileutilities_impl.h index 741a1c4..a3d2bb2 100644 --- a/webkit/glue/webfileutilities_impl.h +++ b/webkit/glue/webfileutilities_impl.h @@ -6,8 +6,8 @@ #define WEBFILEUTILITIES_IMPL_H_ #include "base/platform_file.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileInfo.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileUtilities.h" +#include "third_party/WebKit/public/platform/WebFileInfo.h" +#include "third_party/WebKit/public/platform/WebFileUtilities.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index c8796cb..6485e58 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -33,13 +33,13 @@ #if defined(OS_MACOSX) #include "skia/ext/skia_utils_mac.h" #endif -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileInfo.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebFileInfo.h" +#include "third_party/WebKit/public/platform/WebImage.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#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" diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 53fe977..3b3d90d2 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -16,8 +16,8 @@ #include "base/platform_file.h" #include "base/string16.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCanvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" +#include "third_party/WebKit/public/platform/WebCanvas.h" +#include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "webkit/glue/webkit_glue_export.h" class SkBitmap; diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index d03d58f..16cb166 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -29,14 +29,14 @@ #include "grit/webkit_resources.h" #include "grit/webkit_strings.h" #include "net/base/net_errors.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCookie.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebDiscardableMemory.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebPluginListBuilder.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.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" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebPluginListBuilder.h" +#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/WebFrameClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" diff --git a/webkit/glue/webkitplatformsupport_impl.h b/webkit/glue/webkitplatformsupport_impl.h index e8c2b28..82f3178 100644 --- a/webkit/glue/webkitplatformsupport_impl.h +++ b/webkit/glue/webkitplatformsupport_impl.h @@ -10,8 +10,8 @@ #include "base/platform_file.h" #include "base/threading/thread_local_storage.h" #include "base/timer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" +#include "third_party/WebKit/public/platform/Platform.h" +#include "third_party/WebKit/public/platform/WebURLError.h" #include "ui/base/layout.h" #include "webkit/glue/resource_loader_bridge.h" #include "webkit/glue/webfallbackthemeengine_impl.h" diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index 93ecace..a8c16ed 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -7,9 +7,9 @@ #include "base/basictypes.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#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/WebNetworkStateNotifier.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/glue/websocketstreamhandle_impl.cc index 6737439..3a68cbb 100644 --- a/webkit/glue/websocketstreamhandle_impl.cc +++ b/webkit/glue/websocketstreamhandle_impl.cc @@ -13,10 +13,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamHandleClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebSocketStreamError.h" +#include "third_party/WebKit/public/platform/WebSocketStreamHandleClient.h" +#include "third_party/WebKit/public/platform/WebURL.h" #include "webkit/glue/webkitplatformsupport_impl.h" #include "webkit/glue/websocketstreamhandle_bridge.h" #include "webkit/glue/websocketstreamhandle_delegate.h" diff --git a/webkit/glue/websocketstreamhandle_impl.h b/webkit/glue/websocketstreamhandle_impl.h index 26de021..827bb88 100644 --- a/webkit/glue/websocketstreamhandle_impl.h +++ b/webkit/glue/websocketstreamhandle_impl.h @@ -7,7 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/supports_user_data.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamHandle.h" +#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" namespace webkit_glue { diff --git a/webkit/glue/webthemeengine_impl_android.cc b/webkit/glue/webthemeengine_impl_android.cc index 8a6dbbb..ee46493 100644 --- a/webkit/glue/webthemeengine_impl_android.cc +++ b/webkit/glue/webthemeengine_impl_android.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "ui/native_theme/native_theme.h" using WebKit::WebCanvas; diff --git a/webkit/glue/webthemeengine_impl_android.h b/webkit/glue/webthemeengine_impl_android.h index d626f80..e2b071e 100644 --- a/webkit/glue/webthemeengine_impl_android.h +++ b/webkit/glue/webthemeengine_impl_android.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_ANDROID_H_ #define WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_ANDROID_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/android/WebThemeEngine.h" +#include "third_party/WebKit/public/platform/android/WebThemeEngine.h" namespace webkit_glue { diff --git a/webkit/glue/webthemeengine_impl_default.cc b/webkit/glue/webthemeengine_impl_default.cc index 198067a..9be9ea8 100644 --- a/webkit/glue/webthemeengine_impl_default.cc +++ b/webkit/glue/webthemeengine_impl_default.cc @@ -5,8 +5,8 @@ #include "webkit/glue/webthemeengine_impl_default.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "ui/native_theme/native_theme.h" using WebKit::WebCanvas; diff --git a/webkit/glue/webthemeengine_impl_default.h b/webkit/glue/webthemeengine_impl_default.h index 6d37a86..df97812 100644 --- a/webkit/glue/webthemeengine_impl_default.h +++ b/webkit/glue/webthemeengine_impl_default.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_DEFAULT_H_ #define WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_DEFAULT_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/default/WebThemeEngine.h" +#include "third_party/WebKit/public/platform/default/WebThemeEngine.h" namespace webkit_glue { diff --git a/webkit/glue/webthemeengine_impl_mac.cc b/webkit/glue/webthemeengine_impl_mac.cc index 58c6db2..c640bd6 100644 --- a/webkit/glue/webthemeengine_impl_mac.cc +++ b/webkit/glue/webthemeengine_impl_mac.cc @@ -7,8 +7,8 @@ #include <Carbon/Carbon.h> #include "skia/ext/skia_utils_mac.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCanvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" +#include "third_party/WebKit/public/platform/WebCanvas.h" +#include "third_party/WebKit/public/platform/WebRect.h" using WebKit::WebCanvas; using WebKit::WebRect; diff --git a/webkit/glue/webthemeengine_impl_mac.h b/webkit/glue/webthemeengine_impl_mac.h index adaa906..1d952cc 100644 --- a/webkit/glue/webthemeengine_impl_mac.h +++ b/webkit/glue/webthemeengine_impl_mac.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_MAC_H_ #define WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_MAC_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/mac/WebThemeEngine.h" +#include "third_party/WebKit/public/platform/mac/WebThemeEngine.h" namespace webkit_glue { diff --git a/webkit/glue/webthemeengine_impl_win.cc b/webkit/glue/webthemeengine_impl_win.cc index 8bd4b88..c4dde227 100644 --- a/webkit/glue/webthemeengine_impl_win.cc +++ b/webkit/glue/webthemeengine_impl_win.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/skia_utils_win.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" +#include "third_party/WebKit/public/platform/WebRect.h" #include "ui/base/win/dpi.h" #include "ui/native_theme/native_theme.h" diff --git a/webkit/glue/webthemeengine_impl_win.h b/webkit/glue/webthemeengine_impl_win.h index 75e5513..8635cc8 100644 --- a/webkit/glue/webthemeengine_impl_win.h +++ b/webkit/glue/webthemeengine_impl_win.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_WIN_H_ #define WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_WIN_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/win/WebThemeEngine.h" +#include "third_party/WebKit/public/platform/win/WebThemeEngine.h" namespace webkit_glue { diff --git a/webkit/glue/webthread_impl.h b/webkit/glue/webthread_impl.h index be9a4ba..f71a582 100644 --- a/webkit/glue/webthread_impl.h +++ b/webkit/glue/webthread_impl.h @@ -8,7 +8,7 @@ #include "base/threading/thread.h" #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebThread.h" +#include "third_party/WebKit/public/platform/WebThread.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc index d550422..fcfeb8c 100644 --- a/webkit/glue/weburlloader_impl.cc +++ b/webkit/glue/weburlloader_impl.cc @@ -20,14 +20,14 @@ #include "net/base/net_util.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPHeaderVisitor.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPLoadInfo.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoadTiming.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" +#include "third_party/WebKit/public/platform/WebHTTPLoadInfo.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebURLError.h" +#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" +#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 "webkit/base/file_path_string_conversions.h" #include "webkit/glue/ftp_directory_listing_response_delegate.h" diff --git a/webkit/glue/weburlloader_impl.h b/webkit/glue/weburlloader_impl.h index 27c28d6..ecca9f4 100644 --- a/webkit/glue/weburlloader_impl.h +++ b/webkit/glue/weburlloader_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_WEBURLLOADER_IMPL_H_ #include "base/memory/ref_counted.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoader.h" +#include "third_party/WebKit/public/platform/WebURLLoader.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/glue/weburlrequest_extradata_impl.h b/webkit/glue/weburlrequest_extradata_impl.h index 50688d2..f268303 100644 --- a/webkit/glue/weburlrequest_extradata_impl.h +++ b/webkit/glue/weburlrequest_extradata_impl.h @@ -6,9 +6,9 @@ #define WEBKIT_GLUE_WEBURLREQUEST_EXTRADATA_IMPL_H_ #include "base/compiler_specific.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebReferrerPolicy.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURLRequest.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/glue/weburlresponse_extradata_impl.h b/webkit/glue/weburlresponse_extradata_impl.h index 0b60bce..84b63e8 100644 --- a/webkit/glue/weburlresponse_extradata_impl.h +++ b/webkit/glue/weburlresponse_extradata_impl.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/glue/worker_task_runner.h b/webkit/glue/worker_task_runner.h index 49b1cd7..8e84b88 100644 --- a/webkit/glue/worker_task_runner.h +++ b/webkit/glue/worker_task_runner.h @@ -11,7 +11,7 @@ #include "base/callback_forward.h" #include "base/synchronization/lock.h" #include "base/threading/thread_local.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebWorkerRunLoop.h" +#include "third_party/WebKit/public/platform/WebWorkerRunLoop.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/media/active_loader.cc b/webkit/media/active_loader.cc index 02d098a..b88daf6 100644 --- a/webkit/media/active_loader.cc +++ b/webkit/media/active_loader.cc @@ -4,7 +4,7 @@ #include "webkit/media/active_loader.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoader.h" +#include "third_party/WebKit/public/platform/WebURLLoader.h" #include "webkit/media/buffered_resource_loader.h" namespace webkit_media { diff --git a/webkit/media/android/audio_decoder_android.cc b/webkit/media/android/audio_decoder_android.cc index 95c581b..05143e8 100644 --- a/webkit/media/android/audio_decoder_android.cc +++ b/webkit/media/android/audio_decoder_android.cc @@ -19,7 +19,7 @@ #include "media/base/android/webaudio_media_codec_info.h" #include "media/base/audio_bus.h" #include "media/base/limits.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebAudioBus.h" +#include "third_party/WebKit/public/platform/WebAudioBus.h" namespace webkit_media { diff --git a/webkit/media/android/media_source_delegate.cc b/webkit/media/android/media_source_delegate.cc index 1b63ed1..1386ca2 100644 --- a/webkit/media/android/media_source_delegate.cc +++ b/webkit/media/android/media_source_delegate.cc @@ -11,7 +11,7 @@ #include "media/base/demuxer_stream.h" #include "media/base/media_log.h" #include "media/filters/chunk_demuxer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.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" diff --git a/webkit/media/android/webmediaplayer_android.cc b/webkit/media/android/webmediaplayer_android.cc index 5a49c90..03f05b1 100644 --- a/webkit/media/android/webmediaplayer_android.cc +++ b/webkit/media/android/webmediaplayer_android.cc @@ -15,7 +15,7 @@ #include "media/base/media_switches.h" #include "media/base/video_frame.h" #include "net/base/mime_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.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" diff --git a/webkit/media/android/webmediaplayer_android.h b/webkit/media/android/webmediaplayer_android.h index ce4f95e..c0fdee3 100644 --- a/webkit/media/android/webmediaplayer_android.h +++ b/webkit/media/android/webmediaplayer_android.h @@ -14,9 +14,9 @@ #include "base/time.h" #include "media/base/demuxer_stream.h" #include "cc/layers/video_frame_provider.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#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 "ui/gfx/rect_f.h" #include "webkit/media/android/media_source_delegate.h" diff --git a/webkit/media/audio_decoder.cc b/webkit/media/audio_decoder.cc index 1985222..617e291 100644 --- a/webkit/media/audio_decoder.cc +++ b/webkit/media/audio_decoder.cc @@ -12,7 +12,7 @@ #include "media/base/limits.h" #include "media/filters/audio_file_reader.h" #include "media/filters/in_memory_url_protocol.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebAudioBus.h" +#include "third_party/WebKit/public/platform/WebAudioBus.h" using media::AudioBus; using media::AudioFileReader; diff --git a/webkit/media/buffered_data_source_unittest.cc b/webkit/media/buffered_data_source_unittest.cc index 7bbceeb9..f2e9241 100644 --- a/webkit/media/buffered_data_source_unittest.cc +++ b/webkit/media/buffered_data_source_unittest.cc @@ -8,7 +8,7 @@ #include "media/base/mock_data_source_host.h" #include "media/base/mock_filters.h" #include "media/base/test_helpers.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/media/buffered_data_source.h" #include "webkit/mocks/mock_webframeclient.h" diff --git a/webkit/media/buffered_resource_loader.cc b/webkit/media/buffered_resource_loader.cc index 5177c89..8bc5b24 100644 --- a/webkit/media/buffered_resource_loader.cc +++ b/webkit/media/buffered_resource_loader.cc @@ -13,9 +13,9 @@ #include "base/strings/string_number_conversions.h" #include "media/base/media_log.h" #include "net/http/http_request_headers.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#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 "webkit/media/cache_util.h" diff --git a/webkit/media/buffered_resource_loader.h b/webkit/media/buffered_resource_loader.h index c048239..274cf30 100644 --- a/webkit/media/buffered_resource_loader.h +++ b/webkit/media/buffered_resource_loader.h @@ -12,9 +12,9 @@ #include "base/timer.h" #include "googleurl/src/gurl.h" #include "media/base/seekable_buffer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoader.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" +#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 "webkit/media/active_loader.h" diff --git a/webkit/media/buffered_resource_loader_unittest.cc b/webkit/media/buffered_resource_loader_unittest.cc index f36896a..5d08e75 100644 --- a/webkit/media/buffered_resource_loader_unittest.cc +++ b/webkit/media/buffered_resource_loader_unittest.cc @@ -14,10 +14,10 @@ #include "net/base/net_errors.h" #include "net/http/http_request_headers.h" #include "net/http/http_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebString.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" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/media/buffered_resource_loader.h" diff --git a/webkit/media/cache_util.cc b/webkit/media/cache_util.cc index 3a34a51..773fa29 100644 --- a/webkit/media/cache_util.cc +++ b/webkit/media/cache_util.cc @@ -11,9 +11,9 @@ #include "base/time.h" #include "net/http/http_util.h" #include "net/http/http_version.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebCString.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" using base::Time; using base::TimeDelta; diff --git a/webkit/media/cache_util_unittest.cc b/webkit/media/cache_util_unittest.cc index e937a97d..f86e0c0 100644 --- a/webkit/media/cache_util_unittest.cc +++ b/webkit/media/cache_util_unittest.cc @@ -11,8 +11,8 @@ #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" using WebKit::WebString; using WebKit::WebURLResponse; diff --git a/webkit/media/crypto/key_systems.cc b/webkit/media/crypto/key_systems.cc index 0450164..810fd71 100644 --- a/webkit/media/crypto/key_systems.cc +++ b/webkit/media/crypto/key_systems.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/string_util.h" #include "net/base/mime_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebCString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "webkit/media/crypto/key_systems_info.h" namespace webkit_media { diff --git a/webkit/media/crypto/key_systems_unittest.cc b/webkit/media/crypto/key_systems_unittest.cc index 9415b2c..489abf9 100644 --- a/webkit/media/crypto/key_systems_unittest.cc +++ b/webkit/media/crypto/key_systems_unittest.cc @@ -6,7 +6,7 @@ #include <vector> #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "webkit/media/crypto/key_systems.h" #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc index 1a87024..9372f4a4 100644 --- a/webkit/media/crypto/proxy_decryptor.cc +++ b/webkit/media/crypto/proxy_decryptor.cc @@ -11,7 +11,7 @@ #include "webkit/media/crypto/key_systems.h" #if defined(ENABLE_PEPPER_CDMS) -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#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 "webkit/media/crypto/ppapi_decryptor.h" diff --git a/webkit/media/test_response_generator.cc b/webkit/media/test_response_generator.cc index 7ceee23..ae5aeaf2 100644 --- a/webkit/media/test_response_generator.cc +++ b/webkit/media/test_response_generator.cc @@ -8,8 +8,8 @@ #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "net/base/net_errors.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" using WebKit::WebString; using WebKit::WebURLError; diff --git a/webkit/media/test_response_generator.h b/webkit/media/test_response_generator.h index ecb4536..39744b0 100644 --- a/webkit/media/test_response_generator.h +++ b/webkit/media/test_response_generator.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebURLError.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" namespace webkit_media { diff --git a/webkit/media/webaudiosourceprovider_impl.h b/webkit/media/webaudiosourceprovider_impl.h index 0030df5..0295011 100644 --- a/webkit/media/webaudiosourceprovider_impl.h +++ b/webkit/media/webaudiosourceprovider_impl.h @@ -7,7 +7,7 @@ #include "base/synchronization/lock.h" #include "media/base/audio_renderer_sink.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h" namespace WebKit { diff --git a/webkit/media/webinbandtexttrack_impl.h b/webkit/media/webinbandtexttrack_impl.h index ed9f5d3..b6b191b 100644 --- a/webkit/media/webinbandtexttrack_impl.h +++ b/webkit/media/webinbandtexttrack_impl.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_MEDIA_WEBINANDTEXTTRACK_IMPL_H_ #define WEBKIT_MEDIA_WEBINANDTEXTTRACK_IMPL_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInbandTextTrack.h" namespace webkit_media { diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index d72c766..3e2b88a 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -35,10 +35,10 @@ #include "media/filters/opus_audio_decoder.h" #include "media/filters/video_renderer_base.h" #include "media/filters/vpx_video_decoder.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#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" diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h index 53cb42f..ee7be74 100644 --- a/webkit/media/webmediaplayer_impl.h +++ b/webkit/media/webmediaplayer_impl.h @@ -35,7 +35,7 @@ #include "media/filters/gpu_video_decoder.h" #include "media/filters/skcanvas_video_renderer.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.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" diff --git a/webkit/media/webmediaplayer_ms.cc b/webkit/media/webmediaplayer_ms.cc index 2b5cdd2..cbd2396 100644 --- a/webkit/media/webmediaplayer_ms.cc +++ b/webkit/media/webmediaplayer_ms.cc @@ -13,9 +13,9 @@ #include "cc/layers/video_layer.h" #include "media/base/media_log.h" #include "media/base/video_frame.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#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" diff --git a/webkit/media/webmediasourceclient_impl.cc b/webkit/media/webmediasourceclient_impl.cc index 3eb36f4..d53ddb1 100644 --- a/webkit/media/webmediasourceclient_impl.cc +++ b/webkit/media/webmediasourceclient_impl.cc @@ -6,8 +6,8 @@ #include "base/guid.h" #include "media/filters/chunk_demuxer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebCString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "webkit/media/websourcebuffer_impl.h" using ::WebKit::WebString; diff --git a/webkit/mocks/mock_webhyphenator.h b/webkit/mocks/mock_webhyphenator.h index 8615e16..b42b17c9 100644 --- a/webkit/mocks/mock_webhyphenator.h +++ b/webkit/mocks/mock_webhyphenator.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/platform_file.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHyphenator.h" +#include "third_party/WebKit/public/platform/WebHyphenator.h" typedef struct _HyphenDict HyphenDict; diff --git a/webkit/mocks/mock_weburlloader.cc b/webkit/mocks/mock_weburlloader.cc index f2c6df9..dc4f2d0 100644 --- a/webkit/mocks/mock_weburlloader.cc +++ b/webkit/mocks/mock_weburlloader.cc @@ -4,10 +4,10 @@ #include "webkit/mocks/mock_weburlloader.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebData.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" namespace webkit_glue { diff --git a/webkit/mocks/test_media_stream_client.cc b/webkit/mocks/test_media_stream_client.cc index c3e8b91..056ccaa 100644 --- a/webkit/mocks/test_media_stream_client.cc +++ b/webkit/mocks/test_media_stream_client.cc @@ -7,9 +7,9 @@ #include "googleurl/src/gurl.h" #include "media/base/media_log.h" #include "media/base/pipeline.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#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 "webkit/media/media_stream_audio_renderer.h" #include "webkit/media/simple_video_frame_provider.h" diff --git a/webkit/mocks/test_media_stream_client.h b/webkit/mocks/test_media_stream_client.h index 0f5c65a..c264f4d 100644 --- a/webkit/mocks/test_media_stream_client.h +++ b/webkit/mocks/test_media_stream_client.h @@ -10,7 +10,7 @@ #define WEBKIT_MOCKS_TEST_MEDIA_STREAM_CLIENT_H_ #include "base/callback_forward.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebURL.h" #include "webkit/media/media_stream_client.h" namespace WebKit { diff --git a/webkit/plugins/npapi/webplugin_delegate.h b/webkit/plugins/npapi/webplugin_delegate.h index 9f7fe0e..881d781 100644 --- a/webkit/plugins/npapi/webplugin_delegate.h +++ b/webkit/plugins/npapi/webplugin_delegate.h @@ -10,7 +10,7 @@ #include "base/string16.h" #include "build/build_config.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCanvas.h" +#include "third_party/WebKit/public/platform/WebCanvas.h" #include "third_party/npapi/bindings/npapi.h" #include "ui/gfx/native_widget_types.h" #include "webkit/glue/webcursor.h" diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc index e86f3d1..053ba02 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/Platform/chromium/public/WebCString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCookieJar.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPHeaderVisitor.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoader.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.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" +#include "third_party/WebKit/public/platform/WebHTTPBody.h" +#include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebURLError.h" +#include "third_party/WebKit/public/platform/WebURLLoader.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/WebConsoleMessage.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" diff --git a/webkit/plugins/npapi/webplugin_impl.h b/webkit/plugins/npapi/webplugin_impl.h index 7b6594b..dbf3143 100644 --- a/webkit/plugins/npapi/webplugin_impl.h +++ b/webkit/plugins/npapi/webplugin_impl.h @@ -14,11 +14,11 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebString.h" +#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 "ui/gfx/native_widget_types.h" #include "webkit/plugins/npapi/webplugin.h" diff --git a/webkit/plugins/npapi/webplugin_impl_unittest.cc b/webkit/plugins/npapi/webplugin_impl_unittest.cc index 58db8f5..f66df5c 100644 --- a/webkit/plugins/npapi/webplugin_impl_unittest.cc +++ b/webkit/plugins/npapi/webplugin_impl_unittest.cc @@ -4,9 +4,9 @@ #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebCString.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURLRequest.h" #include "webkit/plugins/npapi/webplugin_impl.h" using WebKit::WebHTTPBody; diff --git a/webkit/plugins/ppapi/event_conversion.cc b/webkit/plugins/ppapi/event_conversion.cc index 873b2ea..c0c1199 100644 --- a/webkit/plugins/ppapi/event_conversion.cc +++ b/webkit/plugins/ppapi/event_conversion.cc @@ -17,8 +17,8 @@ #include "ppapi/c/pp_input_event.h" #include "ppapi/shared_impl/ppb_input_event_shared.h" #include "ppapi/shared_impl/time_conversion.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGamepads.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.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 "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/usb_key_code_conversion.h" diff --git a/webkit/plugins/ppapi/host_globals.cc b/webkit/plugins/ppapi/host_globals.cc index 15dedf2..6631282 100644 --- a/webkit/plugins/ppapi/host_globals.cc +++ b/webkit/plugins/ppapi/host_globals.cc @@ -12,7 +12,7 @@ #include "base/utf_string_conversions.h" #include "ppapi/shared_impl/api_id.h" #include "ppapi/shared_impl/id_assignment.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.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" diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc index de24b2f..e64157f 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.cc +++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc @@ -8,7 +8,7 @@ #include "base/message_loop_proxy.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/ppapi_preferences.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGamepads.h" +#include "third_party/WebKit/public/platform/WebGamepads.h" #include "webkit/plugins/ppapi/mock_platform_image_2d.h" #include "webkit/plugins/ppapi/plugin_delegate.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 4f7f050..5f3e00a 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -48,11 +48,11 @@ #include "printing/metafile_skia_wrapper.h" #include "printing/units.h" #include "skia/ext/platform_device.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGamepads.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebGamepads.h" +#include "third_party/WebKit/public/platform/WebString.h" +#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" diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h index 3053a8a..525471a 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.h +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h @@ -45,10 +45,10 @@ #include "ppapi/thunk/ppb_gamepad_api.h" #include "ppapi/thunk/resource_creation_api.h" #include "skia/ext/refptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCanvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebCanvas.h" +#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 "ui/base/ime/text_input_type.h" diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc index f03b0cd..6980043 100644 --- a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc +++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc @@ -11,10 +11,10 @@ #include "googleurl/src/gurl.h" #include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/shared_impl/var_tracker.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" +#include "third_party/WebKit/public/platform/WebPoint.h" +#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" diff --git a/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc b/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc index 433881e..f40b95a 100644 --- a/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc +++ b/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc @@ -11,7 +11,7 @@ #include "gpu/command_buffer/client/gles2_implementation.h" #include "ppapi/c/ppp_graphics_3d.h" #include "ppapi/thunk/enter.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.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" diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc index 56f3fcc..f32c845 100644 --- a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc +++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc @@ -10,9 +10,9 @@ #include "ppapi/c/dev/ppp_scrollbar_dev.h" #include "ppapi/thunk/thunk.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCanvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#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 "webkit/plugins/ppapi/common.h" diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.h b/webkit/plugins/ppapi/ppb_scrollbar_impl.h index 1c5b95a..c610061 100644 --- a/webkit/plugins/ppapi/ppb_scrollbar_impl.h +++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "ppapi/thunk/ppb_scrollbar_api.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" +#include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginScrollbarClient.h" #include "ui/gfx/rect.h" #include "webkit/plugins/ppapi/ppb_widget_impl.h" diff --git a/webkit/plugins/ppapi/url_request_info_util.cc b/webkit/plugins/ppapi/url_request_info_util.cc index 2a9ecbd..095c9df 100644 --- a/webkit/plugins/ppapi/url_request_info_util.cc +++ b/webkit/plugins/ppapi/url_request_info_util.cc @@ -12,10 +12,10 @@ #include "ppapi/shared_impl/url_request_info_data.h" #include "ppapi/shared_impl/var.h" #include "ppapi/thunk/enter.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebData.h" +#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 "webkit/base/file_path_string_conversions.h" diff --git a/webkit/plugins/ppapi/url_response_info_util.cc b/webkit/plugins/ppapi/url_response_info_util.cc index d03a9ca..2a14112 100644 --- a/webkit/plugins/ppapi/url_response_info_util.cc +++ b/webkit/plugins/ppapi/url_response_info_util.cc @@ -5,10 +5,10 @@ #include "webkit/plugins/ppapi/url_response_info_util.h" #include "base/logging.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPHeaderVisitor.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/plugins/ppapi/ppb_file_ref_impl.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/plugins/sad_plugin.h b/webkit/plugins/sad_plugin.h index 31c52d0..d4ae546 100644 --- a/webkit/plugins/sad_plugin.h +++ b/webkit/plugins/sad_plugin.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_PLUGINS_SAD_PLUGIN_H_ #define WEBKIT_PLUGINS_SAD_PLUGIN_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/WebCanvas.h" +#include "third_party/WebKit/public/platform/WebCanvas.h" #include "webkit/plugins/webkit_plugins_export.h" class SkBitmap; diff --git a/webkit/renderer/compositor_bindings/scrollbar_impl.cc b/webkit/renderer/compositor_bindings/scrollbar_impl.cc index e8d2764..4f1c4bf 100644 --- a/webkit/renderer/compositor_bindings/scrollbar_impl.cc +++ b/webkit/renderer/compositor_bindings/scrollbar_impl.cc @@ -5,8 +5,8 @@ #include "webkit/renderer/compositor_bindings/scrollbar_impl.h" #include "base/logging.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarThemeGeometry.h" +#include "third_party/WebKit/public/platform/WebScrollbar.h" +#include "third_party/WebKit/public/platform/WebScrollbarThemeGeometry.h" using WebKit::WebScrollbar; diff --git a/webkit/renderer/compositor_bindings/scrollbar_impl.h b/webkit/renderer/compositor_bindings/scrollbar_impl.h index 8f35a08..0b6671d 100644 --- a/webkit/renderer/compositor_bindings/scrollbar_impl.h +++ b/webkit/renderer/compositor_bindings/scrollbar_impl.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "cc/input/scrollbar.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarThemePainter.h" +#include "third_party/WebKit/public/platform/WebScrollbarThemePainter.h" namespace WebKit { class WebScrollbar; diff --git a/webkit/renderer/compositor_bindings/web_animation_curve_common.h b/webkit/renderer/compositor_bindings/web_animation_curve_common.h index a8c39d0..a185695 100644 --- a/webkit/renderer/compositor_bindings/web_animation_curve_common.h +++ b/webkit/renderer/compositor_bindings/web_animation_curve_common.h @@ -6,7 +6,7 @@ #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_CURVE_COMMON_H_ #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h" +#include "third_party/WebKit/public/platform/WebAnimationCurve.h" namespace cc { class TimingFunction; } diff --git a/webkit/renderer/compositor_bindings/web_animation_impl.cc b/webkit/renderer/compositor_bindings/web_animation_impl.cc index 59d8f8b..1c15bc3 100644 --- a/webkit/renderer/compositor_bindings/web_animation_impl.cc +++ b/webkit/renderer/compositor_bindings/web_animation_impl.cc @@ -7,8 +7,8 @@ #include "cc/animation/animation.h" #include "cc/animation/animation_curve.h" #include "cc/animation/animation_id_provider.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h" +#include "third_party/WebKit/public/platform/WebAnimation.h" +#include "third_party/WebKit/public/platform/WebAnimationCurve.h" #include "webkit/renderer/compositor_bindings/web_float_animation_curve_impl.h" #include "webkit/renderer/compositor_bindings/web_transform_animation_curve_impl.h" diff --git a/webkit/renderer/compositor_bindings/web_animation_impl.h b/webkit/renderer/compositor_bindings/web_animation_impl.h index b343833..faedf90 100644 --- a/webkit/renderer/compositor_bindings/web_animation_impl.h +++ b/webkit/renderer/compositor_bindings/web_animation_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" +#include "third_party/WebKit/public/platform/WebAnimation.h" #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h" namespace cc { class Animation; } diff --git a/webkit/renderer/compositor_bindings/web_compositing_reasons.cc b/webkit/renderer/compositor_bindings/web_compositing_reasons.cc index 0e04a24..1364f6e 100644 --- a/webkit/renderer/compositor_bindings/web_compositing_reasons.cc +++ b/webkit/renderer/compositor_bindings/web_compositing_reasons.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "cc/layers/compositing_reasons.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositingReasons.h" +#include "third_party/WebKit/public/platform/WebCompositingReasons.h" #define COMPILE_ASSERT_MATCHING_ENUMS(cc_name, webkit_name) \ COMPILE_ASSERT( \ diff --git a/webkit/renderer/compositor_bindings/web_compositor_support_impl.h b/webkit/renderer/compositor_bindings/web_compositor_support_impl.h index fb94711..8048c94 100644 --- a/webkit/renderer/compositor_bindings/web_compositor_support_impl.h +++ b/webkit/renderer/compositor_bindings/web_compositor_support_impl.h @@ -7,9 +7,9 @@ #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSupport.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformOperations.h" +#include "third_party/WebKit/public/platform/WebCompositorSupport.h" +#include "third_party/WebKit/public/platform/WebLayer.h" +#include "third_party/WebKit/public/platform/WebTransformOperations.h" namespace WebKit { class WebGraphicsContext3D; diff --git a/webkit/renderer/compositor_bindings/web_content_layer_impl.cc b/webkit/renderer/compositor_bindings/web_content_layer_impl.cc index 2b2a518..cc02f89 100644 --- a/webkit/renderer/compositor_bindings/web_content_layer_impl.cc +++ b/webkit/renderer/compositor_bindings/web_content_layer_impl.cc @@ -8,11 +8,11 @@ #include "cc/base/switches.h" #include "cc/layers/content_layer.h" #include "cc/layers/picture_layer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayerClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebContentLayerClient.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebFloatRect.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/skia/include/utils/SkMatrix44.h" using cc::ContentLayer; diff --git a/webkit/renderer/compositor_bindings/web_content_layer_impl.h b/webkit/renderer/compositor_bindings/web_content_layer_impl.h index bee6e8c..a8b7dbc 100644 --- a/webkit/renderer/compositor_bindings/web_content_layer_impl.h +++ b/webkit/renderer/compositor_bindings/web_content_layer_impl.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "cc/layers/content_layer_client.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h" +#include "third_party/WebKit/public/platform/WebContentLayer.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h" diff --git a/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc b/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc index 8e01f29..e198d22 100644 --- a/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc +++ b/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc @@ -6,10 +6,10 @@ #include "cc/layers/texture_layer.h" #include "cc/resources/resource_update_queue.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayerClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureMailbox.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebExternalTextureLayerClient.h" +#include "third_party/WebKit/public/platform/WebExternalTextureMailbox.h" +#include "third_party/WebKit/public/platform/WebFloatRect.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" using cc::TextureLayer; diff --git a/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.h b/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.h index b4bc02a..dfe75a6 100644 --- a/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.h +++ b/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "cc/layers/texture_layer_client.h" #include "cc/resources/texture_mailbox.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayer.h" +#include "third_party/WebKit/public/platform/WebExternalTextureLayer.h" #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h" namespace WebKit { diff --git a/webkit/renderer/compositor_bindings/web_float_animation_curve_impl.h b/webkit/renderer/compositor_bindings/web_float_animation_curve_impl.h index 2f4d656..be2df50 100644 --- a/webkit/renderer/compositor_bindings/web_float_animation_curve_impl.h +++ b/webkit/renderer/compositor_bindings/web_float_animation_curve_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_ #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatAnimationCurve.h" +#include "third_party/WebKit/public/platform/WebFloatAnimationCurve.h" #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h" namespace cc { diff --git a/webkit/renderer/compositor_bindings/web_image_layer_impl.h b/webkit/renderer/compositor_bindings/web_image_layer_impl.h index c74d45f..fbce0e1 100644 --- a/webkit/renderer/compositor_bindings/web_image_layer_impl.h +++ b/webkit/renderer/compositor_bindings/web_image_layer_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_IMAGE_LAYER_IMPL_H_ #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImageLayer.h" +#include "third_party/WebKit/public/platform/WebImageLayer.h" #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h" diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.cc b/webkit/renderer/compositor_bindings/web_layer_impl.cc index 6645538..bd251b5 100644 --- a/webkit/renderer/compositor_bindings/web_layer_impl.cc +++ b/webkit/renderer/compositor_bindings/web_layer_impl.cc @@ -9,11 +9,11 @@ #include "cc/base/region.h" #include "cc/layers/layer.h" #include "cc/layers/layer_position_constraint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositingReasons.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerPositionConstraint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebCompositingReasons.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebFloatRect.h" +#include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/skia/include/utils/SkMatrix44.h" #include "webkit/renderer/compositor_bindings/web_animation_impl.h" diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.h b/webkit/renderer/compositor_bindings/web_layer_impl.h index 01e7e58..c6c6824 100644 --- a/webkit/renderer/compositor_bindings/web_layer_impl.h +++ b/webkit/renderer/compositor_bindings/web_layer_impl.h @@ -6,16 +6,16 @@ #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_ #include "base/memory/ref_counted.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebColor.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositingReasons.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebAnimation.h" +#include "third_party/WebKit/public/platform/WebColor.h" +#include "third_party/WebKit/public/platform/WebCompositingReasons.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebLayer.h" +#include "third_party/WebKit/public/platform/WebPoint.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#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/skia/include/utils/SkMatrix44.h" #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h" diff --git a/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.cc b/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.cc index 6eecd58..793390e 100644 --- a/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.cc +++ b/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.cc @@ -5,8 +5,8 @@ #include "webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h" #include "cc/layers/layer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/skia/include/utils/SkMatrix44.h" using cc::Layer; diff --git a/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc b/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc index 3b8798e..f02afd2 100644 --- a/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc +++ b/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc @@ -7,8 +7,8 @@ #include "cc/test/geometry_test_utils.h" #include "cc/trees/layer_tree_host_common.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/skia/include/utils/SkMatrix44.h" #include "ui/gfx/point3_f.h" #include "webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h" diff --git a/webkit/renderer/compositor_bindings/web_rendering_stats_impl.h b/webkit/renderer/compositor_bindings/web_rendering_stats_impl.h index fef23ac..395bd5d 100644 --- a/webkit/renderer/compositor_bindings/web_rendering_stats_impl.h +++ b/webkit/renderer/compositor_bindings/web_rendering_stats_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_RENDERING_STATS_IMPL_H_ #include "cc/debug/rendering_stats.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h" +#include "third_party/WebKit/public/platform/WebRenderingStats.h" namespace WebKit { diff --git a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc b/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc index d39b1fe..a808021 100644 --- a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc +++ b/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc @@ -5,7 +5,7 @@ #include "webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h" #include "cc/layers/scrollbar_layer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h" +#include "third_party/WebKit/public/platform/WebScrollbar.h" #include "webkit/renderer/compositor_bindings/scrollbar_impl.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" diff --git a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h b/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h index 7eb0ce2..de7bbfd 100644 --- a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h +++ b/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLLBAR_LAYER_IMPL_H_ #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarLayer.h" +#include "third_party/WebKit/public/platform/WebScrollbarLayer.h" #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h" namespace WebKit { diff --git a/webkit/renderer/compositor_bindings/web_solid_color_layer_impl.h b/webkit/renderer/compositor_bindings/web_solid_color_layer_impl.h index 15a7e2a..3767ee6 100644 --- a/webkit/renderer/compositor_bindings/web_solid_color_layer_impl.h +++ b/webkit/renderer/compositor_bindings/web_solid_color_layer_impl.h @@ -6,8 +6,8 @@ #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_SOLID_COLOR_LAYER_IMPL_H_ #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebColor.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSolidColorLayer.h" +#include "third_party/WebKit/public/platform/WebColor.h" +#include "third_party/WebKit/public/platform/WebSolidColorLayer.h" #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h" namespace webkit { diff --git a/webkit/renderer/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.cc b/webkit/renderer/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.cc index a15c35d..e9d1ba1 100644 --- a/webkit/renderer/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.cc +++ b/webkit/renderer/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.cc @@ -4,8 +4,8 @@ #include "webkit/renderer/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarThemePainter.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebScrollbarThemePainter.h" using WebKit::WebScrollbarThemePainter; diff --git a/webkit/renderer/compositor_bindings/web_transform_animation_curve_impl.h b/webkit/renderer/compositor_bindings/web_transform_animation_curve_impl.h index c32f175..649b10d 100644 --- a/webkit/renderer/compositor_bindings/web_transform_animation_curve_impl.h +++ b/webkit/renderer/compositor_bindings/web_transform_animation_curve_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_TRANSFORM_ANIMATION_CURVE_IMPL_H_ #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformAnimationCurve.h" +#include "third_party/WebKit/public/platform/WebTransformAnimationCurve.h" #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h" namespace cc { diff --git a/webkit/renderer/compositor_bindings/web_transform_operations_impl.h b/webkit/renderer/compositor_bindings/web_transform_operations_impl.h index 0307dc5..d59372d 100644 --- a/webkit/renderer/compositor_bindings/web_transform_operations_impl.h +++ b/webkit/renderer/compositor_bindings/web_transform_operations_impl.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "cc/animation/transform_operations.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformOperations.h" +#include "third_party/WebKit/public/platform/WebTransformOperations.h" #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h" namespace webkit { diff --git a/webkit/renderer/fileapi/webfilewriter_base.cc b/webkit/renderer/fileapi/webfilewriter_base.cc index 87ea863..2ae8cdb 100644 --- a/webkit/renderer/fileapi/webfilewriter_base.cc +++ b/webkit/renderer/fileapi/webfilewriter_base.cc @@ -5,7 +5,7 @@ #include "webkit/renderer/fileapi/webfilewriter_base.h" #include "base/logging.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.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 "webkit/common/fileapi/file_system_util.h" diff --git a/webkit/renderer/fileapi/webfilewriter_base_unittest.cc b/webkit/renderer/fileapi/webfilewriter_base_unittest.cc index 3b6e20c..cdacfa4 100644 --- a/webkit/renderer/fileapi/webfilewriter_base_unittest.cc +++ b/webkit/renderer/fileapi/webfilewriter_base_unittest.cc @@ -10,7 +10,7 @@ #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.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" diff --git a/webkit/support/simple_database_system.cc b/webkit/support/simple_database_system.cc index c5f6e11..8786c82 100644 --- a/webkit/support/simple_database_system.cc +++ b/webkit/support/simple_database_system.cc @@ -13,7 +13,7 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" #include "base/utf_string_conversions.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" #include "third_party/sqlite/sqlite3.h" #include "webkit/browser/database/database_util.h" diff --git a/webkit/support/test_media_stream_client.cc b/webkit/support/test_media_stream_client.cc index cd729b4..23166f4 100644 --- a/webkit/support/test_media_stream_client.cc +++ b/webkit/support/test_media_stream_client.cc @@ -6,9 +6,9 @@ #include "googleurl/src/gurl.h" #include "media/base/pipeline.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#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 "webkit/media/media_stream_audio_renderer.h" #include "webkit/media/simple_video_frame_provider.h" diff --git a/webkit/support/test_media_stream_client.h b/webkit/support/test_media_stream_client.h index 3a3ceee..d231e7c 100644 --- a/webkit/support/test_media_stream_client.h +++ b/webkit/support/test_media_stream_client.h @@ -14,7 +14,7 @@ #define WEBKIT_SUPPORT_TEST_MEDIA_STREAM_CLIENT_H_ #include "base/callback_forward.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebURL.h" #include "webkit/media/media_stream_client.h" namespace webkit_media { diff --git a/webkit/support/test_webidbfactory.h b/webkit/support/test_webidbfactory.h index 2b6d360..fb902ea 100644 --- a/webkit/support/test_webidbfactory.h +++ b/webkit/support/test_webidbfactory.h @@ -7,7 +7,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/threading/thread_local.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebIDBFactory.h" +#include "third_party/WebKit/public/platform/WebIDBFactory.h" // Wrap a WebKit::WebIDBFactory to rewrite the data directory to // a scoped temp directory. In multiprocess Chromium this is rewritten diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc index 24f5c7a..764ec9d 100644 --- a/webkit/support/test_webkit_platform_support.cc +++ b/webkit/support/test_webkit_platform_support.cc @@ -16,14 +16,14 @@ #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/Platform/chromium/public/WebAudioDevice.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGamepads.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebStorageArea.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebStorageNamespace.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.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" +#include "third_party/WebKit/public/platform/WebGamepads.h" +#include "third_party/WebKit/public/platform/WebStorageArea.h" +#include "third_party/WebKit/public/platform/WebStorageNamespace.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/WebDatabase.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" @@ -60,7 +60,7 @@ #include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h" #if defined(OS_WIN) -#include "third_party/WebKit/Source/Platform/chromium/public/win/WebThemeEngine.h" +#include "third_party/WebKit/public/platform/win/WebThemeEngine.h" #elif defined(OS_MACOSX) #include "base/mac/mac_util.h" #endif diff --git a/webkit/support/test_webkit_platform_support.h b/webkit/support/test_webkit_platform_support.h index 65c62bc..adc02c4 100644 --- a/webkit/support/test_webkit_platform_support.h +++ b/webkit/support/test_webkit_platform_support.h @@ -6,9 +6,9 @@ #define WEBKIT_SUPPORT_TEST_WEBKIT_PLATFORM_SUPPORT_H_ #include "base/compiler_specific.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGamepads.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebUnitTestSupport.h" +#include "third_party/WebKit/public/platform/WebGamepads.h" +#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" +#include "third_party/WebKit/public/platform/WebUnitTestSupport.h" #include "webkit/glue/webfileutilities_impl.h" #include "webkit/glue/webkitplatformsupport_impl.h" #include "webkit/mocks/mock_webhyphenator.h" diff --git a/webkit/support/test_webmessageportchannel.cc b/webkit/support/test_webmessageportchannel.cc index bc06161..9d882c16 100644 --- a/webkit/support/test_webmessageportchannel.cc +++ b/webkit/support/test_webmessageportchannel.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebMessagePortChannelClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebMessagePortChannelClient.h" +#include "third_party/WebKit/public/platform/WebString.h" using WebKit::WebMessagePortChannel; using WebKit::WebMessagePortChannelArray; diff --git a/webkit/support/test_webmessageportchannel.h b/webkit/support/test_webmessageportchannel.h index 3176cfd..bc2da1d 100644 --- a/webkit/support/test_webmessageportchannel.h +++ b/webkit/support/test_webmessageportchannel.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebMessagePortChannel.h" +#include "third_party/WebKit/public/platform/WebMessagePortChannel.h" namespace WebKit { class WebString; diff --git a/webkit/support/test_webplugin_page_delegate.cc b/webkit/support/test_webplugin_page_delegate.cc index f6f18cb..a7628e9 100644 --- a/webkit/support/test_webplugin_page_delegate.cc +++ b/webkit/support/test_webplugin_page_delegate.cc @@ -4,7 +4,7 @@ #include "webkit/support/test_webplugin_page_delegate.h" -#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" +#include "third_party/WebKit/public/platform/Platform.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" namespace webkit_support { diff --git a/webkit/support/web_audio_device_mock.h b/webkit/support/web_audio_device_mock.h index 0d5edb7..830dede 100644 --- a/webkit/support/web_audio_device_mock.h +++ b/webkit/support/web_audio_device_mock.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_SUPPORT_WEB_AUDIO_DEVICE_MOCK_H_ #define WEBKIT_SUPPORT_WEB_AUDIO_DEVICE_MOCK_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/WebAudioDevice.h" +#include "third_party/WebKit/public/platform/WebAudioDevice.h" class WebAudioDeviceMock : public WebKit::WebAudioDevice { public: diff --git a/webkit/support/web_gesture_curve_mock.cc b/webkit/support/web_gesture_curve_mock.cc index 83d2b9b..a3b4917 100644 --- a/webkit/support/web_gesture_curve_mock.cc +++ b/webkit/support/web_gesture_curve_mock.cc @@ -4,8 +4,8 @@ #include "webkit/support/web_gesture_curve_mock.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurveTarget.h" +#include "third_party/WebKit/public/platform/WebFloatSize.h" +#include "third_party/WebKit/public/platform/WebGestureCurveTarget.h" #include "webkit/support/weburl_loader_mock_factory.h" WebGestureCurveMock::WebGestureCurveMock(const WebKit::WebFloatPoint& velocity, diff --git a/webkit/support/web_gesture_curve_mock.h b/webkit/support/web_gesture_curve_mock.h index 922bb59..f05f4e9 100644 --- a/webkit/support/web_gesture_curve_mock.h +++ b/webkit/support/web_gesture_curve_mock.h @@ -6,9 +6,9 @@ #define WEBKIT_SUPPORT_WEB_GESTURE_CURVE_MOCK_H_ #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebSize.h" // A simple class for mocking a WebGestureCurve. The curve flings at velocity // indefinitely. diff --git a/webkit/support/web_layer_tree_view_impl_for_testing.cc b/webkit/support/web_layer_tree_view_impl_for_testing.cc index 77d8346..6cbb74c 100644 --- a/webkit/support/web_layer_tree_view_impl_for_testing.cc +++ b/webkit/support/web_layer_tree_view_impl_for_testing.cc @@ -17,12 +17,12 @@ #include "cc/output/output_surface.h" #include "cc/output/software_output_device.h" #include "cc/trees/layer_tree_host.h" -#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/Platform.h" +#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" +#include "third_party/WebKit/public/platform/WebLayer.h" +#include "third_party/WebKit/public/platform/WebLayerTreeView.h" +#include "third_party/WebKit/public/platform/WebRenderingStats.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "webkit/common/gpu/test_context_provider_factory.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" #include "webkit/support/test_webkit_platform_support.h" diff --git a/webkit/support/web_layer_tree_view_impl_for_testing.h b/webkit/support/web_layer_tree_view_impl_for_testing.h index 0e4295a..71d6a12 100644 --- a/webkit/support/web_layer_tree_view_impl_for_testing.h +++ b/webkit/support/web_layer_tree_view_impl_for_testing.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "cc/trees/layer_tree_host_client.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" +#include "third_party/WebKit/public/platform/WebLayerTreeView.h" #include "webkit/support/webkit_support.h" namespace cc { diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index b369a5a..7de92db 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -37,8 +37,8 @@ #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebStorageNamespace.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" +#include "third_party/WebKit/public/platform/WebStorageNamespace.h" +#include "third_party/WebKit/public/platform/WebURLError.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" diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h index 5311aaa..c782bb7 100644 --- a/webkit/support/webkit_support.h +++ b/webkit/support/webkit_support.h @@ -8,13 +8,13 @@ #include <string> #include "base/basictypes.h" -#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/Platform.h" +#include "third_party/WebKit/public/platform/WebFileSystem.h" +#include "third_party/WebKit/public/platform/WebFileSystemType.h" +#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" +#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 "ui/base/keycodes/keyboard_codes.h" diff --git a/webkit/support/weburl_loader_mock.cc b/webkit/support/weburl_loader_mock.cc index 87ec867..ccdf622 100644 --- a/webkit/support/weburl_loader_mock.cc +++ b/webkit/support/weburl_loader_mock.cc @@ -5,9 +5,9 @@ #include "webkit/support/weburl_loader_mock.h" #include "base/logging.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebURLError.h" +#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "webkit/support/weburl_loader_mock_factory.h" WebURLLoaderMock::WebURLLoaderMock(WebURLLoaderMockFactory* factory, diff --git a/webkit/support/weburl_loader_mock.h b/webkit/support/weburl_loader_mock.h index 831cf21..46de7be 100644 --- a/webkit/support/weburl_loader_mock.h +++ b/webkit/support/weburl_loader_mock.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoader.h" +#include "third_party/WebKit/public/platform/WebURLLoader.h" namespace WebKit { class WebData; diff --git a/webkit/support/weburl_loader_mock_factory.cc b/webkit/support/weburl_loader_mock_factory.cc index cce3efa..9e37253 100644 --- a/webkit/support/weburl_loader_mock_factory.cc +++ b/webkit/support/weburl_loader_mock_factory.cc @@ -6,10 +6,10 @@ #include "base/file_util.h" #include "base/logging.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebString.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" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" #include "webkit/support/webkit_support.h" #include "webkit/support/weburl_loader_mock.h" diff --git a/webkit/support/weburl_loader_mock_factory.h b/webkit/support/weburl_loader_mock_factory.h index 1cbb588..97ea5c8 100644 --- a/webkit/support/weburl_loader_mock_factory.h +++ b/webkit/support/weburl_loader_mock_factory.h @@ -8,9 +8,9 @@ #include <map> #include "base/files/file_path.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.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" namespace WebKit { class WebData; diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.cc b/webkit/tools/test_shell/mock_webclipboard_impl.cc index 9224b30..ec78d0a 100644 --- a/webkit/tools/test_shell/mock_webclipboard_impl.cc +++ b/webkit/tools/test_shell/mock_webclipboard_impl.cc @@ -10,10 +10,10 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCommon.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebDragData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebCommon.h" +#include "third_party/WebKit/public/platform/WebDragData.h" +#include "third_party/WebKit/public/platform/WebImage.h" +#include "third_party/WebKit/public/platform/WebURL.h" #include "ui/base/clipboard/clipboard.h" #include "webkit/glue/webclipboard_impl.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.h b/webkit/tools/test_shell/mock_webclipboard_impl.h index 3f3c5a6..1ec33b2 100644 --- a/webkit/tools/test_shell/mock_webclipboard_impl.h +++ b/webkit/tools/test_shell/mock_webclipboard_impl.h @@ -13,9 +13,9 @@ #include <map> #include "base/string16.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebClipboard.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebDragData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" +#include "third_party/WebKit/public/platform/WebClipboard.h" +#include "third_party/WebKit/public/platform/WebDragData.h" +#include "third_party/WebKit/public/platform/WebImage.h" class MockWebClipboardImpl : public WebKit::WebClipboard { public: diff --git a/webkit/tools/test_shell/simple_dom_storage_system.cc b/webkit/tools/test_shell/simple_dom_storage_system.cc index e17e531..3599bec 100644 --- a/webkit/tools/test_shell/simple_dom_storage_system.cc +++ b/webkit/tools/test_shell/simple_dom_storage_system.cc @@ -6,9 +6,9 @@ #include "base/auto_reset.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebStorageArea.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebStorageNamespace.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#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 "webkit/browser/database/database_util.h" #include "webkit/dom_storage/dom_storage_area.h" diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc index 962c67b..75cbd72 100644 --- a/webkit/tools/test_shell/simple_file_system.cc +++ b/webkit/tools/test_shell/simple_file_system.cc @@ -12,9 +12,9 @@ #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/mime_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileInfo.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#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" diff --git a/webkit/tools/test_shell/simple_file_system.h b/webkit/tools/test_shell/simple_file_system.h index 741c019..464c591 100644 --- a/webkit/tools/test_shell/simple_file_system.h +++ b/webkit/tools/test_shell/simple_file_system.h @@ -10,8 +10,8 @@ #include "base/files/scoped_temp_dir.h" #include "base/id_map.h" #include "base/memory/weak_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h" +#include "third_party/WebKit/public/platform/WebFileSystem.h" +#include "third_party/WebKit/public/platform/WebFileSystemType.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_operation.h" #include "webkit/common/fileapi/file_system_types.h" diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc index 0367a18..85bdc06 100644 --- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc +++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc @@ -15,7 +15,7 @@ #include "net/socket_stream/socket_stream_job.h" #include "net/websockets/websocket_job.h" #include "net/url_request/url_request_context.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamHandle.h" +#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" #include "webkit/glue/websocketstreamhandle_bridge.h" #include "webkit/glue/websocketstreamhandle_delegate.h" diff --git a/webkit/tools/test_shell/simple_webcookiejar_impl.cc b/webkit/tools/test_shell/simple_webcookiejar_impl.cc index fda8616..8636404 100644 --- a/webkit/tools/test_shell/simple_webcookiejar_impl.cc +++ b/webkit/tools/test_shell/simple_webcookiejar_impl.cc @@ -4,7 +4,7 @@ #include "webkit/tools/test_shell/simple_webcookiejar_impl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebURL.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" using WebKit::WebString; diff --git a/webkit/tools/test_shell/simple_webcookiejar_impl.h b/webkit/tools/test_shell/simple_webcookiejar_impl.h index 2798d6a..93ea5b5 100644 --- a/webkit/tools/test_shell/simple_webcookiejar_impl.h +++ b/webkit/tools/test_shell/simple_webcookiejar_impl.h @@ -6,8 +6,8 @@ #define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_WEBCOOKIEJAR_IMPL_H_ // TODO(darin): WebCookieJar.h is missing a WebString.h include! -#include "third_party/WebKit/Source/Platform/chromium/public/WebCookieJar.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebCookieJar.h" +#include "third_party/WebKit/public/platform/WebString.h" class SimpleWebCookieJarImpl : public WebKit::WebCookieJar { public: diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index bb03983..bc36f69 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -27,7 +27,7 @@ #include "net/url_request/file_protocol_handler.h" #include "net/url_request/http_user_agent_settings.h" #include "net/url_request/url_request_job_factory_impl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" +#include "third_party/WebKit/public/platform/Platform.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "webkit/browser/blob/blob_storage_controller.h" #include "webkit/browser/blob/blob_url_request_job_factory.h" diff --git a/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc b/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc index 649dd9a..3374dac 100644 --- a/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc +++ b/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/message_loop.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebBlobData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebBlobData.h" +#include "third_party/WebKit/public/platform/WebURL.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/browser/blob/blob_storage_controller.h" #include "webkit/common/blob/blob_data.h" diff --git a/webkit/tools/test_shell/test_shell_webblobregistry_impl.h b/webkit/tools/test_shell/test_shell_webblobregistry_impl.h index 3723d5d..1eaf395 100644 --- a/webkit/tools/test_shell/test_shell_webblobregistry_impl.h +++ b/webkit/tools/test_shell/test_shell_webblobregistry_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBBLOBREGISTRY_IMPL_H_ #include "base/memory/ref_counted.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebBlobRegistry.h" +#include "third_party/WebKit/public/platform/WebBlobRegistry.h" class GURL; diff --git a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc b/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc index 872238e..06a880b 100644 --- a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc +++ b/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/string_util.h" #include "net/base/mime_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" using WebKit::WebString; using WebKit::WebMimeRegistry; |