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 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
401 if (m_renderView->needsLayout()) | 401 if (m_renderView->needsLayout()) |
402 return; | 402 return; |
403 | 403 |
404 lifecycle().advanceTo(DocumentLifecycle::InCompositingUpdate); | 404 lifecycle().advanceTo(DocumentLifecycle::InCompositingUpdate); |
405 | 405 |
406 updateCompositingLayersInternal(); | 406 updateCompositingLayersInternal(); |
407 | 407 |
408 lifecycle().advanceTo(DocumentLifecycle::CompositingClean); | 408 lifecycle().advanceTo(DocumentLifecycle::CompositingClean); |
409 | 409 |
410 DocumentAnimations::startPendingAnimations(m_renderView->document()); | 410 DocumentAnimations::startPendingAnimations(m_renderView->document()); |
411 DocumentAnimations::dispatchAnimationEventsAsync(m_renderView->document()); | |
412 ASSERT(m_renderView->document().lifecycle().state() == DocumentLifecycle::Co
mpositingClean); | 411 ASSERT(m_renderView->document().lifecycle().state() == DocumentLifecycle::Co
mpositingClean); |
413 } | 412 } |
414 | 413 |
415 void RenderLayerCompositor::updateCompositingLayersInternal() | 414 void RenderLayerCompositor::updateCompositingLayersInternal() |
416 { | 415 { |
417 if (isMainFrame() && m_renderView->frameView()) | 416 if (isMainFrame() && m_renderView->frameView()) |
418 finishCompositingUpdateForFrameTree(&m_renderView->frameView()->frame())
; | 417 finishCompositingUpdateForFrameTree(&m_renderView->frameView()->frame())
; |
419 | 418 |
420 if (m_forceCompositingMode && !m_compositing) | 419 if (m_forceCompositingMode && !m_compositing) |
421 enableCompositingMode(true); | 420 enableCompositingMode(true); |
(...skipping 1995 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2417 } else if (graphicsLayer == m_scrollLayer.get()) { | 2416 } else if (graphicsLayer == m_scrollLayer.get()) { |
2418 name = "LocalFrame Scrolling Layer"; | 2417 name = "LocalFrame Scrolling Layer"; |
2419 } else { | 2418 } else { |
2420 ASSERT_NOT_REACHED(); | 2419 ASSERT_NOT_REACHED(); |
2421 } | 2420 } |
2422 | 2421 |
2423 return name; | 2422 return name; |
2424 } | 2423 } |
2425 | 2424 |
2426 } // namespace WebCore | 2425 } // namespace WebCore |
OLD | NEW |