Chromium Code Reviews| 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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 394 // FIXME: We should carefully clean up the awkward early-exit semantics, bal ancing | 394 // FIXME: We should carefully clean up the awkward early-exit semantics, bal ancing |
| 395 // between skipping unnecessary compositing updates and not incorrectly skip ping | 395 // between skipping unnecessary compositing updates and not incorrectly skip ping |
| 396 // necessary updates. | 396 // necessary updates. |
| 397 | 397 |
| 398 // Avoid updating the layers with old values. Compositing layers will be upd ated after the layout is finished. | 398 // Avoid updating the layers with old values. Compositing layers will be upd ated after the layout is finished. |
| 399 // FIXME: Can we assert that we never return here? | 399 // FIXME: Can we assert that we never return here? |
| 400 if (m_renderView->needsLayout()) | 400 if (m_renderView->needsLayout()) |
| 401 return; | 401 return; |
| 402 | 402 |
| 403 lifecycle().advanceTo(DocumentLifecycle::InCompositingUpdate); | 403 lifecycle().advanceTo(DocumentLifecycle::InCompositingUpdate); |
| 404 DocumentLifecycle::Scope lifecycleScope(lifecycle(), DocumentLifecycle::Comp ositingClean); | |
|
abarth-chromium
2014/02/24 06:14:08
Thanks for fixing this one as well.
| |
| 405 | 404 |
| 405 updateCompositingLayersInternal(); | |
| 406 | |
| 407 lifecycle().advanceTo(DocumentLifecycle::CompositingClean); | |
| 408 | |
| 409 DocumentAnimations::startPendingAnimations(m_renderView->document()); | |
| 410 DocumentAnimations::dispatchAnimationEventsAsync(m_renderView->document()); | |
| 411 } | |
| 412 | |
| 413 void RenderLayerCompositor::updateCompositingLayersInternal() | |
| 414 { | |
| 406 if (isMainFrame() && m_renderView->frameView()) | 415 if (isMainFrame() && m_renderView->frameView()) |
| 407 finishCompositingUpdateForFrameTree(&m_renderView->frameView()->frame()) ; | 416 finishCompositingUpdateForFrameTree(&m_renderView->frameView()->frame()) ; |
| 408 | 417 |
| 409 if (m_forceCompositingMode && !m_compositing) | 418 if (m_forceCompositingMode && !m_compositing) |
| 410 enableCompositingMode(true); | 419 enableCompositingMode(true); |
| 411 | 420 |
| 412 if (!m_needsToRecomputeCompositingRequirements && !m_compositing) | 421 if (!m_needsToRecomputeCompositingRequirements && !m_compositing) |
| 413 return; | 422 return; |
| 414 | 423 |
| 415 TemporaryChange<bool> postLayoutChange(m_inPostLayoutUpdate, true); | 424 TemporaryChange<bool> postLayoutChange(m_inPostLayoutUpdate, true); |
| (...skipping 2331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2747 } else if (graphicsLayer == m_scrollLayer.get()) { | 2756 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 2748 name = "Frame Scrolling Layer"; | 2757 name = "Frame Scrolling Layer"; |
| 2749 } else { | 2758 } else { |
| 2750 ASSERT_NOT_REACHED(); | 2759 ASSERT_NOT_REACHED(); |
| 2751 } | 2760 } |
| 2752 | 2761 |
| 2753 return name; | 2762 return name; |
| 2754 } | 2763 } |
| 2755 | 2764 |
| 2756 } // namespace WebCore | 2765 } // namespace WebCore |
| OLD | NEW |