PlzNavigate: support upgrade-insecure-navigation.

third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 649 matching lines @@
 {
     if (frame()->document())
         frame()->document()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, message));
 }
 
 SecurityOrigin* FrameFetchContext::getSecurityOrigin() const
 {
     return m_document ? m_document->getSecurityOrigin() : nullptr;
 }
 
-void FrameFetchContext::upgradeInsecureRequest(ResourceRequest& resourceRequest)
+// static
+void FrameFetchContext::upgradeInsecureRequest(ResourceRequest& resourceRequest, Document* document, FrameLoader* frameLoader)

[Nate Chapin, 2016/08/26 16:04:34]

Take a FrameLoader& instead?

[arthursonzogni, 2016/08/26 16:38:34]

Yes we can. It is for saying it couldn't be null ?

 {
     // Tack an 'Upgrade-Insecure-Requests' header to outgoing navigational requests, as described in
     // https://w3c.github.io/webappsec/specs/upgrade/#feature-detect
     if (resourceRequest.frameType() != WebURLRequest::FrameTypeNone) {
 
         // Early return if the request has already been upgraded.
         if (resourceRequest.httpHeaderField("Upgrade-Insecure-Requests") == AtomicString("1"))
             return;
 
         resourceRequest.addHTTPHeaderField("Upgrade-Insecure-Requests", "1");
     }
 
     KURL url = resourceRequest.url();
 
     // If we don't yet have an |m_document| (because we're loading an iframe, for instance), check the FrameLoader's policy.
-    WebInsecureRequestPolicy relevantPolicy = m_document ? m_document->getInsecureRequestPolicy() : frame()->loader().getInsecureRequestPolicy();
-    SecurityContext::InsecureNavigationsSet* relevantNavigationSet = m_document ? m_document->insecureNavigationsToUpgrade() : frame()->loader().insecureNavigationsToUpgrade();
+    WebInsecureRequestPolicy relevantPolicy = document ? document->getInsecureRequestPolicy() : frameLoader->getInsecureRequestPolicy();
+    SecurityContext::InsecureNavigationsSet* relevantNavigationSet = document ? document->insecureNavigationsToUpgrade() : frameLoader->insecureNavigationsToUpgrade();
 
     if (url.protocolIs("http") && relevantPolicy & kUpgradeInsecureRequests) {
         // We always upgrade requests that meet any of the following criteria:
         //
         // 1. Are for subresources (including nested frames).
         // 2. Are form submissions.
         // 3. Whose hosts are contained in the document's InsecureNavigationSet.
         if (resourceRequest.frameType() == WebURLRequest::FrameTypeNone
             || resourceRequest.frameType() == WebURLRequest::FrameTypeNested
             || resourceRequest.requestContext() == WebURLRequest::RequestContextForm
             || (!url.host().isNull() && relevantNavigationSet->contains(url.host().impl()->hash()))) {
-            UseCounter::count(m_document, UseCounter::UpgradeInsecureRequestsUpgradedRequest);
+            UseCounter::count(document, UseCounter::UpgradeInsecureRequestsUpgradedRequest);
             url.setProtocol("https");
             if (url.port() == 80)
                 url.setPort(443);
             resourceRequest.setURL(url);
         }
     }
 }
 
+void FrameFetchContext::upgradeInsecureRequest(ResourceRequest& resourceRequest)
+{
+    upgradeInsecureRequest(resourceRequest, m_document, &(frame()->loader()));
+}
+
 void FrameFetchContext::addClientHintsIfNecessary(FetchRequest& fetchRequest)
 {
     if (!RuntimeEnabledFeatures::clientHintsEnabled() || !m_document)
         return;
 
     bool shouldSendDPR = m_document->clientHintsPreferences().shouldSendDPR() || fetchRequest.clientHintsPreferences().shouldSendDPR();
     bool shouldSendResourceWidth = m_document->clientHintsPreferences().shouldSendResourceWidth() || fetchRequest.clientHintsPreferences().shouldSendResourceWidth();
     bool shouldSendViewportWidth = m_document->clientHintsPreferences().shouldSendViewportWidth() || fetchRequest.clientHintsPreferences().shouldSendViewportWidth();
 
     if (shouldSendDPR)
@@ skipping 113 matching lines @@
 }
 
 DEFINE_TRACE(FrameFetchContext)
 {
     visitor->trace(m_document);
     visitor->trace(m_documentLoader);
     FetchContext::trace(visitor);
 }
 
 } // namespace blink