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

Unified Diff: content/renderer/render_frame_proxy.cc

Issue 1149793002: Detach old frame on WebFrame::swap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: properly rebasing Created 5 years, 7 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_proxy.cc
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index 54d8085ac5b3d49dbb44e3df4f0646e361ba50d8..7d8207af0c6f37aa5e433e6125450363f3a6c5d5 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -310,7 +310,11 @@ void RenderFrameProxy::OnDidUpdateOrigin(const url::Origin& origin) {
}
void RenderFrameProxy::frameDetached() {
- if (web_frame_->parent()) {
+ frameDetached(false);
+}
+
+void RenderFrameProxy::frameDetached(bool for_replacement) {
+ if (!for_replacement && web_frame_->parent()) {
web_frame_->parent()->removeChild(web_frame_);
// Let the browser process know this subframe is removed, so that it is
« content/renderer/render_frame_impl.cc ('K') | « content/renderer/render_frame_proxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698