From 00c30cdbc6f847ea361e56e028853109f1dc19d4 Mon Sep 17 00:00:00 2001 From: dcheng Date: Wed, 23 Nov 2016 05:10:37 -0800 Subject: [Backport] Don't send loading completion callbacks for detaching frames. BUG=561873,595078,654654 Change-Id: Ib1fe67a9ee40328110b4c60421bbacb4b718cee7 Review-Url: https://codereview.chromium.org/2428803002 Cr-Commit-Position: refs/heads/master@{#434155} Reviewed-by: Alexandru Croitor --- chromium/third_party/WebKit/Source/core/loader/FrameLoader.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/chromium/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/chromium/third_party/WebKit/Source/core/loader/FrameLoader.cpp index 535da78e5de..ec75216e959 100644 --- a/chromium/third_party/WebKit/Source/core/loader/FrameLoader.cpp +++ b/chromium/third_party/WebKit/Source/core/loader/FrameLoader.cpp @@ -559,6 +559,11 @@ static bool shouldSendFinishNotification(LocalFrame* frame) // An event might have restarted a child frame. if (!allDescendantsAreComplete(frame)) return false; + + // Don't notify if the frame is being detached. + if (frame->isDetaching()) + return false; + return true; } -- cgit v1.2.3