diff options
| author | dcheng <dcheng@chromium.org> | 2016-11-23 05:10:37 -0800 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-16 14:47:51 +0000 |
| commit | 00c30cdbc6f847ea361e56e028853109f1dc19d4 (patch) | |
| tree | 7847999dffb4373b04d71d4aa011730205b70c08 | |
| parent | 062a75ed93a9b75f53292c6421b3292f753ea9b5 (diff) | |
[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 <alexandru.croitor@qt.io>
| -rw-r--r-- | chromium/third_party/WebKit/Source/core/loader/FrameLoader.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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; } |