2011-04-15 Charlie Reis <creis@chromium.org>

webkit-commit-queue · webkit-commit-queue · commit 607f2b66ccb7 · 2011-04-16T00:01:18.000Z
Reviewed by Darin Fisher. [Chromium] fast/events/popup-allowed-from-gesture-initiated-form-submit.html causing debug ASSERT https://bugs.webkit.org/show_bug.cgi?id=44079 Remove an assert whose invariant doesn't hold. * platform/chromium/test_expectations.txt: Re-enable test. 2011-04-15 Charlie Reis <creis@chromium.org> Reviewed by Darin Fisher. [Chromium] fast/events/popup-allowed-from-gesture-initiated-form-submit.html causing debug ASSERT https://bugs.webkit.org/show_bug.cgi?id=44079 Remove an assert whose invariant doesn't hold. * src/FrameLoaderClientImpl.cpp: Canonical link: https://commits.webkit.org/73796@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84055 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2011-04-15  Charlie Reis  <creis@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] fast/events/popup-allowed-from-gesture-initiated-form-submit.html causing debug ASSERT
+        https://bugs.webkit.org/show_bug.cgi?id=44079
+
+        Remove an assert whose invariant doesn't hold.
+
+        * platform/chromium/test_expectations.txt: Re-enable test.
+
 2011-04-15  Kinuko Yasuda  <kinuko@chromium.org>
 
         Reviewed by David Levin.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2250,10 +2250,6 @@ BUGWK43912 WIN LINUX : svg/custom/absolute-sized-content-with-resources.xhtml =
 // Times out frequently since the test was added
 BUGCR52017 MAC LINUX : http/tests/misc/isindex-with-no-form.html = PASS TIMEOUT
 
-// Probably http://trac.webkit.org/changeset/65381
-// This test causes the next one to run to ASSERT
-BUGWK44079 DEBUG SKIP : fast/events/popup-allowed-from-gesture-initiated-form-submit.html = PASS
-
 // Flaky. Not sure when it started to fail.
 BUGCR52572 WIN LINUX DEBUG : http/tests/misc/image-blocked-src-change.html = PASS TEXT
 
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2011-04-15  Charlie Reis  <creis@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] fast/events/popup-allowed-from-gesture-initiated-form-submit.html causing debug ASSERT
+        https://bugs.webkit.org/show_bug.cgi?id=44079
+
+        Remove an assert whose invariant doesn't hold.
+
+        * src/FrameLoaderClientImpl.cpp:
+
 2011-04-15  Kinuko Yasuda  <kinuko@chromium.org>
 
         Reviewed by David Levin.
diff --git a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -714,10 +714,18 @@ void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad()
         // m_expectedClientRedirectDest could be something like
         // "javascript:history.go(-1)" thus we need to exclude url starts with
         // "javascript:". See bug: 1080873
-        ASSERT(m_expectedClientRedirectDest.protocolIs("javascript")
-            || m_expectedClientRedirectDest == url);
-        ds->appendRedirect(m_expectedClientRedirectSrc);
-        completingClientRedirect = true;
+        if (m_expectedClientRedirectDest.protocolIs("javascript")
+            || m_expectedClientRedirectDest == url) {
+            ds->appendRedirect(m_expectedClientRedirectSrc);
+            completingClientRedirect = true;
+        } else {
+            // Any pending redirect is no longer in progress. This can happen
+            // if the navigation was canceled with PolicyIgnore, or if the
+            // redirect was scheduled on the wrong frame (e.g., due to a form
+            // submission targeted to _blank, as in http://webkit.org/b/44079).
+            m_expectedClientRedirectSrc = KURL();
+            m_expectedClientRedirectDest = KURL();
+        }
     }
     ds->appendRedirect(url);
 
