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

Side by Side Diff: extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc

Issue 2331343005: PlzNavigate: Get StreamPrivate API to work. (Closed)
Patch Set: Use WCO::RenderFrameHostChanged to detect the case when a RFH is swapped out for another in the Emb… Created 4 years, 3 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_ma nager.h" 5 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_ma nager.h"
6 6
7 #include <map>
7 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
8 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
9 #include "components/keyed_service/content/browser_context_dependency_manager.h" 10 #include "components/keyed_service/content/browser_context_dependency_manager.h"
10 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 11 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
12 #include "content/public/browser/navigation_handle.h"
11 #include "content/public/browser/render_frame_host.h" 13 #include "content/public/browser/render_frame_host.h"
12 #include "content/public/browser/render_process_host.h" 14 #include "content/public/browser/render_process_host.h"
15 #include "content/public/common/browser_side_navigation_policy.h"
13 #include "extensions/browser/extension_registry.h" 16 #include "extensions/browser/extension_registry.h"
14 #include "extensions/browser/extensions_browser_client.h" 17 #include "extensions/browser/extensions_browser_client.h"
15 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t.h" 18 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t.h"
16 19
17 namespace extensions { 20 namespace extensions {
18 namespace { 21 namespace {
19 22
20 class MimeHandlerStreamManagerFactory 23 class MimeHandlerStreamManagerFactory
21 : public BrowserContextKeyedServiceFactory { 24 : public BrowserContextKeyedServiceFactory {
22 public: 25 public:
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 } // namespace 68 } // namespace
66 69
67 // A WebContentsObserver that observes for a particular RenderFrameHost either 70 // A WebContentsObserver that observes for a particular RenderFrameHost either
68 // navigating or closing (including by crashing). This is necessary to ensure 71 // navigating or closing (including by crashing). This is necessary to ensure
69 // that streams that aren't claimed by a MimeHandlerViewGuest are not leaked, by 72 // that streams that aren't claimed by a MimeHandlerViewGuest are not leaked, by
70 // aborting the stream if any of those events occurs. 73 // aborting the stream if any of those events occurs.
71 class MimeHandlerStreamManager::EmbedderObserver 74 class MimeHandlerStreamManager::EmbedderObserver
72 : public content::WebContentsObserver { 75 : public content::WebContentsObserver {
73 public: 76 public:
74 EmbedderObserver(MimeHandlerStreamManager* stream_manager, 77 EmbedderObserver(MimeHandlerStreamManager* stream_manager,
78 const std::string& view_id,
79 content::WebContents* web_contents,
80 int frame_tree_node_id,
75 int render_process_id, 81 int render_process_id,
76 int render_frame_id, 82 int render_frame_id);
77 const std::string& view_id);
78 83
79 private: 84 private:
80 // WebContentsObserver overrides. 85 // WebContentsObserver overrides.
81 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override; 86 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
82 void RenderProcessGone(base::TerminationStatus status) override; 87 void RenderProcessGone(base::TerminationStatus status) override;
83 void DidStartProvisionalLoadForFrame( 88 void DidStartProvisionalLoadForFrame(
84 content::RenderFrameHost* render_frame_host, 89 content::RenderFrameHost* render_frame_host,
85 const GURL& validated_url, 90 const GURL& validated_url,
86 bool is_error_page, 91 bool is_error_page,
87 bool is_iframe_srcdoc) override; 92 bool is_iframe_srcdoc) override;
88 void WebContentsDestroyed() override; 93 void WebContentsDestroyed() override;
94 void DidStartNavigation(
95 content::NavigationHandle* navigation_handle) override;
96 void RenderFrameHostChanged(content::RenderFrameHost* old_host,
97 content::RenderFrameHost* new_host) override;
89 98
90 void AbortStream(); 99 void AbortStream();
91 100
92 bool IsTrackedRenderFrameHost(content::RenderFrameHost* render_frame_host); 101 bool IsTrackedRenderFrameHost(content::RenderFrameHost* render_frame_host);
93 102
94 MimeHandlerStreamManager* const stream_manager_; 103 MimeHandlerStreamManager* const stream_manager_;
104 const std::string view_id_;
105 const int frame_tree_node_id_;
95 const int render_process_id_; 106 const int render_process_id_;
96 const int render_frame_id_; 107 const int render_frame_id_;
97 const std::string view_id_; 108 // With PlzNavigate we get an initial provisional load notification for the
109 // URL the mime handler is serving. We don't want to clean up the stream
110 // here. This field helps us track the first load notification. Defaults
111 // to true.
112 bool initial_load_for_frame_;
113 // Used to track whether a RenderFrameHost is swapped with another
114 // RenderFrameHost. We use it to determine when it is safe to clean up the
115 // stream. For e.g if a RFH is swapped with another RFH, and the first one
116 // goes away, we want to clean up the stream when the second RFH dies.
117 typedef std::map<content::RenderFrameHost*, content::RenderFrameHost*>
118 RenderFrameHostMap;
119 RenderFrameHostMap changed_hosts_map_;
98 }; 120 };
99 121
100 MimeHandlerStreamManager::MimeHandlerStreamManager() 122 MimeHandlerStreamManager::MimeHandlerStreamManager()
101 : extension_registry_observer_(this) { 123 : extension_registry_observer_(this) {
102 } 124 }
103 125
104 MimeHandlerStreamManager::~MimeHandlerStreamManager() { 126 MimeHandlerStreamManager::~MimeHandlerStreamManager() {
105 } 127 }
106 128
107 // static 129 // static
108 MimeHandlerStreamManager* MimeHandlerStreamManager::Get( 130 MimeHandlerStreamManager* MimeHandlerStreamManager::Get(
109 content::BrowserContext* context) { 131 content::BrowserContext* context) {
110 return MimeHandlerStreamManagerFactory::GetInstance()->Get(context); 132 return MimeHandlerStreamManagerFactory::GetInstance()->Get(context);
111 } 133 }
112 134
113 void MimeHandlerStreamManager::AddStream( 135 void MimeHandlerStreamManager::AddStream(
114 const std::string& view_id, 136 const std::string& view_id,
115 std::unique_ptr<StreamContainer> stream, 137 std::unique_ptr<StreamContainer> stream,
138 content::WebContents* web_contents,
139 int frame_tree_node_id,
116 int render_process_id, 140 int render_process_id,
117 int render_frame_id) { 141 int render_frame_id) {
118 streams_by_extension_id_[stream->extension_id()].insert(view_id); 142 streams_by_extension_id_[stream->extension_id()].insert(view_id);
119 auto result = streams_.insert(std::make_pair(view_id, std::move(stream))); 143 auto result = streams_.insert(std::make_pair(view_id, std::move(stream)));
120 DCHECK(result.second); 144 DCHECK(result.second);
121 embedder_observers_[view_id] = base::MakeUnique<EmbedderObserver>( 145 embedder_observers_[view_id] = base::MakeUnique<EmbedderObserver>(
122 this, render_process_id, render_frame_id, view_id); 146 this, view_id, web_contents, frame_tree_node_id, render_process_id,
147 render_frame_id);
123 } 148 }
124 149
125 std::unique_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream( 150 std::unique_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream(
126 const std::string& view_id) { 151 const std::string& view_id) {
127 auto stream = streams_.find(view_id); 152 auto stream = streams_.find(view_id);
128 if (stream == streams_.end()) 153 if (stream == streams_.end())
129 return nullptr; 154 return nullptr;
130 155
131 std::unique_ptr<StreamContainer> result = 156 std::unique_ptr<StreamContainer> result =
132 base::WrapUnique(stream->second.release()); 157 base::WrapUnique(stream->second.release());
(...skipping 13 matching lines...) Expand all
146 171
147 for (const auto& view_id : streams->second) { 172 for (const auto& view_id : streams->second) {
148 streams_.erase(view_id); 173 streams_.erase(view_id);
149 embedder_observers_.erase(view_id); 174 embedder_observers_.erase(view_id);
150 } 175 }
151 streams_by_extension_id_.erase(streams); 176 streams_by_extension_id_.erase(streams);
152 } 177 }
153 178
154 MimeHandlerStreamManager::EmbedderObserver::EmbedderObserver( 179 MimeHandlerStreamManager::EmbedderObserver::EmbedderObserver(
155 MimeHandlerStreamManager* stream_manager, 180 MimeHandlerStreamManager* stream_manager,
181 const std::string& view_id,
182 content::WebContents* web_contents,
183 int frame_tree_node_id,
156 int render_process_id, 184 int render_process_id,
157 int render_frame_id, 185 int render_frame_id)
158 const std::string& view_id) 186 : WebContentsObserver(web_contents),
159 : WebContentsObserver(content::WebContents::FromRenderFrameHost(
160 content::RenderFrameHost::FromID(render_process_id,
161 render_frame_id))),
162 stream_manager_(stream_manager), 187 stream_manager_(stream_manager),
188 view_id_(view_id),
189 frame_tree_node_id_(frame_tree_node_id),
163 render_process_id_(render_process_id), 190 render_process_id_(render_process_id),
164 render_frame_id_(render_frame_id), 191 render_frame_id_(render_frame_id),
165 view_id_(view_id) { 192 initial_load_for_frame_(true) {}
166 }
167 193
168 void MimeHandlerStreamManager::EmbedderObserver::RenderFrameDeleted( 194 void MimeHandlerStreamManager::EmbedderObserver::RenderFrameDeleted(
169 content::RenderFrameHost* render_frame_host) { 195 content::RenderFrameHost* render_frame_host) {
170 if (!IsTrackedRenderFrameHost(render_frame_host)) 196 if (!IsTrackedRenderFrameHost(render_frame_host)) {
171 return; 197 return;
172 198 }
199 // If the |render_frame_host| is swapped with another RFH, then we should
200 // cleanup the stream when the other RFH dies,
201 RenderFrameHostMap::iterator index =
202 changed_hosts_map_.find(render_frame_host);
203 if (index != changed_hosts_map_.end()) {
204 changed_hosts_map_.erase(index);
205 return;
206 }
173 AbortStream(); 207 AbortStream();
174 } 208 }
175 209
176 void MimeHandlerStreamManager::EmbedderObserver::RenderProcessGone( 210 void MimeHandlerStreamManager::EmbedderObserver::RenderProcessGone(
177 base::TerminationStatus status) { 211 base::TerminationStatus status) {
178 AbortStream(); 212 AbortStream();
179 } 213 }
214
180 void MimeHandlerStreamManager::EmbedderObserver:: 215 void MimeHandlerStreamManager::EmbedderObserver::
181 DidStartProvisionalLoadForFrame(content::RenderFrameHost* render_frame_host, 216 DidStartProvisionalLoadForFrame(content::RenderFrameHost* render_frame_host,
182 const GURL& validated_url, 217 const GURL& validated_url,
183 bool is_error_page, 218 bool is_error_page,
184 bool is_iframe_srcdoc) { 219 bool is_iframe_srcdoc) {
185 if (!IsTrackedRenderFrameHost(render_frame_host)) 220 if (!IsTrackedRenderFrameHost(render_frame_host))
186 return; 221 return;
222 // With PlzNavigate we get a provisional load notification for the URL we are
223 // serving. We don't want to clean up the stream here.
224 if (initial_load_for_frame_ && content::IsBrowserSideNavigationEnabled()) {
225 initial_load_for_frame_ = false;
226 return;
227 }
228 AbortStream();
229 }
187 230
188 AbortStream(); 231 void MimeHandlerStreamManager::EmbedderObserver::DidStartNavigation(
232 content::NavigationHandle* navigation_handle) {
233 // If the top level frame is navigating away, clean up the stream.
234 if (navigation_handle->IsInMainFrame())
235 AbortStream();
236 }
237
238 void MimeHandlerStreamManager::EmbedderObserver::RenderFrameHostChanged(
239 content::RenderFrameHost* old_host,
240 content::RenderFrameHost* new_host) {
241 changed_hosts_map_[old_host] = new_host;
189 } 242 }
190 243
191 void MimeHandlerStreamManager::EmbedderObserver::WebContentsDestroyed() { 244 void MimeHandlerStreamManager::EmbedderObserver::WebContentsDestroyed() {
192 AbortStream(); 245 AbortStream();
193 } 246 }
194 247
195 void MimeHandlerStreamManager::EmbedderObserver::AbortStream() { 248 void MimeHandlerStreamManager::EmbedderObserver::AbortStream() {
196 Observe(nullptr); 249 Observe(nullptr);
197 // This will cause the stream to be destroyed. 250 // This will cause the stream to be destroyed.
198 stream_manager_->ReleaseStream(view_id_); 251 stream_manager_->ReleaseStream(view_id_);
199 } 252 }
200 253
201 bool MimeHandlerStreamManager::EmbedderObserver::IsTrackedRenderFrameHost( 254 bool MimeHandlerStreamManager::EmbedderObserver::IsTrackedRenderFrameHost(
202 content::RenderFrameHost* render_frame_host) { 255 content::RenderFrameHost* render_frame_host) {
203 return render_frame_host->GetRoutingID() == render_frame_id_ && 256 if (frame_tree_node_id_ != -1) {
204 render_frame_host->GetProcess()->GetID() == render_process_id_; 257 return (render_frame_host->GetFrameTreeNodeId() == frame_tree_node_id_);
258 } else {
259 DCHECK((render_frame_id_ != -1) && (render_process_id_ != -1));
260 return render_frame_host->GetRoutingID() == render_frame_id_ &&
261 render_frame_host->GetProcess()->GetID() == render_process_id_;
262 }
205 } 263 }
206 264
207 } // namespace extensions 265 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698