diff options
Diffstat (limited to 'webkit/tools')
39 files changed, 159 insertions, 159 deletions
diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_win.py b/webkit/tools/layout_tests/layout_package/platform_utils_win.py index 2c48fe9..753324f 100644 --- a/webkit/tools/layout_tests/layout_package/platform_utils_win.py +++ b/webkit/tools/layout_tests/layout_package/platform_utils_win.py @@ -136,7 +136,7 @@ def KillAllTestShells(self): def _FindBinary(target, binary): """On Windows, we look for binaries that we compile in potentially two places: src/webkit/$target (preferably, which we get if we - built using webkit.gyp), or src/chrome/$target (if compiled some other + built using webkit_glue.gyp), or src/chrome/$target (if compiled some other way).""" try: return path_utils.PathFromBase('webkit', target, binary) diff --git a/webkit/tools/test_shell/accessibility_controller.cc b/webkit/tools/test_shell/accessibility_controller.cc index 5583062..7778499 100644 --- a/webkit/tools/test_shell/accessibility_controller.cc +++ b/webkit/tools/test_shell/accessibility_controller.cc @@ -7,10 +7,10 @@ #include "webkit/tools/test_shell/accessibility_controller.h" #include "base/logging.h" -#include "webkit/api/public/WebAccessibilityCache.h" -#include "webkit/api/public/WebAccessibilityObject.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/tools/test_shell/test_shell.h" using WebKit::WebAccessibilityCache; diff --git a/webkit/tools/test_shell/accessibility_ui_element.cc b/webkit/tools/test_shell/accessibility_ui_element.cc index 75d50ca..bdf8d40 100644 --- a/webkit/tools/test_shell/accessibility_ui_element.cc +++ b/webkit/tools/test_shell/accessibility_ui_element.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/api/public/WebAccessibilityObject.h" -#include "webkit/api/public/WebCString.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "webkit/glue/glue_util.h" #include "webkit/tools/test_shell/accessibility_ui_element.h" diff --git a/webkit/tools/test_shell/accessibility_ui_element.h b/webkit/tools/test_shell/accessibility_ui_element.h index 8b04020..c83e033 100644 --- a/webkit/tools/test_shell/accessibility_ui_element.h +++ b/webkit/tools/test_shell/accessibility_ui_element.h @@ -6,7 +6,7 @@ #define WEBKIT_TOOLS_TEST_SHELL_ACCESSIBILITY_UI_ELEMENT_H_ #include "webkit/glue/cpp_bound_class.h" -#include "webkit/api/public/WebAccessibilityObject.h" +#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h" class AccessibilityUIElement : public CppBoundClass { public: diff --git a/webkit/tools/test_shell/drag_delegate.cc b/webkit/tools/test_shell/drag_delegate.cc index ec530af..3b693a9 100644 --- a/webkit/tools/test_shell/drag_delegate.cc +++ b/webkit/tools/test_shell/drag_delegate.cc @@ -4,8 +4,8 @@ #include "webkit/tools/test_shell/drag_delegate.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" using WebKit::WebPoint; using WebKit::WebView; diff --git a/webkit/tools/test_shell/drop_delegate.cc b/webkit/tools/test_shell/drop_delegate.cc index 0ef7ae6..daa915a 100644 --- a/webkit/tools/test_shell/drop_delegate.cc +++ b/webkit/tools/test_shell/drop_delegate.cc @@ -4,9 +4,9 @@ #include "webkit/tools/test_shell/drop_delegate.h" -#include "webkit/api/public/WebDragData.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webdropdata.h" using WebKit::WebDragOperation; diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc index 6ee3b1a..fcc7dc3 100644 --- a/webkit/tools/test_shell/event_sending_controller.cc +++ b/webkit/tools/test_shell/event_sending_controller.cc @@ -32,16 +32,16 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/time.h" -#include "webkit/api/public/WebDragData.h" -#include "webkit/api/public/WebDragOperation.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" #include "webkit/tools/test_shell/test_shell.h" #if defined(OS_WIN) -#include "webkit/api/public/win/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h" using WebKit::WebInputEventFactory; #endif diff --git a/webkit/tools/test_shell/event_sending_controller.h b/webkit/tools/test_shell/event_sending_controller.h index 3593ff6a..ca56d35 100644 --- a/webkit/tools/test_shell/event_sending_controller.h +++ b/webkit/tools/test_shell/event_sending_controller.h @@ -19,8 +19,8 @@ #include "build/build_config.h" #include "base/gfx/point.h" #include "base/task.h" -#include "webkit/api/public/WebDragOperation.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/cpp_bound_class.h" class TestShell; diff --git a/webkit/tools/test_shell/keyboard_unittest.cc b/webkit/tools/test_shell/keyboard_unittest.cc index 16a937c..65ac39b 100644 --- a/webkit/tools/test_shell/keyboard_unittest.cc +++ b/webkit/tools/test_shell/keyboard_unittest.cc @@ -16,9 +16,9 @@ MSVC_POP_WARNING(); #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebInputEvent.h" -#include "webkit/api/src/EditorClientImpl.h" -#include "webkit/api/src/WebInputEventConversion.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/src/EditorClientImpl.h" +#include "third_party/WebKit/WebKit/chromium/src/WebInputEventConversion.h" using WebCore::PlatformKeyboardEvent; using WebCore::KeyboardEvent; diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index f400ce0..86d4137 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -14,13 +14,13 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebScriptSource.h" -#include "webkit/api/public/WebSecurityPolicy.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/dom_operations.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" diff --git a/webkit/tools/test_shell/mac/test_shell_webview.mm b/webkit/tools/test_shell/mac/test_shell_webview.mm index b947e2c9..f474685 100644 --- a/webkit/tools/test_shell/mac/test_shell_webview.mm +++ b/webkit/tools/test_shell/mac/test_shell_webview.mm @@ -9,8 +9,8 @@ #include "base/gfx/rect.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/tools/test_shell/test_shell.h" #include "webkit/tools/test_shell/webwidget_host.h" diff --git a/webkit/tools/test_shell/mac/test_webview_delegate.mm b/webkit/tools/test_shell/mac/test_webview_delegate.mm index 186c3fd..483e776 100644 --- a/webkit/tools/test_shell/mac/test_webview_delegate.mm +++ b/webkit/tools/test_shell/mac/test_webview_delegate.mm @@ -7,9 +7,9 @@ #import <Cocoa/Cocoa.h> #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebPopupMenu.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webcursor.h" #include "webkit/glue/plugins/plugin_list.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" diff --git a/webkit/tools/test_shell/mac/webview_host.mm b/webkit/tools/test_shell/mac/webview_host.mm index 341995c..ba62c0d 100644 --- a/webkit/tools/test_shell/mac/webview_host.mm +++ b/webkit/tools/test_shell/mac/webview_host.mm @@ -10,8 +10,8 @@ #include "base/gfx/rect.h" #include "base/gfx/size.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebSize.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webpreferences.h" #include "webkit/tools/test_shell/test_shell.h" #include "webkit/tools/test_shell/test_webview_delegate.h" diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm index da34ca7..b447f96 100644 --- a/webkit/tools/test_shell/mac/webwidget_host.mm +++ b/webkit/tools/test_shell/mac/webwidget_host.mm @@ -10,12 +10,12 @@ #include "base/gfx/size.h" #include "base/logging.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/mac/WebInputEventFactory.h" -#include "webkit/api/public/mac/WebScreenInfoFactory.h" -#include "webkit/api/public/WebInputEvent.h" -#include "webkit/api/public/WebPopupMenu.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebSize.h" +#include "third_party/WebKit/WebKit/chromium/public/mac/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/mac/WebScreenInfoFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" #include "webkit/glue/webkit_glue.h" #include "webkit/tools/test_shell/test_shell.h" diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.cc b/webkit/tools/test_shell/mock_webclipboard_impl.cc index c04e4b8..867d076 100644 --- a/webkit/tools/test_shell/mock_webclipboard_impl.cc +++ b/webkit/tools/test_shell/mock_webclipboard_impl.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/string_util.h" #include "net/base/escape.h" -#include "webkit/api/public/WebImage.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebImage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.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 8491768..0da2d6b 100644 --- a/webkit/tools/test_shell/mock_webclipboard_impl.h +++ b/webkit/tools/test_shell/mock_webclipboard_impl.h @@ -10,8 +10,8 @@ #ifndef WEBKIT_TOOLS_TEST_SHELL_MOCK_WEBCLIPBOARD_IMPL_H_ #define WEBKIT_TOOLS_TEST_SHELL_MOCK_WEBCLIPBOARD_IMPL_H_ -#include "webkit/api/public/WebClipboard.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebClipboard.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" class MockWebClipboardImpl : public WebKit::WebClipboard { public: diff --git a/webkit/tools/test_shell/plain_text_controller.cc b/webkit/tools/test_shell/plain_text_controller.cc index 954a670..426824d 100644 --- a/webkit/tools/test_shell/plain_text_controller.cc +++ b/webkit/tools/test_shell/plain_text_controller.cc @@ -7,9 +7,9 @@ #include "webkit/tools/test_shell/plain_text_controller.h" #include "webkit/tools/test_shell/test_shell.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebRange.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRange.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" using WebKit::WebBindings; using WebKit::WebRange; diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc index 7b374fd..0e812a1 100644 --- a/webkit/tools/test_shell/plugin_tests.cc +++ b/webkit/tools/test_shell/plugin_tests.cc @@ -10,11 +10,11 @@ #include "base/string_util.h" #include "net/base/escape.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebInputEvent.h" -#include "webkit/api/public/WebScriptSource.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/tools/test_shell/test_shell.h" #include "webkit/tools/test_shell/test_shell_test.h" diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc index 223b8c1..8def341 100644 --- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc +++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc @@ -11,7 +11,7 @@ #include "googleurl/src/gurl.h" #include "net/socket_stream/socket_stream.h" #include "net/url_request/url_request_context.h" -#include "webkit/api/public/WebSocketStreamHandle.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSocketStreamHandle.h" #include "webkit/glue/websocketstreamhandle_bridge.h" #include "webkit/glue/websocketstreamhandle_delegate.h" diff --git a/webkit/tools/test_shell/test_navigation_controller.h b/webkit/tools/test_shell/test_navigation_controller.h index bcfa1b2..712fe48 100644 --- a/webkit/tools/test_shell/test_navigation_controller.h +++ b/webkit/tools/test_shell/test_navigation_controller.h @@ -12,7 +12,7 @@ #include "base/linked_ptr.h" #include "base/ref_counted.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" class GURL; class TestShell; diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index d4a974d..aeca423 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -31,17 +31,17 @@ #include "skia/ext/bitmap_platform_device.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "webkit/api/public/WebAccessibilityObject.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebScriptController.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebSize.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebURLRequest.h" -#include "webkit/api/public/WebURLResponse.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/glue_serialize.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 3d16f49..44a6ecb 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -36,11 +36,11 @@ '../../../testing/gtest.gyp:gtest', '../../../third_party/npapi/npapi.gyp:npapi', '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', - '../../webkit.gyp:appcache', - '../../webkit.gyp:database', - '../../webkit.gyp:glue', - '../../api/WebKit.gyp:webkit', - '../../webkit.gyp:inspector_resources', + '../../../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', + '../../webkit_glue.gyp:appcache', + '../../webkit_glue.gyp:database', + '../../webkit_glue.gyp:glue', + '../../webkit_glue.gyp:inspector_resources', 'npapi_layout_test_plugin', ], 'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC', @@ -118,8 +118,8 @@ '../../../base/base.gyp:base', '../../../net/net.gyp:net', '../../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', - '../../webkit.gyp:glue', - '../../api/WebKit.gyp:webkit', + '../../../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', + '../../webkit_glue.gyp:glue', ], 'conditions': [ # http://code.google.com/p/chromium/issues/detail?id=18337 @@ -344,8 +344,8 @@ }, { # OS != "mac" 'dependencies': [ '../../../net/net.gyp:net_resources', - '../../webkit.gyp:webkit_resources', - '../../webkit.gyp:webkit_strings', + '../../webkit_glue.gyp:webkit_resources', + '../../webkit_glue.gyp:webkit_strings', ] }], ], diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index 95c79d2..52b9362 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -23,9 +23,9 @@ #include "grit/webkit_resources.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/plugins/plugin_list.h" #include "webkit/glue/resource_loader_bridge.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index 787d265..9e13f0d 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -28,8 +28,8 @@ #include "net/base/mime_util.h" #include "skia/ext/bitmap_platform_device.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/plugins/plugin_list.h" diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index ea2d625..bd9a5b0 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -24,8 +24,8 @@ #include "net/http/http_cache.h" #include "net/socket/ssl_test_util.h" #include "net/url_request/url_request_context.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebScriptController.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/window_open_disposition.h" #include "webkit/extensions/v8/gc_extension.h" diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h index 529af2a..f67fca0 100644 --- a/webkit/tools/test_shell/test_shell_webkit_init.h +++ b/webkit/tools/test_shell/test_shell_webkit_init.h @@ -11,16 +11,16 @@ #include "base/stats_counters.h" #include "base/string_util.h" #include "media/base/media.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebRuntimeFeatures.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebScriptController.h" -#include "webkit/api/public/WebSecurityPolicy.h" -#include "webkit/api/public/WebStorageArea.h" -#include "webkit/api/public/WebStorageEventDispatcher.h" -#include "webkit/api/public/WebStorageNamespace.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/database/vfs_backend.h" #include "webkit/extensions/v8/gears_extension.h" @@ -36,7 +36,7 @@ #include "v8/include/v8.h" #if defined(OS_WIN) -#include "webkit/api/public/win/WebThemeEngine.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebThemeEngine.h" #include "webkit/tools/test_shell/test_shell_webthemeengine.h" #endif diff --git a/webkit/tools/test_shell/test_shell_webthemeengine.cc b/webkit/tools/test_shell/test_shell_webthemeengine.cc index 95c7d75..b9e0308 100644 --- a/webkit/tools/test_shell/test_shell_webthemeengine.cc +++ b/webkit/tools/test_shell/test_shell_webthemeengine.cc @@ -19,8 +19,8 @@ #include <windows.h> #include "base/logging.h" -#include "webkit/api/public/WebCanvas.h" -#include "webkit/api/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" #include "webkit/tools/test_shell/test_shell_webthemecontrol.h" #include "third_party/skia/include/core/SkRect.h" diff --git a/webkit/tools/test_shell/test_shell_webthemeengine.h b/webkit/tools/test_shell/test_shell_webthemeengine.h index c4b1fce..03d1127 100644 --- a/webkit/tools/test_shell/test_shell_webthemeengine.h +++ b/webkit/tools/test_shell/test_shell_webthemeengine.h @@ -22,7 +22,7 @@ #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBTHEMEENGINE_H_ #include "base/basictypes.h" -#include "webkit/api/public/win/WebThemeEngine.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebThemeEngine.h" namespace TestShellWebTheme { diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 80344b7..d038757 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -27,8 +27,8 @@ #include "net/base/net_module.h" #include "net/url_request/url_request_file_job.h" #include "skia/ext/bitmap_platform_device.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/plugins/plugin_list.h" diff --git a/webkit/tools/test_shell/test_web_worker.h b/webkit/tools/test_shell/test_web_worker.h index 4c2e077..f83752e 100644 --- a/webkit/tools/test_shell/test_web_worker.h +++ b/webkit/tools/test_shell/test_web_worker.h @@ -9,9 +9,9 @@ #include "base/basictypes.h" #include "base/ref_counted.h" -#include "webkit/api/public/WebMessagePortChannel.h" -#include "webkit/api/public/WebWorker.h" -#include "webkit/api/public/WebWorkerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMessagePortChannel.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" namespace WebKit { class WebNotificationPresenter; diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 2dadda1..f8d8ae6 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -20,27 +20,27 @@ #include "base/string_util.h" #include "base/trace_event.h" #include "net/base/net_errors.h" -#include "webkit/api/public/WebAccessibilityObject.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebContextMenuData.h" -#include "webkit/api/public/WebCString.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebDragData.h" -#include "webkit/api/public/WebHistoryItem.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebNode.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebPopupMenu.h" -#include "webkit/api/public/WebRange.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebURLError.h" -#include "webkit/api/public/WebURLRequest.h" -#include "webkit/api/public/WebURLResponse.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNode.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRange.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/appcache/appcache_interfaces.h" #include "webkit/glue/glue_serialize.h" #include "webkit/glue/glue_util.h" diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index a191d95..e9ce56a 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -24,13 +24,13 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/weak_ptr.h" -#include "webkit/api/public/WebContextMenuData.h" -#include "webkit/api/public/WebFrameClient.h" -#include "webkit/api/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" #if defined(OS_MACOSX) -#include "webkit/api/public/WebPopupMenuInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPopupMenuInfo.h" #endif -#include "webkit/api/public/WebViewClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h" #include "webkit/glue/webcursor.h" #include "webkit/glue/webplugin_page_delegate.h" #if defined(OS_WIN) diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc index 288ca24..66207e1 100644 --- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc +++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc @@ -15,12 +15,12 @@ #include "base/string_util.h" #include "net/base/net_errors.h" #include "chrome/common/page_transition_types.h" -#include "webkit/api/public/WebCString.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webcursor.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webpreferences.h" diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc index 180e5f9..8fef1d1 100644 --- a/webkit/tools/test_shell/test_webview_delegate_win.cc +++ b/webkit/tools/test_shell/test_webview_delegate_win.cc @@ -19,10 +19,10 @@ #include "base/string_util.h" #include "base/trace_event.h" #include "net/base/net_errors.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/webplugin.h" diff --git a/webkit/tools/test_shell/text_input_controller.cc b/webkit/tools/test_shell/text_input_controller.cc index 0bc873e..0faa523 100644 --- a/webkit/tools/test_shell/text_input_controller.cc +++ b/webkit/tools/test_shell/text_input_controller.cc @@ -5,10 +5,10 @@ #include "webkit/tools/test_shell/text_input_controller.h" #include "base/string_util.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebRange.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRange.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/tools/test_shell/test_shell.h" using WebKit::WebFrame; diff --git a/webkit/tools/test_shell/webview_host_gtk.cc b/webkit/tools/test_shell/webview_host_gtk.cc index dd2e593..2302af5 100644 --- a/webkit/tools/test_shell/webview_host_gtk.cc +++ b/webkit/tools/test_shell/webview_host_gtk.cc @@ -10,7 +10,7 @@ #include "base/gfx/rect.h" #include "base/gfx/size.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/plugins/gtk_plugin_container.h" #include "webkit/glue/webpreferences.h" #include "webkit/tools/test_shell/test_webview_delegate.h" diff --git a/webkit/tools/test_shell/webview_host_win.cc b/webkit/tools/test_shell/webview_host_win.cc index abbe53f..723dc31 100644 --- a/webkit/tools/test_shell/webview_host_win.cc +++ b/webkit/tools/test_shell/webview_host_win.cc @@ -8,7 +8,7 @@ #include "base/gfx/size.h" #include "base/win_util.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webpreferences.h" #include "webkit/tools/test_shell/test_webview_delegate.h" diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc index f9d23a1..2dd37bd 100644 --- a/webkit/tools/test_shell/webwidget_host_gtk.cc +++ b/webkit/tools/test_shell/webwidget_host_gtk.cc @@ -12,12 +12,12 @@ #include "skia/ext/bitmap_platform_device.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/platform_device.h" -#include "webkit/api/public/gtk/WebInputEventFactory.h" -#include "webkit/api/public/x11/WebScreenInfoFactory.h" -#include "webkit/api/public/WebInputEvent.h" -#include "webkit/api/public/WebPopupMenu.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebSize.h" +#include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/x11/WebScreenInfoFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" #include "webkit/tools/test_shell/test_shell.h" #include "webkit/tools/test_shell/test_shell_x11.h" diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc index 66b283e..59794d0 100644 --- a/webkit/tools/test_shell/webwidget_host_win.cc +++ b/webkit/tools/test_shell/webwidget_host_win.cc @@ -8,12 +8,12 @@ #include "base/logging.h" #include "base/win_util.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebInputEvent.h" -#include "webkit/api/public/WebPopupMenu.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebSize.h" -#include "webkit/api/public/win/WebInputEventFactory.h" -#include "webkit/api/public/win/WebScreenInfoFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebScreenInfoFactory.h" #include "webkit/tools/test_shell/test_shell.h" using WebKit::WebInputEvent; |