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

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: print 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..0cc76a876c14c6c0cc3d2ff599c92528a4e2639d 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -17,6 +17,7 @@
#include "content/renderer/render_thread_impl.h"
#include "content/renderer/render_view_impl.h"
#include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/web/WebFrameClient.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
#include "third_party/WebKit/public/web/WebView.h"
@@ -310,7 +311,11 @@ void RenderFrameProxy::OnDidUpdateOrigin(const url::Origin& origin) {
}
void RenderFrameProxy::frameDetached() {
- if (web_frame_->parent()) {
+ frameDetached(blink::WebDetachReason::Remove);
+}
+
+void RenderFrameProxy::frameDetached(blink::WebDetachReason reason) {
+ if (reason == blink::WebDetachReason::Remove && 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.h ('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