| OLD | NEW |
| 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" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 } // namespace | 65 } // namespace |
| 66 | 66 |
| 67 // A WebContentsObserver that observes for a particular RenderFrameHost either | 67 // A WebContentsObserver that observes for a particular RenderFrameHost either |
| 68 // navigating or closing (including by crashing). This is necessary to ensure | 68 // 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 | 69 // that streams that aren't claimed by a MimeHandlerViewGuest are not leaked, by |
| 70 // aborting the stream if any of those events occurs. | 70 // aborting the stream if any of those events occurs. |
| 71 class MimeHandlerStreamManager::EmbedderObserver | 71 class MimeHandlerStreamManager::EmbedderObserver |
| 72 : public content::WebContentsObserver { | 72 : public content::WebContentsObserver { |
| 73 public: | 73 public: |
| 74 EmbedderObserver(MimeHandlerStreamManager* stream_manager, | 74 EmbedderObserver(MimeHandlerStreamManager* stream_manager, |
| 75 const std::string& view_id, |
| 76 content::WebContents* web_contents, |
| 75 int render_process_id, | 77 int render_process_id, |
| 76 int render_frame_id, | 78 int render_frame_id); |
| 77 const std::string& view_id); | |
| 78 | |
| 79 private: | 79 private: |
| 80 // WebContentsObserver overrides. | 80 // WebContentsObserver overrides. |
| 81 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override; | 81 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override; |
| 82 void RenderProcessGone(base::TerminationStatus status) override; | 82 void RenderProcessGone(base::TerminationStatus status) override; |
| 83 void DidStartProvisionalLoadForFrame( | 83 void DidStartProvisionalLoadForFrame( |
| 84 content::RenderFrameHost* render_frame_host, | 84 content::RenderFrameHost* render_frame_host, |
| 85 const GURL& validated_url, | 85 const GURL& validated_url, |
| 86 bool is_error_page, | 86 bool is_error_page, |
| 87 bool is_iframe_srcdoc) override; | 87 bool is_iframe_srcdoc) override; |
| 88 void WebContentsDestroyed() override; | 88 void WebContentsDestroyed() override; |
| (...skipping 17 matching lines...) Expand all Loading... |
| 106 | 106 |
| 107 // static | 107 // static |
| 108 MimeHandlerStreamManager* MimeHandlerStreamManager::Get( | 108 MimeHandlerStreamManager* MimeHandlerStreamManager::Get( |
| 109 content::BrowserContext* context) { | 109 content::BrowserContext* context) { |
| 110 return MimeHandlerStreamManagerFactory::GetInstance()->Get(context); | 110 return MimeHandlerStreamManagerFactory::GetInstance()->Get(context); |
| 111 } | 111 } |
| 112 | 112 |
| 113 void MimeHandlerStreamManager::AddStream( | 113 void MimeHandlerStreamManager::AddStream( |
| 114 const std::string& view_id, | 114 const std::string& view_id, |
| 115 std::unique_ptr<StreamContainer> stream, | 115 std::unique_ptr<StreamContainer> stream, |
| 116 content::WebContents* web_contents, |
| 116 int render_process_id, | 117 int render_process_id, |
| 117 int render_frame_id) { | 118 int render_frame_id) { |
| 118 streams_by_extension_id_[stream->extension_id()].insert(view_id); | 119 streams_by_extension_id_[stream->extension_id()].insert(view_id); |
| 119 auto result = streams_.insert(std::make_pair(view_id, std::move(stream))); | 120 auto result = streams_.insert(std::make_pair(view_id, std::move(stream))); |
| 120 DCHECK(result.second); | 121 DCHECK(result.second); |
| 121 embedder_observers_[view_id] = base::MakeUnique<EmbedderObserver>( | 122 embedder_observers_[view_id] = base::MakeUnique<EmbedderObserver>( |
| 122 this, render_process_id, render_frame_id, view_id); | 123 this, view_id, web_contents, render_process_id, render_frame_id); |
| 123 } | 124 } |
| 124 | 125 |
| 125 std::unique_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream( | 126 std::unique_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream( |
| 126 const std::string& view_id) { | 127 const std::string& view_id) { |
| 127 auto stream = streams_.find(view_id); | 128 auto stream = streams_.find(view_id); |
| 128 if (stream == streams_.end()) | 129 if (stream == streams_.end()) |
| 129 return nullptr; | 130 return nullptr; |
| 130 | 131 |
| 131 std::unique_ptr<StreamContainer> result = | 132 std::unique_ptr<StreamContainer> result = |
| 132 base::WrapUnique(stream->second.release()); | 133 base::WrapUnique(stream->second.release()); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 146 | 147 |
| 147 for (const auto& view_id : streams->second) { | 148 for (const auto& view_id : streams->second) { |
| 148 streams_.erase(view_id); | 149 streams_.erase(view_id); |
| 149 embedder_observers_.erase(view_id); | 150 embedder_observers_.erase(view_id); |
| 150 } | 151 } |
| 151 streams_by_extension_id_.erase(streams); | 152 streams_by_extension_id_.erase(streams); |
| 152 } | 153 } |
| 153 | 154 |
| 154 MimeHandlerStreamManager::EmbedderObserver::EmbedderObserver( | 155 MimeHandlerStreamManager::EmbedderObserver::EmbedderObserver( |
| 155 MimeHandlerStreamManager* stream_manager, | 156 MimeHandlerStreamManager* stream_manager, |
| 157 const std::string& view_id, |
| 158 content::WebContents* web_contents, |
| 156 int render_process_id, | 159 int render_process_id, |
| 157 int render_frame_id, | 160 int render_frame_id) |
| 158 const std::string& view_id) | 161 : WebContentsObserver(web_contents), |
| 159 : WebContentsObserver(content::WebContents::FromRenderFrameHost( | |
| 160 content::RenderFrameHost::FromID(render_process_id, | |
| 161 render_frame_id))), | |
| 162 stream_manager_(stream_manager), | 162 stream_manager_(stream_manager), |
| 163 render_process_id_(render_process_id), | 163 render_process_id_(render_process_id), |
| 164 render_frame_id_(render_frame_id), | 164 render_frame_id_(render_frame_id), |
| 165 view_id_(view_id) { | 165 view_id_(view_id) { |
| 166 } | 166 } |
| 167 | 167 |
| 168 void MimeHandlerStreamManager::EmbedderObserver::RenderFrameDeleted( | 168 void MimeHandlerStreamManager::EmbedderObserver::RenderFrameDeleted( |
| 169 content::RenderFrameHost* render_frame_host) { | 169 content::RenderFrameHost* render_frame_host) { |
| 170 if (!IsTrackedRenderFrameHost(render_frame_host)) | 170 if (!IsTrackedRenderFrameHost(render_frame_host)) |
| 171 return; | 171 return; |
| (...skipping 26 matching lines...) Expand all Loading... |
| 198 stream_manager_->ReleaseStream(view_id_); | 198 stream_manager_->ReleaseStream(view_id_); |
| 199 } | 199 } |
| 200 | 200 |
| 201 bool MimeHandlerStreamManager::EmbedderObserver::IsTrackedRenderFrameHost( | 201 bool MimeHandlerStreamManager::EmbedderObserver::IsTrackedRenderFrameHost( |
| 202 content::RenderFrameHost* render_frame_host) { | 202 content::RenderFrameHost* render_frame_host) { |
| 203 return render_frame_host->GetRoutingID() == render_frame_id_ && | 203 return render_frame_host->GetRoutingID() == render_frame_id_ && |
| 204 render_frame_host->GetProcess()->GetID() == render_process_id_; | 204 render_frame_host->GetProcess()->GetID() == render_process_id_; |
| 205 } | 205 } |
| 206 | 206 |
| 207 } // namespace extensions | 207 } // namespace extensions |
| OLD | NEW |