From 756fbde6911d40d376680c7ab9b576620f64c108 Mon Sep 17 00:00:00 2001 From: "scottmg@chromium.org" Date: Mon, 22 Jul 2013 18:31:42 +0000 Subject: 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 --- .../browser/browser_plugin/browser_plugin_guest.cc | 2 +- .../browser/child_process_security_policy_impl.h | 2 +- content/browser/loader/offline_policy_unittest.cc | 2 +- .../browser/loader/resource_dispatcher_host_impl.h | 2 +- content/browser/loader/resource_message_filter.h | 2 +- .../browser/loader/resource_request_info_impl.h | 2 +- .../browser/loader/resource_scheduler_unittest.cc | 2 +- .../renderer_host/render_process_host_impl.cc | 2 +- content/browser/ssl/ssl_error_handler.h | 2 +- content/browser/ssl/ssl_policy.cc | 2 +- content/browser/ssl/ssl_policy.h | 2 +- content/browser/ssl/ssl_request_info.h | 2 +- content/browser/web_contents/web_contents_impl.h | 2 +- content/browser/worker_host/worker_process_host.cc | 2 +- content/child/child_thread.h | 2 +- content/child/database_util.h | 2 +- content/child/request_extra_data.h | 2 +- content/child/resource_dispatcher.cc | 4 +-- content/child/resource_dispatcher.h | 2 +- content/child/socket_stream_dispatcher.cc | 2 +- content/common/DEPS | 3 ++ content/common/content_param_traits_macros.h | 2 +- content/common/resource_messages.cc | 1 - content/common/socket_stream_handle_data.cc | 2 +- content/content_child.gypi | 15 ++++----- content/content_common.gypi | 1 - content/content_tests.gypi | 2 +- content/public/browser/content_browser_client.h | 2 +- .../browser/load_from_memory_cache_details.h | 2 +- .../browser/resource_dispatcher_host_delegate.h | 2 +- content/public/browser/resource_request_details.h | 2 +- content/public/browser/resource_request_info.h | 2 +- .../public/child/resource_dispatcher_delegate.h | 32 +++++++++++++++++++ .../public/common/resource_dispatcher_delegate.h | 32 ------------------- content/public/common/resource_response.h | 2 +- content/renderer/render_view_impl.cc | 36 +++++++++++----------- content/renderer/renderer_main.cc | 1 + content/renderer/webplugin_impl.cc | 2 +- 38 files changed, 93 insertions(+), 90 deletions(-) create mode 100644 content/public/child/resource_dispatcher_delegate.h delete mode 100644 content/public/common/resource_dispatcher_delegate.h (limited to 'content') 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 #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 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/child/resource_dispatcher_delegate.h b/content/public/child/resource_dispatcher_delegate.h new file mode 100644 index 0000000..8c67e07 --- /dev/null +++ b/content/public/child/resource_dispatcher_delegate.h @@ -0,0 +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_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_dispatcher_delegate.h b/content/public/common/resource_dispatcher_delegate.h deleted file mode 100644 index 43d174a..0000000 --- a/content/public/common/resource_dispatcher_delegate.h +++ /dev/null @@ -1,32 +0,0 @@ -// 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_ 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" -- cgit v1.1