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

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

Issue 10391049: Merge 116319 - Unreviewed, rolling out r115525. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 months 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
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 2143 matching lines...) Expand 10 before | Expand all | Expand 10 after
2154 #ifdef INSTRUMENT_LAYOUT_SCHEDULING 2154 #ifdef INSTRUMENT_LAYOUT_SCHEDULING
2155 if (!m_frame->document()->ownerElement()) 2155 if (!m_frame->document()->ownerElement())
2156 printf("Layout timer unscheduled at %d\n", m_frame->document()->elapsedT ime()); 2156 printf("Layout timer unscheduled at %d\n", m_frame->document()->elapsedT ime());
2157 #endif 2157 #endif
2158 2158
2159 m_layoutTimer.stop(); 2159 m_layoutTimer.stop();
2160 m_delayedLayout = false; 2160 m_delayedLayout = false;
2161 } 2161 }
2162 2162
2163 #if ENABLE(REQUEST_ANIMATION_FRAME) 2163 #if ENABLE(REQUEST_ANIMATION_FRAME)
2164 void FrameView::serviceScriptedAnimations(double monotonicAnimationStartTime) 2164 void FrameView::serviceScriptedAnimations(DOMTimeStamp time)
2165 { 2165 {
2166 for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNex t()) { 2166 for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNex t()) {
2167 frame->view()->serviceScrollAnimations(); 2167 frame->view()->serviceScrollAnimations();
2168 frame->animation()->serviceAnimations(); 2168 frame->animation()->serviceAnimations();
2169 } 2169 }
2170 2170
2171 Vector<RefPtr<Document> > documents; 2171 Vector<RefPtr<Document> > documents;
2172 for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNex t()) 2172 for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNex t())
2173 documents.append(frame->document()); 2173 documents.append(frame->document());
2174 2174
2175 for (size_t i = 0; i < documents.size(); ++i) 2175 for (size_t i = 0; i < documents.size(); ++i)
2176 documents[i]->serviceScriptedAnimations(monotonicAnimationStartTime); 2176 documents[i]->serviceScriptedAnimations(time);
2177 } 2177 }
2178 #endif 2178 #endif
2179 2179
2180 bool FrameView::isTransparent() const 2180 bool FrameView::isTransparent() const
2181 { 2181 {
2182 return m_isTransparent; 2182 return m_isTransparent;
2183 } 2183 }
2184 2184
2185 void FrameView::setTransparent(bool isTransparent) 2185 void FrameView::setTransparent(bool isTransparent)
2186 { 2186 {
(...skipping 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
3568 } 3568 }
3569 3569
3570 AXObjectCache* FrameView::axObjectCache() const 3570 AXObjectCache* FrameView::axObjectCache() const
3571 { 3571 {
3572 if (frame() && frame()->document() && frame()->document()->axObjectCacheExis ts()) 3572 if (frame() && frame()->document() && frame()->document()->axObjectCacheExis ts())
3573 return frame()->document()->axObjectCache(); 3573 return frame()->document()->axObjectCache();
3574 return 0; 3574 return 0;
3575 } 3575 }
3576 3576
3577 } // namespace WebCore 3577 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/page/FrameView.h ('k') | Source/WebCore/platform/graphics/DisplayRefreshMonitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698