Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Unified Diff: content/browser/frame_host/navigation_handle_impl.h

Issue 2239273002: Don't use SSLStatus from FrameHostMsg_DidCommitProvisionalLoad and instead cache it on the browser … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_handle_impl.h
diff --git a/content/browser/frame_host/navigation_handle_impl.h b/content/browser/frame_host/navigation_handle_impl.h
index 677a167e5737b32c0341c197684f7a1ac22d431a..f7190873db4855ec58ae6f8068e1d655533a8926 100644
--- a/content/browser/frame_host/navigation_handle_impl.h
+++ b/content/browser/frame_host/navigation_handle_impl.h
@@ -19,6 +19,7 @@
#include "content/public/browser/navigation_data.h"
#include "content/public/browser/navigation_throttle.h"
#include "content/public/common/request_context_type.h"
+#include "content/public/common/ssl_status.h"
#include "url/gurl.h"
struct FrameHostMsg_DidCommitProvisionalLoad_Params;
@@ -201,6 +202,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
void WillProcessResponse(
RenderFrameHostImpl* render_frame_host,
scoped_refptr<net::HttpResponseHeaders> response_headers,
+ const SSLStatus& ssl_status,
const ThrottleChecksFinishedCallback& callback);
// Returns the FrameTreeNode this navigation is happening in.
@@ -218,6 +220,11 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
bool same_page,
RenderFrameHostImpl* render_frame_host);
+ // This is only used for the non-PlzNavigate case, as it's the one that has
+ // cross-site requests being transferred to new processes. When that occurs,
+ // the SSL certificate ID has to be updated.
+ void UpdateSSLCertId(int new_cert_id);
+
// Called during commit. Takes ownership of the embedder's NavigationData
// instance. This NavigationData may have been cloned prior to being added
// here.
@@ -225,6 +232,8 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
navigation_data_ = std::move(navigation_data);
}
+ SSLStatus ssl_status() { return ssl_status_; }
+
private:
friend class NavigationHandleImplTest;
@@ -319,6 +328,8 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
// Embedder data tied to this navigation.
std::unique_ptr<NavigationData> navigation_data_;
+ SSLStatus ssl_status_;
+
DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
};

Powered by Google App Engine
This is Rietveld 408576698