OLD | NEW |
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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
203 | 203 |
204 rootRenderLayer()->updateDescendantDependentFlagsForEntireSubtree(); | 204 rootRenderLayer()->updateDescendantDependentFlagsForEntireSubtree(); |
205 m_renderView.commitPendingSelection(); | 205 m_renderView.commitPendingSelection(); |
206 | 206 |
207 lifecycle().advanceTo(DocumentLifecycle::InCompositingUpdate); | 207 lifecycle().advanceTo(DocumentLifecycle::InCompositingUpdate); |
208 updateIfNeeded(); | 208 updateIfNeeded(); |
209 lifecycle().advanceTo(DocumentLifecycle::CompositingClean); | 209 lifecycle().advanceTo(DocumentLifecycle::CompositingClean); |
210 | 210 |
211 DocumentAnimations::startPendingAnimations(m_renderView.document()); | 211 DocumentAnimations::startPendingAnimations(m_renderView.document()); |
212 | 212 |
| 213 m_renderView.frameView()->updateCompositorScrollAnimations(); |
| 214 if (const FrameView::ScrollableAreaSet* animatingScrollableAreas = m_renderV
iew.frameView()->animatingScrollableAreas()) { |
| 215 for (ScrollableArea* scrollableArea : *animatingScrollableAreas) |
| 216 scrollableArea->updateCompositorScrollAnimations(); |
| 217 } |
| 218 |
213 #if ENABLE(ASSERT) | 219 #if ENABLE(ASSERT) |
214 ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean); | 220 ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean); |
215 assertNoUnresolvedDirtyBits(); | 221 assertNoUnresolvedDirtyBits(); |
216 for (Frame* child = m_renderView.frameView()->frame().tree().firstChild(); c
hild; child = child->tree().nextSibling()) { | 222 for (Frame* child = m_renderView.frameView()->frame().tree().firstChild(); c
hild; child = child->tree().nextSibling()) { |
217 if (child->isLocalFrame()) | 223 if (child->isLocalFrame()) |
218 toLocalFrame(child)->contentRenderer()->compositor()->assertNoUnreso
lvedDirtyBits(); | 224 toLocalFrame(child)->contentRenderer()->compositor()->assertNoUnreso
lvedDirtyBits(); |
219 } | 225 } |
220 #endif | 226 #endif |
221 } | 227 } |
222 | 228 |
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1173 } else if (graphicsLayer == m_scrollLayer.get()) { | 1179 } else if (graphicsLayer == m_scrollLayer.get()) { |
1174 name = "LocalFrame Scrolling Layer"; | 1180 name = "LocalFrame Scrolling Layer"; |
1175 } else { | 1181 } else { |
1176 ASSERT_NOT_REACHED(); | 1182 ASSERT_NOT_REACHED(); |
1177 } | 1183 } |
1178 | 1184 |
1179 return name; | 1185 return name; |
1180 } | 1186 } |
1181 | 1187 |
1182 } // namespace blink | 1188 } // namespace blink |
OLD | NEW |