Changeset 32223 in webkit


Ignore:
Timestamp:
Apr 18, 2008 1:14:58 PM (16 years ago)
Author:
dino@apple.com
Message:

Fixed marquee suspension on wrong document. Passes current
document into Frame::clearTimers.

Reviewed by hyatt.

  • history/CachedPage.cpp:

(WebCore::CachedPage::clear):

  • page/Frame.cpp:

(WebCore::Frame::clearTimers):

  • page/Frame.h:
Location:
trunk/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r32221 r32223  
     12008-04-18  Dean Jackson <dino@apple.com>
     2
     3        Fixed marquee suspension on wrong document. Passes current
     4        document into Frame::clearTimers.
     5
     6        Reviewed by hyatt.
     7
     8        * history/CachedPage.cpp:
     9        (WebCore::CachedPage::clear):
     10        * page/Frame.cpp:
     11        (WebCore::Frame::clearTimers):
     12        * page/Frame.h:
     13
    1142008-04-18  Dean Jackson <dino@apple.com>
    215
  • trunk/WebCore/history/CachedPage.cpp

    r31801 r32223  
    165165
    166166    if (m_document->inPageCache()) {
    167         Frame::clearTimers(m_view.get());
     167        Frame::clearTimers(m_view.get(), m_document.get());
    168168
    169169        m_document->setInPageCache(false);
  • trunk/WebCore/page/Frame.cpp

    r31746 r32223  
    14591459}
    14601460
    1461 void Frame::clearTimers(FrameView *view)
     1461void Frame::clearTimers(FrameView *view, Document *document)
    14621462{
    14631463    if (view) {
    14641464        view->unscheduleRelayout();
    14651465        if (view->frame()) {
    1466             Document* document = view->frame()->document();
    14671466            if (document && document->renderer() && document->renderer()->hasLayer())
    14681467                document->renderer()->layer()->suspendMarquees();
     
    14741473void Frame::clearTimers()
    14751474{
    1476     clearTimers(d->m_view.get());
     1475    clearTimers(d->m_view.get(), document());
    14771476}
    14781477
  • trunk/WebCore/page/Frame.h

    r31155 r32223  
    139139
    140140    void clearTimers();
    141     static void clearTimers(FrameView*);
     141    static void clearTimers(FrameView*, Document*);
    142142
    143143    // Convenience, to avoid repeating the code to dig down to get this.
Note: See TracChangeset for help on using the changeset viewer.