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 DocumentAnimations::ServiceOnFrameEndScope animationScope(m_renderView->docu
ment()); |
404 DocumentLifecycle::Scope lifecycleScope(lifecycle(), DocumentLifecycle::Comp
ositingClean); | 405 DocumentLifecycle::Scope lifecycleScope(lifecycle(), DocumentLifecycle::Comp
ositingClean); |
405 | 406 |
406 if (isMainFrame() && m_renderView->frameView()) | 407 if (isMainFrame() && m_renderView->frameView()) |
407 finishCompositingUpdateForFrameTree(&m_renderView->frameView()->frame())
; | 408 finishCompositingUpdateForFrameTree(&m_renderView->frameView()->frame())
; |
408 | 409 |
409 if (m_forceCompositingMode && !m_compositing) | 410 if (m_forceCompositingMode && !m_compositing) |
410 enableCompositingMode(true); | 411 enableCompositingMode(true); |
411 | 412 |
412 if (!m_needsToRecomputeCompositingRequirements && !m_compositing) | 413 if (!m_needsToRecomputeCompositingRequirements && !m_compositing) |
413 return; | 414 return; |
(...skipping 2315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2729 } else if (graphicsLayer == m_scrollLayer.get()) { | 2730 } else if (graphicsLayer == m_scrollLayer.get()) { |
2730 name = "Frame Scrolling Layer"; | 2731 name = "Frame Scrolling Layer"; |
2731 } else { | 2732 } else { |
2732 ASSERT_NOT_REACHED(); | 2733 ASSERT_NOT_REACHED(); |
2733 } | 2734 } |
2734 | 2735 |
2735 return name; | 2736 return name; |
2736 } | 2737 } |
2737 | 2738 |
2738 } // namespace WebCore | 2739 } // namespace WebCore |
OLD | NEW |