git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d9c5f7a)
2007-07-06 Maxime Britto <mbritto@pleyo.com>
authorbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Jul 2007 10:31:35 +0000 (10:31 +0000)
committerbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Jul 2007 10:31:35 +0000 (10:31 +0000)
        Reviewed by Maciej.

        Fix http://bugs.webkit.org/show_bug.cgi?id=13038
        Bug 13038: ASSERTION FAILED: item->target().isEmpty() || m_mainFrame->tree()->find(item->target()) == m_mainFrame

        Modify an ASSERT in goToItem related to going back/forward in history.  We don't need to check the frameset if the target is _blank.
        The attached test case is a manual one since it relies on having pages opened in tabs in Safari.

        * manual-tests/goBack-blank-tab-page.html: Added.
        * manual-tests/resources/before-go-back.html: Added.
        * manual-tests/resources/will-go-back.html: Added.
        * page/Page.cpp:
        (WebCore::Page::goToItem):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24057 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog patch | blob | history
WebCore/manual-tests/goBack-blank-tab-page.html [new file with mode: 0644] patch | blob
WebCore/manual-tests/resources/before-go-back.html [new file with mode: 0644] patch | blob
WebCore/manual-tests/resources/will-go-back.html [new file with mode: 0644] patch | blob
WebCore/page/Page.cpp patch | blob | history

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 515f32705e3a397cc573e3006fd206c54b464208..ef525c6e27287afc41adec4c981c778d7a92554b 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2007-07-06  Maxime Britto  <mbritto@pleyo.com>
+
+        Reviewed by Maciej.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=13038
+        Bug 13038: ASSERTION FAILED: item->target().isEmpty() || m_mainFrame->tree()->find(item->target()) == m_mainFrame
+
+        Modify an ASSERT in goToItem related to going back/forward in history.  We don't need to check the frameset if the target is _blank.
+        The attached test case is a manual one since it relies on having pages opened in tabs in Safari.
+
+        * manual-tests/goBack-blank-tab-page.html: Added.
+        * manual-tests/resources/before-go-back.html: Added.
+        * manual-tests/resources/will-go-back.html: Added.
+        * page/Page.cpp:
+        (WebCore::Page::goToItem):
+
 2007-07-06  Mitz Pettel  <mitz@webkit.org>
 
         Reviewed by Maciej.
diff --git a/WebCore/manual-tests/goBack-blank-tab-page.html b/WebCore/manual-tests/goBack-blank-tab-page.html
new file mode 100644 (file)
index 0000000..7a6157e
--- /dev/null
+++ b/WebCore/manual-tests/goBack-blank-tab-page.html
@@ -0,0 +1,19 @@
+<html>
+<body>
+<a href="resources/before-go-back.html" target="_blank">
+Link to open in a tab</a>
+<br>
+<br>
+<u>Manual test :</u>
+<br>
+You need to open the above link in a new tab. In the opened page, just click on the link : if the webkit doesn't crash, the test has succeed.
+<br>
+<u>Details :</u>
+<br>
+This test checks if you can go back to a _blank-target previously tab-opened page.
+<br>
+If the webkit doesn't meet an assertion error : this test is Successfull.
+<br>
+When you click on the above link, one page (with _blank target) is loaded and this page will open a link and go back.
+</body>
+</html>
diff --git a/WebCore/manual-tests/resources/before-go-back.html b/WebCore/manual-tests/resources/before-go-back.html
new file mode 100644 (file)
index 0000000..10d8dbe
--- /dev/null
+++ b/WebCore/manual-tests/resources/before-go-back.html
@@ -0,0 +1,17 @@
+<html>
+<body>
+<a href="will-go-back.html">
+Click this link</a>
+<br>
+<br>
+<u>Manual test :</u>
+Just click on the link : if the webkit doesn't crash, the test has succeed.
+<br>
+<u>Details:</u>
+This test checks if you can go back to a _blank previously tab-opened page.
+<br>
+When you click on the above link, one page is loaded and tries to go back.
+<br>
+If the webkit doesn't meet an assertion failure : this test is successfull.
+</body>
+</html>
diff --git a/WebCore/manual-tests/resources/will-go-back.html b/WebCore/manual-tests/resources/will-go-back.html
new file mode 100644 (file)
index 0000000..5d09ba3
--- /dev/null
+++ b/WebCore/manual-tests/resources/will-go-back.html
@@ -0,0 +1,11 @@
+<html>
+<script>
+function goBack() {
+    history.back();
+}
+</script>
+
+<body onload="if (!window.layoutTestController) goBack();">
+If you can go back using the history : test has succeed.
+</body>
+</html>
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 78097212c7876a61d9ef058d26be86d6d4364550..208c4a8850714ac2c19258aad6d6031dda7f0683 100644 (file)
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -130,8 +130,9 @@ bool Page::goForward()
 
 void Page::goToItem(HistoryItem* item, FrameLoadType type)
 {
+    // Handle the go back/forward to a frameset, don't need to handle if the traget is a _blank
     // We never go back/forward on a per-frame basis, so the target must be the main frame
-    ASSERT(item->target().isEmpty() || m_mainFrame->tree()->find(item->target()) == m_mainFrame);
+    ASSERT(item->target().isEmpty() || item->target().contains("_blank", true) || m_mainFrame->tree()->find(item->target()) == m_mainFrame);
 
     // Abort any current load if we're going to a history item
     m_mainFrame->loader()->stopAllLoaders();
Mirror of the WebKit open source project from svn.webkit.org.