Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: Source/WebCore/page/FrameView.cpp

Issue 8899006: Merge 102405 - Source/WebCore: Improve handling of frame removal during requestAnimationFrame cal... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/dom/ScriptedAnimationController.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 2067 matching lines...) Expand 10 before | Expand all | Expand 10 after
2078 printf("Layout timer unscheduled at %d\n", m_frame->document()->elapsedT ime()); 2078 printf("Layout timer unscheduled at %d\n", m_frame->document()->elapsedT ime());
2079 #endif 2079 #endif
2080 2080
2081 m_layoutTimer.stop(); 2081 m_layoutTimer.stop();
2082 m_delayedLayout = false; 2082 m_delayedLayout = false;
2083 } 2083 }
2084 2084
2085 #if ENABLE(REQUEST_ANIMATION_FRAME) 2085 #if ENABLE(REQUEST_ANIMATION_FRAME)
2086 void FrameView::serviceScriptedAnimations(DOMTimeStamp time) 2086 void FrameView::serviceScriptedAnimations(DOMTimeStamp time)
2087 { 2087 {
2088 Vector<RefPtr<Document> > documents;
2089
2088 for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNex t()) 2090 for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNex t())
2089 frame->document()->serviceScriptedAnimations(time); 2091 documents.append(frame->document());
2092
2093 for (size_t i = 0; i < documents.size(); ++i)
2094 documents[i]->serviceScriptedAnimations(time);
2090 } 2095 }
2091 #endif 2096 #endif
2092 2097
2093 bool FrameView::isTransparent() const 2098 bool FrameView::isTransparent() const
2094 { 2099 {
2095 return m_isTransparent; 2100 return m_isTransparent;
2096 } 2101 }
2097 2102
2098 void FrameView::setTransparent(bool isTransparent) 2103 void FrameView::setTransparent(bool isTransparent)
2099 { 2104 {
(...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after
3288 } 3293 }
3289 3294
3290 AXObjectCache* FrameView::axObjectCache() const 3295 AXObjectCache* FrameView::axObjectCache() const
3291 { 3296 {
3292 if (frame() && frame()->document() && frame()->document()->axObjectCacheExis ts()) 3297 if (frame() && frame()->document() && frame()->document()->axObjectCacheExis ts())
3293 return frame()->document()->axObjectCache(); 3298 return frame()->document()->axObjectCache();
3294 return 0; 3299 return 0;
3295 } 3300 }
3296 3301
3297 } // namespace WebCore 3302 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/dom/ScriptedAnimationController.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698