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

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

Issue 8894015: Merge 102405 - Source/WebCore: Improve handling of frame removal during requestAnimationFrame cal... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
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 2037 matching lines...) Expand 10 before | Expand all | Expand 10 after
2048 printf("Layout timer unscheduled at %d\n", m_frame->document()->elapsedT ime()); 2048 printf("Layout timer unscheduled at %d\n", m_frame->document()->elapsedT ime());
2049 #endif 2049 #endif
2050 2050
2051 m_layoutTimer.stop(); 2051 m_layoutTimer.stop();
2052 m_delayedLayout = false; 2052 m_delayedLayout = false;
2053 } 2053 }
2054 2054
2055 #if ENABLE(REQUEST_ANIMATION_FRAME) 2055 #if ENABLE(REQUEST_ANIMATION_FRAME)
2056 void FrameView::serviceScriptedAnimations(DOMTimeStamp time) 2056 void FrameView::serviceScriptedAnimations(DOMTimeStamp time)
2057 { 2057 {
2058 Vector<RefPtr<Document> > documents;
2059
2058 for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNex t()) 2060 for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNex t())
2059 frame->document()->serviceScriptedAnimations(time); 2061 documents.append(frame->document());
2062
2063 for (size_t i = 0; i < documents.size(); ++i)
2064 documents[i]->serviceScriptedAnimations(time);
2060 } 2065 }
2061 #endif 2066 #endif
2062 2067
2063 bool FrameView::isTransparent() const 2068 bool FrameView::isTransparent() const
2064 { 2069 {
2065 return m_isTransparent; 2070 return m_isTransparent;
2066 } 2071 }
2067 2072
2068 void FrameView::setTransparent(bool isTransparent) 2073 void FrameView::setTransparent(bool isTransparent)
2069 { 2074 {
(...skipping 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after
3133 } 3138 }
3134 3139
3135 AXObjectCache* FrameView::axObjectCache() const 3140 AXObjectCache* FrameView::axObjectCache() const
3136 { 3141 {
3137 if (frame() && frame()->document() && frame()->document()->axObjectCacheExis ts()) 3142 if (frame() && frame()->document() && frame()->document()->axObjectCacheExis ts())
3138 return frame()->document()->axObjectCache(); 3143 return frame()->document()->axObjectCache();
3139 return 0; 3144 return 0;
3140 } 3145 }
3141 3146
3142 } // namespace WebCore 3147 } // 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