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

Unified Diff: content/browser/presentation/presentation_service_impl.cc

Issue 2949053002: [Presentation API] OffscreenPresentationManager should only interact with top level receiver frame (Closed)
Patch Set: add unit test Created 3 years, 6 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/presentation/presentation_service_impl.cc
diff --git a/content/browser/presentation/presentation_service_impl.cc b/content/browser/presentation/presentation_service_impl.cc
index 6fb5641c60ac183f86feb0a642f0f09151575f0d..c6ed4919f04155cde5b51649d5d935b71f32b835 100644
--- a/content/browser/presentation/presentation_service_impl.cc
+++ b/content/browser/presentation/presentation_service_impl.cc
@@ -59,8 +59,10 @@ PresentationServiceImpl::PresentationServiceImpl(
render_process_id_ = render_frame_host->GetProcess()->GetID();
render_frame_id_ = render_frame_host->GetRoutingID();
- DVLOG(2) << "PresentationServiceImpl: "
- << render_process_id_ << ", " << render_frame_id_;
+ is_main_frame_ = !render_frame_host->GetParent();
+
+ DVLOG(2) << "PresentationServiceImpl: " << render_process_id_ << ", "
+ << render_frame_id_ << " is main frame: " << is_main_frame_;
if (auto* delegate = GetPresentationServiceDelegate())
delegate->AddObserver(render_process_id_, render_frame_id_, this);
@@ -114,7 +116,7 @@ void PresentationServiceImpl::SetClient(
// TODO(imcheng): Set ErrorHandler to listen for errors.
client_ = std::move(client);
- if (receiver_delegate_) {
+ if (receiver_delegate_ && is_main_frame_) {
receiver_delegate_->RegisterReceiverConnectionAvailableCallback(
base::Bind(&PresentationServiceImpl::OnReceiverConnectionAvailable,
weak_factory_.GetWeakPtr()));
@@ -428,8 +430,11 @@ void PresentationServiceImpl::WebContentsDestroyed() {
void PresentationServiceImpl::Reset() {
DVLOG(2) << "PresentationServiceImpl::Reset";
- if (auto* delegate = GetPresentationServiceDelegate())
- delegate->Reset(render_process_id_, render_frame_id_);
+ if (controller_delegate_)
+ controller_delegate_->Reset(render_process_id_, render_frame_id_);
+
+ if (receiver_delegate_ && is_main_frame_)
+ receiver_delegate_->Reset(render_process_id_, render_frame_id_);
default_presentation_urls_.clear();

Powered by Google App Engine
This is Rietveld 408576698