Redirect HTML resource bytes directly to parser thread (Chrome side CL)

content/child/resource_dispatcher.cc

 // 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/child/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/debug/alias.h"
 #include "base/files/file_path.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "content/child/request_extra_data.h"
 #include "content/child/site_isolation_policy.h"
+#include "content/child/webparserresourcebridge_impl.h"
 #include "content/common/inter_process_time_ticks_converter.h"
 #include "content/common/resource_messages.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/common/resource_type.h"
 
@@ skipping 41 matching lines @@
   IPCResourceLoaderBridge(ResourceDispatcher* dispatcher,
       const ResourceLoaderBridge::RequestInfo& request_info);
   virtual ~IPCResourceLoaderBridge();
 
   // ResourceLoaderBridge
   virtual void SetRequestBody(ResourceRequestBody* request_body) OVERRIDE;
   virtual bool Start(Peer* peer) OVERRIDE;
   virtual void Cancel() OVERRIDE;
   virtual void SetDefersLoading(bool value) OVERRIDE;
   virtual void DidChangePriority(net::RequestPriority new_priority) OVERRIDE;
+  virtual blink::WebParserResourceBridge*
+      ConstructParserResourceBridge() OVERRIDE;
   virtual void SyncLoad(SyncLoadResponse* response) OVERRIDE;
 
  private:
   ResourceLoaderBridge::Peer* peer_;
 
   // The resource dispatcher for this loader.  The bridge doesn't own it, but
   // it's guaranteed to outlive the bridge.
   ResourceDispatcher* dispatcher_;
 
   // The request to send, created on initialization for modification and
@@ skipping 133 matching lines @@
 void IPCResourceLoaderBridge::DidChangePriority(
     net::RequestPriority new_priority) {
   if (request_id_ < 0) {
     NOTREACHED() << "Trying to change priority of an unstarted request";
     return;
   }
 
   dispatcher_->DidChangePriority(routing_id_, request_id_, new_priority);
 }
 
+blink::WebParserResourceBridge*
+IPCResourceLoaderBridge::ConstructParserResourceBridge() {
+  if (request_id_ < 0) {
+    NOTREACHED() << "Trying to set parser-resource bridge on unstarted request";
+    return NULL;
+  }
+
+  return dispatcher_->ConstructParserResourceBridge(request_id_);
+}
+
 void IPCResourceLoaderBridge::SyncLoad(SyncLoadResponse* response) {
   if (request_id_ != -1) {
     NOTREACHED() << "Starting a request twice";
     response->error_code = net::ERR_FAILED;
     return;
   }
 
   request_id_ = MakeRequestID();
   is_synchronous_request_ = true;
 
@@ skipping 371 matching lines @@
   }
 }
 
 void ResourceDispatcher::DidChangePriority(
     int routing_id, int request_id, net::RequestPriority new_priority) {
   DCHECK(ContainsKey(pending_requests_, request_id));
   message_sender()->Send(new ResourceHostMsg_DidChangePriority(
       request_id, new_priority));
 }
 
+blink::WebParserResourceBridge*
+ResourceDispatcher::ConstructParserResourceBridge(int request_id) {
+  PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
+  DCHECK(request_info != NULL);

[jam, 2013/12/17 00:44:40]

nit: this dcheck isn't necessary. in release builds it does nothing. in debug
builds, the crash below is just as useful of a signal to the developer.

[oystein (OOO til 10th of July), 2013/12/17 01:07:27]

Done.

+
+  base::SharedMemoryHandle shm_handle;
+  if (request_info->buffer != NULL) {

[jam, 2013/12/17 00:44:40]

nit: "!= NULL" is redundant, convention is to skip it. same below on line 656,
just do "if (!request_info)

[oystein (OOO til 10th of July), 2013/12/17 01:07:27]

I fixed the possible ones, but for the request_info->buffer: error: value of
type 'linked_ptr<base::SharedMemory>' is not contextually convertible to 'bool'

+    bool handle_ok = request_info->buffer->ShareToProcess(
+        base::GetCurrentProcessHandle(), &shm_handle);
+    DCHECK(handle_ok);
+  }
+
+  return new WebParserResourceBridgeImpl(request_id, weak_factory_.GetWeakPtr(),
+                                         shm_handle, request_info->buffer_size);
+}
+
+void ResourceDispatcher::OnParserResourceMessageFilterAdded(int request_id) {
+  PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
+  if (request_info == NULL)
+    return; // We can safely ignore completed requests here.
+
+  request_info->peer->OnParserResourceMessageFilterAdded();
+}
+
 ResourceDispatcher::PendingRequestInfo::PendingRequestInfo()
     : peer(NULL),
       resource_type(ResourceType::SUB_RESOURCE),
       is_deferred(false),
       buffer_size(0) {
 }
 
 ResourceDispatcher::PendingRequestInfo::PendingRequestInfo(
     webkit_glue::ResourceLoaderBridge::Peer* peer,
     ResourceType::Type resource_type,
@@ skipping 168 matching lines @@
 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) {
   while (!queue->empty()) {
     IPC::Message* message = queue->front();
     ReleaseResourcesInDataMessage(*message);
     queue->pop_front();
     delete message;
   }
 }
 
 }  // namespace content