| 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 } | 227 } |
| 228 | 228 |
| 229 m_layoutView.commitPendingSelection(); | 229 m_layoutView.commitPendingSelection(); |
| 230 | 230 |
| 231 lifecycle().advanceTo(DocumentLifecycle::InCompositingUpdate); | 231 lifecycle().advanceTo(DocumentLifecycle::InCompositingUpdate); |
| 232 updateIfNeeded(); | 232 updateIfNeeded(); |
| 233 lifecycle().advanceTo(DocumentLifecycle::CompositingClean); | 233 lifecycle().advanceTo(DocumentLifecycle::CompositingClean); |
| 234 | 234 |
| 235 DocumentAnimations::updateCompositorAnimations(m_layoutView.document()); | 235 DocumentAnimations::updateCompositorAnimations(m_layoutView.document()); |
| 236 | 236 |
| 237 m_layoutView.frameView()->updateCompositorScrollAnimations(); | 237 m_layoutView.frameView()->scrollableArea()->updateCompositorScrollAnimations
(); |
| 238 if (const FrameView::ScrollableAreaSet* animatingScrollableAreas = m_layoutV
iew.frameView()->animatingScrollableAreas()) { | 238 if (const FrameView::ScrollableAreaSet* animatingScrollableAreas = m_layoutV
iew.frameView()->animatingScrollableAreas()) { |
| 239 for (ScrollableArea* scrollableArea : *animatingScrollableAreas) | 239 for (ScrollableArea* scrollableArea : *animatingScrollableAreas) |
| 240 scrollableArea->updateCompositorScrollAnimations(); | 240 scrollableArea->updateCompositorScrollAnimations(); |
| 241 } | 241 } |
| 242 | 242 |
| 243 #if ENABLE(ASSERT) | 243 #if ENABLE(ASSERT) |
| 244 ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean); | 244 ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean); |
| 245 assertNoUnresolvedDirtyBits(); | 245 assertNoUnresolvedDirtyBits(); |
| 246 for (Frame* child = m_layoutView.frameView()->frame().tree().firstChild(); c
hild; child = child->tree().nextSibling()) { | 246 for (Frame* child = m_layoutView.frameView()->frame().tree().firstChild(); c
hild; child = child->tree().nextSibling()) { |
| 247 if (child->isLocalFrame()) | 247 if (child->isLocalFrame()) |
| (...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1205 } else if (graphicsLayer == m_scrollLayer.get()) { | 1205 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1206 name = "LocalFrame Scrolling Layer"; | 1206 name = "LocalFrame Scrolling Layer"; |
| 1207 } else { | 1207 } else { |
| 1208 ASSERT_NOT_REACHED(); | 1208 ASSERT_NOT_REACHED(); |
| 1209 } | 1209 } |
| 1210 | 1210 |
| 1211 return name; | 1211 return name; |
| 1212 } | 1212 } |
| 1213 | 1213 |
| 1214 } // namespace blink | 1214 } // namespace blink |
| OLD | NEW |