Changeset 24057 in webkit

Timestamp:

Jul 6, 2007 3:31:35 AM (17 years ago)

Author:

bdash

Message:

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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• 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 (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/WebCore/page/Page.cpp

@@ -131 +131 @@
 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