[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
beidson at apple.com
beidson at apple.com
Wed Apr 7 23:07:28 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit a566251f77740064feeb371950fb8c8d20320eb4
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 27 00:19:33 2009 +0000
<rdar://problem/7289467> and http://webkit.org/b/30798 - REGRESSION (r48687): www.myuhc.com doesn't load.
Reviewed by Darin Adler.
WebCore:
Test: fast/loader/grandparent-completion-starts-redirect.html
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::completed): Notify all descendants that the load completed, not just direct children.
LayoutTests:
* fast/loader/grandparent-completion-starts-redirect-expected.txt: Added.
* fast/loader/grandparent-completion-starts-redirect.html: Added.
* fast/loader/resources/meta-redirect-to-notify-done.html: Added.
* fast/loader/resources/parent-of-redirect.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50116 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 932e0ea..f7b6bc9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-26 Brady Eidson <beidson at apple.com>
+
+ Reviewed by Darin Adler.
+
+ <rdar://problem/7289467> and http://webkit.org/b/30798 - REGRESSION (r48687): www.myuhc.com doesn't load.
+
+ * fast/loader/grandparent-completion-starts-redirect-expected.txt: Added.
+ * fast/loader/grandparent-completion-starts-redirect.html: Added.
+ * fast/loader/resources/meta-redirect-to-notify-done.html: Added.
+ * fast/loader/resources/parent-of-redirect.html: Added.
+
2009-10-26 Dan Bernstein <mitz at apple.com>
Reviewed by Sam Weinig.
diff --git a/LayoutTests/fast/loader/grandparent-completion-starts-redirect-expected.txt b/LayoutTests/fast/loader/grandparent-completion-starts-redirect-expected.txt
new file mode 100644
index 0000000..98c5ace
--- /dev/null
+++ b/LayoutTests/fast/loader/grandparent-completion-starts-redirect-expected.txt
@@ -0,0 +1,16 @@
+This is the grandparent of a frame that redirects itself.
+That grandchild frame redirects from a page with text to an empty page.
+A successful test result is a blank grandchild frame.
+If the explanatory text on the grandchild frame is still there, the test has failed.
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+This is the parent of a frame that redirects itself.
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->/<!--frame0-->-->'
+--------
+
diff --git a/LayoutTests/fast/loader/grandparent-completion-starts-redirect.html b/LayoutTests/fast/loader/grandparent-completion-starts-redirect.html
new file mode 100644
index 0000000..57d6fac
--- /dev/null
+++ b/LayoutTests/fast/loader/grandparent-completion-starts-redirect.html
@@ -0,0 +1,18 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.dumpChildFramesAsText();
+ layoutTestController.waitUntilDone();
+}
+</script>
+</head>
+<body>
+This is the grandparent of a frame that redirects itself.<br>
+That grandchild frame redirects from a page with text to an empty page.<br>
+A successful test result is a blank grandchild frame.<br>
+If the explanatory text on the grandchild frame is still there, the test has failed.<br>
+<iframe src="resources/parent-of-redirect.html"></iframe>
+</body>
+</html>
diff --git a/LayoutTests/fast/loader/resources/meta-redirect-to-notify-done.html b/LayoutTests/fast/loader/resources/meta-redirect-to-notify-done.html
new file mode 100644
index 0000000..fd08ecf
--- /dev/null
+++ b/LayoutTests/fast/loader/resources/meta-redirect-to-notify-done.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+<meta http-equiv="Refresh" content="0;url=notify-done.html">
+</head>
+<body>
+This frame does a meta-redirect to a an empty page that performs a notify done.<br>
+If things are working correctly, you shouldn't see this text in the test results.
+</body>
+</html>
diff --git a/LayoutTests/fast/loader/resources/parent-of-redirect.html b/LayoutTests/fast/loader/resources/parent-of-redirect.html
new file mode 100644
index 0000000..210d519
--- /dev/null
+++ b/LayoutTests/fast/loader/resources/parent-of-redirect.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+This is the parent of a frame that redirects itself.<br>
+<iframe src="meta-redirect-to-notify-done.html"></iframe>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 887e287..34d243e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-26 Brady Eidson <beidson at apple.com>
+
+ Reviewed by Darin Adler.
+
+ <rdar://problem/7289467> and http://webkit.org/b/30798 - REGRESSION (r48687): www.myuhc.com doesn't load.
+
+ Test: fast/loader/grandparent-completion-starts-redirect.html
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::completed): Notify all descendants that the load completed, not just direct children.
+
2009-10-26 Dan Bernstein <mitz at apple.com>
Reviewed by Beth Dakin.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 39d4900..cf21602 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -1729,10 +1729,13 @@ bool FrameLoader::isComplete() const
void FrameLoader::completed()
{
RefPtr<Frame> protect(m_frame);
- for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
- child->redirectScheduler()->startTimer();
+
+ for (Frame* descendant = m_frame->tree()->traverseNext(m_frame); descendant; descendant = descendant->tree()->traverseNext(m_frame))
+ descendant->redirectScheduler()->startTimer();
+
if (Frame* parent = m_frame->tree()->parent())
parent->loader()->checkCompleted();
+
if (m_frame->view())
m_frame->view()->maintainScrollPositionAtAnchor(0);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list