Add the UMA PLT.BeginToFinish{,Doc}_AfterPreconnectRequest

content/renderer/render_frame_impl.cc

 // Copyright 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 "content/renderer/render_frame_impl.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/child/appcache_dispatcher.h"
 #include "content/child/fileapi/file_system_dispatcher.h"
@@ skipping 472 matching lines @@
   // notification before sending message to the browser process.
   render_view_->didNavigateWithinPage(frame, is_new_navigation);
 }
 
 void RenderFrameImpl::didUpdateCurrentHistoryItem(WebKit::WebFrame* frame) {
   // TODO(nasko): Move implementation here. Needed methods:
   // * StartNavStateSyncTimerIfNecessary
   render_view_->didUpdateCurrentHistoryItem(frame);
 }
 
+void RenderFrameImpl::willRequestAfterPreconnect(
+    WebKit::WebFrame* frame,
+    WebKit::WebURLRequest& request) {
+  WebKit::WebReferrerPolicy referrer_policy = WebKit::WebReferrerPolicyDefault;

[jochen (gone - plz use gerrit), 2013/12/20 09:02:25]

this should be frame->document().referrerPolicy();

+  WebString custom_user_agent;

[jochen (gone - plz use gerrit), 2013/12/20 09:02:25]

this will never be a non-empty string, so we always end up clearing the user
agent in willSendRequest()

+
+  if (request.extraData()) {
+    // This will only be called before willSendRequest, so only ExtraData

[jochen (gone - plz use gerrit), 2013/12/20 09:02:25]

only willSendRequest() ever sets extra data, so this branch is dead code.

[kouhei (in TOK), 2013/12/20 09:33:34]

Pepper also sets this? custom_user_agent only seems to be set via extraData().
My intention here was to not erase that info here.

https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/p...

+    // members we have to copy here is on WebURLRequestExtraDataImpl.
+    webkit_glue::WebURLRequestExtraDataImpl* old_extra_data =
+        static_cast<webkit_glue::WebURLRequestExtraDataImpl*>(
+            request.extraData());
+
+    referrer_policy = old_extra_data->referrer_policy();
+    custom_user_agent = old_extra_data->custom_user_agent();
+  }
+
+  bool was_after_preconnect_request = true;
+  // The args after |was_after_preconnect_request| are not used, and set to
+  // correct values at |willSendRequest|.
+  request.setExtraData(new webkit_glue::WebURLRequestExtraDataImpl(
+      referrer_policy, custom_user_agent, was_after_preconnect_request));

[jochen (gone - plz use gerrit), 2013/12/20 09:02:25]

the request is inspected in RenderFrameImpl::decidePolicyForNavigation which is
invoked before willSendRequest().

In RenderViewImpl::GetReferrerPolicyFromRequest() we now end up incorrectly
using the default policy.

+}
+
 void RenderFrameImpl::willSendRequest(
     WebKit::WebFrame* frame,
     unsigned identifier,
     WebKit::WebURLRequest& request,
     const WebKit::WebURLResponse& redirect_response) {
   // The request my be empty during tests.
   if (request.url().isEmpty())
     return;
 
   WebFrame* top_frame = frame->top();
@@ skipping 31 matching lines @@
     referrer_policy = internal_data->referrer_policy();
     internal_data->clear_referrer_policy();
   } else {
     referrer_policy = frame->document().referrerPolicy();
   }
 
   // The request's extra data may indicate that we should set a custom user
   // agent. This needs to be done here, after WebKit is through with setting the
   // user agent on its own.
   WebString custom_user_agent;
+  bool was_after_preconnect_request = false;
   if (request.extraData()) {
     webkit_glue::WebURLRequestExtraDataImpl* old_extra_data =
         static_cast<webkit_glue::WebURLRequestExtraDataImpl*>(
             request.extraData());
     custom_user_agent = old_extra_data->custom_user_agent();
+    was_after_preconnect_request =
+        old_extra_data->was_after_preconnect_request();
 
     if (!custom_user_agent.isNull()) {
       if (custom_user_agent.isEmpty())
         request.clearHTTPHeaderField("User-Agent");
       else
         request.setHTTPHeaderField("User-Agent", custom_user_agent);
     }
   }
 
   request.setExtraData(
       new RequestExtraData(referrer_policy,
                            custom_user_agent,
+                           was_after_preconnect_request,
                            (frame == top_frame),
                            frame->identifier(),
                            frame->parent() == top_frame,
                            frame->parent() ? frame->parent()->identifier() : -1,
                            navigation_state->allow_download(),
                            transition_type,
                            navigation_state->transferred_request_child_id(),
                            navigation_state->transferred_request_request_id()));
 
   DocumentState* top_document_state =
       DocumentState::FromDataSource(top_data_source);
-  // TODO(gavinp): separate out prefetching and prerender field trials
-  // if the rel=prerender rel type is sticking around.
-  if (top_document_state &&
-      request.targetType() == WebURLRequest::TargetIsPrefetch)
-    top_document_state->set_was_prefetcher(true);
+  if (top_document_state) {
+    // TODO(gavinp): separate out prefetching and prerender field trials
+    // if the rel=prerender rel type is sticking around.
+    if (request.targetType() == WebURLRequest::TargetIsPrefetch)
+      top_document_state->set_was_prefetcher(true);
+
+    if (was_after_preconnect_request)
+      top_document_state->set_was_after_preconnect_request(true);
+  }
 
   // This is an instance where we embed a copy of the routing id
   // into the data portion of the message. This can cause problems if we
   // don't register this id on the browser side, since the download manager
   // expects to find a RenderViewHost based off the id.
   request.setRequestorID(GetRoutingID());
   request.setHasUserGesture(WebUserGestureIndicator::isProcessingUserGesture());
 
   if (!navigation_state->extra_headers().empty()) {
     for (net::HttpUtil::HeadersIterator i(
@@ skipping 317 matching lines @@
 
 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame,
                                           int arb_robustness_status_code) {
   Send(new ViewHostMsg_DidLose3DContext(
       GURL(frame->top()->document().securityOrigin().toString()),
       THREE_D_API_TYPE_WEBGL,
       arb_robustness_status_code));
 }
 
 }  // namespace content