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

Side by Side Diff: content/browser/frame_host/render_frame_host_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: merge and 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 18 matching lines...) Expand all
29 #include "content/common/accessibility_mode_enums.h" 29 #include "content/common/accessibility_mode_enums.h"
30 #include "content/common/ax_content_node_data.h" 30 #include "content/common/ax_content_node_data.h"
31 #include "content/common/content_export.h" 31 #include "content/common/content_export.h"
32 #include "content/common/frame.mojom.h" 32 #include "content/common/frame.mojom.h"
33 #include "content/common/frame_message_enums.h" 33 #include "content/common/frame_message_enums.h"
34 #include "content/common/frame_replication_state.h" 34 #include "content/common/frame_replication_state.h"
35 #include "content/common/image_downloader/image_downloader.mojom.h" 35 #include "content/common/image_downloader/image_downloader.mojom.h"
36 #include "content/common/navigation_params.h" 36 #include "content/common/navigation_params.h"
37 #include "content/public/browser/render_frame_host.h" 37 #include "content/public/browser/render_frame_host.h"
38 #include "content/public/common/javascript_message_type.h" 38 #include "content/public/common/javascript_message_type.h"
39 #include "content/public/common/ssl_status.h"
39 #include "media/mojo/interfaces/service_factory.mojom.h" 40 #include "media/mojo/interfaces/service_factory.mojom.h"
40 #include "net/http/http_response_headers.h" 41 #include "net/http/http_response_headers.h"
41 #include "services/shell/public/cpp/interface_factory.h" 42 #include "services/shell/public/cpp/interface_factory.h"
42 #include "services/shell/public/cpp/interface_registry.h" 43 #include "services/shell/public/cpp/interface_registry.h"
43 #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h" 44 #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h"
44 #include "third_party/WebKit/public/web/WebTextDirection.h" 45 #include "third_party/WebKit/public/web/WebTextDirection.h"
45 #include "third_party/WebKit/public/web/WebTreeScopeType.h" 46 #include "third_party/WebKit/public/web/WebTreeScopeType.h"
46 #include "ui/accessibility/ax_node_data.h" 47 #include "ui/accessibility/ax_node_data.h"
47 #include "ui/base/page_transition_types.h" 48 #include "ui/base/page_transition_types.h"
48 49
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 // separately so that the ScopedPageLoadDeferrers of any current dialogs are 597 // separately so that the ScopedPageLoadDeferrers of any current dialogs are
597 // no longer on the stack when we attempt to swap it out. 598 // no longer on the stack when we attempt to swap it out.
598 void SuppressFurtherDialogs(); 599 void SuppressFurtherDialogs();
599 600
600 // PlzNavigate: returns the LoFi state of the last successful navigation that 601 // PlzNavigate: returns the LoFi state of the last successful navigation that
601 // made a network request. 602 // made a network request.
602 LoFiState last_navigation_lofi_state() const { 603 LoFiState last_navigation_lofi_state() const {
603 return last_navigation_lofi_state_; 604 return last_navigation_lofi_state_;
604 } 605 }
605 606
607 void SetSSLStatusForPendingNavigate(const GURL& url,
608 const SSLStatus& ssl_status);
609 bool GetSSLStatusForPendingNavigate(const GURL& url, SSLStatus* ssl_status);
610
606 protected: 611 protected:
607 friend class RenderFrameHostFactory; 612 friend class RenderFrameHostFactory;
608 613
609 // |flags| is a combination of CreateRenderFrameFlags. 614 // |flags| is a combination of CreateRenderFrameFlags.
610 // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost 615 // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost
611 // should be the abstraction needed here, but we need RenderViewHost to pass 616 // should be the abstraction needed here, but we need RenderViewHost to pass
612 // into WebContentsObserver::FrameDetached for now. 617 // into WebContentsObserver::FrameDetached for now.
613 RenderFrameHostImpl(SiteInstance* site_instance, 618 RenderFrameHostImpl(SiteInstance* site_instance,
614 RenderViewHostImpl* render_view_host, 619 RenderViewHostImpl* render_view_host,
615 RenderFrameHostDelegate* delegate, 620 RenderFrameHostDelegate* delegate,
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
1049 1054
1050 mojo::Binding<mojom::FrameHost> frame_host_binding_; 1055 mojo::Binding<mojom::FrameHost> frame_host_binding_;
1051 mojom::FramePtr frame_; 1056 mojom::FramePtr frame_;
1052 1057
1053 // Callback for responding when 1058 // Callback for responding when
1054 // |FrameHostMsg_TextSurroundingSelectionResponse| message comes. 1059 // |FrameHostMsg_TextSurroundingSelectionResponse| message comes.
1055 TextSurroundingSelectionCallback text_surrounding_selection_callback_; 1060 TextSurroundingSelectionCallback text_surrounding_selection_callback_;
1056 1061
1057 std::vector<std::unique_ptr<shell::InterfaceRegistry>> media_registries_; 1062 std::vector<std::unique_ptr<shell::InterfaceRegistry>> media_registries_;
1058 1063
1064 GURL pending_navigate_ssl_status_url_;
1065 SSLStatus pending_navigate_ssl_status_;
nasko 2016/08/15 22:18:22 If the SSLStatus is used only for the main frame,
jam 2016/08/15 22:57:37 Are you thinking of storing this temporary object
1066
1059 // NOTE: This must be the last member. 1067 // NOTE: This must be the last member.
1060 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 1068 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
1061 1069
1062 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 1070 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
1063 }; 1071 };
1064 1072
1065 } // namespace content 1073 } // namespace content
1066 1074
1067 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 1075 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698