[webkit-changes] [90344] trunk

Sun, 03 Jul 2011 11:29:17 -0700

Title: [90344] trunk
Revision
90344
Author
[email protected]
Date
2011-07-03 11:29:08 -0700 (Sun, 03 Jul 2011)

Log Message

2011-07-03  Sheriff Bot  <[email protected]>

        Unreviewed, rolling out r90342.
        http://trac.webkit.org/changeset/90342
        https://bugs.webkit.org/show_bug.cgi?id=63875

        Newly added tests fail on Mac, GTK, and Win7 (Requested by
        abarth on #webkit).

        * http/tests/navigation/scrollstate-after-http-equiv-refresh-expected.txt: Removed.
        * http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-2-expected.txt: Removed.
        * http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-2.html: Removed.
        * http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-expected.txt: Removed.
        * http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier.html: Removed.
        * http/tests/navigation/scrollstate-after-http-equiv-refresh.html: Removed.
        * http/tests/navigation/scrollstate-after-location-reload-expected.txt: Removed.
        * http/tests/navigation/scrollstate-after-location-reload.html: Removed.
2011-07-03  Sheriff Bot  <[email protected]>

        Unreviewed, rolling out r90342.
        http://trac.webkit.org/changeset/90342
        https://bugs.webkit.org/show_bug.cgi?id=63875

        Newly added tests fail on Mac, GTK, and Win7 (Requested by
        abarth on #webkit).

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::loadURL):
        * loader/NavigationScheduler.cpp:

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (90343 => 90344)


--- trunk/LayoutTests/ChangeLog	2011-07-03 17:42:01 UTC (rev 90343)
+++ trunk/LayoutTests/ChangeLog	2011-07-03 18:29:08 UTC (rev 90344)
@@ -1,3 +1,21 @@
+2011-07-03  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r90342.
+        http://trac.webkit.org/changeset/90342
+        https://bugs.webkit.org/show_bug.cgi?id=63875
+
+        Newly added tests fail on Mac, GTK, and Win7 (Requested by
+        abarth on #webkit).
+
+        * http/tests/navigation/scrollstate-after-http-equiv-refresh-expected.txt: Removed.
+        * http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-2-expected.txt: Removed.
+        * http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-2.html: Removed.
+        * http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-expected.txt: Removed.
+        * http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier.html: Removed.
+        * http/tests/navigation/scrollstate-after-http-equiv-refresh.html: Removed.
+        * http/tests/navigation/scrollstate-after-location-reload-expected.txt: Removed.
+        * http/tests/navigation/scrollstate-after-location-reload.html: Removed.
+
 2011-07-03  Robert Hogan  <[email protected]>
 
         Skip Qt platform-specific test after r90341

Deleted: trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-expected.txt (90343 => 90344)


--- trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-expected.txt	2011-07-03 17:42:01 UTC (rev 90343)
+++ trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-expected.txt	2011-07-03 18:29:08 UTC (rev 90344)
@@ -1 +0,0 @@
-SUCCESS

Deleted: trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-2-expected.txt (90343 => 90344)


--- trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-2-expected.txt	2011-07-03 17:42:01 UTC (rev 90343)
+++ trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-2-expected.txt	2011-07-03 18:29:08 UTC (rev 90344)
@@ -1 +0,0 @@
-SUCCESS

Deleted: trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-2.html (90343 => 90344)


--- trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-2.html	2011-07-03 17:42:01 UTC (rev 90343)
+++ trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-2.html	2011-07-03 18:29:08 UTC (rev 90344)
@@ -1,117 +0,0 @@
-<html>
-<meta http-equiv="refresh" content="2">
-<script>
-
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    layoutTestController.dumpAsText();
-}
-
-function testScroll() {
-  window.setTimeout(function() {
-        if (window.pageYOffset != 0) {
-          document.body.innerHTML = "SUCCESS";
-          layoutTestController.notifyDone();
-        } else
-          location.assign('scrollstate-after-http-equiv-refresh-fragment-identifier-2.html#1');
-    }, 0);
-}
-
-_onload_ = testScroll;
-
-</script>
-
-<body>
-This test checks that a page reloaded by http-equiv="refresh" respects the user's navigation to
-fragment identifiers within the page when reloading.
-https://bugs.webkit.org/show_bug.cgi?id=62482
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<div id="1"></div>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-</body>
-</html>

Deleted: trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-expected.txt (90343 => 90344)


--- trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-expected.txt	2011-07-03 17:42:01 UTC (rev 90343)
+++ trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier-expected.txt	2011-07-03 18:29:08 UTC (rev 90344)
@@ -1 +0,0 @@
-SUCCESS

Deleted: trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier.html (90343 => 90344)


--- trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier.html	2011-07-03 17:42:01 UTC (rev 90343)
+++ trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh-fragment-identifier.html	2011-07-03 18:29:08 UTC (rev 90344)
@@ -1,131 +0,0 @@
-<html>
-<meta http-equiv="refresh" content="2">
-<script>
-
-if (window.layoutTestController) {
-    layoutTestController.waitUntilDone();
-    layoutTestController.dumpAsText();
-}
-function documentURLHash()
-{
-    var index = document.URL.lastIndexOf("#");
-    if (index == -1)
-        return "";
-    return document.URL.substring(index);
-}
-
-function hashChanged()
-{
-    document.body.innerHTML += "scrolled to hash " + documentURLHash();
-    window.scroll(0,100);
-}
-
-function testScroll() {
-  window.setTimeout(function() {
-        if (window.pageYOffset == 100) {
-          document.body.innerHTML = "SUCCESS";
-          layoutTestController.notifyDone();
-        } else
-          location.assign('scrollstate-after-http-equiv-refresh-fragment-identifier.html#1');
-    }, 0);
-}
-
-_onload_ = testScroll;
-_onhashchange_ = hashChanged;
-
-</script>
-
-<body>
-This test checks that a page reloaded by http-equiv="refresh" restores its scroll state even
-when the user has loaded a fragment within the document.
-https://bugs.webkit.org/show_bug.cgi?id=62482
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<div id="1"></div>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-</body>
-</html>

Deleted: trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh.html (90343 => 90344)


--- trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh.html	2011-07-03 17:42:01 UTC (rev 90343)
+++ trunk/LayoutTests/http/tests/navigation/scrollstate-after-http-equiv-refresh.html	2011-07-03 18:29:08 UTC (rev 90344)
@@ -1,58 +0,0 @@
-<html>
-<meta http-equiv="refresh" content="2">
-<script>
-    if (window.layoutTestController) {
-        layoutTestController.waitUntilDone();
-        layoutTestController.dumpAsText();
-    }
-    function testScroll() {
-      window.setTimeout(function() {
-          if (window.pageYOffset == 100) {
-            document.body.innerHTML = "SUCCESS";
-            layoutTestController.notifyDone();
-          } else
-            window.scroll(0,100);
-        }, 0);
-    }
-    _onload_ = testScroll;
-</script>
-
-<body>
-This test checks that a page reloaded by http-equiv="refresh" restores its scroll state.
-https://bugs.webkit.org/show_bug.cgi?id=62482
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-</body>
-</html>

Deleted: trunk/LayoutTests/http/tests/navigation/scrollstate-after-location-reload-expected.txt (90343 => 90344)


--- trunk/LayoutTests/http/tests/navigation/scrollstate-after-location-reload-expected.txt	2011-07-03 17:42:01 UTC (rev 90343)
+++ trunk/LayoutTests/http/tests/navigation/scrollstate-after-location-reload-expected.txt	2011-07-03 18:29:08 UTC (rev 90344)
@@ -1 +0,0 @@
-SUCCESS

Deleted: trunk/LayoutTests/http/tests/navigation/scrollstate-after-location-reload.html (90343 => 90344)


--- trunk/LayoutTests/http/tests/navigation/scrollstate-after-location-reload.html	2011-07-03 17:42:01 UTC (rev 90343)
+++ trunk/LayoutTests/http/tests/navigation/scrollstate-after-location-reload.html	2011-07-03 18:29:08 UTC (rev 90344)
@@ -1,61 +0,0 @@
-<html>
-<script>
-    if (window.layoutTestController) {
-        layoutTestController.waitUntilDone();
-        layoutTestController.dumpAsText();
-    }
-    function testScroll() {
-      window.setTimeout(function() {
-          if (window.pageYOffset == 100) {
-            document.body.innerHTML = "SUCCESS";
-            layoutTestController.notifyDone();
-          } else {
-            window.scroll(0,100);
-            window.setTimeout(function() {
-              window.location.reload();
-            }, 1000);
-          }
-        }, 0);
-    }
-    _onload_ = testScroll;
-</script>
-
-<body>
-This test checks that a page reloaded by window.location.reload() restores its scroll state.
-https://bugs.webkit.org/show_bug.cgi?id=62482
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-</body>
-</html>

Modified: trunk/Source/WebCore/ChangeLog (90343 => 90344)


--- trunk/Source/WebCore/ChangeLog	2011-07-03 17:42:01 UTC (rev 90343)
+++ trunk/Source/WebCore/ChangeLog	2011-07-03 18:29:08 UTC (rev 90344)
@@ -1,3 +1,16 @@
+2011-07-03  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r90342.
+        http://trac.webkit.org/changeset/90342
+        https://bugs.webkit.org/show_bug.cgi?id=63875
+
+        Newly added tests fail on Mac, GTK, and Win7 (Requested by
+        abarth on #webkit).
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadURL):
+        * loader/NavigationScheduler.cpp:
+
 2011-07-03  Robert Hogan  <[email protected]>
 
         Restore scroll position on page reloads scheduled by <meta http-equiv="refresh" content="XX"/>

Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (90343 => 90344)


--- trunk/Source/WebCore/loader/FrameLoader.cpp	2011-07-03 17:42:01 UTC (rev 90343)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp	2011-07-03 18:29:08 UTC (rev 90344)
@@ -1217,7 +1217,7 @@
             m_quickRedirectComing = false;
             if (m_provisionalDocumentLoader)
                 m_provisionalDocumentLoader->setIsClientRedirect(true);
-        } else if (sameURL && newLoadType != FrameLoadTypeReload && newLoadType != FrameLoadTypeReloadFromOrigin)
+        } else if (sameURL)
             // Example of this case are sites that reload the same URL with a different cookie
             // driving the generated content, or a master frame with links that drive a target
             // frame, where the user has clicked on the same link repeatedly.

Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (90343 => 90344)


--- trunk/Source/WebCore/loader/NavigationScheduler.cpp	2011-07-03 17:42:01 UTC (rev 90343)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp	2011-07-03 18:29:08 UTC (rev 90344)
@@ -153,13 +153,6 @@
     }
 
     virtual bool shouldStartTimer(Frame* frame) { return frame->loader()->allAncestorsAreComplete(); }
-
-    virtual void fire(Frame* frame)
-    {
-        UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
-        bool refresh = equalIgnoringFragmentIdentifier(frame->document()->url(), KURL(ParsedURLString, url()));
-        frame->loader()->changeLocation(securityOrigin(), KURL(ParsedURLString, url()), referrer(), lockHistory(), lockBackForwardList(), refresh);
-    }
 };
 
 class ScheduledLocationChange : public ScheduledURLNavigation {

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to