diff options
| author | yaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 01:14:49 +0000 |
|---|---|---|
| committer | yaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 01:14:49 +0000 |
| commit | 418ed5ab9cd81a2106893fce7aa121f693c6a98f (patch) | |
| tree | e91f4b793e1c1b73775c0507993c16ad6fabffce | |
| parent | 730aef2589a2e544797931eab99ea3d770040d99 (diff) | |
| download | chromium_src-418ed5ab9cd81a2106893fce7aa121f693c6a98f.zip chromium_src-418ed5ab9cd81a2106893fce7aa121f693c6a98f.tar.gz chromium_src-418ed5ab9cd81a2106893fce7aa121f693c6a98f.tar.bz2 | |
Upstreaming WebKit.gyp
This mega patch contains a few simple but tightly dependent changes:
1. Deletion of webkit/api/WebKit.gyp. The file now lives in webkit.org.
2. Rename of webkit/webkit.gyp to webkit/webkit_glue.gyp. Having two webkit.gyp was a source of developer confusion.
3. Gyp dependencies are updated across chromium to point at the upstream WebKit.gyp and the renamed webkit_glue.gyp.
4. Some 200+ files include paths fixed to point to third_party/WebKit/WebKit/chromium instead of webkit/api. The later will be deleted in a subsequent patch.
Review URL: http://codereview.chromium.org/387020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31749 0039d316-1c4b-4281-b951-d872f2087c98
234 files changed, 652 insertions, 1030 deletions
diff --git a/build/all.gyp b/build/all.gyp index 58c4119..9e23774 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -32,9 +32,10 @@ '../third_party/modp_b64/modp_b64.gyp:*', '../third_party/npapi/npapi.gyp:*', '../third_party/sqlite/sqlite.gyp:*', + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*', '../third_party/zlib/zlib.gyp:*', '../webkit/tools/test_shell/test_shell.gyp:*', - '../webkit/webkit.gyp:*', + '../webkit/webkit_glue.gyp:*', 'util/build_util.gyp:*', 'temp_gyp/googleurl.gyp:*', ], diff --git a/chrome/DEPS b/chrome/DEPS index 1e982a0..d3f8343 100644 --- a/chrome/DEPS +++ b/chrome/DEPS @@ -16,7 +16,7 @@ include_rules = [ "-tools", # Allow inclusion of WebKit API files. - "+webkit/api", + "+third_party/WebKit/WebKit/chromium", # Allow inclusion of the appcache library. "+webkit/appcache", diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp index 43dae19..12fd1db 100644 --- a/chrome/app/locales/locales.gyp +++ b/chrome/app/locales/locales.gyp @@ -12,7 +12,7 @@ 'type': 'loadable_module', 'dependencies': [ '../../chrome.gyp:chrome_strings', - '../../../webkit/webkit.gyp:webkit_strings', + '../../../webkit/webkit_glue.gyp:webkit_strings', '../../../app/app.gyp:app_strings', ], 'msvs_settings': { diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc index f736798..86ff2f7 100644 --- a/chrome/browser/gtk/find_bar_gtk.cc +++ b/chrome/browser/gtk/find_bar_gtk.cc @@ -27,7 +27,7 @@ #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "webkit/api/public/gtk/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h" namespace { diff --git a/chrome/browser/gtk/tab_contents_drag_source.h b/chrome/browser/gtk/tab_contents_drag_source.h index cdcc3ed..8a81647 100644 --- a/chrome/browser/gtk/tab_contents_drag_source.h +++ b/chrome/browser/gtk/tab_contents_drag_source.h @@ -10,7 +10,7 @@ #include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/message_loop.h" -#include "webkit/api/public/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" class TabContents; class TabContentsView; diff --git a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc index 6469cea..a6d772a 100644 --- a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc +++ b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc @@ -6,9 +6,9 @@ #include "base/logging.h" #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h" -#include "webkit/api/public/WebData.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/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" WebKit::WebClipboard* BrowserWebKitClientImpl::clipboard() { NOTREACHED(); diff --git a/chrome/browser/in_process_webkit/storage_area.cc b/chrome/browser/in_process_webkit/storage_area.cc index 61b9f26..1b8ea59 100644 --- a/chrome/browser/in_process_webkit/storage_area.cc +++ b/chrome/browser/in_process_webkit/storage_area.cc @@ -6,9 +6,9 @@ #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h" #include "chrome/browser/in_process_webkit/storage_namespace.h" -#include "webkit/api/public/WebStorageArea.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" using WebKit::WebStorageArea; using WebKit::WebURL; diff --git a/chrome/browser/in_process_webkit/storage_namespace.cc b/chrome/browser/in_process_webkit/storage_namespace.cc index 0d15867..b38303b 100644 --- a/chrome/browser/in_process_webkit/storage_namespace.cc +++ b/chrome/browser/in_process_webkit/storage_namespace.cc @@ -8,8 +8,8 @@ #include "chrome/browser/in_process_webkit/dom_storage_context.h" #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h" #include "chrome/browser/in_process_webkit/storage_area.h" -#include "webkit/api/public/WebStorageArea.h" -#include "webkit/api/public/WebStorageNamespace.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebStorageArea; diff --git a/chrome/browser/in_process_webkit/storage_namespace.h b/chrome/browser/in_process_webkit/storage_namespace.h index 9ee2c2b..f6d045a 100644 --- a/chrome/browser/in_process_webkit/storage_namespace.h +++ b/chrome/browser/in_process_webkit/storage_namespace.h @@ -9,7 +9,7 @@ #include "base/hash_tables.h" #include "base/scoped_ptr.h" #include "chrome/common/dom_storage_type.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" class DOMStorageContext; class FilePath; diff --git a/chrome/browser/in_process_webkit/webkit_thread.cc b/chrome/browser/in_process_webkit/webkit_thread.cc index b8df3df..6311140 100644 --- a/chrome/browser/in_process_webkit/webkit_thread.cc +++ b/chrome/browser/in_process_webkit/webkit_thread.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "chrome/browser/in_process_webkit/browser_webkitclient_impl.h" #include "chrome/common/chrome_switches.h" -#include "webkit/api/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" // This happens on the UI thread before the IO thread has been shut down. WebKitThread::WebKitThread() { diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index d170891..2057f70 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -30,7 +30,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "webkit/api/public/WebNotificationPresenter.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" using WebKit::WebNotificationPresenter; diff --git a/chrome/browser/notifications/desktop_notifications_unittest.h b/chrome/browser/notifications/desktop_notifications_unittest.h index 91c65c8..493c35c 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.h +++ b/chrome/browser/notifications/desktop_notifications_unittest.h @@ -19,7 +19,7 @@ #include "chrome/browser/notifications/notifications_prefs_cache.h" #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebNotificationPresenter.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" // Mock implementation of Javascript object proxy which logs events that // would have been fired on it. diff --git a/chrome/browser/notifications/notifications_prefs_cache.cc b/chrome/browser/notifications/notifications_prefs_cache.cc index 3ff90d7..d9a4dae 100644 --- a/chrome/browser/notifications/notifications_prefs_cache.cc +++ b/chrome/browser/notifications/notifications_prefs_cache.cc @@ -8,7 +8,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/chrome_thread.h" #include "chrome/common/pref_service.h" -#include "webkit/api/public/WebNotificationPresenter.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" NotificationsPrefsCache::NotificationsPrefsCache( const ListValue* allowed, const ListValue* denied) { diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h index 03b2b73..2d01df8 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.h +++ b/chrome/browser/renderer_host/browser_render_process_host.h @@ -19,7 +19,7 @@ #include "chrome/common/transport_dib.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/common/notification_registrar.h" -#include "webkit/api/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" class AudioRendererHost; class CommandLine; diff --git a/chrome/browser/renderer_host/render_sandbox_host_linux.cc b/chrome/browser/renderer_host/render_sandbox_host_linux.cc index 7bba4a6..c27bb4b 100644 --- a/chrome/browser/renderer_host/render_sandbox_host_linux.cc +++ b/chrome/browser/renderer_host/render_sandbox_host_linux.cc @@ -22,7 +22,7 @@ #include "base/string_util.h" #include "base/unix_domain_socket_posix.h" #include "chrome/common/sandbox_methods_linux.h" -#include "webkit/api/public/gtk/WebFontInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/gtk/WebFontInfo.h" #include "SkFontHost_fontconfig_direct.h" #include "SkFontHost_fontconfig_ipc.h" diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index 368a9ad..34ba64d 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -39,7 +39,7 @@ #include "chrome/common/url_constants.h" #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "webkit/api/public/WebFindOptions.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h" #include "webkit/glue/form_field_values.h" #if defined(OS_WIN) diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index 9ac9191..a66f371 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -14,9 +14,9 @@ #include "chrome/common/page_zoom.h" #include "chrome/common/view_types.h" #include "net/base/load_states.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebDragOperation.h" -#include "webkit/api/public/WebTextDirection.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" #include "webkit/glue/form_field_values.h" #include "webkit/glue/password_form_dom_manager.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h index af87a9e..e8004bd 100644 --- a/chrome/browser/renderer_host/render_view_host_delegate.h +++ b/chrome/browser/renderer_host/render_view_host_delegate.h @@ -12,7 +12,7 @@ #include "base/string16.h" #include "chrome/common/view_types.h" #include "net/base/load_states.h" -#include "webkit/api/public/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" #include "webkit/glue/window_open_disposition.h" struct ContextMenuParams; diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc index fb5fddc..3e723b4 100644 --- a/chrome/browser/renderer_host/render_widget_host.cc +++ b/chrome/browser/renderer_host/render_widget_host.cc @@ -22,8 +22,8 @@ #endif #if defined (OS_MACOSX) -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/mac/WebScreenInfoFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/mac/WebScreenInfoFactory.h" #endif using base::Time; diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h index 0253336..c8ac6d5 100644 --- a/chrome/browser/renderer_host/render_widget_host.h +++ b/chrome/browser/renderer_host/render_widget_host.h @@ -18,7 +18,7 @@ #include "chrome/common/property_bag.h" #include "ipc/ipc_channel.h" #include "testing/gtest/include/gtest/gtest_prod.h" -#include "webkit/api/public/WebTextDirection.h" +#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" namespace gfx { class Rect; diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc index b19cb46..e5fe05e 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc @@ -31,7 +31,7 @@ #include "chrome/browser/renderer_host/gtk_im_context_wrapper.h" #include "chrome/browser/renderer_host/gtk_key_bindings_handler.h" #include "chrome/browser/renderer_host/render_widget_host.h" -#include "webkit/api/public/gtk/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h" #include "webkit/glue/webcursor_gtk_data.h" static const int kMaxWindowWidth = 4000; diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index d043a52..95275cb 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -18,8 +18,8 @@ #include "chrome/common/edit_command.h" #include "chrome/common/render_messages.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/mac/WebInputEventFactory.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/mac/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/webmenurunner_mac.h" using WebKit::WebInputEvent; diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index d01c410..837cdf9 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -30,8 +30,8 @@ #include "chrome/common/render_messages.h" #include "grit/webkit_resources.h" #include "skia/ext/skia_utils_win.h" -#include "webkit/api/public/WebInputEvent.h" -#include "webkit/api/public/win/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h" #include "views/accessibility/view_accessibility.h" #include "views/focus/focus_util_win.h" // Included for views::kReflectedMessage - TODO(beng): move this to win_util.h! diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h index 250b737..577e14a 100644 --- a/chrome/browser/renderer_host/resource_message_filter.h +++ b/chrome/browser/renderer_host/resource_message_filter.h @@ -28,7 +28,7 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/transport_dib.h" #include "ipc/ipc_channel_proxy.h" -#include "webkit/api/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" class AppCacheDispatcherHost; class AudioRendererHost; diff --git a/chrome/browser/renderer_host/resource_message_filter_gtk.cc b/chrome/browser/renderer_host/resource_message_filter_gtk.cc index 5ed8fb0..6c44d81 100644 --- a/chrome/browser/renderer_host/resource_message_filter_gtk.cc +++ b/chrome/browser/renderer_host/resource_message_filter_gtk.cc @@ -22,8 +22,8 @@ #include "chrome/common/x11_util.h" #include "grit/generated_resources.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/x11/WebScreenInfoFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/x11/WebScreenInfoFactory.h" using WebKit::WebScreenInfo; using WebKit::WebScreenInfoFactory; diff --git a/chrome/browser/renderer_host/resource_message_filter_win.cc b/chrome/browser/renderer_host/resource_message_filter_win.cc index b9acece..aa53422 100644 --- a/chrome/browser/renderer_host/resource_message_filter_win.cc +++ b/chrome/browser/renderer_host/resource_message_filter_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/renderer_host/resource_message_filter.h" #include "chrome/common/render_messages.h" -#include "webkit/api/public/win/WebScreenInfoFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebScreenInfoFactory.h" using WebKit::WebScreenInfo; using WebKit::WebScreenInfoFactory; diff --git a/chrome/browser/renderer_host/web_cache_manager.h b/chrome/browser/renderer_host/web_cache_manager.h index 82af433..db95280 100644 --- a/chrome/browser/renderer_host/web_cache_manager.h +++ b/chrome/browser/renderer_host/web_cache_manager.h @@ -17,7 +17,7 @@ #include "base/task.h" #include "base/time.h" #include "testing/gtest/include/gtest/gtest_prod.h" -#include "webkit/api/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" template<typename Type> struct DefaultSingletonTraits; diff --git a/chrome/browser/ssl/ssl_policy_backend.h b/chrome/browser/ssl/ssl_policy_backend.h index 9e86a6d..059534b 100644 --- a/chrome/browser/ssl/ssl_policy_backend.h +++ b/chrome/browser/ssl/ssl_policy_backend.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "chrome/browser/tab_contents/security_style.h" #include "net/base/x509_certificate.h" -#include "webkit/api/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" class NavigationController; class SSLHostState; diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 41ebc96..f1f6fff 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -33,8 +33,8 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "net/base/escape.h" -#include "webkit/api/public/WebMediaPlayerAction.h" -#include "webkit/api/public/WebContextMenuData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h" +#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" using WebKit::WebContextMenuData; using WebKit::WebMediaPlayerAction; diff --git a/chrome/browser/tab_contents/web_drag_dest_gtk.h b/chrome/browser/tab_contents/web_drag_dest_gtk.h index 8bba71e..46e16aa 100644 --- a/chrome/browser/tab_contents/web_drag_dest_gtk.h +++ b/chrome/browser/tab_contents/web_drag_dest_gtk.h @@ -9,7 +9,7 @@ #include "base/scoped_ptr.h" #include "base/task.h" -#include "webkit/api/public/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" #include "webkit/glue/webdropdata.h" class TabContents; diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h index 2c76a7d..2fe885e 100644 --- a/chrome/browser/task_manager.h +++ b/chrome/browser/task_manager.h @@ -21,7 +21,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "net/url_request/url_request_job_tracker.h" #include "testing/gtest/include/gtest/gtest_prod.h" -#include "webkit/api/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" class Extension; class SkBitmap; diff --git a/chrome/browser/task_manager_resource_providers.h b/chrome/browser/task_manager_resource_providers.h index b374a65..3f76046 100644 --- a/chrome/browser/task_manager_resource_providers.h +++ b/chrome/browser/task_manager_resource_providers.h @@ -13,7 +13,7 @@ #include "chrome/browser/task_manager.h" #include "chrome/common/child_process_info.h" #include "chrome/common/notification_observer.h" -#include "webkit/api/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" class Extension; class ExtensionHost; diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index a8528f9..17e780a 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -31,7 +31,7 @@ 'profile_import', 'worker', '../printing/printing.gyp:printing', - '../webkit/webkit.gyp:inspector_resources', + '../webkit/webkit_glue.gyp:inspector_resources', ], 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', @@ -524,8 +524,8 @@ '../third_party/sqlite/sqlite.gyp:sqlite', '../third_party/zlib/zlib.gyp:zlib', '../third_party/npapi/npapi.gyp:npapi', - '../webkit/webkit.gyp:appcache', - '../webkit/webkit.gyp:glue', + '../webkit/webkit_glue.gyp:appcache', + '../webkit/webkit_glue.gyp:glue', ], 'include_dirs': [ '..', @@ -791,8 +791,8 @@ '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', '../third_party/hunspell/hunspell.gyp:hunspell', - '../webkit/webkit.gyp:database', - '../webkit/webkit.gyp:glue', + '../webkit/webkit_glue.gyp:database', + '../webkit/webkit_glue.gyp:glue', ], 'include_dirs': [ '..', @@ -3173,7 +3173,7 @@ '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', '../third_party/hunspell/hunspell.gyp:hunspell', - '../webkit/webkit.gyp:glue', + '../webkit/webkit_glue.gyp:glue', ], 'include_dirs': [ '<(INTERMEDIATE_DIR)', @@ -3225,7 +3225,7 @@ 'chrome_resources', 'chrome_strings', '../third_party/npapi/npapi.gyp:npapi', - '../webkit/webkit.gyp:glue', + '../webkit/webkit_glue.gyp:glue', '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome', '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate', @@ -3276,9 +3276,11 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/npapi/npapi.gyp:npapi', + # TODO(yaar): Should only stop depending on webcore and depend + # only on webkit. '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', - '../webkit/webkit.gyp:glue', - '../webkit/api/WebKit.gyp:webkit', + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', + '../webkit/webkit_glue.gyp:glue', ], 'include_dirs': [ '..', @@ -3474,7 +3476,7 @@ 'msvs_guid': 'C78D02D0-A366-4EC6-A248-AA8E64C4BA18', 'dependencies': [ '../base/base.gyp:base', - '../webkit/api/WebKit.gyp:webkit', + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', ], 'sources': [ 'worker/nativewebworker_impl.cc', @@ -4475,8 +4477,7 @@ '../net/net.gyp:net_resources', '../net/net.gyp:net_test_support', '../printing/printing.gyp:printing', - '../webkit/api/WebKit.gyp:webkit', - '../webkit/webkit.gyp:webkit_resources', + '../webkit/webkit_glue.gyp:webkit_resources', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -4485,6 +4486,7 @@ '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', ], 'include_dirs': [ '..', @@ -5639,7 +5641,7 @@ '../build/util/support/support.gyp:*', '../third_party/cld/cld.gyp:cld', '../views/views.gyp:views', - '../webkit/webkit.gyp:webkit_resources', + '../webkit/webkit_glue.gyp:webkit_resources', '../gears/gears.gyp:gears', ], 'defines': [ @@ -6333,7 +6335,7 @@ '../base/base.gyp:test_support_perf', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', - '../webkit/webkit.gyp:glue', + '../webkit/webkit_glue.gyp:glue', ], 'sources': [ 'browser/safe_browsing/database_perftest.cc', @@ -6536,7 +6538,7 @@ '../third_party/tcmalloc/tcmalloc.gyp:*', '../third_party/zlib/zlib.gyp:*', '../webkit/tools/test_shell/test_shell.gyp:*', - '../webkit/webkit.gyp:*', + '../webkit/webkit_glue.gyp:*', '../build/temp_gyp/googleurl.gyp:*', @@ -6656,13 +6658,13 @@ 'syncapi', 'test_support_unit', '../printing/printing.gyp:printing', - '../webkit/api/WebKit.gyp:webkit', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', ], 'include_dirs': [ '..', diff --git a/chrome/common/css_colors.h b/chrome/common/css_colors.h index 994a3907..d952e98 100644 --- a/chrome/common/css_colors.h +++ b/chrome/common/css_colors.h @@ -8,8 +8,8 @@ #include <utility> #include "base/basictypes.h" -#include "webkit/api/public/WebColor.h" -#include "webkit/api/public/WebColorName.h" +#include "third_party/WebKit/WebKit/chromium/public/WebColor.h" +#include "third_party/WebKit/WebKit/chromium/public/WebColorName.h" // Functionality related to sending the values of CSS colors to the renderer. class CSSColors { diff --git a/chrome/common/db_message_filter.cc b/chrome/common/db_message_filter.cc index 939c6e8..a3e6bd8 100644 --- a/chrome/common/db_message_filter.cc +++ b/chrome/common/db_message_filter.cc @@ -6,7 +6,7 @@ #include "chrome/common/child_process.h" #include "chrome/common/render_messages.h" -#include "webkit/api/public/WebDatabase.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" DBMessageFilter* DBMessageFilter::instance_ = NULL; diff --git a/chrome/common/desktop_notifications/active_notification_tracker.cc b/chrome/common/desktop_notifications/active_notification_tracker.cc index 230d76a..3357ab3 100644 --- a/chrome/common/desktop_notifications/active_notification_tracker.cc +++ b/chrome/common/desktop_notifications/active_notification_tracker.cc @@ -5,8 +5,8 @@ #include "chrome/common/desktop_notifications/active_notification_tracker.h" #include "base/message_loop.h" -#include "webkit/api/public/WebNotification.h" -#include "webkit/api/public/WebNotificationPermissionCallback.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotification.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPermissionCallback.h" using WebKit::WebNotification; using WebKit::WebNotificationPermissionCallback; diff --git a/chrome/common/desktop_notifications/active_notification_tracker.h b/chrome/common/desktop_notifications/active_notification_tracker.h index 4bdd5d9..b25c42e 100644 --- a/chrome/common/desktop_notifications/active_notification_tracker.h +++ b/chrome/common/desktop_notifications/active_notification_tracker.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/id_map.h" #include "base/hash_tables.h" -#include "webkit/api/public/WebNotification.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotification.h" namespace WebKit { class WebNotificationPermissionCallback; diff --git a/chrome/common/native_web_keyboard_event.h b/chrome/common/native_web_keyboard_event.h index 654c38b..4edf0e2 100644 --- a/chrome/common/native_web_keyboard_event.h +++ b/chrome/common/native_web_keyboard_event.h @@ -6,7 +6,7 @@ #define CHROME_COMMON_NATIVE_WEB_KEYBOARD_EVENT_H_ #include "base/basictypes.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #if defined(OS_WIN) #include <windows.h> diff --git a/chrome/common/native_web_keyboard_event_linux.cc b/chrome/common/native_web_keyboard_event_linux.cc index 6df2290..3daeb47 100644 --- a/chrome/common/native_web_keyboard_event_linux.cc +++ b/chrome/common/native_web_keyboard_event_linux.cc @@ -4,7 +4,7 @@ #include "chrome/common/native_web_keyboard_event.h" -#include "webkit/api/public/gtk/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h" using WebKit::WebInputEventFactory; diff --git a/chrome/common/native_web_keyboard_event_mac.mm b/chrome/common/native_web_keyboard_event_mac.mm index 59e0ace..0c11033 100644 --- a/chrome/common/native_web_keyboard_event_mac.mm +++ b/chrome/common/native_web_keyboard_event_mac.mm @@ -6,7 +6,7 @@ #import <AppKit/AppKit.h> -#include "webkit/api/public/mac/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/mac/WebInputEventFactory.h" using WebKit::WebInputEventFactory; diff --git a/chrome/common/native_web_keyboard_event_win.cc b/chrome/common/native_web_keyboard_event_win.cc index b98f28b..a2ba45f 100644 --- a/chrome/common/native_web_keyboard_event_win.cc +++ b/chrome/common/native_web_keyboard_event_win.cc @@ -4,7 +4,7 @@ #include "chrome/common/native_web_keyboard_event.h" -#include "webkit/api/public/win/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h" using WebKit::WebInputEventFactory; using WebKit::WebKeyboardEvent; diff --git a/chrome/common/plugin_messages.h b/chrome/common/plugin_messages.h index 6ce53b8..c4c70fb 100644 --- a/chrome/common/plugin_messages.h +++ b/chrome/common/plugin_messages.h @@ -21,8 +21,8 @@ #include "googleurl/src/gurl.h" #include "ipc/ipc_message_utils.h" #include "third_party/npapi/bindings/npapi.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/npruntime_util.h" // Name prefix of the event handle when a message box is displayed. diff --git a/chrome/common/webkit_param_traits.h b/chrome/common/webkit_param_traits.h index dacaf08..5dfd90d 100644 --- a/chrome/common/webkit_param_traits.h +++ b/chrome/common/webkit_param_traits.h @@ -24,16 +24,16 @@ #define CHROME_COMMON_WEBKIT_PARAM_TRAITS_H_ #include "ipc/ipc_message_utils.h" -#include "webkit/api/public/WebCache.h" -#include "webkit/api/public/WebCompositionCommand.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebContextMenuData.h" -#include "webkit/api/public/WebDragOperation.h" -#include "webkit/api/public/WebFindOptions.h" -#include "webkit/api/public/WebInputEvent.h" -#include "webkit/api/public/WebMediaPlayerAction.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebTextDirection.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCompositionCommand.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/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" namespace IPC { diff --git a/chrome/common/webmessageportchannel_impl.cc b/chrome/common/webmessageportchannel_impl.cc index f585355..17b4fb8 100644 --- a/chrome/common/webmessageportchannel_impl.cc +++ b/chrome/common/webmessageportchannel_impl.cc @@ -7,8 +7,8 @@ #include "chrome/common/child_process.h" #include "chrome/common/child_thread.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebMessagePortChannelClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMessagePortChannelClient.h" using WebKit::WebMessagePortChannel; using WebKit::WebMessagePortChannelArray; diff --git a/chrome/common/webmessageportchannel_impl.h b/chrome/common/webmessageportchannel_impl.h index 89a36b0..da52b9d 100644 --- a/chrome/common/webmessageportchannel_impl.h +++ b/chrome/common/webmessageportchannel_impl.h @@ -13,7 +13,7 @@ #include "base/string16.h" #include "base/ref_counted.h" #include "ipc/ipc_channel.h" -#include "webkit/api/public/WebMessagePortChannel.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMessagePortChannel.h" // This is thread safe. class WebMessagePortChannelImpl diff --git a/chrome/plugin/npobject_proxy.cc b/chrome/plugin/npobject_proxy.cc index 8071141..01cc4c7 100644 --- a/chrome/plugin/npobject_proxy.cc +++ b/chrome/plugin/npobject_proxy.cc @@ -7,7 +7,7 @@ #include "chrome/common/plugin_messages.h" #include "chrome/plugin/npobject_util.h" #include "chrome/plugin/plugin_channel.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/plugins/plugin_instance.h" diff --git a/chrome/plugin/npobject_stub.cc b/chrome/plugin/npobject_stub.cc index 7b0e213..958ad55 100644 --- a/chrome/plugin/npobject_stub.cc +++ b/chrome/plugin/npobject_stub.cc @@ -11,7 +11,7 @@ #include "chrome/plugin/plugin_thread.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/plugins/plugin_constants_win.h" using WebKit::WebBindings; diff --git a/chrome/plugin/npobject_util.cc b/chrome/plugin/npobject_util.cc index 71d866e..7594225 100644 --- a/chrome/plugin/npobject_util.cc +++ b/chrome/plugin/npobject_util.cc @@ -8,7 +8,7 @@ #include "chrome/common/plugin_messages.h" #include "chrome/plugin/npobject_proxy.h" #include "chrome/plugin/plugin_channel_base.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/plugins/nphostapi.h" #include "webkit/glue/plugins/plugin_host.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc index ac19f31..c02b42f 100644 --- a/chrome/plugin/webplugin_delegate_stub.cc +++ b/chrome/plugin/webplugin_delegate_stub.cc @@ -18,8 +18,8 @@ #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" #include "skia/ext/platform_device.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/glue/webcursor.h" diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index 9983315..61ecc7e 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -28,7 +28,7 @@ #include "chrome/plugin/plugin_thread.h" #include "chrome/plugin/webplugin_delegate_stub.h" #include "skia/ext/platform_device.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" using WebKit::WebBindings; diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc index 87dc832..aad6ceb 100644 --- a/chrome/renderer/devtools_agent.cc +++ b/chrome/renderer/devtools_agent.cc @@ -7,9 +7,9 @@ #include "chrome/common/devtools_messages.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebDevToolsAgent.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "webkit/glue/glue_util.h" using WebKit::WebDevToolsAgent; diff --git a/chrome/renderer/devtools_agent.h b/chrome/renderer/devtools_agent.h index 9f52e9e..26a6297 100644 --- a/chrome/renderer/devtools_agent.h +++ b/chrome/renderer/devtools_agent.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "webkit/api/public/WebDevToolsAgentClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgentClient.h" namespace IPC { class Message; diff --git a/chrome/renderer/devtools_agent_filter.cc b/chrome/renderer/devtools_agent_filter.cc index 8049868..f67f183 100644 --- a/chrome/renderer/devtools_agent_filter.cc +++ b/chrome/renderer/devtools_agent_filter.cc @@ -9,8 +9,8 @@ #include "chrome/renderer/devtools_agent.h" #include "chrome/renderer/plugin_channel_host.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebDevToolsAgent.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" using WebKit::WebDevToolsAgent; using WebKit::WebString; diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc index c950fb5..9b17c8b 100644 --- a/chrome/renderer/devtools_client.cc +++ b/chrome/renderer/devtools_client.cc @@ -10,8 +10,8 @@ #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebDevToolsFrontend.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsFrontend.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" using WebKit::WebDevToolsFrontend; using WebKit::WebString; diff --git a/chrome/renderer/devtools_client.h b/chrome/renderer/devtools_client.h index a380255..e83ec12 100644 --- a/chrome/renderer/devtools_client.h +++ b/chrome/renderer/devtools_client.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "webkit/api/public/WebDevToolsFrontendClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsFrontendClient.h" namespace IPC { class Message; diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc index 6c35b25..988068e 100644 --- a/chrome/renderer/extensions/bindings_utils.cc +++ b/chrome/renderer/extensions/bindings_utils.cc @@ -6,7 +6,7 @@ #include "base/string_util.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebFrame; using WebKit::WebView; diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index e23c060..ba7e898 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -14,9 +14,9 @@ #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" #include "grit/renderer_resources.h" -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" using bindings_utils::CallFunctionInContext; using bindings_utils::ContextInfo; diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc index fee736a..ce5295a 100644 --- a/chrome/renderer/extensions/extension_process_bindings.cc +++ b/chrome/renderer/extensions/extension_process_bindings.cc @@ -25,10 +25,10 @@ #include "grit/renderer_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebSecurityPolicy.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" using bindings_utils::GetStringResource; using bindings_utils::ContextInfo; diff --git a/chrome/renderer/external_extension.cc b/chrome/renderer/external_extension.cc index c647de4..f0e0bd5 100644 --- a/chrome/renderer/external_extension.cc +++ b/chrome/renderer/external_extension.cc @@ -4,7 +4,7 @@ #include "chrome/renderer/external_extension.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebFrame; using WebKit::WebView; diff --git a/chrome/renderer/external_host_bindings.cc b/chrome/renderer/external_host_bindings.cc index 1ab3cc0..51a71bc 100644 --- a/chrome/renderer/external_host_bindings.cc +++ b/chrome/renderer/external_host_bindings.cc @@ -6,8 +6,8 @@ #include "base/values.h" #include "chrome/common/render_messages.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebBindings; diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc index e68c8e4..8688a56 100644 --- a/chrome/renderer/loadtimes_extension_bindings.cc +++ b/chrome/renderer/loadtimes_extension_bindings.cc @@ -8,7 +8,7 @@ #include "base/time.h" #include "chrome/renderer/navigation_state.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" #include "v8/include/v8.h" using WebKit::WebDataSource; diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index e95e937..2b49390 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -12,7 +12,7 @@ #include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_errors.h" -#include "webkit/api/public/WebURLError.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebURLError; diff --git a/chrome/renderer/navigation_state.h b/chrome/renderer/navigation_state.h index 5f3191d..90c1270 100644 --- a/chrome/renderer/navigation_state.h +++ b/chrome/renderer/navigation_state.h @@ -9,8 +9,8 @@ #include "base/time.h" #include "chrome/common/page_transition_types.h" #include "chrome/renderer/user_script_idle_scheduler.h" -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" #include "webkit/glue/alt_error_page_resource_fetcher.h" #include "webkit/glue/password_form.h" diff --git a/chrome/renderer/notification_provider.cc b/chrome/renderer/notification_provider.cc index 2862e4a..9510cab 100644 --- a/chrome/renderer/notification_provider.cc +++ b/chrome/renderer/notification_provider.cc @@ -8,8 +8,8 @@ #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebNotificationPermissionCallback.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPermissionCallback.h" using WebKit::WebNotification; using WebKit::WebNotificationPresenter; diff --git a/chrome/renderer/notification_provider.h b/chrome/renderer/notification_provider.h index f08d031..d02ee15 100644 --- a/chrome/renderer/notification_provider.h +++ b/chrome/renderer/notification_provider.h @@ -9,8 +9,8 @@ #include "chrome/common/desktop_notifications/active_notification_tracker.h" #include "ipc/ipc_channel.h" -#include "webkit/api/public/WebNotification.h" -#include "webkit/api/public/WebNotificationPresenter.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotification.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" class RenderView; namespace WebKit { diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index fe49462..32e4064 100644 --- a/chrome/renderer/print_web_view_helper.cc +++ b/chrome/renderer/print_web_view_helper.cc @@ -11,11 +11,11 @@ #include "chrome/renderer/render_view.h" #include "grit/generated_resources.h" #include "printing/units.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebSize.h" -#include "webkit/api/public/WebURLRequest.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/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebFrame; diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h index eb3ffaf..44ae591 100644 --- a/chrome/renderer/print_web_view_helper.h +++ b/chrome/renderer/print_web_view_helper.h @@ -10,7 +10,7 @@ #include "base/gfx/size.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "webkit/api/public/WebViewClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h" namespace gfx { class Size; diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc index dd1c986..4b2f92f 100644 --- a/chrome/renderer/print_web_view_helper_linux.cc +++ b/chrome/renderer/print_web_view_helper_linux.cc @@ -9,7 +9,7 @@ #include "chrome/common/render_messages.h" #include "printing/native_metafile.h" #include "skia/ext/vector_canvas.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebFrame; diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm index 98b26e5..ae579bb 100644 --- a/chrome/renderer/print_web_view_helper_mac.mm +++ b/chrome/renderer/print_web_view_helper_mac.mm @@ -14,9 +14,9 @@ #include "chrome/renderer/render_view.h" #include "grit/generated_resources.h" #include "printing/native_metafile.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebCanvas.h" -#include "webkit/api/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" using WebKit::WebFrame; using WebKit::WebCanvas; diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc index c5bf711..b3b64ea 100644 --- a/chrome/renderer/print_web_view_helper_win.cc +++ b/chrome/renderer/print_web_view_helper_win.cc @@ -12,8 +12,8 @@ #include "grit/generated_resources.h" #include "printing/native_metafile.h" #include "skia/ext/vector_canvas.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebConsoleMessage; using WebKit::WebFrame; diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index a388929..a165b09 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -59,17 +59,17 @@ #include "chrome/renderer/user_script_slave.h" #include "ipc/ipc_message.h" #include "third_party/tcmalloc/tcmalloc/src/google/malloc_extension.h" -#include "webkit/api/public/WebCache.h" -#include "webkit/api/public/WebColor.h" -#include "webkit/api/public/WebCrossOriginPreflightResultCache.h" -#include "webkit/api/public/WebDatabase.h" -#include "webkit/api/public/WebFontCache.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebRuntimeFeatures.h" -#include "webkit/api/public/WebScriptController.h" -#include "webkit/api/public/WebSecurityPolicy.h" -#include "webkit/api/public/WebStorageEventDispatcher.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebColor.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFontCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.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/WebStorageEventDispatcher.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "webkit/extensions/v8/benchmarking_extension.h" #include "webkit/extensions/v8/gears_extension.h" #include "webkit/extensions/v8/interval_extension.h" diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 245b6f5..006ae43 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -68,28 +68,28 @@ #include "net/base/net_errors.h" #include "skia/ext/bitmap_platform_device.h" #include "skia/ext/image_operations.h" -#include "webkit/api/public/WebAccessibilityCache.h" -#include "webkit/api/public/WebAccessibilityObject.h" -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebDevToolsAgent.h" -#include "webkit/api/public/WebDragData.h" -#include "webkit/api/public/WebFormElement.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebHistoryItem.h" -#include "webkit/api/public/WebNode.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebRange.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebScriptSource.h" -#include "webkit/api/public/WebSearchableFormData.h" -#include "webkit/api/public/WebSecurityOrigin.h" -#include "webkit/api/public/WebSize.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/WebVector.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/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.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/WebRange.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSearchableFormData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.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/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/WebVector.h" #include "webkit/appcache/appcache_interfaces.h" #include "webkit/default_plugin/default_plugin_shared.h" #include "webkit/glue/glue_serialize.h" diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 53d7e95..e15438f 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -35,14 +35,14 @@ #include "chrome/renderer/render_view_visitor.h" #include "third_party/skia/include/core/SkBitmap.h" #include "testing/gtest/include/gtest/gtest_prod.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebContextMenuData.h" -#include "webkit/api/public/WebFrameClient.h" -#include "webkit/api/public/WebMediaPlayerAction.h" -#include "webkit/api/public/WebNode.h" -#include "webkit/api/public/WebTextDirection.h" -#include "webkit/api/public/WebView.h" -#include "webkit/api/public/WebViewClient.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/WebFrameClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNode.h" +#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h" #include "webkit/glue/dom_serializer_delegate.h" #include "webkit/glue/form_data.h" #include "webkit/glue/image_resource_fetcher.h" diff --git a/chrome/renderer/render_view_linux.cc b/chrome/renderer/render_view_linux.cc index 9cc8a64..40f5fe1 100644 --- a/chrome/renderer/render_view_linux.cc +++ b/chrome/renderer/render_view_linux.cc @@ -5,7 +5,7 @@ #include "chrome/renderer/render_view.h" #include "chrome/common/renderer_preferences.h" -#include "webkit/api/public/linux/WebFontRendering.h" +#include "third_party/WebKit/WebKit/chromium/public/linux/WebFontRendering.h" using WebKit::WebFontRendering; diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc index 7a8172d..8afdbf6 100644 --- a/chrome/renderer/render_view_unittest.cc +++ b/chrome/renderer/render_view_unittest.cc @@ -13,8 +13,8 @@ #include "printing/image.h" #include "printing/native_metafile.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURLError.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" using WebKit::WebCompositionCommand; using WebKit::WebFrame; diff --git a/chrome/renderer/render_view_unittest_mac.mm b/chrome/renderer/render_view_unittest_mac.mm index a83af57..f8880c7 100644 --- a/chrome/renderer/render_view_unittest_mac.mm +++ b/chrome/renderer/render_view_unittest_mac.mm @@ -6,7 +6,7 @@ #include "chrome/common/render_messages.h" #include "chrome/test/render_view_test.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include <Cocoa/Cocoa.h> #include <Carbon/Carbon.h> // for the kVK_* constants. diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc index 0c5e970..85ecf77 100644 --- a/chrome/renderer/render_widget.cc +++ b/chrome/renderer/render_widget.cc @@ -15,12 +15,12 @@ #include "chrome/renderer/render_process.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkShader.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebPopupMenu.h" -#include "webkit/api/public/WebPopupMenuInfo.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebSize.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/WebPopupMenuInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.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" #if defined(OS_POSIX) @@ -28,7 +28,7 @@ #include "third_party/skia/include/core/SkMallocPixelRef.h" #endif // defined(OS_POSIX) -#include "webkit/api/public/WebWidget.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWidget.h" using WebKit::WebCompositionCommand; using WebKit::WebCursorInfo; diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h index 7428ec3..df17bd1 100644 --- a/chrome/renderer/render_widget.h +++ b/chrome/renderer/render_widget.h @@ -18,10 +18,10 @@ #include "ipc/ipc_channel.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "webkit/api/public/WebCompositionCommand.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebTextDirection.h" -#include "webkit/api/public/WebWidgetClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCompositionCommand.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWidgetClient.h" #include "webkit/glue/webcursor.h" class RenderThreadBase; diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index c22820a..558589c 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -27,9 +27,9 @@ #include "chrome/renderer/socket_stream_dispatcher.h" #include "googleurl/src/url_util.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebKitClient.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "webkit/glue/scoped_clipboard_writer_glue.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/websocketstreamhandle_bridge.h" diff --git a/chrome/renderer/renderer_web_database_observer.cc b/chrome/renderer/renderer_web_database_observer.cc index d99dfb4..15a5d17 100644 --- a/chrome/renderer/renderer_web_database_observer.cc +++ b/chrome/renderer/renderer_web_database_observer.cc @@ -5,7 +5,7 @@ #include "chrome/renderer/renderer_web_database_observer.h" #include "chrome/common/render_messages.h" -#include "webkit/api/public/WebDatabase.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" RendererWebDatabaseObserver::RendererWebDatabaseObserver( IPC::Message::Sender* sender) diff --git a/chrome/renderer/renderer_web_database_observer.h b/chrome/renderer/renderer_web_database_observer.h index 4e09b53..4c06853 100644 --- a/chrome/renderer/renderer_web_database_observer.h +++ b/chrome/renderer/renderer_web_database_observer.h @@ -6,7 +6,7 @@ #define CHROME_RENDERER_RENDERER_WEB_DATABASE_OBSERVER_H_ #include "ipc/ipc_message.h" -#include "webkit/api/public/WebDatabaseObserver.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDatabaseObserver.h" class RendererWebDatabaseObserver : public WebKit::WebDatabaseObserver { public: diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc index d671a3f..cec8119 100644 --- a/chrome/renderer/renderer_webkitclient_impl.cc +++ b/chrome/renderer/renderer_webkitclient_impl.cc @@ -24,11 +24,11 @@ #include "chrome/renderer/renderer_webstoragenamespace_impl.h" #include "chrome/renderer/visitedlink_slave.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebCookie.h" -#include "webkit/api/public/WebStorageEventDispatcher.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCookie.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.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/WebVector.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h index 326d3a6..19e88a8 100644 --- a/chrome/renderer/renderer_webkitclient_impl.h +++ b/chrome/renderer/renderer_webkitclient_impl.h @@ -12,12 +12,12 @@ #include "webkit/glue/webkitclient_impl.h" #if defined(OS_WIN) -#include "webkit/api/public/win/WebSandboxSupport.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebSandboxSupport.h" #elif defined(OS_LINUX) #include <string> #include <map> #include "base/lock.h" -#include "webkit/api/public/linux/WebSandboxSupport.h" +#include "third_party/WebKit/WebKit/chromium/public/linux/WebSandboxSupport.h" #endif class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl { diff --git a/chrome/renderer/renderer_webstoragearea_impl.cc b/chrome/renderer/renderer_webstoragearea_impl.cc index 3ddc29c..95e688e 100644 --- a/chrome/renderer/renderer_webstoragearea_impl.cc +++ b/chrome/renderer/renderer_webstoragearea_impl.cc @@ -6,7 +6,7 @@ #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" using WebKit::WebString; using WebKit::WebURL; diff --git a/chrome/renderer/renderer_webstoragearea_impl.h b/chrome/renderer/renderer_webstoragearea_impl.h index c61a0f1..2a13bf8 100644 --- a/chrome/renderer/renderer_webstoragearea_impl.h +++ b/chrome/renderer/renderer_webstoragearea_impl.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "webkit/api/public/WebStorageArea.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" class RendererWebStorageAreaImpl : public WebKit::WebStorageArea { public: diff --git a/chrome/renderer/renderer_webstoragenamespace_impl.h b/chrome/renderer/renderer_webstoragenamespace_impl.h index c5a6dfb7..fd01435 100644 --- a/chrome/renderer/renderer_webstoragenamespace_impl.h +++ b/chrome/renderer/renderer_webstoragenamespace_impl.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "chrome/common/dom_storage_type.h" -#include "webkit/api/public/WebStorageNamespace.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h" class RendererWebStorageNamespaceImpl : public WebKit::WebStorageNamespace { public: diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc index 9fff626..6aafd4a 100644 --- a/chrome/renderer/user_script_slave.cc +++ b/chrome/renderer/user_script_slave.cc @@ -13,7 +13,7 @@ #include "base/string_util.h" #include "chrome/renderer/extension_groups.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" #include "grit/renderer_resources.h" diff --git a/chrome/renderer/user_script_slave.h b/chrome/renderer/user_script_slave.h index 3d7c49d..5d3ae6b 100644 --- a/chrome/renderer/user_script_slave.h +++ b/chrome/renderer/user_script_slave.h @@ -14,7 +14,7 @@ #include "base/stl_util-inl.h" #include "base/string_piece.h" #include "chrome/common/extensions/user_script.h" -#include "webkit/api/public/WebScriptSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" namespace WebKit { class WebFrame; diff --git a/chrome/renderer/webmediaplayer_impl.h b/chrome/renderer/webmediaplayer_impl.h index 740c7db..4adbc40 100644 --- a/chrome/renderer/webmediaplayer_impl.h +++ b/chrome/renderer/webmediaplayer_impl.h @@ -50,8 +50,8 @@ #include "media/base/filters.h" #include "media/base/pipeline_impl.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebMediaPlayer.h" -#include "webkit/api/public/WebMediaPlayerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayer.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerClient.h" class AudioRendererImpl; class DataSourceImpl; diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc index b7ab0f5..ecb4984 100644 --- a/chrome/renderer/webplugin_delegate_pepper.cc +++ b/chrome/renderer/webplugin_delegate_pepper.cc @@ -18,7 +18,7 @@ #include "base/string_util.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/pepper/pepper.h" #include "webkit/glue/plugins/plugin_constants_win.h" diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index db7a42a..3853115 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -29,13 +29,13 @@ #include "grit/renderer_resources.h" #include "net/base/mime_util.h" #include "printing/native_metafile.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebDragData.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebVector.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webplugin.h" diff --git a/chrome/renderer/websharedworker_proxy.cc b/chrome/renderer/websharedworker_proxy.cc index 5bcde88..7ad1f61 100644 --- a/chrome/renderer/websharedworker_proxy.cc +++ b/chrome/renderer/websharedworker_proxy.cc @@ -7,7 +7,7 @@ #include "chrome/common/render_messages.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" WebSharedWorkerProxy::WebSharedWorkerProxy(ChildThread* child_thread, int route_id, diff --git a/chrome/renderer/websharedworker_proxy.h b/chrome/renderer/websharedworker_proxy.h index 6adcf08..68dab47 100644 --- a/chrome/renderer/websharedworker_proxy.h +++ b/chrome/renderer/websharedworker_proxy.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "chrome/renderer/webworker_base.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebSharedWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSharedWorker.h" class ChildThread; diff --git a/chrome/renderer/websharedworkerrepository_impl.h b/chrome/renderer/websharedworkerrepository_impl.h index 4083202..d8cec99 100644 --- a/chrome/renderer/websharedworkerrepository_impl.h +++ b/chrome/renderer/websharedworkerrepository_impl.h @@ -5,7 +5,7 @@ #ifndef CHROME_RENDERER_WEB_SHARED_WORKER_REPOSITORY_IMPL_H_ #define CHROME_RENDERER_WEB_SHARED_WORKER_REPOSITORY_IMPL_H_ -#include "webkit/api/public/WebSharedWorkerRepository.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSharedWorkerRepository.h" namespace WebKit { class WebSharedWorker; diff --git a/chrome/renderer/webworker_base.cc b/chrome/renderer/webworker_base.cc index 1364e7a..e32026c 100644 --- a/chrome/renderer/webworker_base.cc +++ b/chrome/renderer/webworker_base.cc @@ -8,8 +8,8 @@ #include "chrome/common/render_messages.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebWorkerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" using WebKit::WebMessagePortChannel; using WebKit::WebMessagePortChannelArray; diff --git a/chrome/renderer/webworker_proxy.cc b/chrome/renderer/webworker_proxy.cc index e8a5b9d..a263565 100644 --- a/chrome/renderer/webworker_proxy.cc +++ b/chrome/renderer/webworker_proxy.cc @@ -8,8 +8,8 @@ #include "chrome/common/render_messages.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebWorkerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" using WebKit::WebCommonWorkerClient; using WebKit::WebMessagePortChannel; diff --git a/chrome/renderer/webworker_proxy.h b/chrome/renderer/webworker_proxy.h index 48487c0..fb2db3ed 100644 --- a/chrome/renderer/webworker_proxy.h +++ b/chrome/renderer/webworker_proxy.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "chrome/renderer/webworker_base.h" #include "ipc/ipc_channel.h" -#include "webkit/api/public/WebWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorker.h" class ChildThread; class GURL; diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi index 7f0838c..1e8cc2b 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.gypi +++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi @@ -20,7 +20,7 @@ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', # run time dependency - '<(DEPTH)/webkit/webkit.gyp:webkit_resources', + '<(DEPTH)/webkit/webkit_glue.gyp:webkit_resources', ], 'include_dirs': [ '<(DEPTH)', diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc index ccd7da5..883be1a 100644 --- a/chrome/test/render_view_test.cc +++ b/chrome/test/render_view_test.cc @@ -14,13 +14,13 @@ #include "chrome/renderer/extensions/js_only_v8_extensions.h" #include "chrome/renderer/extensions/renderer_extension_bindings.h" #include "chrome/renderer/renderer_main_platform_delegate.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebInputEvent.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebScriptController.h" -#include "webkit/api/public/WebScriptSource.h" -#include "webkit/api/public/WebURLRequest.h" -#include "webkit/api/public/WebView.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/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebFrame; diff --git a/chrome/test/render_view_test.h b/chrome/test/render_view_test.h index df4e2d3..add9d55 100644 --- a/chrome/test/render_view_test.h +++ b/chrome/test/render_view_test.h @@ -19,7 +19,7 @@ #include "chrome/renderer/renderer_main_platform_delegate.h" #include "chrome/renderer/renderer_webkitclient_impl.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" class RenderViewTest : public testing::Test { public: diff --git a/chrome/worker/nativewebworker_impl.cc b/chrome/worker/nativewebworker_impl.cc index 58a5c07..d647086 100644 --- a/chrome/worker/nativewebworker_impl.cc +++ b/chrome/worker/nativewebworker_impl.cc @@ -11,10 +11,10 @@ #include "base/logging.h" #include "webkit/glue/glue_util.h" #include "base/thread.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebKitClient.h" -#include "webkit/api/public/WebWorkerClient.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/WebKitClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" // TODO(sehr): This will be changed to point to the real NaCl headers once // the builds are integrated. diff --git a/chrome/worker/nativewebworker_impl.h b/chrome/worker/nativewebworker_impl.h index 2407136..ac7e801 100644 --- a/chrome/worker/nativewebworker_impl.h +++ b/chrome/worker/nativewebworker_impl.h @@ -6,8 +6,8 @@ #define CHROME_WORKER_NATIVEWORKER_H_ #include "base/basictypes.h" -#include "webkit/api/public/WebWorker.h" -#include "webkit/api/public/WebWorkerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" // Forward declaration for the listener thread pointer. diff --git a/chrome/worker/websharedworker_stub.cc b/chrome/worker/websharedworker_stub.cc index 1860f29..3c7aa3e 100644 --- a/chrome/worker/websharedworker_stub.cc +++ b/chrome/worker/websharedworker_stub.cc @@ -6,9 +6,9 @@ #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebSharedWorker.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSharedWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" WebSharedWorkerStub::WebSharedWorkerStub( const string16& name, int route_id) diff --git a/chrome/worker/webworker_stub.cc b/chrome/worker/webworker_stub.cc index 37be7ab..33a9b60 100644 --- a/chrome/worker/webworker_stub.cc +++ b/chrome/worker/webworker_stub.cc @@ -9,9 +9,9 @@ #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" #include "chrome/worker/nativewebworker_impl.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebWorker.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/WebWorker.h" using WebKit::WebWorker; diff --git a/chrome/worker/webworkerclient_proxy.cc b/chrome/worker/webworkerclient_proxy.cc index 35b2a28..8519c23 100644 --- a/chrome/worker/webworkerclient_proxy.cc +++ b/chrome/worker/webworkerclient_proxy.cc @@ -12,9 +12,9 @@ #include "chrome/worker/webworker_stub_base.h" #include "chrome/worker/worker_thread.h" #include "ipc/ipc_logging.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebWorker.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/WebWorker.h" using WebKit::WebMessagePortChannel; using WebKit::WebMessagePortChannelArray; diff --git a/chrome/worker/webworkerclient_proxy.h b/chrome/worker/webworkerclient_proxy.h index 1f91b7e..92229c2 100644 --- a/chrome/worker/webworkerclient_proxy.h +++ b/chrome/worker/webworkerclient_proxy.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/task.h" #include "ipc/ipc_channel.h" -#include "webkit/api/public/WebWorkerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" namespace WebKit { class WebWorker; diff --git a/chrome/worker/worker_thread.cc b/chrome/worker/worker_thread.cc index 8ffc92b..e05e15c 100644 --- a/chrome/worker/worker_thread.cc +++ b/chrome/worker/worker_thread.cc @@ -10,7 +10,7 @@ #include "chrome/worker/webworker_stub.h" #include "chrome/worker/websharedworker_stub.h" #include "chrome/worker/worker_webkitclient_impl.h" -#include "webkit/api/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls( base::LINKER_INITIALIZED); diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc index c8df883..12ed15a 100644 --- a/chrome/worker/worker_webkitclient_impl.cc +++ b/chrome/worker/worker_webkitclient_impl.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/worker/worker_thread.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" using WebKit::WebClipboard; using WebKit::WebMessagePortChannel; diff --git a/chrome/worker/worker_webkitclient_impl.h b/chrome/worker/worker_webkitclient_impl.h index b0dcb68..0cb213c 100644 --- a/chrome/worker/worker_webkitclient_impl.h +++ b/chrome/worker/worker_webkitclient_impl.h @@ -5,7 +5,7 @@ #ifndef CHROME_WORKER_WORKER_WEBKIT_CLIENT_IMPL_H_ #define CHROME_WORKER_WORKER_WEBKIT_CLIENT_IMPL_H_ -#include "webkit/api/public/WebMimeRegistry.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMimeRegistry.h" #include "webkit/glue/webkitclient_impl.h" class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl, diff --git a/webkit/api/WebKit.gyp b/webkit/api/WebKit.gyp deleted file mode 100644 index 0f2b4d1..0000000 --- a/webkit/api/WebKit.gyp +++ /dev/null @@ -1,381 +0,0 @@ -# -# Copyright (C) 2009 Google Inc. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -{ - 'includes': [ - # FIXME: change to ../features.gypi once upstreamed to WebKit/chromium/api. - '../../third_party/WebKit/WebKit/chromium/features.gypi', - ], - 'variables': { - # We can't turn on warnings on Windows and Linux until we upstream the - # WebKit API. - 'conditions': [ - ['OS=="mac"', { - 'chromium_code': 1, - }], - ], - }, - 'targets': [ - { - 'target_name': 'webkit', - 'type': '<(library)', - 'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65', - 'dependencies': [ - #FIXME: change to ../../WebCore/WebCore.gyp/WebCore.gyp:webcore once upstreamed. - '../../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', - ], - 'include_dirs': [ - 'public', - 'src', - ], - 'defines': [ - 'WEBKIT_IMPLEMENTATION', - ], - 'sources': [ - 'public/gtk/WebInputEventFactory.h', - 'public/linux/WebFontRendering.h', - 'public/x11/WebScreenInfoFactory.h', - 'public/mac/WebInputEventFactory.h', - 'public/mac/WebScreenInfoFactory.h', - 'public/WebAccessibilityCache.h', - 'public/WebAccessibilityObject.h', - 'public/WebAccessibilityRole.h', - 'public/WebApplicationCacheHost.h', - 'public/WebApplicationCacheHostClient.h', - 'public/WebBindings.h', - 'public/WebCache.h', - 'public/WebCanvas.h', - 'public/WebClipboard.h', - 'public/WebColor.h', - 'public/WebColorName.h', - 'public/WebCommon.h', - 'public/WebCommonWorkerClient.h', - 'public/WebCompositionCommand.h', - 'public/WebConsoleMessage.h', - 'public/WebContextMenuData.h', - 'public/WebCookie.h', - 'public/WebCrossOriginPreflightResultCache.h', - 'public/WebCString.h', - 'public/WebCursorInfo.h', - 'public/WebData.h', - 'public/WebDatabase.h', - 'public/WebDatabaseObserver.h', - 'public/WebDataSource.h', - 'public/WebDevToolsAgent.h', - 'public/WebDevToolsAgentClient.h', - 'public/WebDevToolsFrontend.h', - 'public/WebDevToolsFrontendClient.h', - 'public/WebDragData.h', - 'public/WebEditingAction.h', - 'public/WebElement.h', - 'public/WebFileChooserCompletion.h', - 'public/WebFindOptions.h', - 'public/WebFrame.h', - 'public/WebFrameClient.h', - 'public/WebFontCache.h', - 'public/WebFormElement.h', - 'public/WebHistoryItem.h', - 'public/WebHTTPBody.h', - 'public/WebImage.h', - 'public/WebInputElement.h', - 'public/WebInputEvent.h', - 'public/WebKit.h', - 'public/WebKitClient.h', - 'public/WebLocalizedString.h', - 'public/WebMediaPlayer.h', - 'public/WebMediaPlayerAction.h', - 'public/WebMediaPlayerClient.h', - 'public/WebMessagePortChannel.h', - 'public/WebMessagePortChannelClient.h', - 'public/WebMimeRegistry.h', - 'public/WebNavigationType.h', - 'public/WebNode.h', - 'public/WebNonCopyable.h', - 'public/WebNotification.h', - 'public/WebNotificationPresenter.h', - 'public/WebNotificationPermissionCallback.h', - 'public/WebPasswordAutocompleteListener.h', - 'public/WebPasswordFormData.h', - 'public/WebPlugin.h', - 'public/WebPluginContainer.h', - 'public/WebPluginListBuilder.h', - 'public/WebPoint.h', - 'public/WebPopupMenu.h', - 'public/WebPopupMenuInfo.h', - 'public/WebRange.h', - 'public/WebRect.h', - 'public/WebRuntimeFeatures.h', - 'public/WebScreenInfo.h', - 'public/WebScriptController.h', - 'public/WebScriptSource.h', - 'public/WebSearchableFormData.h', - 'public/WebSecurityOrigin.h', - 'public/WebSecurityPolicy.h', - 'public/WebSettings.h', - 'public/WebSharedWorker.h' - 'public/WebSharedWorkerRepository.h', - 'public/WebSize.h', - 'public/WebSocketStreamError.h', - 'public/WebSocketStreamHandle.h', - 'public/WebSocketStreamHandleClient.h', - 'public/WebStorageArea.h', - 'public/WebStorageEventDispatcher.h', - 'public/WebStorageNamespace.h', - 'public/WebString.h', - 'public/WebTextAffinity.h', - 'public/WebTextDirection.h', - 'public/WebURL.h', - 'public/WebURLError.h', - 'public/WebURLLoader.h', - 'public/WebURLLoaderClient.h', - 'public/WebURLRequest.h', - 'public/WebURLResponse.h', - 'public/WebVector.h', - 'public/WebView.h', - 'public/WebViewClient.h', - 'public/WebWidget.h', - 'public/WebWidgetClient.h', - 'public/WebWorker.h', - 'public/WebWorkerClient.h', - 'public/win/WebInputEventFactory.h', - 'public/win/WebSandboxSupport.h', - 'public/win/WebScreenInfoFactory.h', - 'public/win/WebScreenInfoFactory.h', - 'src/ApplicationCacheHost.cpp', - 'src/AssertMatchingEnums.cpp', - 'src/AutocompletePopupMenuClient.cpp', - 'src/AutocompletePopupMenuClient.h', - 'src/BackForwardListClientImpl.cpp', - 'src/BackForwardListClientImpl.h', - 'src/ChromeClientImpl.cpp', - 'src/ChromeClientImpl.h', - 'src/ChromiumBridge.cpp', - 'src/ChromiumCurrentTime.cpp', - 'src/ChromiumThreading.cpp', - 'src/ContextMenuClientImpl.cpp', - 'src/ContextMenuClientImpl.h', - 'src/DOMUtilitiesPrivate.cpp', - 'src/DOMUtilitiesPrivate.h', - 'src/DragClientImpl.cpp', - 'src/DragClientImpl.h', - 'src/EditorClientImpl.cpp', - 'src/EditorClientImpl.h', - 'src/FrameLoaderClientImpl.cpp', - 'src/FrameLoaderClientImpl.h', - 'src/gtk/WebFontInfo.cpp', - 'src/gtk/WebFontInfo.h', - 'src/gtk/WebInputEventFactory.cpp', - 'src/InspectorClientImpl.cpp', - 'src/InspectorClientImpl.h', - 'src/linux/WebFontRendering.cpp', - 'src/x11/WebScreenInfoFactory.cpp', - 'src/mac/WebInputEventFactory.mm', - 'src/mac/WebScreenInfoFactory.mm', - 'src/LocalizedStrings.cpp', - 'src/MediaPlayerPrivateChromium.cpp', - 'src/NotificationPresenterImpl.h', - 'src/NotificationPresenterImpl.cpp', - 'src/PlatformMessagePortChannel.cpp', - 'src/PlatformMessagePortChannel.h', - 'src/ResourceHandle.cpp', - 'src/SharedWorkerRepository.cpp', - 'src/SocketStreamHandle.cpp', - 'src/StorageAreaProxy.cpp', - 'src/StorageAreaProxy.h', - 'src/StorageEventDispatcherChromium.cpp', - 'src/StorageEventDispatcherImpl.cpp', - 'src/StorageEventDispatcherImpl.h', - 'src/StorageNamespaceProxy.cpp', - 'src/StorageNamespaceProxy.h', - 'src/TemporaryGlue.h', - 'src/WebAccessibilityCache.cpp', - 'src/WebAccessibilityCacheImpl.cpp', - 'src/WebAccessibilityCacheImpl.h', - 'src/WebAccessibilityObject.cpp', - 'src/WebBindings.cpp', - 'src/WebCache.cpp', - 'src/WebColor.cpp', - 'src/WebCrossOriginPreflightResultCache.cpp', - 'src/WebCString.cpp', - 'src/WebCursorInfo.cpp', - 'src/WebData.cpp', - 'src/WebDatabase.cpp', - 'src/WebDataSourceImpl.cpp', - 'src/WebDataSourceImpl.h', - 'src/WebDragData.cpp', - 'src/WebElement.cpp', - 'src/WebFileChooserCompletionImpl.cpp', - 'src/WebFileChooserCompletionImpl.h', - 'src/WebFontCache.cpp', - 'src/WebFormElement.cpp', - 'src/WebFrameImpl.cpp', - 'src/WebFrameImpl.h', - 'src/WebHistoryItem.cpp', - 'src/WebHTTPBody.cpp', - 'src/WebImageCG.cpp', - 'src/WebImageSkia.cpp', - 'src/WebInputElement.cpp', - 'src/WebInputEvent.cpp', - 'src/WebInputEventConversion.cpp', - 'src/WebInputEventConversion.h', - 'src/WebKit.cpp', - 'src/WebMediaPlayerClientImpl.cpp', - 'src/WebMediaPlayerClientImpl.h', - 'src/WebNode.cpp', - 'src/WebNotification.cpp', - 'src/WebPasswordFormData.cpp', - 'src/WebPasswordFormUtils.cpp', - 'src/WebPasswordFormUtils.h', - 'src/WebPluginContainerImpl.h', - 'src/WebPluginContainerImpl.cpp', - 'src/WebPluginListBuilderImpl.cpp', - 'src/WebPluginListBuilderImpl.h', - 'src/WebPluginLoadObserver.cpp', - 'src/WebPluginLoadObserver.h', - 'src/WebPopupMenuImpl.cpp', - 'src/WebPopupMenuImpl.h', - 'src/WebRange.cpp', - 'src/WebRuntimeFeatures.cpp', - 'src/WebScriptController.cpp', - 'src/WebSearchableFormData.cpp', - 'src/WebSecurityOrigin.cpp', - 'src/WebSecurityPolicy.cpp', - 'src/WebSettingsImpl.cpp', - 'src/WebSettingsImpl.h', - 'src/WebSharedWorkerImpl.cpp', - 'src/WebSharedWorkerImpl.h', - 'src/WebStorageAreaImpl.cpp', - 'src/WebStorageAreaImpl.h', - 'src/WebStorageEventDispatcherImpl.cpp', - 'src/WebStorageEventDispatcherImpl.h', - 'src/WebStorageNamespaceImpl.cpp', - 'src/WebStorageNamespaceImpl.h', - 'src/WebString.cpp', - 'src/WebURL.cpp', - 'src/WebURLRequest.cpp', - 'src/WebURLRequestPrivate.h', - 'src/WebURLResponse.cpp', - 'src/WebURLResponsePrivate.h', - 'src/WebURLError.cpp', - 'src/WebViewImpl.cpp', - 'src/WebViewImpl.h', - 'src/WebWorkerBase.cpp', - 'src/WebWorkerBase.h', - 'src/WebWorkerClientImpl.cpp', - 'src/WebWorkerClientImpl.h', - 'src/WebWorkerImpl.cpp', - 'src/WebWorkerImpl.h', - 'src/WrappedResourceRequest.h', - 'src/WrappedResourceResponse.h', - 'src/win/WebInputEventFactory.cpp', - 'src/win/WebScreenInfoFactory.cpp', - ], - 'conditions': [ - ['OS=="linux" or OS=="freebsd"', { - 'dependencies': [ - # FIXME: correct path once upstreamed - '../../build/linux/system.gyp:fontconfig', - '../../build/linux/system.gyp:gtk', - '../../build/linux/system.gyp:x11', - ], - 'include_dirs': [ - 'public/x11', - 'public/gtk', - 'public/linux', - ], - }, { # else: OS!="linux" and OS!="freebsd" - 'sources/': [ - ['exclude', '/gtk/'], - ['exclude', '/x11/'], - ['exclude', '/linux/'], - ], - }], - ['OS=="mac"', { - 'include_dirs': [ - 'public/mac', - ], - 'sources/': [ - ['exclude', 'Skia\\.cpp$'], - ], - }, { # else: OS!="mac" - 'sources/': [ - ['exclude', '/mac/'], - ['exclude', 'CG\\.cpp$'], - ], - }], - ['OS=="win"', { - 'include_dirs': [ - 'public/win', - ], - }, { # else: OS!="win" - 'sources/': [['exclude', '/win/']], - }], - ['"ENABLE_3D_CANVAS=1" in feature_defines', { - # Conditionally compile in GLEW and our GraphicsContext3D implementation. - 'sources+': [ - 'src/GraphicsContext3D.cpp', - # FIXME: correct path once upstreamed - '../../third_party/glew/src/glew.c' - ], - 'include_dirs+': [ - # FIXME: correct path once upstreamed - '../../third_party/glew/include' - ], - 'defines+': [ - 'GLEW_STATIC=1', - 'GLEW_NO_GLU=1', - ], - 'conditions': [ - ['OS=="win"', { - 'link_settings': { - 'libraries': [ - '-lopengl32.lib', - ], - }, - }], - ['OS=="mac"', { - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', - ], - }, - }], - ], - }], - ], - }, - ], # targets -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/webkit/appcache/appcache_interfaces.cc b/webkit/appcache/appcache_interfaces.cc index 5b24597..d48f342 100644 --- a/webkit/appcache/appcache_interfaces.cc +++ b/webkit/appcache/appcache_interfaces.cc @@ -6,7 +6,7 @@ #include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" -#include "webkit/api/public/WebApplicationCacheHost.h" +#include "third_party/WebKit/WebKit/chromium/public/WebApplicationCacheHost.h" using WebKit::WebApplicationCacheHost; diff --git a/webkit/appcache/web_application_cache_host_impl.cc b/webkit/appcache/web_application_cache_host_impl.cc index 2ec081f..ed0257f 100644 --- a/webkit/appcache/web_application_cache_host_impl.cc +++ b/webkit/appcache/web_application_cache_host_impl.cc @@ -7,9 +7,9 @@ #include "base/compiler_specific.h" #include "base/id_map.h" #include "base/string_util.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebURLRequest.h" -#include "webkit/api/public/WebURLResponse.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" using WebKit::WebApplicationCacheHost; using WebKit::WebApplicationCacheHostClient; diff --git a/webkit/appcache/web_application_cache_host_impl.h b/webkit/appcache/web_application_cache_host_impl.h index c530eba..e5e529e 100644 --- a/webkit/appcache/web_application_cache_host_impl.h +++ b/webkit/appcache/web_application_cache_host_impl.h @@ -6,8 +6,8 @@ #define WEBKIT_APPCACHE_WEB_APPLICATION_CACHE_HOST_IMPL_H_ #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebApplicationCacheHostClient.h" -#include "webkit/api/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebApplicationCacheHostClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" #include "webkit/appcache/appcache_interfaces.h" namespace appcache { diff --git a/webkit/data/purify/test_shell_tests.exe_UMR.txt b/webkit/data/purify/test_shell_tests.exe_UMR.txt index c29dde9..ca44a7f 100644 --- a/webkit/data/purify/test_shell_tests.exe_UMR.txt +++ b/webkit/data/purify/test_shell_tests.exe_UMR.txt @@ -22,7 +22,7 @@ Error Location third_party/webkit/webcore/loader/frameloader.cpp WebCore::FrameLoader::finishedLoading(void) third_party/webkit/webcore/loader/mainresourceloader.cpp WebCore::MainResourceLoader::didFinishLoading(void) third_party/webkit/webcore/loader/resourceloader.cpp WebCore::ResourceLoader::didFinishLoading(ResourceHandle::WebCore *) - webkit/api/src/resourcehandle.cpp WebCore::ResourceHandleInternal::didFinishLoading(WebURLLoader::WebKit *) + third_party/webkit/webkit/chromium/src/resourcehandle.cpp WebCore::ResourceHandleInternal::didFinishLoading(WebURLLoader::WebKit *) webkit/glue/weburlloader_impl.cc webkit_glue::WebURLLoaderImpl::Context::OnCompletedRequest(URLRequestStatus const&,basic_string::std const&) webkit/tools/test_shell/simple_resource_loader_bridge.cc RequestProxy::NotifyCompletedRequest(URLRequestStatus const&,basic_string::std const&) base/tuple.h ?DispatchToMethod@VRequestProxy@?A0x517e93eb@@P812@AEXABVURLRequestStatus@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@ZV3@V45@@@YAXPAVRequestProxy@?A0x517e93eb@@P801@AEXABVURLRequestStatus@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@ZABU?$Tuple2@VURLRequestStatus@@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@@@Z diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp index 061059c..280b0c4 100644 --- a/webkit/default_plugin/default_plugin.gyp +++ b/webkit/default_plugin/default_plugin.gyp @@ -17,8 +17,8 @@ '../../third_party/icu/icu.gyp:icuuc', '../../third_party/libxml/libxml.gyp:libxml', '../../third_party/npapi/npapi.gyp:npapi', - '../webkit.gyp:webkit_resources', - '../webkit.gyp:webkit_strings', + '../webkit_glue.gyp:webkit_resources', + '../webkit_glue.gyp:webkit_strings', ], 'include_dirs': [ '../..', diff --git a/webkit/glue/alt_error_page_resource_fetcher.h b/webkit/glue/alt_error_page_resource_fetcher.h index b9b47ba..363931a 100644 --- a/webkit/glue/alt_error_page_resource_fetcher.h +++ b/webkit/glue/alt_error_page_resource_fetcher.h @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "base/task.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebURLError.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" namespace WebKit { class WebFrame; diff --git a/webkit/glue/context_menu.h b/webkit/glue/context_menu.h index a47f74b..87825f4 100644 --- a/webkit/glue/context_menu.h +++ b/webkit/glue/context_menu.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/string_util.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebContextMenuData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" // Parameters structure for ViewHostMsg_ContextMenu. // FIXME(beng): This would be more useful in the future and more efficient diff --git a/webkit/glue/context_menu_unittest.cc b/webkit/glue/context_menu_unittest.cc index 9b00769..80bc02c 100644 --- a/webkit/glue/context_menu_unittest.cc +++ b/webkit/glue/context_menu_unittest.cc @@ -10,7 +10,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/message_loop.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" #include "webkit/tools/test_shell/test_shell_test.h" diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc index f82b78e..c704ed6 100644 --- a/webkit/glue/cpp_bound_class.cc +++ b/webkit/glue/cpp_bound_class.cc @@ -15,9 +15,9 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/string_util.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "webkit/glue/cpp_bound_class.h" using WebKit::WebBindings; diff --git a/webkit/glue/cpp_bound_class_unittest.cc b/webkit/glue/cpp_bound_class_unittest.cc index 5edb23d..71a56e6 100644 --- a/webkit/glue/cpp_bound_class_unittest.cc +++ b/webkit/glue/cpp_bound_class_unittest.cc @@ -9,10 +9,10 @@ #include <vector> #include "base/message_loop.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebURL.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/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/cpp_binding_example.h" #include "webkit/glue/webkit_glue.h" #include "webkit/tools/test_shell/test_shell_test.h" diff --git a/webkit/glue/cpp_variant.cc b/webkit/glue/cpp_variant.cc index 9237cc9..794eb27 100644 --- a/webkit/glue/cpp_variant.cc +++ b/webkit/glue/cpp_variant.cc @@ -5,7 +5,7 @@ // This file contains definitions for CppVariant. #include <limits> -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/cpp_variant.h" #include "base/logging.h" #include "base/string_util.h" diff --git a/webkit/glue/cpp_variant_unittest.cc b/webkit/glue/cpp_variant_unittest.cc index a2d9f3d..877ae7c 100644 --- a/webkit/glue/cpp_variant_unittest.cc +++ b/webkit/glue/cpp_variant_unittest.cc @@ -6,7 +6,7 @@ #include "base/compiler_specific.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/cpp_variant.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/glue/devtools/debugger_agent_impl.cc b/webkit/glue/devtools/debugger_agent_impl.cc index f950328..5ffa541 100644 --- a/webkit/glue/devtools/debugger_agent_impl.cc +++ b/webkit/glue/devtools/debugger_agent_impl.cc @@ -18,7 +18,7 @@ #undef LOG #include "grit/webkit_resources.h" -#include "webkit/api/src/WebViewImpl.h" +#include "third_party/WebKit/WebKit/chromium/src/WebViewImpl.h" #include "webkit/glue/devtools/debugger_agent_impl.h" #include "webkit/glue/devtools/debugger_agent_manager.h" #include "webkit/glue/glue_util.h" diff --git a/webkit/glue/devtools/debugger_agent_manager.cc b/webkit/glue/devtools/debugger_agent_manager.cc index 2cfb459..3c84743 100644 --- a/webkit/glue/devtools/debugger_agent_manager.cc +++ b/webkit/glue/devtools/debugger_agent_manager.cc @@ -10,9 +10,9 @@ #include <wtf/HashSet.h> #undef LOG -#include "webkit/api/public/WebDevToolsAgent.h" -#include "webkit/api/src/WebFrameImpl.h" -#include "webkit/api/src/WebViewImpl.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h" +#include "third_party/WebKit/WebKit/chromium/src/WebFrameImpl.h" +#include "third_party/WebKit/WebKit/chromium/src/WebViewImpl.h" #include "webkit/glue/devtools/debugger_agent_impl.h" #include "webkit/glue/devtools/debugger_agent_manager.h" #include "webkit/glue/webdevtoolsagent_impl.h" diff --git a/webkit/glue/devtools/debugger_agent_manager.h b/webkit/glue/devtools/debugger_agent_manager.h index 3d49ed7..f3c9c4f 100644 --- a/webkit/glue/devtools/debugger_agent_manager.h +++ b/webkit/glue/devtools/debugger_agent_manager.h @@ -9,7 +9,7 @@ #include <wtf/Noncopyable.h> #include "v8/include/v8-debug.h" -#include "webkit/api/public/WebDevToolsAgent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h" namespace WebCore { class PageGroupLoadDeferrer; diff --git a/webkit/glue/devtools/devtools_rpc_js.h b/webkit/glue/devtools/devtools_rpc_js.h index 2bc9480..63f76b7 100644 --- a/webkit/glue/devtools/devtools_rpc_js.h +++ b/webkit/glue/devtools/devtools_rpc_js.h @@ -11,7 +11,7 @@ #include <wtf/Noncopyable.h> #include <wtf/OwnPtr.h> -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" #include "webkit/glue/devtools/bound_object.h" #include "webkit/glue/devtools/devtools_rpc.h" #include "webkit/glue/glue_util.h" diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc index 3f091b1..06c6519 100644 --- a/webkit/glue/dom_operations.cc +++ b/webkit/glue/dom_operations.cc @@ -31,11 +31,11 @@ MSVC_POP_WARNING(); #undef LOG #include "base/string_util.h" -#include "webkit/api/public/WebVector.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" // TODO(yaar) Eventually should not depend on api/src. -#include "webkit/api/src/DOMUtilitiesPrivate.h" -#include "webkit/api/src/WebFrameImpl.h" +#include "third_party/WebKit/WebKit/chromium/src/DOMUtilitiesPrivate.h" +#include "third_party/WebKit/WebKit/chromium/src/WebFrameImpl.h" #include "webkit/glue/dom_operations.h" #include "webkit/glue/dom_operations_private.h" #include "webkit/glue/form_data.h" diff --git a/webkit/glue/dom_operations_unittest.cc b/webkit/glue/dom_operations_unittest.cc index e744c14..e9f590c 100644 --- a/webkit/glue/dom_operations_unittest.cc +++ b/webkit/glue/dom_operations_unittest.cc @@ -7,7 +7,7 @@ #include "base/string_util.h" #include "net/base/net_util.h" #include "net/url_request/url_request_context.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/dom_operations.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" #include "webkit/tools/test_shell/test_shell_test.h" diff --git a/webkit/glue/dom_serializer.cc b/webkit/glue/dom_serializer.cc index b3c7b28..a7b469b 100644 --- a/webkit/glue/dom_serializer.cc +++ b/webkit/glue/dom_serializer.cc @@ -73,7 +73,7 @@ MSVC_POP_WARNING(); #include "webkit/glue/dom_serializer.h" #include "base/string_util.h" -#include "webkit/api/src/WebFrameImpl.h" +#include "third_party/WebKit/WebKit/chromium/src/WebFrameImpl.h" #include "webkit/glue/dom_operations.h" #include "webkit/glue/dom_operations_private.h" #include "webkit/glue/dom_serializer_delegate.h" diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc index eeafc5e0..f6c4bb75 100644 --- a/webkit/glue/dom_serializer_unittest.cc +++ b/webkit/glue/dom_serializer_unittest.cc @@ -29,15 +29,15 @@ MSVC_POP_WARNING(); #include "base/string_util.h" #include "net/base/net_util.h" #include "net/url_request/url_request_context.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebData.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/dom_operations_private.h" #include "webkit/glue/dom_serializer.h" #include "webkit/glue/dom_serializer_delegate.h" #include "webkit/glue/glue_util.h" -#include "webkit/api/src/WebFrameImpl.h" +#include "third_party/WebKit/WebKit/chromium/src/WebFrameImpl.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" #include "webkit/tools/test_shell/test_shell_test.h" diff --git a/webkit/glue/form_field_values.cc b/webkit/glue/form_field_values.cc index 9beaf18..d739b5f 100644 --- a/webkit/glue/form_field_values.cc +++ b/webkit/glue/form_field_values.cc @@ -15,10 +15,10 @@ #include "base/logging.h" #include "base/string16.h" #include "base/string_util.h" -#include "webkit/api/public/WebFormElement.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h" #include "webkit/glue/form_field_values.h" // Can include from api/src because this file will eventually be there too. -#include "webkit/api/src/DOMUtilitiesPrivate.h" +#include "third_party/WebKit/WebKit/chromium/src/DOMUtilitiesPrivate.h" #include "webkit/glue/glue_util.h" using WebKit::WebFormElement; diff --git a/webkit/glue/ftp_directory_listing_response_delegate.cc b/webkit/glue/ftp_directory_listing_response_delegate.cc index 893d6a3..b437d2c 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/ftp/ftp_directory_listing_parsers.h" #include "net/ftp/ftp_server_type_histograms.h" #include "unicode/ucsdet.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebURLLoaderClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h" using WebKit::WebURLLoader; using WebKit::WebURLLoaderClient; diff --git a/webkit/glue/ftp_directory_listing_response_delegate.h b/webkit/glue/ftp_directory_listing_response_delegate.h index 82d955c..d5c7c21 100644 --- a/webkit/glue/ftp_directory_listing_response_delegate.h +++ b/webkit/glue/ftp_directory_listing_response_delegate.h @@ -12,7 +12,7 @@ #include "net/ftp/ftp_directory_listing_buffer.h" #include "net/third_party/parseftp/ParseFTPList.h" -#include "webkit/api/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" namespace WebKit { class WebURLLoader; diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc index e0f662da..a0009f8 100644 --- a/webkit/glue/glue_serialize.cc +++ b/webkit/glue/glue_serialize.cc @@ -9,12 +9,12 @@ #include "base/pickle.h" #include "base/string_util.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebHistoryItem.h" -#include "webkit/api/public/WebHTTPBody.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHTTPBody.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/WebVector.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/glue/glue_serialize.h b/webkit/glue/glue_serialize.h index ea73032..303fe3a 100644 --- a/webkit/glue/glue_serialize.h +++ b/webkit/glue/glue_serialize.h @@ -11,7 +11,7 @@ #define WEBKIT_GLUE_GLUE_SERIALIZE_H_ #include <string> -#include "webkit/api/public/WebHistoryItem.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h" namespace webkit_glue { diff --git a/webkit/glue/glue_serialize_unittest.cc b/webkit/glue/glue_serialize_unittest.cc index 94b8350..e3d91bd 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 "webkit/api/public/WebHTTPBody.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHTTPBody.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/WebKit/chromium/public/WebVector.h" #include "webkit/glue/glue_serialize.h" using WebKit::WebData; diff --git a/webkit/glue/glue_util.cc b/webkit/glue/glue_util.cc index fe78982..3e61944 100644 --- a/webkit/glue/glue_util.cc +++ b/webkit/glue/glue_util.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. // TODO(darin): This file will be deleted once we complete the move to -// webkit/api +// third_party/WebKit/WebKit/chromium // In this file, we pretend to be part of the WebKit implementation. // This is just a temporary hack while glue is still being moved into -// webkit/api. +// third_party/WebKit/WebKit/chromium. #define WEBKIT_IMPLEMENTATION 1 #include "config.h" @@ -36,22 +36,22 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebAccessibilityObject.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebDragData.h" -#include "webkit/api/public/WebFormElement.h" -#include "webkit/api/public/WebHistoryItem.h" -#include "webkit/api/public/WebNode.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebRange.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebSecurityOrigin.h" -#include "webkit/api/public/WebSize.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 "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.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/WebRange.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.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/WebURLError.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" namespace webkit_glue { diff --git a/webkit/glue/iframe_redirect_unittest.cc b/webkit/glue/iframe_redirect_unittest.cc index 23d4fdb..4865bd8 100644 --- a/webkit/glue/iframe_redirect_unittest.cc +++ b/webkit/glue/iframe_redirect_unittest.cc @@ -10,12 +10,12 @@ #include "base/file_util.h" #include "base/string_util.h" -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebVector.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.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/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" #include "webkit/tools/test_shell/test_shell_test.h" diff --git a/webkit/glue/image_decoder.cc b/webkit/glue/image_decoder.cc index 595054d..6850909 100644 --- a/webkit/glue/image_decoder.cc +++ b/webkit/glue/image_decoder.cc @@ -4,9 +4,9 @@ #include "webkit/glue/image_decoder.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebImage.h" -#include "webkit/api/public/WebSize.h" +#include "third_party/WebKit/WebKit/chromium/public/WebData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebImage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" #include "third_party/skia/include/core/SkBitmap.h" #if WEBKIT_USING_CG diff --git a/webkit/glue/image_resource_fetcher.cc b/webkit/glue/image_resource_fetcher.cc index 0a30f53..ad6dbdfd 100644 --- a/webkit/glue/image_resource_fetcher.cc +++ b/webkit/glue/image_resource_fetcher.cc @@ -5,7 +5,7 @@ #include "webkit/glue/image_resource_fetcher.h" #include "base/gfx/size.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" #include "webkit/glue/image_decoder.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/webkit/glue/media/video_renderer_impl.h b/webkit/glue/media/video_renderer_impl.h index 6e7daf2..b0fde12 100644 --- a/webkit/glue/media/video_renderer_impl.h +++ b/webkit/glue/media/video_renderer_impl.h @@ -21,7 +21,7 @@ #include "media/base/filters.h" #include "media/filters/video_renderer_base.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebMediaPlayer.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayer.h" #include "webkit/glue/webmediaplayer_impl.h" namespace webkit_glue { diff --git a/webkit/glue/mimetype_unittest.cc b/webkit/glue/mimetype_unittest.cc index cc4b793..a0ac5a2 100644 --- a/webkit/glue/mimetype_unittest.cc +++ b/webkit/glue/mimetype_unittest.cc @@ -10,8 +10,8 @@ #include "base/string_util.h" #include "net/url_request/url_request_unittest.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/unittest_test_server.h" #include "webkit/glue/webkit_glue.h" #include "webkit/tools/test_shell/test_shell_test.h" diff --git a/webkit/glue/multipart_response_delegate.cc b/webkit/glue/multipart_response_delegate.cc index 5d1f57d..a5420b6 100644 --- a/webkit/glue/multipart_response_delegate.cc +++ b/webkit/glue/multipart_response_delegate.cc @@ -7,10 +7,10 @@ #include "base/logging.h" #include "base/string_util.h" #include "net/base/net_util.h" -#include "webkit/api/public/WebHTTPHeaderVisitor.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebURLLoaderClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHTTPHeaderVisitor.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/WebURLLoaderClient.h" #include "webkit/glue/glue_util.h" using WebKit::WebHTTPHeaderVisitor; diff --git a/webkit/glue/multipart_response_delegate.h b/webkit/glue/multipart_response_delegate.h index 3676a78..6a558b7 100644 --- a/webkit/glue/multipart_response_delegate.h +++ b/webkit/glue/multipart_response_delegate.h @@ -51,7 +51,7 @@ #include <string> -#include "webkit/api/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" namespace WebKit { class WebURLLoader; diff --git a/webkit/glue/multipart_response_delegate_unittest.cc b/webkit/glue/multipart_response_delegate_unittest.cc index b2196040..5c57265 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 "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebURLLoaderClient.h" -#include "webkit/api/public/WebURLResponse.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/WebURLLoaderClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/multipart_response_delegate.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/glue/npruntime_util.cc b/webkit/glue/npruntime_util.cc index e2edc72..dfc3a2b 100644 --- a/webkit/glue/npruntime_util.cc +++ b/webkit/glue/npruntime_util.cc @@ -5,7 +5,7 @@ #include "webkit/glue/npruntime_util.h" #include "base/pickle.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" using WebKit::WebBindings; diff --git a/webkit/glue/password_form.h b/webkit/glue/password_form.h index f392029..57a54c1 100644 --- a/webkit/glue/password_form.h +++ b/webkit/glue/password_form.h @@ -10,7 +10,7 @@ #include "base/time.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebPasswordFormData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPasswordFormData.h" namespace webkit_glue { diff --git a/webkit/glue/password_form_dom_manager.cc b/webkit/glue/password_form_dom_manager.cc index 0ce1c36..5c56d63 100644 --- a/webkit/glue/password_form_dom_manager.cc +++ b/webkit/glue/password_form_dom_manager.cc @@ -4,7 +4,7 @@ #include "base/logging.h" -#include "webkit/api/public/WebPasswordFormData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPasswordFormData.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/password_form_dom_manager.h" diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc index 43b45ab..599816f 100644 --- a/webkit/glue/plugins/plugin_host.cc +++ b/webkit/glue/plugins/plugin_host.cc @@ -14,7 +14,7 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "net/base/net_util.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/default_plugin/default_plugin_shared.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webplugininfo.h" diff --git a/webkit/glue/plugins/webplugin_delegate_impl.cc b/webkit/glue/plugins/webplugin_delegate_impl.cc index fee8114..664ebed 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl.cc +++ b/webkit/glue/plugins/webplugin_delegate_impl.cc @@ -13,7 +13,7 @@ #include "base/scoped_ptr.h" #include "base/stats_counters.h" #include "base/string_util.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/plugins/plugin_constants_win.h" #include "webkit/glue/plugins/plugin_instance.h" diff --git a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc index 3ee26cd..a7d781f 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc +++ b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc @@ -18,8 +18,8 @@ #include "base/stats_counters.h" #include "base/string_util.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webplugin.h" #include "webkit/glue/plugins/gtk_plugin_container.h" diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm index 8119c41..1042cae 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm +++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm @@ -15,7 +15,7 @@ #include "base/scoped_ptr.h" #include "base/stats_counters.h" #include "base/string_util.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/default_plugin/plugin_impl.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webplugin.h" diff --git a/webkit/glue/plugins/webplugin_delegate_impl_win.cc b/webkit/glue/plugins/webplugin_delegate_impl_win.cc index 7f099d5..f43e165 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_win.cc +++ b/webkit/glue/plugins/webplugin_delegate_impl_win.cc @@ -17,7 +17,7 @@ #include "base/string_util.h" #include "base/win_util.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/default_plugin/plugin_impl.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/plugins/plugin_constants_win.h" diff --git a/webkit/glue/resource_fetcher.cc b/webkit/glue/resource_fetcher.cc index ccd007f..f29b63b 100644 --- a/webkit/glue/resource_fetcher.cc +++ b/webkit/glue/resource_fetcher.cc @@ -5,13 +5,13 @@ #include "webkit/glue/resource_fetcher.h" #include "base/logging.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebKitClient.h" -#include "webkit/api/public/WebURLError.h" -#include "webkit/api/public/WebURLLoader.h" -#include "webkit/api/public/WebURLRequest.h" -#include "webkit/api/public/WebURL.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/WebKitClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLLoader.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" using base::TimeDelta; using WebKit::WebFrame; diff --git a/webkit/glue/resource_fetcher.h b/webkit/glue/resource_fetcher.h index 53a030f..af4ec1b 100644 --- a/webkit/glue/resource_fetcher.h +++ b/webkit/glue/resource_fetcher.h @@ -18,8 +18,8 @@ #include "base/scoped_ptr.h" #include "base/timer.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebURLLoaderClient.h" -#include "webkit/api/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" class GURL; diff --git a/webkit/glue/resource_fetcher_unittest.cc b/webkit/glue/resource_fetcher_unittest.cc index daa88cf..e1022a0 100644 --- a/webkit/glue/resource_fetcher_unittest.cc +++ b/webkit/glue/resource_fetcher_unittest.cc @@ -6,9 +6,9 @@ #include <gtk/gtk.h> #endif -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebURLResponse.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/unittest_test_server.h" #include "webkit/glue/resource_fetcher.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" diff --git a/webkit/glue/simple_webmimeregistry_impl.cc b/webkit/glue/simple_webmimeregistry_impl.cc index 2857002..83022c1 100644 --- a/webkit/glue/simple_webmimeregistry_impl.cc +++ b/webkit/glue/simple_webmimeregistry_impl.cc @@ -7,7 +7,7 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "net/base/mime_util.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/glue/simple_webmimeregistry_impl.h b/webkit/glue/simple_webmimeregistry_impl.h index 9587562..0056de0 100644 --- a/webkit/glue/simple_webmimeregistry_impl.h +++ b/webkit/glue/simple_webmimeregistry_impl.h @@ -5,7 +5,7 @@ #ifndef WEBMIMEREGISTRY_IMPL_H_ #define WEBMIMEREGISTRY_IMPL_H_ -#include "webkit/api/public/WebMimeRegistry.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMimeRegistry.h" namespace webkit_glue { diff --git a/webkit/glue/webaccessibility.cc b/webkit/glue/webaccessibility.cc index 6553eeb..07f72d4 100644 --- a/webkit/glue/webaccessibility.cc +++ b/webkit/glue/webaccessibility.cc @@ -4,12 +4,12 @@ #include "webkit/glue/webaccessibility.h" -#include "webkit/api/public/WebAccessibilityCache.h" -#include "webkit/api/public/WebAccessibilityObject.h" -#include "webkit/api/public/WebAccessibilityRole.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebString.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/WebAccessibilityRole.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" using WebKit::WebAccessibilityCache; using WebKit::WebAccessibilityRole; diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc index 624cc3b..bac8e0a 100644 --- a/webkit/glue/webclipboard_impl.cc +++ b/webkit/glue/webclipboard_impl.cc @@ -10,10 +10,10 @@ #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "webkit/api/public/WebImage.h" -#include "webkit/api/public/WebSize.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebImage.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 "webkit/glue/scoped_clipboard_writer_glue.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/glue/webclipboard_impl.h b/webkit/glue/webclipboard_impl.h index 330752a..ec25650 100644 --- a/webkit/glue/webclipboard_impl.h +++ b/webkit/glue/webclipboard_impl.h @@ -6,7 +6,7 @@ #define WEBCLIPBOARD_IMPL_H_ #include "app/clipboard/clipboard.h" -#include "webkit/api/public/WebClipboard.h" +#include "third_party/WebKit/WebKit/chromium/public/WebClipboard.h" #include <string> diff --git a/webkit/glue/webcursor.cc b/webkit/glue/webcursor.cc index 3be9cc2..f09372c 100644 --- a/webkit/glue/webcursor.cc +++ b/webkit/glue/webcursor.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/pickle.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebImage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebImage.h" using WebKit::WebCursorInfo; using WebKit::WebImage; diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h index afd27a5..32c8a2b 100644 --- a/webkit/glue/webcursor.h +++ b/webkit/glue/webcursor.h @@ -17,7 +17,7 @@ typedef struct HICON__* HICON; typedef HICON HCURSOR; #elif defined(USE_X11) // GdkCursorType is an enum, which we can't forward-declare. :( -// If you work around this, be sure to fix webkit.gyp:glue to not put +// If you work around this, be sure to fix webkit_glue.gyp:glue to not put // GTK in the export_dependent_settings section! #include <gdk/gdkcursor.h> #elif defined(OS_MACOSX) diff --git a/webkit/glue/webcursor_gtk.cc b/webkit/glue/webcursor_gtk.cc index 4c882ff..abcbaec 100644 --- a/webkit/glue/webcursor_gtk.cc +++ b/webkit/glue/webcursor_gtk.cc @@ -7,7 +7,7 @@ #include <gdk/gdk.h> #include "base/logging.h" -#include "webkit/api/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" using WebKit::WebCursorInfo; diff --git a/webkit/glue/webcursor_mac.mm b/webkit/glue/webcursor_mac.mm index 2d6dee6..c4ffc39 100644 --- a/webkit/glue/webcursor_mac.mm +++ b/webkit/glue/webcursor_mac.mm @@ -9,9 +9,9 @@ #include "base/logging.h" #include "base/nsimage_cache_mac.h" #include "base/scoped_cftyperef.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebImage.h" -#include "webkit/api/public/WebSize.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebImage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" using WebKit::WebCursorInfo; using WebKit::WebImage; diff --git a/webkit/glue/webcursor_win.cc b/webkit/glue/webcursor_win.cc index 63e1e3c..80026a1 100644 --- a/webkit/glue/webcursor_win.cc +++ b/webkit/glue/webcursor_win.cc @@ -7,7 +7,7 @@ #include "base/pickle.h" #include "grit/webkit_resources.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "webkit/api/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" #include "webkit/glue/webcursor.h" using WebKit::WebCursorInfo; diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc index 4623f33c..da6055c 100644 --- a/webkit/glue/webdevtoolsagent_impl.cc +++ b/webkit/glue/webdevtoolsagent_impl.cc @@ -24,14 +24,14 @@ #include <wtf/OwnPtr.h> #undef LOG -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebDevToolsAgentClient.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebURLRequest.h" -#include "webkit/api/src/WebFrameImpl.h" -#include "webkit/api/src/WebViewImpl.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgentClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.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/src/WebFrameImpl.h" +#include "third_party/WebKit/WebKit/chromium/src/WebViewImpl.h" #include "webkit/glue/devtools/bound_object.h" #include "webkit/glue/devtools/debugger_agent_impl.h" #include "webkit/glue/devtools/debugger_agent_manager.h" diff --git a/webkit/glue/webdevtoolsagent_impl.h b/webkit/glue/webdevtoolsagent_impl.h index 826a814..39851f0 100644 --- a/webkit/glue/webdevtoolsagent_impl.h +++ b/webkit/glue/webdevtoolsagent_impl.h @@ -10,7 +10,7 @@ #include <wtf/OwnPtr.h> #include "v8.h" -#include "webkit/api/src/WebDevToolsAgentPrivate.h" +#include "third_party/WebKit/WebKit/chromium/src/WebDevToolsAgentPrivate.h" #include "webkit/glue/devtools/devtools_rpc.h" #include "webkit/glue/devtools/apu_agent_delegate.h" #include "webkit/glue/devtools/tools_agent.h" diff --git a/webkit/glue/webdevtoolsfrontend_impl.cc b/webkit/glue/webdevtoolsfrontend_impl.cc index 8f8a10d..672546c 100644 --- a/webkit/glue/webdevtoolsfrontend_impl.cc +++ b/webkit/glue/webdevtoolsfrontend_impl.cc @@ -24,11 +24,11 @@ #include <wtf/Vector.h> #undef LOG -#include "webkit/api/public/WebDevToolsFrontendClient.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebScriptSource.h" -#include "webkit/api/src/WebFrameImpl.h" -#include "webkit/api/src/WebViewImpl.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsFrontendClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" +#include "third_party/WebKit/WebKit/chromium/src/WebFrameImpl.h" +#include "third_party/WebKit/WebKit/chromium/src/WebViewImpl.h" #include "webkit/glue/devtools/bound_object.h" #include "webkit/glue/devtools/debugger_agent.h" #include "webkit/glue/devtools/devtools_rpc_js.h" diff --git a/webkit/glue/webdevtoolsfrontend_impl.h b/webkit/glue/webdevtoolsfrontend_impl.h index 6ad02e2..877e4b0 100644 --- a/webkit/glue/webdevtoolsfrontend_impl.h +++ b/webkit/glue/webdevtoolsfrontend_impl.h @@ -13,7 +13,7 @@ #include <wtf/RefPtr.h> #include "v8.h" -#include "webkit/api/public/WebDevToolsFrontend.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsFrontend.h" #include "webkit/glue/devtools/devtools_rpc.h" namespace WebCore { diff --git a/webkit/glue/webdropdata.cc b/webkit/glue/webdropdata.cc index 8314477..b48c04c 100644 --- a/webkit/glue/webdropdata.cc +++ b/webkit/glue/webdropdata.cc @@ -4,11 +4,11 @@ #include "webkit/glue/webdropdata.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebDragData.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragData.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/WebVector.h" using WebKit::WebData; using WebKit::WebDragData; diff --git a/webkit/glue/webframe_unittest.cc b/webkit/glue/webframe_unittest.cc index 1faf22f..0c329cd 100644 --- a/webkit/glue/webframe_unittest.cc +++ b/webkit/glue/webframe_unittest.cc @@ -4,11 +4,11 @@ #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.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/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/tools/test_shell/test_shell_test.h" using WebKit::WebFrame; diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index d3e5b72..85b72b16 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -38,14 +38,14 @@ #include "net/base/escape.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "webkit/api/public/WebHistoryItem.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebVector.h" #if defined(OS_WIN) -#include "webkit/api/public/win/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h" #endif -#include "webkit/api/src/WebFrameImpl.h" -#include "webkit/api/src/WebViewImpl.h" +#include "third_party/WebKit/WebKit/chromium/src/WebFrameImpl.h" +#include "third_party/WebKit/WebKit/chromium/src/WebViewImpl.h" #include "webkit/glue/glue_serialize.h" #include "webkit/glue/glue_util.h" diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index f52d902..c46e094a 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -17,7 +17,7 @@ #include "app/clipboard/clipboard.h" #include "base/file_path.h" #include "base/string16.h" -#include "webkit/api/public/WebCanvas.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h" class GURL; class SkBitmap; diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index a66c674..61d2d6a 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -23,14 +23,14 @@ #include "grit/webkit_resources.h" #include "grit/webkit_strings.h" #include "net/base/net_util.h" -#include "webkit/api/public/WebCookie.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebFrameClient.h" -#include "webkit/api/public/WebPluginListBuilder.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebVector.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCookie.h" +#include "third_party/WebKit/WebKit/chromium/public/WebData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPluginListBuilder.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/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/plugins/plugin_instance.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h index ff18ed1..bdeb01b 100644 --- a/webkit/glue/webkitclient_impl.h +++ b/webkit/glue/webkitclient_impl.h @@ -7,7 +7,7 @@ #include "base/platform_file.h" #include "base/timer.h" -#include "webkit/api/public/WebKitClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h" #if defined(OS_WIN) #include "webkit/glue/webthemeengine_impl_win.h" #endif diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index e1a1c59..09c1071 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -10,9 +10,9 @@ #include "media/filters/ffmpeg_video_decoder.h" #include "media/filters/null_audio_renderer.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebSize.h" -#include "webkit/api/public/WebURL.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/WebURL.h" #include "webkit/glue/media/video_renderer_impl.h" using WebKit::WebCanvas; diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h index 538f22b..7e2d8b2 100644 --- a/webkit/glue/webmediaplayer_impl.h +++ b/webkit/glue/webmediaplayer_impl.h @@ -63,8 +63,8 @@ #include "media/base/filters.h" #include "media/base/pipeline_impl.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebMediaPlayer.h" -#include "webkit/api/public/WebMediaPlayerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayer.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerClient.h" class GURL; diff --git a/webkit/glue/webmenuitem.h b/webkit/glue/webmenuitem.h index 584e071..ab267bb 100644 --- a/webkit/glue/webmenuitem.h +++ b/webkit/glue/webmenuitem.h @@ -6,7 +6,7 @@ #define WEBMENUITEM_H_ #include "base/string16.h" -#include "webkit/api/public/WebPopupMenuInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPopupMenuInfo.h" // Container for information about entries in an HTML select popup menu. struct WebMenuItem { diff --git a/webkit/glue/webpasswordautocompletelistener_impl.cc b/webkit/glue/webpasswordautocompletelistener_impl.cc index b7133ad..a61d1ed 100644 --- a/webkit/glue/webpasswordautocompletelistener_impl.cc +++ b/webkit/glue/webpasswordautocompletelistener_impl.cc @@ -7,10 +7,10 @@ #include "base/string_util.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebNode.h" -#include "webkit/api/public/WebVector.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNode.h" +#include "third_party/WebKit/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webpasswordautocompletelistener_impl.h" diff --git a/webkit/glue/webpasswordautocompletelistener_impl.h b/webkit/glue/webpasswordautocompletelistener_impl.h index 7020bf1..092455e 100644 --- a/webkit/glue/webpasswordautocompletelistener_impl.h +++ b/webkit/glue/webpasswordautocompletelistener_impl.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "webkit/api/public/WebInputElement.h" -#include "webkit/api/public/WebPasswordAutocompleteListener.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPasswordAutocompleteListener.h" #include "webkit/glue/password_form_dom_manager.h" using WebKit::WebInputElement; diff --git a/webkit/glue/webplugin_delegate.h b/webkit/glue/webplugin_delegate.h index 1f7e714..2b9c5bb 100644 --- a/webkit/glue/webplugin_delegate.h +++ b/webkit/glue/webplugin_delegate.h @@ -13,7 +13,7 @@ #include "build/build_config.h" #include "third_party/npapi/bindings/npapi.h" #include "webkit/glue/pepper/pepper.h" -#include "webkit/api/public/WebCanvas.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h" class FilePath; class GURL; diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index d3c8e9c..bc23872 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -10,25 +10,25 @@ #include "net/base/escape.h" #include "net/base/net_errors.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebCString.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebHTTPBody.h" -#include "webkit/api/public/WebHTTPHeaderVisitor.h" -#include "webkit/api/public/WebInputEvent.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebKitClient.h" -#include "webkit/api/public/WebPluginContainer.h" -#include "webkit/api/public/WebPluginParams.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebURLError.h" -#include "webkit/api/public/WebURLLoader.h" -#include "webkit/api/public/WebURLLoaderClient.h" -#include "webkit/api/public/WebURLResponse.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.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/WebData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHTTPBody.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHTTPHeaderVisitor.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.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/WebURLLoader.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/multipart_response_delegate.h" #include "webkit/glue/webplugin_impl.h" #include "webkit/glue/plugins/plugin_host.h" diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/webplugin_impl.h index c691920..5bbc39f 100644 --- a/webkit/glue/webplugin_impl.h +++ b/webkit/glue/webplugin_impl.h @@ -15,11 +15,11 @@ #include "base/task.h" #include "base/weak_ptr.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebPlugin.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURLLoaderClient.h" -#include "webkit/api/public/WebURLRequest.h" -#include "webkit/api/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPlugin.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebVector.h" #include "webkit/glue/webplugin.h" class WebViewDelegate; diff --git a/webkit/glue/webplugin_impl_unittest.cc b/webkit/glue/webplugin_impl_unittest.cc index 70c9436..4d15e54 100644 --- a/webkit/glue/webplugin_impl_unittest.cc +++ b/webkit/glue/webplugin_impl_unittest.cc @@ -4,9 +4,9 @@ #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebCString.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" #include "webkit/glue/webplugin_impl.h" using WebKit::WebHTTPBody; diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index cfbfa13..77cbcfd 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -5,12 +5,12 @@ #include "webkit/glue/webpreferences.h" #include "base/string_util.h" -#include "webkit/api/public/WebRuntimeFeatures.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebSettings.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebView.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/WebSettings.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/WebView.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebRuntimeFeatures; diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/glue/websocketstreamhandle_impl.cc index 8847a8d..60faea2 100644 --- a/webkit/glue/websocketstreamhandle_impl.cc +++ b/webkit/glue/websocketstreamhandle_impl.cc @@ -12,9 +12,9 @@ #include "base/logging.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebSocketStreamHandleClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSocketStreamHandleClient.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 657884e..f8a08f4 100644 --- a/webkit/glue/websocketstreamhandle_impl.h +++ b/webkit/glue/websocketstreamhandle_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_IMPL_H_ #include "base/ref_counted.h" -#include "webkit/api/public/WebSocketStreamHandle.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSocketStreamHandle.h" namespace webkit_glue { diff --git a/webkit/glue/webthemeengine_impl_win.cc b/webkit/glue/webthemeengine_impl_win.cc index f60f9ac..86ff202 100644 --- a/webkit/glue/webthemeengine_impl_win.cc +++ b/webkit/glue/webthemeengine_impl_win.cc @@ -7,7 +7,7 @@ #include "app/gfx/native_theme_win.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/skia_utils_win.h" -#include "webkit/api/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" using WebKit::WebCanvas; using WebKit::WebColor; diff --git a/webkit/glue/webthemeengine_impl_win.h b/webkit/glue/webthemeengine_impl_win.h index 9d24def..866e7b8 100644 --- a/webkit/glue/webthemeengine_impl_win.h +++ b/webkit/glue/webthemeengine_impl_win.h @@ -5,7 +5,7 @@ #ifndef WEBTHEMEENGINE_IMPL_WIN_H_ #define WEBTHEMEENGINE_IMPL_WIN_H_ -#include "webkit/api/public/win/WebThemeEngine.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebThemeEngine.h" namespace webkit_glue { diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc index 4fcc1372..7fd8a22 100644 --- a/webkit/glue/weburlloader_impl.cc +++ b/webkit/glue/weburlloader_impl.cc @@ -16,12 +16,12 @@ #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/http/http_response_headers.h" -#include "webkit/api/public/WebHTTPHeaderVisitor.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebURLError.h" -#include "webkit/api/public/WebURLLoaderClient.h" -#include "webkit/api/public/WebURLRequest.h" -#include "webkit/api/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHTTPHeaderVisitor.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/WebURLLoaderClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" #include "webkit/glue/ftp_directory_listing_response_delegate.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/multipart_response_delegate.h" diff --git a/webkit/glue/weburlloader_impl.h b/webkit/glue/weburlloader_impl.h index 9199c74..f9e5a0b 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/ref_counted.h" -#include "webkit/api/public/WebURLLoader.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLLoader.h" namespace webkit_glue { diff --git a/webkit/glue/webview_unittest.cc b/webkit/glue/webview_unittest.cc index 4c524f8..ff512f8 100644 --- a/webkit/glue/webview_unittest.cc +++ b/webkit/glue/webview_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/tools/test_shell/test_shell_test.h" using WebKit::WebView; diff --git a/webkit/glue/window_open_disposition.h b/webkit/glue/window_open_disposition.h index d328adf..24495f1 100644 --- a/webkit/glue/window_open_disposition.h +++ b/webkit/glue/window_open_disposition.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_GLUE_WINDOW_OPEN_DISPOSITION_H_ #define WEBKIT_GLUE_WINDOW_OPEN_DISPOSITION_H_ -#include "webkit/api/public/WebNavigationPolicy.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNavigationPolicy.h" enum WindowOpenDisposition { SUPPRESS_OPEN, 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; diff --git a/webkit/webkit.gyp b/webkit/webkit_glue.gyp index d211dab..914be72 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit_glue.gyp @@ -135,7 +135,7 @@ 'msvs_guid': '0B945915-31A7-4A07-A5B5-568D737A39B1', 'dependencies': [ '../net/net.gyp:net', - 'api/WebKit.gyp:webkit', + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', ], 'sources': [ # This list contains all .h and .cc in appcache except for test code. @@ -204,7 +204,7 @@ '../net/net.gyp:net', 'inspector_resources', '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', - 'api/WebKit.gyp:webkit', + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', 'webkit_resources', 'webkit_strings', ], |