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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1642283002: Deal with frame removal by content scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ImageDocument: Account for detach in DOM mutations Created 4 years, 10 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/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 1d26e5940b95c7e048e0c00402c46f46e2753403..f7257fa4e2906ba8290183a698570e25bf0d7e7c 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3350,8 +3350,17 @@ void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) {
}
}
- FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
- DidCreateDocumentElement());
+ // Notify observers; The frame can be detached by an extension script.
+ if (observers_.might_have_observers()) {
nasko 2016/02/08 18:12:53 Yuck :(. Why is this the only method that needs th
robwu 2016/02/09 01:18:10 This is needed because the observers expect the su
+ base::WeakPtr<RenderFrameImpl> self = weak_factory_.GetWeakPtr();
+ base::ObserverListBase<RenderFrameObserver>::Iterator it(&observers_);
+ RenderFrameObserver* obs;
+ while ((obs = it.GetNext()) != nullptr) {
+ obs->DidCreateDocumentElement();
+ if (!self.get())
+ return;
+ }
+ }
FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
DidCreateDocumentElement(frame));
}
@@ -3395,7 +3404,17 @@ void RenderFrameImpl::didFinishDocumentLoad(blink::WebLocalFrame* frame,
FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
DidFinishDocumentLoad(frame));
- FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidFinishDocumentLoad());
+ // Notify observers; The frame can be detached by an extension script.
+ if (observers_.might_have_observers()) {
+ base::WeakPtr<RenderFrameImpl> self = weak_factory_.GetWeakPtr();
+ base::ObserverListBase<RenderFrameObserver>::Iterator it(&observers_);
+ RenderFrameObserver* obs;
+ while ((obs = it.GetNext()) != nullptr) {
+ obs->DidFinishDocumentLoad();
+ if (!self.get())
+ return;
+ }
+ }
// Check whether we have new encoding name.
UpdateEncoding(frame, frame->view()->pageEncoding().utf8());

Powered by Google App Engine
This is Rietveld 408576698