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

Side by Side Diff: Source/core/layout/compositing/LayerCompositor.cpp

Issue 962793008: Rename startPendingAnimations to updateCompositorAnimations (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « Source/core/animation/DocumentAnimations.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) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 // which asserts that it's not InCompositingUpdate. 200 // which asserts that it's not InCompositingUpdate.
201 enableCompositingModeIfNeeded(); 201 enableCompositingModeIfNeeded();
202 202
203 rootLayer()->updateDescendantDependentFlagsForEntireSubtree(); 203 rootLayer()->updateDescendantDependentFlagsForEntireSubtree();
204 m_layoutView.commitPendingSelection(); 204 m_layoutView.commitPendingSelection();
205 205
206 lifecycle().advanceTo(DocumentLifecycle::InCompositingUpdate); 206 lifecycle().advanceTo(DocumentLifecycle::InCompositingUpdate);
207 updateIfNeeded(); 207 updateIfNeeded();
208 lifecycle().advanceTo(DocumentLifecycle::CompositingClean); 208 lifecycle().advanceTo(DocumentLifecycle::CompositingClean);
209 209
210 DocumentAnimations::startPendingAnimations(m_layoutView.document()); 210 DocumentAnimations::updateCompositorAnimations(m_layoutView.document());
211 211
212 m_layoutView.frameView()->updateCompositorScrollAnimations(); 212 m_layoutView.frameView()->updateCompositorScrollAnimations();
213 if (const FrameView::ScrollableAreaSet* animatingScrollableAreas = m_layoutV iew.frameView()->animatingScrollableAreas()) { 213 if (const FrameView::ScrollableAreaSet* animatingScrollableAreas = m_layoutV iew.frameView()->animatingScrollableAreas()) {
214 for (ScrollableArea* scrollableArea : *animatingScrollableAreas) 214 for (ScrollableArea* scrollableArea : *animatingScrollableAreas)
215 scrollableArea->updateCompositorScrollAnimations(); 215 scrollableArea->updateCompositorScrollAnimations();
216 } 216 }
217 217
218 #if ENABLE(ASSERT) 218 #if ENABLE(ASSERT)
219 ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean); 219 ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean);
220 assertNoUnresolvedDirtyBits(); 220 assertNoUnresolvedDirtyBits();
(...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after
1161 } else if (graphicsLayer == m_scrollLayer.get()) { 1161 } else if (graphicsLayer == m_scrollLayer.get()) {
1162 name = "LocalFrame Scrolling Layer"; 1162 name = "LocalFrame Scrolling Layer";
1163 } else { 1163 } else {
1164 ASSERT_NOT_REACHED(); 1164 ASSERT_NOT_REACHED();
1165 } 1165 }
1166 1166
1167 return name; 1167 return name;
1168 } 1168 }
1169 1169
1170 } // namespace blink 1170 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/animation/DocumentAnimations.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698