Changeset 31228 in webkit


Ignore:
Timestamp:
Mar 22, 2008 12:14:40 AM (16 years ago)
Author:
oliver@apple.com
Message:

2008-03-21 Cameron Zwarich <cwzwarich@uwaterloo.ca>

Bug 13693: REGRESSION (r13615): Acid2 Test Eyes render improperly after a page refresh
<http://bugs.webkit.org/show_bug.cgi?id=13693>

Reviewed by Oliver Hunt

Do not create bogus history items for unloaded <object> elements, because they
cause fallback content to be ignored on reload.

Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r31227 r31228  
     12008-03-21  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
     2
     3        Reviewed by Oliver Hunt.
     4
     5        Test for <http://bugs.webkit.org/show_bug.cgi?id=13693>
     6        Bug 13693: REGRESSION (r13615): Acid2 Test Eyes render improperly after a page refresh
     7
     8        * http/tests/navigation/fallback-anchor-reload-expected.txt: Added.
     9        * http/tests/navigation/fallback-anchor-reload.html: Added.
     10
    1112008-03-21  Dan Bernstein  <mitz@apple.com>
    212
  • trunk/WebCore/ChangeLog

    r31227 r31228  
     12008-03-21  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
     2
     3        Reviewed by Oliver Hunt.
     4
     5        Bug 13693: REGRESSION (r13615): Acid2 Test Eyes render improperly after a page refresh
     6        <http://bugs.webkit.org/show_bug.cgi?id=13693>
     7
     8        Do not create bogus history items for unloaded <object> elements, because they
     9        cause fallback content to be ignored on reload.
     10
     11        * loader/FrameLoader.cpp:
     12        (WebCore::FrameLoader::createHistoryItemTree):
     13
    1142008-03-21  Dan Bernstein  <mitz@apple.com>
    215
  • trunk/WebCore/loader/FrameLoader.cpp

    r31197 r31228  
    38873887        // save frame state for items that aren't loading (khtml doesn't save those)
    38883888        saveDocumentState();
    3889         for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
    3890             bfItem->addChildItem(child->loader()->createHistoryItemTree(targetFrame, clipAtTarget));
     3889        for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling()) {
     3890            FrameLoader* childLoader = child->loader();
     3891            bool hasChildLoaded = childLoader->frameHasLoaded();
     3892           
     3893            // If the child is a frame corresponding to an <object> element that never loaded,
     3894            // we don't want to create a history item, because that causes fallback content
     3895            // to be ignored on reload.
     3896           
     3897            if (!(!hasChildLoaded && childLoader->isHostedByObjectElement()))
     3898                bfItem->addChildItem(childLoader->createHistoryItemTree(targetFrame, clipAtTarget));
     3899        }
    38913900    }
    38923901    if (m_frame == targetFrame)
Note: See TracChangeset for help on using the changeset viewer.