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

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: Fix DCHECK leading to browser test redness 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
« no previous file with comments | « extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "components/keyed_service/content/browser_context_dependency_manager.h" 9 #include "components/keyed_service/content/browser_context_dependency_manager.h"
10 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 10 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
11 #include "content/public/browser/navigation_handle.h"
11 #include "content/public/browser/render_frame_host.h" 12 #include "content/public/browser/render_frame_host.h"
12 #include "content/public/browser/render_process_host.h" 13 #include "content/public/browser/render_process_host.h"
14 #include "content/public/browser/web_contents.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 int frame_tree_node_id,
75 int render_process_id, 80 int render_process_id,
76 int render_frame_id, 81 int render_frame_id);
77 const std::string& view_id);
78 82
79 private: 83 private:
80 // WebContentsObserver overrides. 84 // WebContentsObserver overrides.
81 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override; 85 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
82 void RenderProcessGone(base::TerminationStatus status) override; 86 void RenderProcessGone(base::TerminationStatus status) override;
83 void DidStartProvisionalLoadForFrame( 87 void DidStartProvisionalLoadForFrame(
84 content::RenderFrameHost* render_frame_host, 88 content::RenderFrameHost* render_frame_host,
85 const GURL& validated_url, 89 const GURL& validated_url,
86 bool is_error_page, 90 bool is_error_page,
87 bool is_iframe_srcdoc) override; 91 bool is_iframe_srcdoc) override;
88 void WebContentsDestroyed() override; 92 void WebContentsDestroyed() override;
93 void DidStartNavigation(
94 content::NavigationHandle* navigation_handle) override;
95 void RenderFrameHostChanged(content::RenderFrameHost* old_host,
96 content::RenderFrameHost* new_host) override;
89 97
90 void AbortStream(); 98 void AbortStream();
91 99
92 bool IsTrackedRenderFrameHost(content::RenderFrameHost* render_frame_host); 100 bool IsTrackedRenderFrameHost(content::RenderFrameHost* render_frame_host);
93 101
94 MimeHandlerStreamManager* const stream_manager_; 102 MimeHandlerStreamManager* const stream_manager_;
95 const int render_process_id_;
96 const int render_frame_id_;
97 const std::string view_id_; 103 const std::string view_id_;
104 int frame_tree_node_id_;
105 int render_process_id_;
106 int render_frame_id_;
107 // With PlzNavigate we get an initial provisional load notification for the
108 // URL the mime handler is serving. We don't want to clean up the stream
109 // here. This field helps us track the first load notification. Defaults
110 // to true.
111 bool initial_load_for_frame_;
112 // If a RFH is swapped with another RFH, this is set to the new RFH. This
113 // ensures that we don't inadvarently clean up the stream when the old RFH
114 // dies.
115 content::RenderFrameHost* new_host_;
98 }; 116 };
99 117
100 MimeHandlerStreamManager::MimeHandlerStreamManager() 118 MimeHandlerStreamManager::MimeHandlerStreamManager()
101 : extension_registry_observer_(this) { 119 : extension_registry_observer_(this) {
102 } 120 }
103 121
104 MimeHandlerStreamManager::~MimeHandlerStreamManager() { 122 MimeHandlerStreamManager::~MimeHandlerStreamManager() {
105 } 123 }
106 124
107 // static 125 // static
108 MimeHandlerStreamManager* MimeHandlerStreamManager::Get( 126 MimeHandlerStreamManager* MimeHandlerStreamManager::Get(
109 content::BrowserContext* context) { 127 content::BrowserContext* context) {
110 return MimeHandlerStreamManagerFactory::GetInstance()->Get(context); 128 return MimeHandlerStreamManagerFactory::GetInstance()->Get(context);
111 } 129 }
112 130
113 void MimeHandlerStreamManager::AddStream( 131 void MimeHandlerStreamManager::AddStream(
114 const std::string& view_id, 132 const std::string& view_id,
115 std::unique_ptr<StreamContainer> stream, 133 std::unique_ptr<StreamContainer> stream,
134 int frame_tree_node_id,
116 int render_process_id, 135 int render_process_id,
117 int render_frame_id) { 136 int render_frame_id) {
118 streams_by_extension_id_[stream->extension_id()].insert(view_id); 137 streams_by_extension_id_[stream->extension_id()].insert(view_id);
119 auto result = streams_.insert(std::make_pair(view_id, std::move(stream))); 138 auto result = streams_.insert(std::make_pair(view_id, std::move(stream)));
120 DCHECK(result.second); 139 DCHECK(result.second);
121 embedder_observers_[view_id] = base::MakeUnique<EmbedderObserver>( 140 embedder_observers_[view_id] = base::MakeUnique<EmbedderObserver>(
122 this, render_process_id, render_frame_id, view_id); 141 this, view_id, frame_tree_node_id, render_process_id, render_frame_id);
123 } 142 }
124 143
125 std::unique_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream( 144 std::unique_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream(
126 const std::string& view_id) { 145 const std::string& view_id) {
127 auto stream = streams_.find(view_id); 146 auto stream = streams_.find(view_id);
128 if (stream == streams_.end()) 147 if (stream == streams_.end())
129 return nullptr; 148 return nullptr;
130 149
131 std::unique_ptr<StreamContainer> result = 150 std::unique_ptr<StreamContainer> result =
132 base::WrapUnique(stream->second.release()); 151 base::WrapUnique(stream->second.release());
(...skipping 13 matching lines...) Expand all
146 165
147 for (const auto& view_id : streams->second) { 166 for (const auto& view_id : streams->second) {
148 streams_.erase(view_id); 167 streams_.erase(view_id);
149 embedder_observers_.erase(view_id); 168 embedder_observers_.erase(view_id);
150 } 169 }
151 streams_by_extension_id_.erase(streams); 170 streams_by_extension_id_.erase(streams);
152 } 171 }
153 172
154 MimeHandlerStreamManager::EmbedderObserver::EmbedderObserver( 173 MimeHandlerStreamManager::EmbedderObserver::EmbedderObserver(
155 MimeHandlerStreamManager* stream_manager, 174 MimeHandlerStreamManager* stream_manager,
175 const std::string& view_id,
176 int frame_tree_node_id,
156 int render_process_id, 177 int render_process_id,
157 int render_frame_id, 178 int render_frame_id)
158 const std::string& view_id) 179 : stream_manager_(stream_manager),
159 : WebContentsObserver(content::WebContents::FromRenderFrameHost( 180 view_id_(view_id),
160 content::RenderFrameHost::FromID(render_process_id, 181 frame_tree_node_id_(frame_tree_node_id),
161 render_frame_id))),
162 stream_manager_(stream_manager),
163 render_process_id_(render_process_id), 182 render_process_id_(render_process_id),
164 render_frame_id_(render_frame_id), 183 render_frame_id_(render_frame_id),
165 view_id_(view_id) { 184 initial_load_for_frame_(true),
185 new_host_(nullptr) {
186 content::WebContents* web_contents = nullptr;
187 if (frame_tree_node_id != -1) {
188 web_contents =
189 content::WebContents::FromFrameTreeNodeId(frame_tree_node_id);
190 } else {
191 web_contents = content::WebContents::FromRenderFrameHost(
192 content::RenderFrameHost::FromID(render_process_id, render_frame_id));
193 }
194 content::WebContentsObserver::Observe(web_contents);
166 } 195 }
167 196
168 void MimeHandlerStreamManager::EmbedderObserver::RenderFrameDeleted( 197 void MimeHandlerStreamManager::EmbedderObserver::RenderFrameDeleted(
169 content::RenderFrameHost* render_frame_host) { 198 content::RenderFrameHost* render_frame_host) {
170 if (!IsTrackedRenderFrameHost(render_frame_host)) 199 if (!IsTrackedRenderFrameHost(render_frame_host))
171 return; 200 return;
172
173 AbortStream(); 201 AbortStream();
174 } 202 }
175 203
176 void MimeHandlerStreamManager::EmbedderObserver::RenderProcessGone( 204 void MimeHandlerStreamManager::EmbedderObserver::RenderProcessGone(
177 base::TerminationStatus status) { 205 base::TerminationStatus status) {
178 AbortStream(); 206 AbortStream();
179 } 207 }
208
180 void MimeHandlerStreamManager::EmbedderObserver:: 209 void MimeHandlerStreamManager::EmbedderObserver::
181 DidStartProvisionalLoadForFrame(content::RenderFrameHost* render_frame_host, 210 DidStartProvisionalLoadForFrame(content::RenderFrameHost* render_frame_host,
182 const GURL& validated_url, 211 const GURL& validated_url,
183 bool is_error_page, 212 bool is_error_page,
184 bool is_iframe_srcdoc) { 213 bool is_iframe_srcdoc) {
185 if (!IsTrackedRenderFrameHost(render_frame_host)) 214 if (!IsTrackedRenderFrameHost(render_frame_host))
186 return; 215 return;
216 // With PlzNavigate we get a provisional load notification for the URL we are
217 // serving. We don't want to clean up the stream here.
218 if (initial_load_for_frame_ && content::IsBrowserSideNavigationEnabled()) {
219 initial_load_for_frame_ = false;
220 return;
221 }
222 AbortStream();
223 }
187 224
188 AbortStream(); 225 void MimeHandlerStreamManager::EmbedderObserver::DidStartNavigation(
226 content::NavigationHandle* navigation_handle) {
227 // If the top level frame is navigating away, clean up the stream.
228 if (navigation_handle->IsInMainFrame())
229 AbortStream();
230 }
231
232 void MimeHandlerStreamManager::EmbedderObserver::RenderFrameHostChanged(
233 content::RenderFrameHost* old_host,
234 content::RenderFrameHost* new_host) {
235 new_host_ = new_host;
236 // Update the RFID, RPIDs to those of the new RFH. This ensures
237 // that if the new RFH gets deleted before loading the stream, we will
238 // abort it.
239 DCHECK((frame_tree_node_id_ == -1) ||
240 (frame_tree_node_id_ == new_host_->GetFrameTreeNodeId()));
241 render_frame_id_ = new_host_->GetRoutingID();
242 render_process_id_ = new_host_->GetProcess()->GetID();
189 } 243 }
190 244
191 void MimeHandlerStreamManager::EmbedderObserver::WebContentsDestroyed() { 245 void MimeHandlerStreamManager::EmbedderObserver::WebContentsDestroyed() {
192 AbortStream(); 246 AbortStream();
193 } 247 }
194 248
195 void MimeHandlerStreamManager::EmbedderObserver::AbortStream() { 249 void MimeHandlerStreamManager::EmbedderObserver::AbortStream() {
196 Observe(nullptr); 250 Observe(nullptr);
197 // This will cause the stream to be destroyed. 251 // This will cause the stream to be destroyed.
198 stream_manager_->ReleaseStream(view_id_); 252 stream_manager_->ReleaseStream(view_id_);
199 } 253 }
200 254
201 bool MimeHandlerStreamManager::EmbedderObserver::IsTrackedRenderFrameHost( 255 bool MimeHandlerStreamManager::EmbedderObserver::IsTrackedRenderFrameHost(
202 content::RenderFrameHost* render_frame_host) { 256 content::RenderFrameHost* render_frame_host) {
203 return render_frame_host->GetRoutingID() == render_frame_id_ && 257 // We don't want to abort the stream if the frame we were tracking changed to
204 render_frame_host->GetProcess()->GetID() == render_process_id_; 258 // new_host_.
259 if (new_host_ && (render_frame_host != new_host_))
260 return false;
261
262 if (frame_tree_node_id_ != -1) {
263 return render_frame_host->GetFrameTreeNodeId() == frame_tree_node_id_;
264 } else {
265 DCHECK((render_frame_id_ != -1) && (render_process_id_ != -1));
266 return render_frame_host->GetRoutingID() == render_frame_id_ &&
267 render_frame_host->GetProcess()->GetID() == render_process_id_;
268 }
205 } 269 }
206 270
207 } // namespace extensions 271 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698