Move loading code from content/child to content/renderer/loader.
BUG=777007
[email protected]
Change-Id: I91c416ab591b1f4644763b509ac4c8f3971a51a8
Reviewed-on: https://chromium-review.googlesource.com/732494
Reviewed-by: John Abd-El-Malek <[email protected]>
Commit-Queue: John Abd-El-Malek <[email protected]>
Cr-Commit-Position: refs/heads/master@{#510694}diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 7046b78..48377cd9 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -130,6 +130,7 @@
class BrowserPluginManager;
class CacheStorageDispatcher;
class CategorizedWorkerPool;
+class ChildResourceMessageFilter;
class CompositorForwardingMessageFilter;
class DevToolsAgentFilter;
class DomStorageDispatcher;
@@ -144,6 +145,7 @@
class PeerConnectionTracker;
class RenderThreadObserver;
class RendererBlinkPlatformImpl;
+class ResourceDispatcher;
class ResourceDispatchThrottler;
class ServiceWorkerMessageFilter;
class VideoCaptureImplManager;
@@ -229,6 +231,7 @@
blink::scheduler::RendererProcessType type) override;
// IPC::Listener implementation via ChildThreadImpl:
+ bool OnMessageReceived(const IPC::Message& msg) override;
void OnAssociatedInterfaceRequest(
const std::string& name,
mojo::ScopedInterfaceEndpointHandle handle) override;
@@ -330,6 +333,10 @@
return midi_message_filter_.get();
}
+ ResourceDispatcher* resource_dispatcher() const {
+ return resource_dispatcher_.get();
+ }
+
#if defined(OS_ANDROID)
SynchronousCompositorFilter* sync_compositor_message_filter() {
return sync_compositor_message_filter_.get();
@@ -617,6 +624,7 @@
std::unique_ptr<IndexedDBDispatcher> main_thread_indexed_db_dispatcher_;
std::unique_ptr<blink::scheduler::RendererScheduler> renderer_scheduler_;
std::unique_ptr<RendererBlinkPlatformImpl> blink_platform_impl_;
+ std::unique_ptr<ResourceDispatcher> resource_dispatcher_;
std::unique_ptr<ResourceDispatchThrottler> resource_dispatch_throttler_;
std::unique_ptr<CacheStorageDispatcher> main_thread_cache_storage_dispatcher_;
@@ -626,6 +634,7 @@
scoped_refptr<MidiMessageFilter> midi_message_filter_;
scoped_refptr<DevToolsAgentFilter> devtools_agent_message_filter_;
scoped_refptr<ServiceWorkerMessageFilter> service_worker_message_filter_;
+ scoped_refptr<ChildResourceMessageFilter> resource_message_filter_;
std::unique_ptr<BrowserPluginManager> browser_plugin_manager_;
