Changeset 23861 in webkit


Ignore:
Timestamp:
Jun 28, 2007 2:08:16 PM (17 years ago)
Author:
weinig
Message:

LayoutTests:

Reviewed by Geoff.

Tests for ​http://bugs.webkit.org/show_bug.cgi?id=13038

ASSERTION FAILED: item->target().isEmpty()
m_mainFrame->tree()->find(item->target()) == m_mainFrame

Although the test works with the script, it can't detect an eventually
error automatically since the first link must be opened in a new tab with
a _blank target to reproduce the crash. So it should be launched manually
following the steps decribed in there, then it's effective.

  • http/tests/navigation/goBack-blank-tab-page-expected.txt: Added.
  • http/tests/navigation/goBack-blank-tab-page.html: Added.
  • http/tests/navigation/resources/before-go-back.html: Added.
  • http/tests/navigation/resources/will-go-back.html: Added.

WebCore:

Reviewed by Geoff.

Patch for ​http://bugs.webkit.org/show_bug.cgi?id=13038

ASSERTION FAILED: item->target().isEmpty()
m_mainFrame->tree()->find(item->target()) == m_mainFrame

Modification of an ASSERT on goToItem related to go back/forward in
history.Don't need to check the frameset if the target is _blank.

  • page/Page.cpp: (WebCore::Page::goToItem):
Location:
trunk
Files:
4 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r23860 r23861  
     12007-06-28  Maxime Britto  <mbritto@pleyo.com>
     2
     3        Reviewed by Geoff.
     4
     5        Tests for http://bugs.webkit.org/show_bug.cgi?id=13038
     6        ASSERTION FAILED: item->target().isEmpty() || m_mainFrame->tree()->find(item->target()) == m_mainFrame
     7
     8        Although the test works with the script, it can't detect an eventually
     9        error automatically since the first link must be opened in a new tab with
     10        a _blank target to reproduce the crash. So it should be launched manually
     11        following the steps decribed in there, then it's effective.
     12
     13         * http/tests/navigation/goBack-blank-tab-page-expected.txt: Added.
     14         * http/tests/navigation/goBack-blank-tab-page.html: Added.
     15         * http/tests/navigation/resources/before-go-back.html: Added.
     16         * http/tests/navigation/resources/will-go-back.html: Added.
     17
    1182007-06-28  Anders Carlsson  <andersca@apple.com>
    219

  • trunk/WebCore/ChangeLog

    r23857 r23861  
     12007-06-26  Maxime Britto  <mbritto@pleyo.com>
     2
     3        Reviewed by Geoff.
     4
     5        Patch for http://bugs.webkit.org/show_bug.cgi?id=13038
     6        ASSERTION FAILED: item->target().isEmpty() || m_mainFrame->tree()->find(item->target()) == m_mainFrame
     7
     8        Modification of an ASSERT on goToItem related to go back/forward in
     9        history.Don't need to check the frameset if the target is _blank.
     10
     11         * page/Page.cpp:
     12         (WebCore::Page::goToItem):
     13
    1142007-06-28  Anders Carlsson  <andersca@apple.com>
    215

  • trunk/WebCore/page/Page.cpp

    r23677 r23861  
    131131void Page::goToItem(HistoryItem* item, FrameLoadType type)
    132132{
     133    // Handle the go back/forward to a frameset, don't need to handle if the traget is a _blank
    133134    // We never go back/forward on a per-frame basis, so the target must be the main frame
    134     ASSERT(item->target().isEmpty() || m_mainFrame->tree()->find(item->target()) == m_mainFrame);
     135    ASSERT(item->target().isEmpty() || item->target().contains("_blank", true) || m_mainFrame->tree()->find(item->target()) == m_mainFrame);
    135136
    136137    // Abort any current load if we're going to a history item
Note: See TracChangeset for help on using the changeset viewer.