Changeset 32223 in webkit
- Timestamp:
- Apr 18, 2008 1:14:58 PM (16 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r32221 r32223 1 2008-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 1 14 2008-04-18 Dean Jackson <dino@apple.com> 2 15 -
trunk/WebCore/history/CachedPage.cpp
r31801 r32223 165 165 166 166 if (m_document->inPageCache()) { 167 Frame::clearTimers(m_view.get() );167 Frame::clearTimers(m_view.get(), m_document.get()); 168 168 169 169 m_document->setInPageCache(false); -
trunk/WebCore/page/Frame.cpp
r31746 r32223 1459 1459 } 1460 1460 1461 void Frame::clearTimers(FrameView *view )1461 void Frame::clearTimers(FrameView *view, Document *document) 1462 1462 { 1463 1463 if (view) { 1464 1464 view->unscheduleRelayout(); 1465 1465 if (view->frame()) { 1466 Document* document = view->frame()->document();1467 1466 if (document && document->renderer() && document->renderer()->hasLayer()) 1468 1467 document->renderer()->layer()->suspendMarquees(); … … 1474 1473 void Frame::clearTimers() 1475 1474 { 1476 clearTimers(d->m_view.get() );1475 clearTimers(d->m_view.get(), document()); 1477 1476 } 1478 1477 -
trunk/WebCore/page/Frame.h
r31155 r32223 139 139 140 140 void clearTimers(); 141 static void clearTimers(FrameView* );141 static void clearTimers(FrameView*, Document*); 142 142 143 143 // Convenience, to avoid repeating the code to dig down to get this.
Note: See TracChangeset
for help on using the changeset viewer.