Skip to content

GitLab

T
tangled
Commit 23f95c71 authored by japhet@chromium.org's avatar japhet@chromium.org
Browse files
Options

Add a RefPtr<Frame> for child in FrameLoader::checkLoadCompleteForThisFrame 

Not having this can cause problems in the test harnass, where some of the
FrameLoaderClients do substantially more work than they do in a non-test
environment.

BUG=357283

Review URL: https://codereview.chromium.org/317513002

git-svn-id: svn://svn.chromium.org/blink/trunk@175601 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 415830ea
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 2 deletions
third_party/WebKit/LayoutTests/http/tests/misc/detach-during-notifyDone.html 0 → 100644
View file @ 23f95c71
<iframe></iframe><iframe src=resources/detached-frame.html></iframe>
<script>
if (window.testRunner) {
testRunner.dumpAsText();
testRunner.waitUntilDone();
}
</script>
We pass if we don't crash under ASAN
third_party/WebKit/LayoutTests/http/tests/misc/resources/detached-frame.html 0 → 100644
View file @ 23f95c71
<script>
function test() {
var xhr = new XMLHttpRequest;
xhr.open("GET", "detached-frame.html");
xhr.send();
xhr.onreadystatechange = function() {
if (xhr.readyState == xhr.DONE) {
var parentWindow = window.parent;
parentWindow.document.body.innerHTML += "";
parentWindow.testRunner.notifyDone();
}
}
}
</script>
<body onload="test()">
\ No newline at end of file
third_party/WebKit/Source/core/loader/FrameLoader.cpp
View file @ 23f95c71
...@@ -949,9 +949,9 @@ bool FrameLoader::checkLoadCompleteForThisFrame() ...@@ -949,9 +949,9 @@ bool FrameLoader::checkLoadCompleteForThisFrame()
RefPtr<LocalFrame> protect(m_frame); RefPtr<LocalFrame> protect(m_frame);
bool allChildrenAreDoneLoading = true; bool allChildrenAreDoneLoading = true;
for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree().nextSibling()) { for (RefPtr<Frame> child = m_frame->tree().firstChild(); child; child = child->tree().nextSibling()) {
if (child->isLocalFrame()) if (child->isLocalFrame())
allChildrenAreDoneLoading &= toLocalFrame(child)->loader().checkLoadCompleteForThisFrame(); allChildrenAreDoneLoading &= toLocalFrame(child.get())->loader().checkLoadCompleteForThisFrame();
} }
if (m_state == FrameStateProvisional && m_provisionalDocumentLoader) { if (m_state == FrameStateProvisional && m_provisionalDocumentLoader) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment