diff options
23 files changed, 42 insertions, 43 deletions
diff --git a/android_webview/renderer/DEPS b/android_webview/renderer/DEPS index 2263fab..b2554bc 100644 --- a/android_webview/renderer/DEPS +++ b/android_webview/renderer/DEPS @@ -8,7 +8,7 @@ include_rules = [ "+content/public/renderer", "+third_party/WebKit/Source/WebKit/chromium/public", - "+third_party/WebKit/Source/Platform/chromium/public", + "+third_party/WebKit/public/platform", "+ui/gl/gpu_memory_buffer.h", ] diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc index a0ac2fd..02b1c54 100644 --- a/android_webview/renderer/aw_content_renderer_client.cc +++ b/android_webview/renderer/aw_content_renderer_client.cc @@ -13,10 +13,10 @@ #include "components/visitedlink/renderer/visitedlink_slave.h" #include "content/public/renderer/render_thread.h" #include "googleurl/src/gurl.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/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/WebSecurityPolicy.h" namespace android_webview { diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc index 27a7242..8452b45 100644 --- a/android_webview/renderer/aw_render_view_ext.cc +++ b/android_webview/renderer/aw_render_view_ext.cc @@ -16,9 +16,9 @@ #include "content/public/renderer/document_state.h" #include "content/public/renderer/render_view.h" #include "skia/ext/refptr.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/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebSize.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/WebDataSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" diff --git a/components/autofill/DEPS b/components/autofill/DEPS index fb54544..df74b4f 100644 --- a/components/autofill/DEPS +++ b/components/autofill/DEPS @@ -4,7 +4,7 @@ include_rules = [ "+jni", "+net", # Allow inclusion of WebKit API files. - "+third_party/WebKit/Source/Platform/chromium", + "+third_party/WebKit/public/platform", "+third_party/WebKit/Source/WebKit/chromium", "+ui", ] diff --git a/components/autofill/browser/risk/fingerprint.cc b/components/autofill/browser/risk/fingerprint.cc index d49c887..cb6538c 100644 --- a/components/autofill/browser/risk/fingerprint.cc +++ b/components/autofill/browser/risk/fingerprint.cc @@ -27,8 +27,8 @@ #include "content/public/common/content_client.h" #include "content/public/common/geoposition.h" #include "gpu/config/gpu_info.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebScreenInfo.h" #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" #include "webkit/plugins/webplugininfo.h" diff --git a/components/autofill/renderer/autofill_agent.cc b/components/autofill/renderer/autofill_agent.cc index d0b776e..c58b3a0 100644 --- a/components/autofill/renderer/autofill_agent.cc +++ b/components/autofill/renderer/autofill_agent.cc @@ -26,8 +26,8 @@ #include "content/public/common/ssl_status.h" #include "content/public/renderer/render_view.h" #include "grit/component_resources.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h" diff --git a/components/autofill/renderer/form_autofill_util.cc b/components/autofill/renderer/form_autofill_util.cc index 7102b44..04fc849 100644 --- a/components/autofill/renderer/form_autofill_util.cc +++ b/components/autofill/renderer/form_autofill_util.cc @@ -16,8 +16,8 @@ #include "components/autofill/common/form_data.h" #include "components/autofill/common/form_field_data.h" #include "components/autofill/common/web_element_descriptor.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/WebString.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/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebExceptionCode.h" diff --git a/components/autofill/renderer/form_cache.cc b/components/autofill/renderer/form_cache.cc index 988aa3d..1c00d67 100644 --- a/components/autofill/renderer/form_cache.cc +++ b/components/autofill/renderer/form_cache.cc @@ -13,8 +13,8 @@ #include "components/autofill/common/form_field_data_predictions.h" #include "components/autofill/renderer/form_autofill_util.h" #include "grit/component_resources.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/WebString.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/WebFormControlElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" diff --git a/components/autofill/renderer/page_click_tracker.cc b/components/autofill/renderer/page_click_tracker.cc index 54c8f2f..f1aae33 100644 --- a/components/autofill/renderer/page_click_tracker.cc +++ b/components/autofill/renderer/page_click_tracker.cc @@ -7,7 +7,7 @@ #include "components/autofill/renderer/form_autofill_util.h" #include "components/autofill/renderer/page_click_listener.h" #include "content/public/renderer/render_view.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/WebDOMMouseEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/components/autofill/renderer/password_autofill_agent.cc b/components/autofill/renderer/password_autofill_agent.cc index 704e54fa..c185f25 100644 --- a/components/autofill/renderer/password_autofill_agent.cc +++ b/components/autofill/renderer/password_autofill_agent.cc @@ -14,7 +14,7 @@ #include "content/public/common/password_form.h" #include "content/public/renderer/password_form_conversion_utils.h" #include "content/public/renderer/render_view.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/WebAutofillClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" diff --git a/components/autofill/renderer/password_generation_manager.cc b/components/autofill/renderer/password_generation_manager.cc index fab0eb1..7ba2cde 100644 --- a/components/autofill/renderer/password_generation_manager.cc +++ b/components/autofill/renderer/password_generation_manager.cc @@ -10,9 +10,9 @@ #include "content/public/renderer/password_form_conversion_utils.h" #include "content/public/renderer/render_view.h" #include "google_apis/gaia/gaia_urls.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCString.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/WebCString.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/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/components/sessions/DEPS b/components/sessions/DEPS index 339b6c8..cc311fc 100644 --- a/components/sessions/DEPS +++ b/components/sessions/DEPS @@ -4,6 +4,6 @@ include_rules = [ "+content/public/common", "+googleurl", "+sync", - "+third_party/WebKit/Source/Platform/chromium/public", + "+third_party/WebKit/public/platform", "+webkit", ] diff --git a/components/sessions/serialized_navigation_entry.cc b/components/sessions/serialized_navigation_entry.cc index e322830..fba0d3a 100644 --- a/components/sessions/serialized_navigation_entry.cc +++ b/components/sessions/serialized_navigation_entry.cc @@ -11,7 +11,7 @@ #include "content/public/browser/navigation_entry.h" #include "sync/protocol/session_specifics.pb.h" #include "sync/util/time.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" +#include "third_party/WebKit/public/platform/WebReferrerPolicy.h" using content::NavigationEntry; diff --git a/components/sessions/serialized_navigation_entry_test_helper.cc b/components/sessions/serialized_navigation_entry_test_helper.cc index b1e2c00..00d7925 100644 --- a/components/sessions/serialized_navigation_entry_test_helper.cc +++ b/components/sessions/serialized_navigation_entry_test_helper.cc @@ -9,7 +9,7 @@ #include "components/sessions/serialized_navigation_entry.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" +#include "third_party/WebKit/public/platform/WebReferrerPolicy.h" namespace sessions { diff --git a/components/sessions/serialized_navigation_entry_unittest.cc b/components/sessions/serialized_navigation_entry_unittest.cc index f8e5c3f..0a2453a 100644 --- a/components/sessions/serialized_navigation_entry_unittest.cc +++ b/components/sessions/serialized_navigation_entry_unittest.cc @@ -22,7 +22,7 @@ #include "sync/protocol/session_specifics.pb.h" #include "sync/util/time.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" +#include "third_party/WebKit/public/platform/WebReferrerPolicy.h" namespace sessions { namespace { diff --git a/components/visitedlink/renderer/DEPS b/components/visitedlink/renderer/DEPS index 49859da..ba7c7da 100644 --- a/components/visitedlink/renderer/DEPS +++ b/components/visitedlink/renderer/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+content/public/renderer", - "+third_party/WebKit/Source/Platform/chromium/public", + "+third_party/WebKit/public/platform", "+third_party/WebKit/Source/WebKit/chromium/public", ] - @@ -1,6 +1,6 @@ include_rules = [ "+media", - "+third_party/WebKit/Source/Platform/chromium/public", + "+third_party/WebKit/public/platform", "+third_party/WebKit/Source/WebKit/chromium/public", "+third_party/skia", ] diff --git a/ppapi/proxy/browser_font_resource_trusted.cc b/ppapi/proxy/browser_font_resource_trusted.cc index e9ee4fe..e11f14a 100644 --- a/ppapi/proxy/browser_font_resource_trusted.cc +++ b/ppapi/proxy/browser_font_resource_trusted.cc @@ -13,10 +13,10 @@ #include "ppapi/thunk/ppb_image_data_api.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/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/public/platform/WebCanvas.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/Source/WebKit/chromium/public/WebFont.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontDescription.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextRun.h" diff --git a/ui/aura/bench/DEPS b/ui/aura/bench/DEPS index e908ebb..69deb97 100644 --- a/ui/aura/bench/DEPS +++ b/ui/aura/bench/DEPS @@ -1,4 +1,4 @@ include_rules = [ "+third_party/khronos", - "+third_party/WebKit/Source/Platform/chromium/public", + "+third_party/WebKit/public/platform", ] diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc index 4f0afe1..08d3177 100644 --- a/ui/aura/bench/bench_main.cc +++ b/ui/aura/bench/bench_main.cc @@ -31,7 +31,7 @@ #ifndef GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES 1 #endif -#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" +#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/khronos/GLES2/gl2ext.h" #if defined(USE_X11) diff --git a/ui/compositor/DEPS b/ui/compositor/DEPS index 7dbb84f..626b197 100644 --- a/ui/compositor/DEPS +++ b/ui/compositor/DEPS @@ -3,9 +3,9 @@ # Compositor out of WebKit. include_rules = [ "+cc", - "+third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h", - "+third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h", - "+third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h", - "+third_party/WebKit/Source/Platform/chromium/public/WebString.h", + "+third_party/WebKit/public/platform/WebFilterOperation.h", + "+third_party/WebKit/public/platform/WebFilterOperations.h", + "+third_party/WebKit/public/platform/WebGraphicsContext3D.h", + "+third_party/WebKit/public/platform/WebString.h", "+webkit/common/gpu", ] diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc index cd5f7f3..fa5cc29 100644 --- a/ui/compositor/layer.cc +++ b/ui/compositor/layer.cc @@ -17,8 +17,8 @@ #include "cc/layers/texture_layer.h" #include "cc/output/delegated_frame_data.h" #include "cc/resources/transferable_resource.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h" +#include "third_party/WebKit/public/platform/WebFilterOperation.h" +#include "third_party/WebKit/public/platform/WebFilterOperations.h" #include "ui/base/animation/animation.h" #include "ui/compositor/compositor_switches.h" #include "ui/compositor/dip_util.h" diff --git a/ui/compositor/test_web_graphics_context_3d.h b/ui/compositor/test_web_graphics_context_3d.h index a95b304..dcf3a6e 100644 --- a/ui/compositor/test_web_graphics_context_3d.h +++ b/ui/compositor/test_web_graphics_context_3d.h @@ -7,8 +7,8 @@ #include "base/logging.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 "ui/compositor/compositor_export.h" namespace gfx { |