diff options
Diffstat (limited to 'webkit/support')
20 files changed, 55 insertions, 55 deletions
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; |