diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 18:31:42 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 18:31:42 +0000 |
| commit | 756fbde6911d40d376680c7ab9b576620f64c108 (patch) | |
| tree | db279a9daa90a0842a5eb035ffd6ec796ae851d2 | |
| parent | 3b06f2ae871249581d6b4aeb47921f102b638156 (diff) | |
| download | chromium_src-756fbde6911d40d376680c7ab9b576620f64c108.zip chromium_src-756fbde6911d40d376680c7ab9b576620f64c108.tar.gz chromium_src-756fbde6911d40d376680c7ab9b576620f64c108.tar.bz2 | |
Move webkitplatformsupport_impl and related from glue to child
Picking up Ananta's change.
Move the webkitplatformsupport_impl.cc/.h files out of webkit\glue to
webkit\child.
This requires moving the following files out of webkit\glue to webkit\child:
1. weburlloader_impl.cc/.h
2. weburlrequest_extradata_impl.cc/.h
3. websocketstreamhandle_impl.cc/.h
4. weburlresponse_extradata_impl.cc/.h
5. websocketstreamhandle_delegate.h
6. ftp_directory_listing_response_delegate.cc/.h
7. multipart_response_delegate.cc/.h
8. multipart_response_delegate_unittest.cc
9. resource_loader_bridge.cc/.h
The following files have been moved to webkit\common:
2. resource_type.cc/.h
Move MemoryUsageKB out of webkit_glue.cc/h to webkit/child/webkit_child_helpers.
I added an include rule to content\common\DEPS to allow including
webkit\child\websocketstreamhandle_delegate.h. This will be removed in a
followup.
TBR=jam@chromium.org, jamesr@chromium.org, jschuh@chromium.org
BUG=237249
Review URL: https://codereview.chromium.org/19673002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212927 0039d316-1c4b-4281-b951-d872f2087c98
97 files changed, 452 insertions, 400 deletions
diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt index bc5ad88..190bcb6 100644 --- a/android_webview/tools/third_party_files_whitelist.txt +++ b/android_webview/tools/third_party_files_whitelist.txt @@ -186,13 +186,13 @@ webkit/browser/appcache/manifest_parser.cc # code is taken from WebKit, the license for which we already pick up from # webkit/. webkit/browser/appcache/manifest_parser.h -# Copyright Tim Copperfield and Christian Dywan; LGPL license. Not used on -# Android. -webkit/common/cursors/webcursor_gtk_data.h # Copyright The Chromium Authors and Netscape Communications Corporation; BSD # and (MPL, GPL v2 or LGPL v2) licenses. This third-party code is taken from # Mozilla, the license for which we already pick up from third_party/npapi/. -webkit/glue/multipart_response_delegate.h +webkit/child/multipart_response_delegate.h +# Copyright Tim Copperfield and Christian Dywan; LGPL license. Not used on +# Android. +webkit/common/cursors/webcursor_gtk_data.h # This third-party code is taken from Mozilla, but is copyright Google and has # been re-licensed under the Chromium license. webkit/support/webkit_support_gfx.cc diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.h b/chrome/browser/captive_portal/captive_portal_tab_helper.h index 88cf5ef..dec16d2 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_helper.h +++ b/chrome/browser/captive_portal/captive_portal_tab_helper.h @@ -14,7 +14,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" class GURL; class Profile; diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h index c79d482..f4c8f75 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h" #include "chrome/common/extensions/api/events.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace base { class Value; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index f63ffd6..e62f3f9 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc @@ -40,7 +40,7 @@ #include "net/test/embedded_test_server/embedded_test_server.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" using content::WebContents; diff --git a/chrome/browser/extensions/api/web_request/web_request_api.h b/chrome/browser/extensions/api/web_request/web_request_api.h index 4e9ea49..e0339fc 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.h +++ b/chrome/browser/extensions/api/web_request/web_request_api.h @@ -25,7 +25,7 @@ #include "net/base/completion_callback.h" #include "net/base/network_delegate.h" #include "net/http/http_request_headers.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" class ExtensionInfoMap; class ExtensionWebRequestTimeTracker; diff --git a/chrome/browser/extensions/api/web_request/web_request_api_helpers.h b/chrome/browser/extensions/api/web_request/web_request_api_helpers.h index 9b849c1..90b2f84 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_helpers.h +++ b/chrome/browser/extensions/api/web_request/web_request_api_helpers.h @@ -20,7 +20,7 @@ #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "url/gurl.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace base { class ListValue; diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index a8a0108..47241e9 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -36,7 +36,7 @@ #include "content/public/common/result_codes.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" using extensions::Extension; using extensions::ExtensionAPI; diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h index d4f6c4a..009a9d74 100644 --- a/chrome/browser/extensions/user_script_listener.h +++ b/chrome/browser/extensions/user_script_listener.h @@ -15,7 +15,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" class GURL; class URLPattern; diff --git a/chrome/browser/net/resource_prefetch_predictor_observer.h b/chrome/browser/net/resource_prefetch_predictor_observer.h index 5ffb27b..3790f0a 100644 --- a/chrome/browser/net/resource_prefetch_predictor_observer.h +++ b/chrome/browser/net/resource_prefetch_predictor_observer.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/predictors/resource_prefetch_predictor.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace net { class URLRequest; diff --git a/chrome/browser/predictors/resource_prefetch_predictor.h b/chrome/browser/predictors/resource_prefetch_predictor.h index 3776241..ed177e4 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor.h +++ b/chrome/browser/predictors/resource_prefetch_predictor.h @@ -23,7 +23,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "url/gurl.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" class PredictorsHandler; class Profile; diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables.h b/chrome/browser/predictors/resource_prefetch_predictor_tables.h index f8a965e..6995388 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_tables.h +++ b/chrome/browser/predictors/resource_prefetch_predictor_tables.h @@ -14,7 +14,7 @@ #include "chrome/browser/predictors/predictor_table_base.h" #include "chrome/browser/predictors/resource_prefetch_common.h" #include "url/gurl.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace sql { class Statement; diff --git a/chrome/browser/ui/webui/predictors/predictors_handler.cc b/chrome/browser/ui/webui/predictors/predictors_handler.cc index 14c88cf..3536ac9 100644 --- a/chrome/browser/ui/webui/predictors/predictors_handler.cc +++ b/chrome/browser/ui/webui/predictors/predictors_handler.cc @@ -13,7 +13,7 @@ #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_ui.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" using predictors::AutocompleteActionPredictor; using predictors::ResourcePrefetchPredictor; diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 261a81a..fa6d12d 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -19,14 +19,15 @@ '../net/net.gyp:net', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', + '../third_party/WebKit/public/blink.gyp:blink', '../third_party/hunspell/hunspell.gyp:hunspell', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/npapi/npapi.gyp:npapi', '../third_party/re2/re2.gyp:re2', - '../third_party/WebKit/public/blink.gyp:blink', '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', '../ui/surface/surface.gyp:surface', + '../webkit/support/webkit_support.gyp:glue_child', '../webkit/glue/webkit_glue_common.gyp:glue_common', '../webkit/renderer/webkit_renderer.gyp:webkit_renderer', '../webkit/support/webkit_support.gyp:glue', diff --git a/chrome/common/automation_messages.h b/chrome/common/automation_messages.h index 20b8925..c01b93a 100644 --- a/chrome/common/automation_messages.h +++ b/chrome/common/automation_messages.h @@ -145,7 +145,7 @@ IPC_STRUCT_BEGIN(AutomationURLRequest) IPC_STRUCT_MEMBER(std::string, referrer) IPC_STRUCT_MEMBER(std::string, extra_request_headers) IPC_STRUCT_MEMBER(scoped_refptr<net::UploadData>, upload_data) - IPC_STRUCT_MEMBER(int, resource_type) // see webkit/glue/resource_type.h + IPC_STRUCT_MEMBER(int, resource_type) // see webkit/common/resource_type.h IPC_STRUCT_MEMBER(int, load_flags) // see net/base/load_flags.h IPC_STRUCT_END() diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS index c8ec078..41e8310 100644 --- a/chrome/renderer/DEPS +++ b/chrome/renderer/DEPS @@ -2,6 +2,7 @@ include_rules = [ "+components/autofill/content/renderer", "+components/autofill/core/common", "+components/visitedlink/renderer", + "+content/public/child", "+content/public/renderer", "+extensions/common", "+grit", # For generated headers @@ -13,6 +14,7 @@ include_rules = [ "+sandbox/win/src", "+skia", + "+webkit/child", "+webkit/common", "+webkit/glue", "+webkit/glue/plugins", diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index e213149..f4a5f8b 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/chrome/renderer/chrome_render_process_observer.cc @@ -33,7 +33,7 @@ #include "chrome/renderer/content_settings_observer.h" #include "chrome/renderer/extensions/extension_localization_peer.h" #include "chrome/renderer/security_filter_peer.h" -#include "content/public/common/resource_dispatcher_delegate.h" +#include "content/public/child/resource_dispatcher_delegate.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_visitor.h" @@ -41,7 +41,6 @@ #include "media/base/media_switches.h" #include "net/base/net_errors.h" #include "net/base/net_module.h" -#include "third_party/sqlite/sqlite3.h" #include "third_party/WebKit/public/web/WebCache.h" #include "third_party/WebKit/public/web/WebCrossOriginPreflightResultCache.h" #include "third_party/WebKit/public/web/WebDocument.h" @@ -50,6 +49,7 @@ #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "third_party/WebKit/public/web/WebSecurityPolicy.h" #include "third_party/WebKit/public/web/WebView.h" +#include "third_party/sqlite/sqlite3.h" #include "v8/include/v8.h" #if defined(OS_WIN) diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc index b36149a..fb8ddf8 100644 --- a/chrome/renderer/content_settings_observer.cc +++ b/chrome/renderer/content_settings_observer.cc @@ -19,7 +19,7 @@ #include "third_party/WebKit/public/web/WebFrameClient.h" #include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "third_party/WebKit/public/web/WebView.h" -#include "webkit/glue/weburlresponse_extradata_impl.h" +#include "webkit/child/weburlresponse_extradata_impl.h" using WebKit::WebDataSource; using WebKit::WebFrame; diff --git a/chrome/renderer/extensions/extension_localization_peer.h b/chrome/renderer/extensions/extension_localization_peer.h index 531fd6b..3245d440 100644 --- a/chrome/renderer/extensions/extension_localization_peer.h +++ b/chrome/renderer/extensions/extension_localization_peer.h @@ -8,7 +8,7 @@ #include <string> #include "ipc/ipc_sender.h" -#include "webkit/glue/resource_loader_bridge.h" +#include "webkit/child/resource_loader_bridge.h" // The ExtensionLocalizationPeer is a proxy to a // webkit_glue::ResourceLoaderBridge::Peer instance. It is used to pre-process diff --git a/chrome/renderer/extensions/extension_localization_peer_unittest.cc b/chrome/renderer/extensions/extension_localization_peer_unittest.cc index dd16705..f56f924 100644 --- a/chrome/renderer/extensions/extension_localization_peer_unittest.cc +++ b/chrome/renderer/extensions/extension_localization_peer_unittest.cc @@ -14,7 +14,7 @@ #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/glue/resource_loader_bridge.h" +#include "webkit/child/resource_loader_bridge.h" using testing::_; using testing::DoAll; diff --git a/chrome/renderer/security_filter_peer.h b/chrome/renderer/security_filter_peer.h index b4dd637..ddc9e64 100644 --- a/chrome/renderer/security_filter_peer.h +++ b/chrome/renderer/security_filter_peer.h @@ -5,7 +5,7 @@ #ifndef CHROME_RENDERER_SECURITY_FILTER_PEER_H_ #define CHROME_RENDERER_SECURITY_FILTER_PEER_H_ -#include "webkit/glue/resource_loader_bridge.h" +#include "webkit/child/resource_loader_bridge.h" // The SecurityFilterPeer is a proxy to a // webkit_glue::ResourceLoaderBridge::Peer instance. It is used to pre-process diff --git a/chrome_frame/plugin_url_request.h b/chrome_frame/plugin_url_request.h index 718741b..acfc49d 100644 --- a/chrome_frame/plugin_url_request.h +++ b/chrome_frame/plugin_url_request.h @@ -17,7 +17,7 @@ #include "net/base/host_port_pair.h" #include "net/base/upload_data.h" #include "net/url_request/url_request_status.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" class PluginUrlRequest; class PluginUrlRequestDelegate; diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index 6dbf2df..8571a7c 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -46,7 +46,7 @@ #include "third_party/WebKit/public/web/WebCursorInfo.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/surface/transport_dib.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" #if defined(OS_MACOSX) #include "content/browser/browser_plugin/browser_plugin_popup_menu_helper_mac.h" diff --git a/content/browser/child_process_security_policy_impl.h b/content/browser/child_process_security_policy_impl.h index acf74cd..713ef59 100644 --- a/content/browser/child_process_security_policy_impl.h +++ b/content/browser/child_process_security_policy_impl.h @@ -16,7 +16,7 @@ #include "base/synchronization/lock.h" #include "content/public/browser/child_process_security_policy.h" #include "webkit/common/fileapi/file_system_types.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" class GURL; diff --git a/content/browser/loader/offline_policy_unittest.cc b/content/browser/loader/offline_policy_unittest.cc index 18c09df..40243c8 100644 --- a/content/browser/loader/offline_policy_unittest.cc +++ b/content/browser/loader/offline_policy_unittest.cc @@ -9,7 +9,7 @@ #include "net/base/load_flags.h" #include "net/http/http_response_info.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace content { diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h index 54e47e4..71253fa 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.h +++ b/content/browser/loader/resource_dispatcher_host_impl.h @@ -41,7 +41,7 @@ #include "ipc/ipc_message.h" #include "net/cookies/canonical_cookie.h" #include "net/url_request/url_request.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" class ResourceHandler; struct ResourceHostMsg_Request; diff --git a/content/browser/loader/resource_message_filter.h b/content/browser/loader/resource_message_filter.h index 0ea5771..2c56af0 100644 --- a/content/browser/loader/resource_message_filter.h +++ b/content/browser/loader/resource_message_filter.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "content/public/browser/browser_message_filter.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace fileapi { class FileSystemContext; diff --git a/content/browser/loader/resource_request_info_impl.h b/content/browser/loader/resource_request_info_impl.h index 1c663257..d9958653 100644 --- a/content/browser/loader/resource_request_info_impl.h +++ b/content/browser/loader/resource_request_info_impl.h @@ -14,7 +14,7 @@ #include "content/public/browser/resource_request_info.h" #include "content/public/common/referrer.h" #include "net/base/load_states.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace webkit_blob { class BlobData; diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc index c28e2ff..2066294 100644 --- a/content/browser/loader/resource_scheduler_unittest.cc +++ b/content/browser/loader/resource_scheduler_unittest.cc @@ -21,7 +21,7 @@ #include "net/url_request/url_request.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace content { diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 931e47d..157afe4 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -130,7 +130,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" #include "webkit/browser/fileapi/sandbox_file_system_backend.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" #include "webkit/plugins/plugin_switches.h" #if defined(OS_ANDROID) diff --git a/content/browser/ssl/ssl_error_handler.h b/content/browser/ssl/ssl_error_handler.h index e7345e2..5f9e9e5 100644 --- a/content/browser/ssl/ssl_error_handler.h +++ b/content/browser/ssl/ssl_error_handler.h @@ -13,7 +13,7 @@ #include "content/common/content_export.h" #include "content/public/browser/global_request_id.h" #include "url/gurl.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace net { class SSLInfo; diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc index 5430070..28c679b 100644 --- a/content/browser/ssl/ssl_policy.cc +++ b/content/browser/ssl/ssl_policy.cc @@ -21,7 +21,7 @@ #include "content/public/common/ssl_status.h" #include "content/public/common/url_constants.h" #include "net/ssl/ssl_info.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace { diff --git a/content/browser/ssl/ssl_policy.h b/content/browser/ssl/ssl_policy.h index 7d5d361..c88e10c 100644 --- a/content/browser/ssl/ssl_policy.h +++ b/content/browser/ssl/ssl_policy.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/ref_counted.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace content { class NavigationEntryImpl; diff --git a/content/browser/ssl/ssl_request_info.h b/content/browser/ssl/ssl_request_info.h index 7f27b4b..cf745fe 100644 --- a/content/browser/ssl/ssl_request_info.h +++ b/content/browser/ssl/ssl_request_info.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "net/cert/cert_status_flags.h" #include "url/gurl.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace content { diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index 5486eba..81fbdf3 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -31,7 +31,7 @@ #include "ui/gfx/rect_f.h" #include "ui/gfx/size.h" #include "ui/gfx/vector2d.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" struct BrowserPluginHostMsg_ResizeGuest_Params; struct ViewHostMsg_DateTimeDialogValue_Params; diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc index b0e32c8..9f57bcc 100644 --- a/content/browser/worker_host/worker_process_host.cc +++ b/content/browser/worker_host/worker_process_host.cc @@ -50,7 +50,7 @@ #include "ui/base/ui_base_switches.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/sandbox_file_system_backend.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" #if defined(OS_WIN) #include "content/common/sandbox_win.h" diff --git a/content/child/child_thread.h b/content/child/child_thread.h index 77f7bdf..aa04e2e 100644 --- a/content/child/child_thread.h +++ b/content/child/child_thread.h @@ -13,7 +13,7 @@ #include "content/common/content_export.h" #include "content/common/message_router.h" #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. -#include "webkit/glue/resource_loader_bridge.h" +#include "webkit/child/resource_loader_bridge.h" namespace base { class MessageLoop; diff --git a/content/child/database_util.h b/content/child/database_util.h index 75bcd20..8b85623 100644 --- a/content/child/database_util.h +++ b/content/child/database_util.h @@ -5,7 +5,7 @@ #ifndef CONTENT_CHILD_DATABASE_UTIL_H_ #define CONTENT_CHILD_DATABASE_UTIL_H_ -#include "webkit/glue/webkitplatformsupport_impl.h" +#include "webkit/child/webkitplatformsupport_impl.h" namespace IPC { class SyncMessageFilter; diff --git a/content/child/request_extra_data.h b/content/child/request_extra_data.h index 5b890e6..3cbc7fa 100644 --- a/content/child/request_extra_data.h +++ b/content/child/request_extra_data.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "content/common/content_export.h" #include "content/public/common/page_transition_types.h" -#include "webkit/glue/weburlrequest_extradata_impl.h" +#include "webkit/child/weburlrequest_extradata_impl.h" namespace content { diff --git a/content/child/resource_dispatcher.cc b/content/child/resource_dispatcher.cc index 9bf8a10..424902f 100644 --- a/content/child/resource_dispatcher.cc +++ b/content/child/resource_dispatcher.cc @@ -18,13 +18,13 @@ #include "content/child/request_extra_data.h" #include "content/common/inter_process_time_ticks_converter.h" #include "content/common/resource_messages.h" -#include "content/public/common/resource_dispatcher_delegate.h" +#include "content/public/child/resource_dispatcher_delegate.h" #include "content/public/common/resource_response.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/request_priority.h" #include "net/http/http_response_headers.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" using webkit_glue::ResourceLoaderBridge; using webkit_glue::ResourceRequestBody; diff --git a/content/child/resource_dispatcher.h b/content/child/resource_dispatcher.h index 9b26602..66416f4 100644 --- a/content/child/resource_dispatcher.h +++ b/content/child/resource_dispatcher.h @@ -18,7 +18,7 @@ #include "content/common/content_export.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" -#include "webkit/glue/resource_loader_bridge.h" +#include "webkit/child/resource_loader_bridge.h" namespace content { class ResourceDispatcherDelegate; diff --git a/content/child/socket_stream_dispatcher.cc b/content/child/socket_stream_dispatcher.cc index 8dc4569..9997f35 100644 --- a/content/child/socket_stream_dispatcher.cc +++ b/content/child/socket_stream_dispatcher.cc @@ -19,8 +19,8 @@ #include "content/common/socket_stream_messages.h" #include "net/base/net_errors.h" #include "url/gurl.h" +#include "webkit/child/websocketstreamhandle_delegate.h" #include "webkit/glue/websocketstreamhandle_bridge.h" -#include "webkit/glue/websocketstreamhandle_delegate.h" namespace content { diff --git a/content/common/DEPS b/content/common/DEPS index 9f9a62f..afff5e3 100644 --- a/content/common/DEPS +++ b/content/common/DEPS @@ -6,6 +6,9 @@ include_rules = [ "-webkit/child", "-webkit/renderer", + # TODO(ananta|jamesr|scottmg) http://crbug.com/237249 + "!webkit/child/websocketstreamhandle_impl.h", + # No inclusion of WebKit from the browser, other than strictly enum/POD, # header-only types, and some selected common code. "-third_party/WebKit", diff --git a/content/common/content_param_traits_macros.h b/content/common/content_param_traits_macros.h index e7d42ab..b99a331 100644 --- a/content/common/content_param_traits_macros.h +++ b/content/common/content_param_traits_macros.h @@ -12,7 +12,7 @@ #include "ipc/ipc_message_macros.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/latency_info.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" #undef IPC_MESSAGE_EXPORT #define IPC_MESSAGE_EXPORT CONTENT_EXPORT diff --git a/content/common/resource_messages.cc b/content/common/resource_messages.cc index 3efc61f..0bfaa07 100644 --- a/content/common/resource_messages.cc +++ b/content/common/resource_messages.cc @@ -6,7 +6,6 @@ #include "net/base/load_timing_info.h" #include "net/http/http_response_headers.h" -#include "webkit/glue/resource_loader_bridge.h" namespace IPC { diff --git a/content/common/socket_stream_handle_data.cc b/content/common/socket_stream_handle_data.cc index b8090c7..be419d7 100644 --- a/content/common/socket_stream_handle_data.cc +++ b/content/common/socket_stream_handle_data.cc @@ -4,7 +4,7 @@ #include "content/common/socket_stream_handle_data.h" -#include "webkit/glue/websocketstreamhandle_impl.h" +#include "webkit/child/websocketstreamhandle_impl.h" using webkit_glue::WebSocketStreamHandleImpl; using WebKit::WebSocketStreamHandle; diff --git a/content/content_child.gypi b/content/content_child.gypi index 7f789711..ffca557 100644 --- a/content/content_child.gypi +++ b/content/content_child.gypi @@ -16,7 +16,6 @@ '../base/base.gyp:base', ], 'sources': [ - 'public/child/image_decoder_utils.h', 'child/android/child_jni_registrar.cc', 'child/android/child_jni_registrar.h', 'child/appcache_backend_proxy.cc', @@ -47,10 +46,10 @@ 'child/image_decoder.h', 'child/indexed_db/indexed_db_dispatcher.cc', 'child/indexed_db/indexed_db_dispatcher.h', - 'child/indexed_db/indexed_db_message_filter.cc', - 'child/indexed_db/indexed_db_message_filter.h', 'child/indexed_db/indexed_db_key_builders.cc', 'child/indexed_db/indexed_db_key_builders.h', + 'child/indexed_db/indexed_db_message_filter.cc', + 'child/indexed_db/indexed_db_message_filter.h', 'child/indexed_db/proxy_webidbcursor_impl.cc', 'child/indexed_db/proxy_webidbcursor_impl.h', 'child/indexed_db/proxy_webidbdatabase_impl.cc', @@ -62,12 +61,12 @@ 'child/npapi/npobject_base.h', 'child/npapi/npobject_proxy.cc', 'child/npapi/npobject_proxy.h', - 'child/npapi/npruntime_util.cc', - 'child/npapi/npruntime_util.h', 'child/npapi/npobject_stub.cc', 'child/npapi/npobject_stub.h', 'child/npapi/npobject_util.cc', 'child/npapi/npobject_util.h', + 'child/npapi/npruntime_util.cc', + 'child/npapi/npruntime_util.h', 'child/npapi/plugin_host.cc', 'child/npapi/plugin_host.h', 'child/npapi/plugin_instance.cc', @@ -114,14 +113,16 @@ 'child/socket_stream_dispatcher.h', 'child/thread_safe_sender.cc', 'child/thread_safe_sender.h', - 'child/webblobregistry_impl.cc', - 'child/webblobregistry_impl.h', 'child/web_database_observer_impl.cc', 'child/web_database_observer_impl.h', + 'child/webblobregistry_impl.cc', + 'child/webblobregistry_impl.h', 'child/webkitplatformsupport_impl.cc', 'child/webkitplatformsupport_impl.h', 'child/webmessageportchannel_impl.cc', 'child/webmessageportchannel_impl.h', + 'public/child/image_decoder_utils.h', + 'public/child/resource_dispatcher_delegate.h', ], 'conditions': [ ['OS=="android"', { diff --git a/content/content_common.gypi b/content/content_common.gypi index 50fbff2..77ba35b 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -73,7 +73,6 @@ 'public/common/referrer.h', 'public/common/renderer_preferences.cc', 'public/common/renderer_preferences.h', - 'public/common/resource_dispatcher_delegate.h', 'public/common/resource_response.h', 'public/common/result_codes.h', 'public/common/result_codes_list.h', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 92a88f7..9083289 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -518,6 +518,7 @@ '../webkit/browser/fileapi/transient_file_util_unittest.cc', '../webkit/browser/fileapi/upload_file_system_file_element_reader_unittest.cc', 'test/run_all_unittests.cc', + '../webkit/child/multipart_response_delegate_unittest.cc', '../webkit/child/touch_fling_gesture_curve_unittest.cc', '../webkit/child/worker_task_runner_unittest.cc', '../webkit/common/blob/shareable_file_reference_unittest.cc', @@ -526,7 +527,6 @@ '../webkit/common/database/database_identifier_unittest.cc', '../webkit/common/dom_storage/dom_storage_map_unittest.cc', '../webkit/common/fileapi/file_system_util_unittest.cc', - '../webkit/glue/multipart_response_delegate_unittest.cc', '../webkit/glue/webkit_glue_unittest.cc', '../webkit/mocks/mock_weburlloader.cc', '../webkit/mocks/mock_weburlloader.h', diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index 9cf7aaf..daadcb0 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -24,7 +24,7 @@ #include "net/cookies/canonical_cookie.h" #include "net/url_request/url_request_job_factory.h" #include "third_party/WebKit/public/web/WebNotificationPresenter.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) #include "base/posix/global_descriptors.h" diff --git a/content/public/browser/load_from_memory_cache_details.h b/content/public/browser/load_from_memory_cache_details.h index b826fe7..ac9b734 100644 --- a/content/public/browser/load_from_memory_cache_details.h +++ b/content/public/browser/load_from_memory_cache_details.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "net/cert/cert_status_flags.h" #include "url/gurl.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace content { diff --git a/content/public/browser/resource_dispatcher_host_delegate.h b/content/public/browser/resource_dispatcher_host_delegate.h index 1a6ddb8..af56b73 100644 --- a/content/public/browser/resource_dispatcher_host_delegate.h +++ b/content/public/browser/resource_dispatcher_host_delegate.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" class GURL; template <class T> class ScopedVector; diff --git a/content/public/browser/resource_request_details.h b/content/public/browser/resource_request_details.h index 66c0eaf..1c20557 100644 --- a/content/public/browser/resource_request_details.h +++ b/content/public/browser/resource_request_details.h @@ -11,7 +11,7 @@ #include "net/cert/cert_status_flags.h" #include "net/url_request/url_request_status.h" #include "url/gurl.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace net { class URLRequest; diff --git a/content/public/browser/resource_request_info.h b/content/public/browser/resource_request_info.h index 76dfc48..6952975 100644 --- a/content/public/browser/resource_request_info.h +++ b/content/public/browser/resource_request_info.h @@ -9,7 +9,7 @@ #include "content/common/content_export.h" #include "content/public/common/page_transition_types.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace net { class URLRequest; diff --git a/content/public/common/resource_dispatcher_delegate.h b/content/public/child/resource_dispatcher_delegate.h index 43d174a..8c67e07 100644 --- a/content/public/common/resource_dispatcher_delegate.h +++ b/content/public/child/resource_dispatcher_delegate.h @@ -1,32 +1,32 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CONTENT_PUBLIC_COMMON_RESOURCE_DISPATCHER_DELEGATE_H_ -#define CONTENT_PUBLIC_COMMON_RESOURCE_DISPATCHER_DELEGATE_H_ - -#include "content/common/content_export.h" -#include "webkit/glue/resource_loader_bridge.h" - -namespace content { - -// Interface that allows observing request events and optionally replacing the -// peer. -class CONTENT_EXPORT ResourceDispatcherDelegate { - public: - virtual ~ResourceDispatcherDelegate() {} - - virtual webkit_glue::ResourceLoaderBridge::Peer* OnRequestComplete( - webkit_glue::ResourceLoaderBridge::Peer* current_peer, - ResourceType::Type resource_type, - int error_code) = 0; - - virtual webkit_glue::ResourceLoaderBridge::Peer* OnReceivedResponse( - webkit_glue::ResourceLoaderBridge::Peer* current_peer, - const std::string& mime_type, - const GURL& url) = 0; -}; - -} // namespace content - -#endif // CONTENT_PUBLIC_COMMON_RESOURCE_DISPATCHER_DELEGATE_H_ +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_PUBLIC_CHILD_RESOURCE_DISPATCHER_DELEGATE_H_
+#define CONTENT_PUBLIC_CHILD_RESOURCE_DISPATCHER_DELEGATE_H_
+
+#include "content/common/content_export.h"
+#include "webkit/child/resource_loader_bridge.h"
+
+namespace content {
+
+// Interface that allows observing request events and optionally replacing the
+// peer.
+class CONTENT_EXPORT ResourceDispatcherDelegate {
+ public:
+ virtual ~ResourceDispatcherDelegate() {}
+
+ virtual webkit_glue::ResourceLoaderBridge::Peer* OnRequestComplete(
+ webkit_glue::ResourceLoaderBridge::Peer* current_peer,
+ ResourceType::Type resource_type,
+ int error_code) = 0;
+
+ virtual webkit_glue::ResourceLoaderBridge::Peer* OnReceivedResponse(
+ webkit_glue::ResourceLoaderBridge::Peer* current_peer,
+ const std::string& mime_type,
+ const GURL& url) = 0;
+};
+
+} // namespace content
+
+#endif // CONTENT_PUBLIC_CHILD_RESOURCE_DISPATCHER_DELEGATE_H_
diff --git a/content/public/common/resource_response.h b/content/public/common/resource_response.h index 6e7cec2..829a1ea 100644 --- a/content/public/common/resource_response.h +++ b/content/public/common/resource_response.h @@ -14,7 +14,7 @@ #include "content/common/content_export.h" #include "net/url_request/url_request_status.h" #include "url/gurl.h" -#include "webkit/glue/resource_loader_bridge.h" +#include "webkit/common/resource_response_info.h" namespace content { diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 288b405..3d5d7f8 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -139,6 +139,22 @@ #include "net/base/net_errors.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/http/http_util.h" +#include "third_party/WebKit/public/platform/WebCString.h" +#include "third_party/WebKit/public/platform/WebDragData.h" +#include "third_party/WebKit/public/platform/WebFileSystemType.h" +#include "third_party/WebKit/public/platform/WebHTTPBody.h" +#include "third_party/WebKit/public/platform/WebImage.h" +#include "third_party/WebKit/public/platform/WebMessagePortChannel.h" +#include "third_party/WebKit/public/platform/WebPoint.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebSize.h" +#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebURLError.h" +#include "third_party/WebKit/public/platform/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/public/web/WebAccessibilityObject.h" #include "third_party/WebKit/public/web/WebColorName.h" #include "third_party/WebKit/public/web/WebDOMEvent.h" @@ -181,22 +197,6 @@ #include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/web/WebWindowFeatures.h" #include "third_party/WebKit/public/web/default/WebRenderTheme.h" -#include "third_party/WebKit/public/platform/WebCString.h" -#include "third_party/WebKit/public/platform/WebDragData.h" -#include "third_party/WebKit/public/platform/WebFileSystemType.h" -#include "third_party/WebKit/public/platform/WebHTTPBody.h" -#include "third_party/WebKit/public/platform/WebImage.h" -#include "third_party/WebKit/public/platform/WebMessagePortChannel.h" -#include "third_party/WebKit/public/platform/WebPoint.h" -#include "third_party/WebKit/public/platform/WebRect.h" -#include "third_party/WebKit/public/platform/WebSize.h" -#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" -#include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/WebKit/public/platform/WebURLError.h" -#include "third_party/WebKit/public/platform/WebURLRequest.h" -#include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "third_party/WebKit/public/platform/WebVector.h" #include "ui/base/ui_base_switches_util.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" @@ -205,9 +205,9 @@ #include "ui/gfx/size_conversions.h" #include "ui/shell_dialogs/selected_file_info.h" #include "v8/include/v8.h" +#include "webkit/child/weburlresponse_extradata_impl.h" #include "webkit/common/dom_storage/dom_storage_types.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/weburlresponse_extradata_impl.h" #include "webkit/renderer/appcache/web_application_cache_host_impl.h" #include "webkit/renderer/webpreferences_renderer.h" @@ -225,9 +225,9 @@ #include "content/renderer/media/android/webmediaplayer_android.h" #include "content/renderer/media/android/webmediaplayer_proxy_android.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/public/web/WebHitTestResult.h" #include "third_party/WebKit/public/platform/WebFloatPoint.h" #include "third_party/WebKit/public/platform/WebFloatRect.h" +#include "third_party/WebKit/public/web/WebHitTestResult.h" #include "ui/gfx/rect_f.h" #if defined(GOOGLE_TV) diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index ddc8060..0fd87e3 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -33,6 +33,7 @@ #include "content/renderer/render_thread_impl.h" #include "content/renderer/renderer_main_platform_delegate.h" #include "ui/base/ui_base_switches.h" +#include "webkit/child/webkit_child_helpers.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/ppapi/ppapi_interface_factory.h" diff --git a/content/renderer/webplugin_impl.cc b/content/renderer/webplugin_impl.cc index 6112fa4..9c9b0b0 100644 --- a/content/renderer/webplugin_impl.cc +++ b/content/renderer/webplugin_impl.cc @@ -48,7 +48,7 @@ #include "ui/gfx/rect.h" #include "url/gurl.h" #include "url/url_util.h" -#include "webkit/glue/multipart_response_delegate.h" +#include "webkit/child/multipart_response_delegate.h" #include "webkit/plugins/plugin_constants.h" #include "webkit/renderer/appcache/web_application_cache_host_impl.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" diff --git a/webkit/browser/appcache/appcache_host.h b/webkit/browser/appcache/appcache_host.h index fdc97d0..4242bc1 100644 --- a/webkit/browser/appcache/appcache_host.h +++ b/webkit/browser/appcache/appcache_host.h @@ -15,7 +15,7 @@ #include "webkit/browser/appcache/appcache_storage.h" #include "webkit/browser/webkit_storage_browser_export.h" #include "webkit/common/appcache/appcache_interfaces.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace net { class URLRequest; diff --git a/webkit/browser/appcache/appcache_interceptor.h b/webkit/browser/appcache/appcache_interceptor.h index 10ae84d..b1db1c0 100644 --- a/webkit/browser/appcache/appcache_interceptor.h +++ b/webkit/browser/appcache/appcache_interceptor.h @@ -9,7 +9,7 @@ #include "net/url_request/url_request.h" #include "url/gurl.h" #include "webkit/browser/webkit_storage_browser_export.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace appcache { diff --git a/webkit/browser/appcache/appcache_request_handler.h b/webkit/browser/appcache/appcache_request_handler.h index 1b7753c..606d6cf 100644 --- a/webkit/browser/appcache/appcache_request_handler.h +++ b/webkit/browser/appcache/appcache_request_handler.h @@ -10,7 +10,7 @@ #include "webkit/browser/appcache/appcache_entry.h" #include "webkit/browser/appcache/appcache_host.h" #include "webkit/browser/webkit_storage_browser_export.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" namespace net { class NetworkDelegate; diff --git a/webkit/child/DEPS b/webkit/child/DEPS index 552b168..64d1c38 100644 --- a/webkit/child/DEPS +++ b/webkit/child/DEPS @@ -1,5 +1,6 @@ -include_rules = [
- "+jni", # Needed for Android's java-generated bindings.
- "+ui/base",
- "+ui/native_theme",
-]
+include_rules = [ + "+content/public/common", + "+jni", # Needed for Android's java-generated bindings. + "+ui/base", + "+ui/native_theme", +] diff --git a/webkit/glue/ftp_directory_listing_response_delegate.cc b/webkit/child/ftp_directory_listing_response_delegate.cc index 0629000..d84ada6 100644 --- a/webkit/glue/ftp_directory_listing_response_delegate.cc +++ b/webkit/child/ftp_directory_listing_response_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/glue/ftp_directory_listing_response_delegate.h" +#include "webkit/child/ftp_directory_listing_response_delegate.h" #include <vector> @@ -19,7 +19,7 @@ #include "net/ftp/ftp_directory_listing_parser.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" -#include "webkit/glue/weburlresponse_extradata_impl.h" +#include "webkit/child/weburlresponse_extradata_impl.h" using net::FtpDirectoryListingEntry; diff --git a/webkit/glue/ftp_directory_listing_response_delegate.h b/webkit/child/ftp_directory_listing_response_delegate.h index 0562049..efcbb21 100644 --- a/webkit/glue/ftp_directory_listing_response_delegate.h +++ b/webkit/child/ftp_directory_listing_response_delegate.h @@ -1,53 +1,53 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// -// A delegate class of WebURLLoaderImpl that handles text/vnd.chromium.ftp-dir -// data. - -#ifndef WEBKIT_GLUE_FTP_DIRECTORY_LISTING_RESPONSE_DELEGATE_H_ -#define WEBKIT_GLUE_FTP_DIRECTORY_LISTING_RESPONSE_DELEGATE_H_ - -#include <string> - -#include "base/basictypes.h" -#include "third_party/WebKit/public/platform/WebURLResponse.h" - -namespace WebKit { -class WebURLLoader; -class WebURLLoaderClient; -} - -class GURL; - -namespace webkit_glue { - -class FtpDirectoryListingResponseDelegate { - public: - FtpDirectoryListingResponseDelegate(WebKit::WebURLLoaderClient* client, - WebKit::WebURLLoader* loader, - const WebKit::WebURLResponse& response); - - // Passed through from ResourceHandleInternal - void OnReceivedData(const char* data, int data_len); - void OnCompletedRequest(); - - private: - void Init(const GURL& response_url); - - void SendDataToClient(const std::string& data); - - // Pointers to the client and associated loader so we can make callbacks as - // we parse pieces of data. - WebKit::WebURLLoaderClient* client_; - WebKit::WebURLLoader* loader_; - - // Buffer for data received from the network. - std::string buffer_; - - DISALLOW_COPY_AND_ASSIGN(FtpDirectoryListingResponseDelegate); -}; - -} // namespace webkit_glue - -#endif // WEBKIT_GLUE_FTP_DIRECTORY_LISTING_RESPONSE_DELEGATE_H_ +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// A delegate class of WebURLLoaderImpl that handles text/vnd.chromium.ftp-dir
+// data.
+
+#ifndef WEBKIT_CHILD_FTP_DIRECTORY_LISTING_RESPONSE_DELEGATE_H_
+#define WEBKIT_CHILD_FTP_DIRECTORY_LISTING_RESPONSE_DELEGATE_H_
+
+#include <string>
+
+#include "base/basictypes.h"
+#include "third_party/WebKit/public/platform/WebURLResponse.h"
+
+namespace WebKit {
+class WebURLLoader;
+class WebURLLoaderClient;
+}
+
+class GURL;
+
+namespace webkit_glue {
+
+class FtpDirectoryListingResponseDelegate {
+ public:
+ FtpDirectoryListingResponseDelegate(WebKit::WebURLLoaderClient* client,
+ WebKit::WebURLLoader* loader,
+ const WebKit::WebURLResponse& response);
+
+ // Passed through from ResourceHandleInternal
+ void OnReceivedData(const char* data, int data_len);
+ void OnCompletedRequest();
+
+ private:
+ void Init(const GURL& response_url);
+
+ void SendDataToClient(const std::string& data);
+
+ // Pointers to the client and associated loader so we can make callbacks as
+ // we parse pieces of data.
+ WebKit::WebURLLoaderClient* client_;
+ WebKit::WebURLLoader* loader_;
+
+ // Buffer for data received from the network.
+ std::string buffer_;
+
+ DISALLOW_COPY_AND_ASSIGN(FtpDirectoryListingResponseDelegate);
+};
+
+} // namespace webkit_glue
+
+#endif // WEBKIT_CHILD_FTP_DIRECTORY_LISTING_RESPONSE_DELEGATE_H_
diff --git a/webkit/glue/multipart_response_delegate.cc b/webkit/child/multipart_response_delegate.cc index 325caf9..06af916 100644 --- a/webkit/glue/multipart_response_delegate.cc +++ b/webkit/child/multipart_response_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/glue/multipart_response_delegate.h" +#include "webkit/child/multipart_response_delegate.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" diff --git a/webkit/glue/multipart_response_delegate.h b/webkit/child/multipart_response_delegate.h index 6de1591..f85c1cf 100644 --- a/webkit/glue/multipart_response_delegate.h +++ b/webkit/child/multipart_response_delegate.h @@ -46,14 +46,14 @@ * * ***** END LICENSE BLOCK ***** */ -#ifndef WEBKIT_GLUE_MULTIPART_RESPONSE_DELEGATE_H_ -#define WEBKIT_GLUE_MULTIPART_RESPONSE_DELEGATE_H_ +#ifndef WEBKIT_CHILD_MULTIPART_RESPONSE_DELEGATE_H_ +#define WEBKIT_CHILD_MULTIPART_RESPONSE_DELEGATE_H_ #include <string> #include "base/basictypes.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "webkit/common/webkit_common_export.h" +#include "webkit/child/webkit_child_export.h" namespace WebKit { class WebURLLoader; @@ -65,7 +65,7 @@ namespace webkit_glue { // Used by unit tests to access private members. class MultipartResponseDelegateTester; -class WEBKIT_COMMON_EXPORT MultipartResponseDelegate { +class WEBKIT_CHILD_EXPORT MultipartResponseDelegate { public: MultipartResponseDelegate(WebKit::WebURLLoaderClient* client, WebKit::WebURLLoader* loader, @@ -150,4 +150,4 @@ class WEBKIT_COMMON_EXPORT MultipartResponseDelegate { } // namespace webkit_glue -#endif +#endif // WEBKIT_CHILD_MULTIPART_RESPONSE_DELEGATE_H_ diff --git a/webkit/glue/multipart_response_delegate_unittest.cc b/webkit/child/multipart_response_delegate_unittest.cc index 8e43d85..34ea209 100644 --- a/webkit/glue/multipart_response_delegate_unittest.cc +++ b/webkit/child/multipart_response_delegate_unittest.cc @@ -5,12 +5,12 @@ #include <vector> #include "base/basictypes.h" +#include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "webkit/glue/multipart_response_delegate.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webkit/child/multipart_response_delegate.h" using std::string; using WebKit::WebString; diff --git a/webkit/glue/resource_loader_bridge.cc b/webkit/child/resource_loader_bridge.cc index 4d8eabe..077f557 100644 --- a/webkit/glue/resource_loader_bridge.cc +++ b/webkit/child/resource_loader_bridge.cc @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/glue/resource_loader_bridge.h" +#include "webkit/child/resource_loader_bridge.h" #include "net/http/http_response_headers.h" #include "webkit/common/appcache/appcache_interfaces.h" +#include "webkit/common/resource_response_info.h" namespace webkit_glue { diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/child/resource_loader_bridge.h index 3df3cc3..9d51b62 100644 --- a/webkit/glue/resource_loader_bridge.h +++ b/webkit/child/resource_loader_bridge.h @@ -13,8 +13,8 @@ // In turn, the bridge's owner on the WebKit end will implement the Peer // interface, which we will use to communicate notifications back. -#ifndef WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_ -#define WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_ +#ifndef WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_ +#define WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_ #include <utility> @@ -29,9 +29,9 @@ #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "url/gurl.h" +#include "webkit/child/webkit_child_export.h" #include "webkit/common/resource_response_info.h" -#include "webkit/glue/resource_type.h" -#include "webkit/glue/webkit_glue_export.h" +#include "webkit/common/resource_type.h" namespace webkit_glue { class ResourceRequestBody; @@ -40,7 +40,7 @@ class ResourceLoaderBridge { public: // Structure used when calling // WebKitPlatformSupportImpl::CreateResourceLoader(). - struct WEBKIT_GLUE_EXPORT RequestInfo { + struct WEBKIT_CHILD_EXPORT RequestInfo { RequestInfo(); ~RequestInfo(); @@ -106,8 +106,8 @@ class ResourceLoaderBridge { // See the SyncLoad method declared below. (The name of this struct is not // suffixed with "Info" because it also contains the response data.) struct SyncLoadResponse : ResourceResponseInfo { - SyncLoadResponse(); - ~SyncLoadResponse(); + WEBKIT_CHILD_EXPORT SyncLoadResponse(); + WEBKIT_CHILD_EXPORT ~SyncLoadResponse(); // The response error code. int error_code; @@ -182,7 +182,7 @@ class ResourceLoaderBridge { // use WebKitPlatformSupportImpl::CreateResourceLoader() for construction, but // anybody can delete at any time, INCLUDING during processing of callbacks. - WEBKIT_GLUE_EXPORT virtual ~ResourceLoaderBridge(); + WEBKIT_CHILD_EXPORT virtual ~ResourceLoaderBridge(); // Call this method before calling Start() to set the request body. // May only be used with HTTP(S) POST requests. @@ -221,7 +221,7 @@ class ResourceLoaderBridge { // WebKitPlatformSupportImpl::CreateResourceLoader() // For HTTP(S) POST requests, the AppendDataToUpload and AppendFileToUpload // methods may be called to construct the body of the request. - WEBKIT_GLUE_EXPORT ResourceLoaderBridge(); + WEBKIT_CHILD_EXPORT ResourceLoaderBridge(); private: DISALLOW_COPY_AND_ASSIGN(ResourceLoaderBridge); @@ -229,4 +229,4 @@ class ResourceLoaderBridge { } // namespace webkit_glue -#endif // WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_ +#endif // WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_ diff --git a/webkit/child/webkit_child_helpers.cc b/webkit/child/webkit_child_helpers.cc new file mode 100644 index 0000000..6777955 --- /dev/null +++ b/webkit/child/webkit_child_helpers.cc @@ -0,0 +1,53 @@ +// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "webkit/child/webkit_child_helpers.h" + +#if defined(OS_LINUX) +#include <malloc.h> +#endif + +#include "base/logging.h" +#include "base/memory/scoped_ptr.h" +#include "base/process_util.h" +#include "v8/include/v8.h" + +namespace webkit_glue { + +#if defined(OS_LINUX) || defined(OS_ANDROID) +size_t MemoryUsageKB() { + struct mallinfo minfo = mallinfo(); + uint64_t mem_usage = +#if defined(USE_TCMALLOC) + minfo.uordblks +#else + (minfo.hblkhd + minfo.arena) +#endif + >> 10; + + v8::HeapStatistics stat; + // TODO(svenpanne) The call below doesn't take web workers into account, this + // has to be done manually by iterating over all Isolates involved. + v8::Isolate::GetCurrent()->GetHeapStatistics(&stat); + return mem_usage + (static_cast<uint64_t>(stat.total_heap_size()) >> 10); +} +#elif defined(OS_MACOSX) +size_t MemoryUsageKB() { + scoped_ptr<base::ProcessMetrics> process_metrics( + // The default port provider is sufficient to get data for the current + // process. + base::ProcessMetrics::CreateProcessMetrics( + base::GetCurrentProcessHandle(), NULL)); + return process_metrics->GetWorkingSetSize() >> 10; +} +#else +size_t MemoryUsageKB() { + scoped_ptr<base::ProcessMetrics> process_metrics( + base::ProcessMetrics::CreateProcessMetrics( + base::GetCurrentProcessHandle())); + return process_metrics->GetPagefileUsage() >> 10; +} +#endif + +} // webkit_glue diff --git a/webkit/child/webkit_child_helpers.h b/webkit/child/webkit_child_helpers.h new file mode 100644 index 0000000..3262fa2 --- /dev/null +++ b/webkit/child/webkit_child_helpers.h @@ -0,0 +1,21 @@ +// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef WEBKIT_CHILD_WEBKIT_CHILD_HELPERS_H_ +#define WEBKIT_CHILD_WEBKIT_CHILD_HELPERS_H_ + +#include "base/basictypes.h" +#include "webkit/child/webkit_child_export.h" + +namespace webkit_glue { + +// Returns an estimate of the memory usage of the renderer process. Different +// platforms implement this function differently, and count in different +// allocations. Results are not comparable across platforms. The estimate is +// computed inside the sandbox and thus its not always accurate. +WEBKIT_CHILD_EXPORT size_t MemoryUsageKB(); + +} // webkit_glue + +#endif // WEBKIT_CHILD_WEBKIT_CHILD_HELPERS_H_ diff --git a/webkit/child/webkitplatformsupport_child_impl.h b/webkit/child/webkitplatformsupport_child_impl.h index abb6338..5ba71d8 100644 --- a/webkit/child/webkitplatformsupport_child_impl.h +++ b/webkit/child/webkitplatformsupport_child_impl.h @@ -8,7 +8,7 @@ #include "base/threading/thread_local_storage.h" #include "webkit/child/webfallbackthemeengine_impl.h" #include "webkit/child/webkit_child_export.h" -#include "webkit/glue/webkitplatformsupport_impl.h" +#include "webkit/child/webkitplatformsupport_impl.h" #if defined(USE_DEFAULT_RENDER_THEME) #include "webkit/child/webthemeengine_impl_default.h" diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/child/webkitplatformsupport_impl.cc index e592058..31a355e0 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/child/webkitplatformsupport_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/glue/webkitplatformsupport_impl.h" +#include "webkit/child/webkitplatformsupport_impl.h" #include <math.h> @@ -26,6 +26,7 @@ #include "base/synchronization/lock.h" #include "base/sys_info.h" #include "base/time/time.h" +#include "content/public/common/webplugininfo.h" #include "grit/webkit_chromium_resources.h" #include "grit/webkit_resources.h" #include "grit/webkit_strings.h" @@ -36,6 +37,7 @@ #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebDiscardableMemory.h" #include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebPluginListBuilder.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebVector.h" @@ -44,10 +46,11 @@ #include "third_party/WebKit/public/web/WebScreenInfo.h" #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" #include "ui/base/layout.h" +#include "webkit/child/webkit_child_helpers.h" +#include "webkit/child/websocketstreamhandle_impl.h" +#include "webkit/child/weburlloader_impl.h" #include "webkit/common/user_agent/user_agent.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/websocketstreamhandle_impl.h" -#include "webkit/glue/weburlloader_impl.h" using WebKit::WebAudioBus; using WebKit::WebCookie; diff --git a/webkit/glue/webkitplatformsupport_impl.h b/webkit/child/webkitplatformsupport_impl.h index 68fcb2a..e9077582 100644 --- a/webkit/glue/webkitplatformsupport_impl.h +++ b/webkit/child/webkitplatformsupport_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_PLATFORM_SUPPORT_IMPL_H_ -#define WEBKIT_PLATFORM_SUPPORT_IMPL_H_ +#ifndef WEBKIT_CHILD_WEBKITPLATFORMSUPPORT_IMPL_H_ +#define WEBKIT_CHILD_WEBKITPLATFORMSUPPORT_IMPL_H_ #include "base/compiler_specific.h" #include "base/debug/trace_event.h" @@ -12,8 +12,8 @@ #include "third_party/WebKit/public/platform/Platform.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "ui/base/layout.h" -#include "webkit/glue/resource_loader_bridge.h" -#include "webkit/glue/webkit_glue_export.h" +#include "webkit/child/resource_loader_bridge.h" +#include "webkit/child/webkit_child_export.h" namespace base { class MessageLoop; @@ -28,7 +28,7 @@ namespace webkit_glue { class WebSocketStreamHandleDelegate; class WebSocketStreamHandleBridge; -class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl : +class WEBKIT_CHILD_EXPORT WebKitPlatformSupportImpl : NON_EXPORTED_BASE(public WebKit::Platform) { public: WebKitPlatformSupportImpl(); @@ -152,4 +152,4 @@ class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl : } // namespace webkit_glue -#endif // WEBKIT_PLATFORM_SUPPORT_IMPL_H_ +#endif // WEBKIT_CHILD_WEBKITPLATFORMSUPPORT_IMPL_H_ diff --git a/webkit/glue/websocketstreamhandle_delegate.h b/webkit/child/websocketstreamhandle_delegate.h index 2d02329..ba0822e 100644 --- a/webkit/glue/websocketstreamhandle_delegate.h +++ b/webkit/child/websocketstreamhandle_delegate.h @@ -1,44 +1,44 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_DELEGATE_H_ -#define WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_DELEGATE_H_ - -#include "base/strings/string16.h" - -class GURL; - -namespace WebKit { -class WebSocketStreamHandle; -} - -namespace webkit_glue { - -class WebSocketStreamHandleDelegate { - public: - WebSocketStreamHandleDelegate() {} - - virtual void WillOpenStream(WebKit::WebSocketStreamHandle* handle, - const GURL& url) {} - virtual void WillSendData(WebKit::WebSocketStreamHandle* handle, - const char* data, int len) {} - - virtual void DidOpenStream(WebKit::WebSocketStreamHandle* handle, - int max_amount_send_allowed) {} - virtual void DidSendData(WebKit::WebSocketStreamHandle* handle, - int amount_sent) {} - virtual void DidReceiveData(WebKit::WebSocketStreamHandle* handle, - const char* data, int len) {} - virtual void DidClose(WebKit::WebSocketStreamHandle*) {} - virtual void DidFail(WebKit::WebSocketStreamHandle* handle, - int error_code, - const string16& error_msg) {} - - protected: - virtual ~WebSocketStreamHandleDelegate() {} -}; - -} // namespace webkit_glue - -#endif // WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_DELEGATE_H_ +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_DELEGATE_H_
+#define WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_DELEGATE_H_
+
+#include "base/strings/string16.h"
+
+class GURL;
+
+namespace WebKit {
+class WebSocketStreamHandle;
+}
+
+namespace webkit_glue {
+
+class WebSocketStreamHandleDelegate {
+ public:
+ WebSocketStreamHandleDelegate() {}
+
+ virtual void WillOpenStream(WebKit::WebSocketStreamHandle* handle,
+ const GURL& url) {}
+ virtual void WillSendData(WebKit::WebSocketStreamHandle* handle,
+ const char* data, int len) {}
+
+ virtual void DidOpenStream(WebKit::WebSocketStreamHandle* handle,
+ int max_amount_send_allowed) {}
+ virtual void DidSendData(WebKit::WebSocketStreamHandle* handle,
+ int amount_sent) {}
+ virtual void DidReceiveData(WebKit::WebSocketStreamHandle* handle,
+ const char* data, int len) {}
+ virtual void DidClose(WebKit::WebSocketStreamHandle*) {}
+ virtual void DidFail(WebKit::WebSocketStreamHandle* handle,
+ int error_code,
+ const string16& error_msg) {}
+
+ protected:
+ virtual ~WebSocketStreamHandleDelegate() {}
+};
+
+} // namespace webkit_glue
+
+#endif // WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_DELEGATE_H_
diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/child/websocketstreamhandle_impl.cc index 7736dd5..f7da0e2 100644 --- a/webkit/glue/websocketstreamhandle_impl.cc +++ b/webkit/child/websocketstreamhandle_impl.cc @@ -4,7 +4,7 @@ // An implementation of WebSocketStreamHandle. -#include "webkit/glue/websocketstreamhandle_impl.h" +#include "webkit/child/websocketstreamhandle_impl.h" #include <vector> @@ -17,9 +17,9 @@ #include "third_party/WebKit/public/platform/WebSocketStreamError.h" #include "third_party/WebKit/public/platform/WebSocketStreamHandleClient.h" #include "third_party/WebKit/public/platform/WebURL.h" -#include "webkit/glue/webkitplatformsupport_impl.h" +#include "webkit/child/webkitplatformsupport_impl.h" +#include "webkit/child/websocketstreamhandle_delegate.h" #include "webkit/glue/websocketstreamhandle_bridge.h" -#include "webkit/glue/websocketstreamhandle_delegate.h" using WebKit::WebData; using WebKit::WebSocketStreamError; diff --git a/webkit/glue/websocketstreamhandle_impl.h b/webkit/child/websocketstreamhandle_impl.h index 827bb88..911b83e2 100644 --- a/webkit/glue/websocketstreamhandle_impl.h +++ b/webkit/child/websocketstreamhandle_impl.h @@ -1,40 +1,40 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_IMPL_H_ -#define WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_IMPL_H_ - -#include "base/memory/ref_counted.h" -#include "base/supports_user_data.h" -#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" - -namespace webkit_glue { - -class WebKitPlatformSupportImpl; - -class WebSocketStreamHandleImpl - : public base::SupportsUserData, - public WebKit::WebSocketStreamHandle { - public: - explicit WebSocketStreamHandleImpl(WebKitPlatformSupportImpl* platform); - virtual ~WebSocketStreamHandleImpl(); - - // WebSocketStreamHandle methods: - virtual void connect( - const WebKit::WebURL& url, - WebKit::WebSocketStreamHandleClient* client); - virtual bool send(const WebKit::WebData& data); - virtual void close(); - - private: - class Context; - scoped_refptr<Context> context_; - WebKitPlatformSupportImpl* platform_; - - DISALLOW_COPY_AND_ASSIGN(WebSocketStreamHandleImpl); -}; - -} // namespace webkit_glue - -#endif // WEBKIT_GLUE_WEBSOCKETSTREAMHANDLE_IMPL_H_ +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_IMPL_H_
+#define WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_IMPL_H_
+
+#include "base/memory/ref_counted.h"
+#include "base/supports_user_data.h"
+#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h"
+
+namespace webkit_glue {
+
+class WebKitPlatformSupportImpl;
+
+class WebSocketStreamHandleImpl
+ : public base::SupportsUserData,
+ public WebKit::WebSocketStreamHandle {
+ public:
+ explicit WebSocketStreamHandleImpl(WebKitPlatformSupportImpl* platform);
+ virtual ~WebSocketStreamHandleImpl();
+
+ // WebSocketStreamHandle methods:
+ virtual void connect(
+ const WebKit::WebURL& url,
+ WebKit::WebSocketStreamHandleClient* client);
+ virtual bool send(const WebKit::WebData& data);
+ virtual void close();
+
+ private:
+ class Context;
+ scoped_refptr<Context> context_;
+ WebKitPlatformSupportImpl* platform_;
+
+ DISALLOW_COPY_AND_ASSIGN(WebSocketStreamHandleImpl);
+};
+
+} // namespace webkit_glue
+
+#endif // WEBKIT_CHILD_WEBSOCKETSTREAMHANDLE_IMPL_H_
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/child/weburlloader_impl.cc index 2f12b18..40b15ed 100644 --- a/webkit/glue/weburlloader_impl.cc +++ b/webkit/child/weburlloader_impl.cc @@ -4,7 +4,7 @@ // An implementation of WebURLLoader in terms of ResourceLoaderBridge. -#include "webkit/glue/weburlloader_impl.h" +#include "webkit/child/weburlloader_impl.h" #include "base/bind.h" #include "base/files/file_path.h" @@ -24,18 +24,18 @@ #include "third_party/WebKit/public/platform/WebHTTPLoadInfo.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebURLError.h" -#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "third_party/WebKit/public/platform/WebURLLoadTiming.h" +#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" #include "third_party/WebKit/public/web/WebSecurityPolicy.h" +#include "webkit/child/ftp_directory_listing_response_delegate.h" +#include "webkit/child/multipart_response_delegate.h" +#include "webkit/child/resource_loader_bridge.h" +#include "webkit/child/webkitplatformsupport_impl.h" +#include "webkit/child/weburlrequest_extradata_impl.h" +#include "webkit/child/weburlresponse_extradata_impl.h" #include "webkit/common/resource_request_body.h" -#include "webkit/glue/ftp_directory_listing_response_delegate.h" -#include "webkit/glue/multipart_response_delegate.h" -#include "webkit/glue/resource_loader_bridge.h" -#include "webkit/glue/webkitplatformsupport_impl.h" -#include "webkit/glue/weburlrequest_extradata_impl.h" -#include "webkit/glue/weburlresponse_extradata_impl.h" using base::Time; using base::TimeTicks; diff --git a/webkit/glue/weburlloader_impl.h b/webkit/child/weburlloader_impl.h index ecca9f4..1412b32 100644 --- a/webkit/glue/weburlloader_impl.h +++ b/webkit/child/weburlloader_impl.h @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBURLLOADER_IMPL_H_ -#define WEBKIT_GLUE_WEBURLLOADER_IMPL_H_ +#ifndef WEBKIT_CHILD_WEBURLLOADER_IMPL_H_ +#define WEBKIT_CHILD_WEBURLLOADER_IMPL_H_ #include "base/memory/ref_counted.h" #include "third_party/WebKit/public/platform/WebURLLoader.h" -#include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { @@ -42,4 +41,4 @@ class WebURLLoaderImpl : public WebKit::WebURLLoader { } // namespace webkit_glue -#endif // WEBKIT_GLUE_WEBURLLOADER_IMPL_H_ +#endif // WEBKIT_CHILD_WEBURLLOADER_IMPL_H_ diff --git a/webkit/glue/weburlrequest_extradata_impl.cc b/webkit/child/weburlrequest_extradata_impl.cc index d9e7462..231672c 100644 --- a/webkit/glue/weburlrequest_extradata_impl.cc +++ b/webkit/child/weburlrequest_extradata_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/glue/weburlrequest_extradata_impl.h" +#include "webkit/child/weburlrequest_extradata_impl.h" using WebKit::WebReferrerPolicy; using WebKit::WebString; diff --git a/webkit/glue/weburlrequest_extradata_impl.h b/webkit/child/weburlrequest_extradata_impl.h index 151c4845..6e5dccd 100644 --- a/webkit/glue/weburlrequest_extradata_impl.h +++ b/webkit/child/weburlrequest_extradata_impl.h @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBURLREQUEST_EXTRADATA_IMPL_H_ -#define WEBKIT_GLUE_WEBURLREQUEST_EXTRADATA_IMPL_H_ +#ifndef WEBKIT_CHILD_WEBURLREQUEST_EXTRADATA_IMPL_H_ +#define WEBKIT_CHILD_WEBURLREQUEST_EXTRADATA_IMPL_H_ #include "base/compiler_specific.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" -#include "webkit/common/webkit_common_export.h" +#include "webkit/child/webkit_child_export.h" namespace webkit_glue { // Base class for Chrome's implementation of the "extra data" stored in each // ResourceRequest. -class WEBKIT_COMMON_EXPORT WebURLRequestExtraDataImpl : +class WEBKIT_CHILD_EXPORT WebURLRequestExtraDataImpl : public NON_EXPORTED_BASE(WebKit::WebURLRequest::ExtraData) { public: // |custom_user_agent| is used to communicate an overriding custom user agent @@ -42,4 +42,4 @@ class WEBKIT_COMMON_EXPORT WebURLRequestExtraDataImpl : } // namespace webkit_glue -#endif // WEBKIT_GLUE_WEBURLREQUEST_EXTRADATA_IMPL_H_ +#endif // WEBKIT_CHILD_WEBURLREQUEST_EXTRADATA_IMPL_H_ diff --git a/webkit/glue/weburlresponse_extradata_impl.cc b/webkit/child/weburlresponse_extradata_impl.cc index 4063662..89ace8a 100644 --- a/webkit/glue/weburlresponse_extradata_impl.cc +++ b/webkit/child/weburlresponse_extradata_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/glue/weburlresponse_extradata_impl.h" +#include "webkit/child/weburlresponse_extradata_impl.h" namespace webkit_glue { diff --git a/webkit/glue/weburlresponse_extradata_impl.h b/webkit/child/weburlresponse_extradata_impl.h index c26325c..ac87d7e 100644 --- a/webkit/glue/weburlresponse_extradata_impl.h +++ b/webkit/child/weburlresponse_extradata_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBURLRESPONSE_EXTRADATA_IMPL_H_ -#define WEBKIT_GLUE_WEBURLRESPONSE_EXTRADATA_IMPL_H_ +#ifndef WEBKIT_CHILD_WEBURLRESPONSE_EXTRADATA_IMPL_H_ +#define WEBKIT_CHILD_WEBURLRESPONSE_EXTRADATA_IMPL_H_ #include <string> @@ -11,12 +11,12 @@ #include "base/compiler_specific.h" #include "net/http/http_response_info.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "webkit/common/webkit_common_export.h" +#include "webkit/child/webkit_child_export.h" namespace webkit_glue { // Base class for Chrome's implementation of the "extra data". -class WEBKIT_COMMON_EXPORT WebURLResponseExtraDataImpl : +class WEBKIT_CHILD_EXPORT WebURLResponseExtraDataImpl : public NON_EXPORTED_BASE(WebKit::WebURLResponse::ExtraData) { public: explicit WebURLResponseExtraDataImpl( @@ -93,4 +93,4 @@ class WEBKIT_COMMON_EXPORT WebURLResponseExtraDataImpl : } // namespace webkit_glue -#endif // WEBKIT_GLUE_WEBURLRESPONSE_EXTRADATA_IMPL_H_ +#endif // WEBKIT_CHILD_WEBURLRESPONSE_EXTRADATA_IMPL_H_ diff --git a/webkit/common/resource_request_body.h b/webkit/common/resource_request_body.h index 5c1edd1..c0bdc08 100644 --- a/webkit/common/resource_request_body.h +++ b/webkit/common/resource_request_body.h @@ -62,4 +62,4 @@ class WEBKIT_COMMON_EXPORT ResourceRequestBody } // namespace webkit_glue -#endif // WEBKIT_GLUE_RESOURCE_REQUEST_BODY_H_ +#endif // WEBKIT_COMMON_RESOURCE_REQUEST_BODY_H_ diff --git a/webkit/glue/resource_type.cc b/webkit/common/resource_type.cc index e6df456..2c416d3 100644 --- a/webkit/glue/resource_type.cc +++ b/webkit/common/resource_type.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" #include "base/logging.h" diff --git a/webkit/glue/resource_type.h b/webkit/common/resource_type.h index f083806..9ec7909 100644 --- a/webkit/glue/resource_type.h +++ b/webkit/common/resource_type.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_RESOURCE_TYPE_H__ -#define WEBKIT_GLUE_RESOURCE_TYPE_H__ +#ifndef WEBKIT_COMMON_RESOURCE_TYPE_H__ +#define WEBKIT_COMMON_RESOURCE_TYPE_H__ #include "base/basictypes.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" -#include "webkit/glue/webkit_glue_export.h" +#include "webkit/common/webkit_common_export.h" class ResourceType { public: @@ -41,7 +41,7 @@ class ResourceType { return static_cast<Type>(type); } - WEBKIT_GLUE_EXPORT static Type FromTargetType( + WEBKIT_COMMON_EXPORT static Type FromTargetType( WebKit::WebURLRequest::TargetType type); static bool IsFrame(ResourceType::Type type) { @@ -67,4 +67,4 @@ class ResourceType { ResourceType(); ~ResourceType(); }; -#endif // WEBKIT_GLUE_RESOURCE_TYPE_H__ +#endif // WEBKIT_COMMON_RESOURCE_TYPE_H__ diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp index e3b6579..af1c688 100644 --- a/webkit/common/webkit_common.gyp +++ b/webkit/common/webkit_common.gyp @@ -15,8 +15,8 @@ 'WEBKIT_COMMON_IMPLEMENTATION', ], 'dependencies': [ - '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/skia/skia.gyp:skia', @@ -39,10 +39,10 @@ 'cursors/webcursor_aura.cc', 'cursors/webcursor_aurawin.cc', 'cursors/webcursor_aurax11.cc', - 'cursors/webcursor_null.cc', 'cursors/webcursor_gtk.cc', 'cursors/webcursor_gtk_data.h', 'cursors/webcursor_mac.mm', + 'cursors/webcursor_null.cc', 'cursors/webcursor_win.cc', 'data_element.cc', 'data_element.h', @@ -52,6 +52,8 @@ 'resource_request_body.h', 'resource_response_info.cc', 'resource_response_info.h', + 'resource_type.cc', + 'resource_type.h', ], 'conditions': [ diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 2ef0e57..4c832f3 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -89,39 +89,4 @@ int GetGlyphPageCount() { COMPILE_ASSERT(std::numeric_limits<double>::has_quiet_NaN, has_quiet_NaN); -#if defined(OS_LINUX) || defined(OS_ANDROID) -size_t MemoryUsageKB() { - struct mallinfo minfo = mallinfo(); - uint64_t mem_usage = -#if defined(USE_TCMALLOC) - minfo.uordblks -#else - (minfo.hblkhd + minfo.arena) -#endif - >> 10; - - v8::HeapStatistics stat; - // TODO(svenpanne) The call below doesn't take web workers into account, this - // has to be done manually by iterating over all Isolates involved. - v8::Isolate::GetCurrent()->GetHeapStatistics(&stat); - return mem_usage + (static_cast<uint64_t>(stat.total_heap_size()) >> 10); -} -#elif defined(OS_MACOSX) -size_t MemoryUsageKB() { - scoped_ptr<base::ProcessMetrics> process_metrics( - // The default port provider is sufficient to get data for the current - // process. - base::ProcessMetrics::CreateProcessMetrics( - base::GetCurrentProcessHandle(), NULL)); - return process_metrics->GetWorkingSetSize() >> 10; -} -#else -size_t MemoryUsageKB() { - scoped_ptr<base::ProcessMetrics> process_metrics( - base::ProcessMetrics::CreateProcessMetrics( - base::GetCurrentProcessHandle())); - return process_metrics->GetPagefileUsage() >> 10; -} -#endif - } // namespace webkit_glue diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index a12d4c6..347fe30 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -19,26 +19,38 @@ ], 'dependencies': [ '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/base/base.gyp:base_i18n', + '<(DEPTH)/base/base.gyp:base_static', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme', '<(DEPTH)/ui/ui.gyp:ui', - - # TODO(scottmg): crbug.com/237249 - 'glue', + '<(DEPTH)/url/url.gyp:url_lib', + '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', + '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', + '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common', + '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common', ], 'include_dirs': [ # For JNI generated header. '<(SHARED_INTERMEDIATE_DIR)/webkit', ], + 'hard_dependency': 1, 'sources': [ '../child/fling_animator_impl_android.cc', '../child/fling_animator_impl_android.h', '../child/fling_curve_configuration.cc', '../child/fling_curve_configuration.h', + '../child/ftp_directory_listing_response_delegate.cc', + '../child/ftp_directory_listing_response_delegate.h', + '../child/multipart_response_delegate.cc', + '../child/multipart_response_delegate.h', + '../child/resource_loader_bridge.cc', + '../child/resource_loader_bridge.h', '../child/touch_fling_gesture_curve.cc', '../child/touch_fling_gesture_curve.h', '../child/web_discardable_memory_impl.cc', @@ -46,8 +58,15 @@ '../child/webfallbackthemeengine_impl.cc', '../child/webfallbackthemeengine_impl.h', '../child/webkit_child_export.h', + '../child/webkit_child_helpers.cc', + '../child/webkit_child_helpers.h', '../child/webkitplatformsupport_child_impl.cc', '../child/webkitplatformsupport_child_impl.h', + '../child/webkitplatformsupport_impl.cc', + '../child/webkitplatformsupport_impl.h', + '../child/websocketstreamhandle_delegate.h', + '../child/websocketstreamhandle_impl.cc', + '../child/websocketstreamhandle_impl.h', '../child/webthemeengine_impl_android.cc', '../child/webthemeengine_impl_android.h', '../child/webthemeengine_impl_default.cc', @@ -58,6 +77,12 @@ '../child/webthemeengine_impl_win.h', '../child/webthread_impl.cc', '../child/webthread_impl.h', + '../child/weburlloader_impl.cc', + '../child/weburlloader_impl.h', + '../child/weburlrequest_extradata_impl.cc', + '../child/weburlrequest_extradata_impl.h', + '../child/weburlresponse_extradata_impl.cc', + '../child/weburlresponse_extradata_impl.h', '../child/worker_task_runner.cc', '../child/worker_task_runner.h', ], @@ -129,13 +154,7 @@ '<(SHARED_INTERMEDIATE_DIR)/ui', ], 'sources': [ - 'ftp_directory_listing_response_delegate.cc', - 'ftp_directory_listing_response_delegate.h', 'network_list_observer.h', - 'resource_loader_bridge.cc', - 'resource_loader_bridge.h', - 'resource_type.cc', - 'resource_type.h', 'simple_webmimeregistry_impl.cc', 'simple_webmimeregistry_impl.h', 'webfileutilities_impl.cc', @@ -143,14 +162,7 @@ 'webkit_glue.cc', 'webkit_glue.h', 'webkit_glue_export.h', - 'webkitplatformsupport_impl.cc', - 'webkitplatformsupport_impl.h', 'websocketstreamhandle_bridge.h', - 'websocketstreamhandle_delegate.h', - 'websocketstreamhandle_impl.cc', - 'websocketstreamhandle_impl.h', - 'weburlloader_impl.cc', - 'weburlloader_impl.h', ], # When glue is a dependency, it needs to be a hard dependency. # Dependents may rely on files generated by this target or one of its diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 2a9d74d..33fed9f 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -46,12 +46,6 @@ WEBKIT_GLUE_EXPORT WebKit::WebCanvas* ToWebCanvas(SkCanvas*); // used to get memory usage statistics. WEBKIT_GLUE_EXPORT int GetGlyphPageCount(); -// Returns an estimate of the memory usage of the renderer process. Different -// platforms implement this function differently, and count in different -// allocations. Results are not comparable across platforms. The estimate is -// computed inside the sandbox and thus its not always accurate. -WEBKIT_GLUE_EXPORT size_t MemoryUsageKB(); - } // namespace webkit_glue #endif // WEBKIT_GLUE_WEBKIT_GLUE_H_ diff --git a/webkit/glue/webkit_glue_common.gyp b/webkit/glue/webkit_glue_common.gyp index ff845ef..51f152e 100644 --- a/webkit/glue/webkit_glue_common.gyp +++ b/webkit/glue/webkit_glue_common.gyp @@ -26,12 +26,6 @@ '../common/webkit_common_export.h', '../common/webpreferences.cc', '../common/webpreferences.h', - 'multipart_response_delegate.cc', - 'multipart_response_delegate.h', - 'weburlrequest_extradata_impl.cc', - 'weburlrequest_extradata_impl.h', - 'weburlresponse_extradata_impl.cc', - 'weburlresponse_extradata_impl.h', ], 'conditions': [ ['toolkit_uses_gtk == 1', { diff --git a/webkit/glue/webkit_glue_unittest.cc b/webkit/glue/webkit_glue_unittest.cc index 27879e8..50b57ab 100644 --- a/webkit/glue/webkit_glue_unittest.cc +++ b/webkit/glue/webkit_glue_unittest.cc @@ -9,7 +9,7 @@ #include "base/message_loop/message_loop.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/glue/webkitplatformsupport_impl.h" +#include "webkit/child/webkitplatformsupport_impl.h" namespace { diff --git a/webkit/mocks/mock_weburlloader.h b/webkit/mocks/mock_weburlloader.h index 68ff9a2..a9e2d6b 100644 --- a/webkit/mocks/mock_weburlloader.h +++ b/webkit/mocks/mock_weburlloader.h @@ -6,7 +6,7 @@ #define WEBKIT_MOCKS_MOCK_WEBURLLOADER_H_ #include "testing/gmock/include/gmock/gmock.h" -#include "webkit/glue/weburlloader_impl.h" +#include "webkit/child/weburlloader_impl.h" namespace webkit_glue { diff --git a/webkit/plugins/ppapi/url_request_info_util.cc b/webkit/plugins/ppapi/url_request_info_util.cc index 774a3c9..b9e765a 100644 --- a/webkit/plugins/ppapi/url_request_info_util.cc +++ b/webkit/plugins/ppapi/url_request_info_util.cc @@ -18,7 +18,7 @@ #include "third_party/WebKit/public/web/WebFrame.h" #include "url/gurl.h" #include "url/url_util.h" -#include "webkit/glue/weburlrequest_extradata_impl.h" +#include "webkit/child/weburlrequest_extradata_impl.h" #include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/ppapi/ppb_file_ref_impl.h" diff --git a/webkit/plugins/webkit_plugins.gypi b/webkit/plugins/webkit_plugins.gypi index 0479a6c..c63f524 100644 --- a/webkit/plugins/webkit_plugins.gypi +++ b/webkit/plugins/webkit_plugins.gypi @@ -41,6 +41,7 @@ '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common', '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', '<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common', + 'glue_child', ], 'sources': [ # This list contains all .h, .cc, and .mm files in glue except for diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc index bde978b..8b3c5d2 100644 --- a/webkit/support/test_webkit_platform_support.cc +++ b/webkit/support/test_webkit_platform_support.cc @@ -14,12 +14,6 @@ #include "media/base/media.h" #include "net/cookies/cookie_monster.h" #include "net/test/spawned_test_server/spawned_test_server.h" -#include "third_party/WebKit/public/web/WebDatabase.h" -#include "third_party/WebKit/public/web/WebKit.h" -#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" -#include "third_party/WebKit/public/web/WebScriptController.h" -#include "third_party/WebKit/public/web/WebSecurityPolicy.h" -#include "third_party/WebKit/public/web/WebStorageEventDispatcher.h" #include "third_party/WebKit/public/platform/WebAudioDevice.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebFileSystem.h" @@ -28,14 +22,20 @@ #include "third_party/WebKit/public/platform/WebStorageNamespace.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/web/WebDatabase.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" +#include "third_party/WebKit/public/web/WebScriptController.h" +#include "third_party/WebKit/public/web/WebSecurityPolicy.h" +#include "third_party/WebKit/public/web/WebStorageEventDispatcher.h" #include "v8/include/v8.h" #include "webkit/browser/database/vfs_backend.h" +#include "webkit/child/webkitplatformsupport_impl.h" #include "webkit/common/gpu/test_context_provider_factory.h" #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "webkit/common/gpu/webgraphicscontext3d_provider_impl.h" #include "webkit/glue/simple_webmimeregistry_impl.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/webkitplatformsupport_impl.h" #include "webkit/renderer/appcache/web_application_cache_host_impl.h" #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h" #include "webkit/support/gc_extension.h" diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index b96b537..bdb99f9 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -17,10 +17,10 @@ #include "third_party/WebKit/public/web/WebKit.h" #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "url/url_util.h" +#include "webkit/child/webkitplatformsupport_impl.h" #include "webkit/common/user_agent/user_agent.h" #include "webkit/common/user_agent/user_agent_util.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/webkitplatformsupport_impl.h" #include "webkit/support/platform_support.h" #include "webkit/support/test_webkit_platform_support.h" |