| 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 13 matching lines...) Expand all Loading... |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 | 27 |
| 28 #include "core/rendering/RenderLayerCompositor.h" | 28 #include "core/rendering/RenderLayerCompositor.h" |
| 29 | 29 |
| 30 #include "CSSPropertyNames.h" | 30 #include "CSSPropertyNames.h" |
| 31 #include "HTMLNames.h" | 31 #include "HTMLNames.h" |
| 32 #include "RuntimeEnabledFeatures.h" | 32 #include "RuntimeEnabledFeatures.h" |
| 33 #include "core/animation/ActiveAnimations.h" | 33 #include "core/animation/ActiveAnimations.h" |
| 34 #include "core/animation/DocumentAnimations.h" |
| 34 #include "core/dom/FullscreenElementStack.h" | 35 #include "core/dom/FullscreenElementStack.h" |
| 35 #include "core/dom/NodeList.h" | 36 #include "core/dom/NodeList.h" |
| 36 #include "core/html/HTMLCanvasElement.h" | 37 #include "core/html/HTMLCanvasElement.h" |
| 37 #include "core/html/HTMLIFrameElement.h" | 38 #include "core/html/HTMLIFrameElement.h" |
| 38 #include "core/html/HTMLVideoElement.h" | 39 #include "core/html/HTMLVideoElement.h" |
| 39 #include "core/html/canvas/CanvasRenderingContext.h" | 40 #include "core/html/canvas/CanvasRenderingContext.h" |
| 40 #include "core/inspector/InspectorInstrumentation.h" | 41 #include "core/inspector/InspectorInstrumentation.h" |
| 41 #include "core/page/Chrome.h" | 42 #include "core/page/Chrome.h" |
| 42 #include "core/page/ChromeClient.h" | 43 #include "core/page/ChromeClient.h" |
| 43 #include "core/frame/Frame.h" | 44 #include "core/frame/Frame.h" |
| (...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 // We just need to do a geometry update. This is only used for position:
fixed scrolling; | 470 // We just need to do a geometry update. This is only used for position:
fixed scrolling; |
| 470 // most of the time, geometry is updated via RenderLayer::styleChanged()
. | 471 // most of the time, geometry is updated via RenderLayer::styleChanged()
. |
| 471 updateLayerTreeGeometry(updateRoot); | 472 updateLayerTreeGeometry(updateRoot); |
| 472 } | 473 } |
| 473 | 474 |
| 474 ASSERT(updateRoot || !m_compositingLayersNeedRebuild); | 475 ASSERT(updateRoot || !m_compositingLayersNeedRebuild); |
| 475 | 476 |
| 476 if (!hasAcceleratedCompositing()) | 477 if (!hasAcceleratedCompositing()) |
| 477 enableCompositingMode(false); | 478 enableCompositingMode(false); |
| 478 | 479 |
| 480 if (isMainFrame()) |
| 481 DocumentAnimations::serviceAfterCompositingUpdate(*m_renderView->frameVi
ew()); |
| 482 |
| 479 // The scrolling coordinator may realize that it needs updating while compos
iting was being updated in this function. | 483 // The scrolling coordinator may realize that it needs updating while compos
iting was being updated in this function. |
| 480 needsToUpdateScrollingCoordinator |= scrollingCoordinator() ? scrollingCoord
inator()->needsToUpdateAfterCompositingChange() : false; | 484 needsToUpdateScrollingCoordinator |= scrollingCoordinator() ? scrollingCoord
inator()->needsToUpdateAfterCompositingChange() : false; |
| 481 if (needsToUpdateScrollingCoordinator && isMainFrame() && scrollingCoordinat
or() && inCompositingMode()) | 485 if (needsToUpdateScrollingCoordinator && isMainFrame() && scrollingCoordinat
or() && inCompositingMode()) |
| 482 scrollingCoordinator()->updateAfterCompositingChange(); | 486 scrollingCoordinator()->updateAfterCompositingChange(); |
| 483 | 487 |
| 484 // Inform the inspector that the layer tree has changed. | 488 // Inform the inspector that the layer tree has changed. |
| 485 if (isMainFrame()) | 489 if (isMainFrame()) |
| 486 InspectorInstrumentation::layerTreeDidChange(page()); | 490 InspectorInstrumentation::layerTreeDidChange(page()); |
| 487 } | 491 } |
| 488 | 492 |
| (...skipping 1965 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2454 } else if (graphicsLayer == m_scrollLayer.get()) { | 2458 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 2455 name = "Frame Scrolling Layer"; | 2459 name = "Frame Scrolling Layer"; |
| 2456 } else { | 2460 } else { |
| 2457 ASSERT_NOT_REACHED(); | 2461 ASSERT_NOT_REACHED(); |
| 2458 } | 2462 } |
| 2459 | 2463 |
| 2460 return name; | 2464 return name; |
| 2461 } | 2465 } |
| 2462 | 2466 |
| 2463 } // namespace WebCore | 2467 } // namespace WebCore |
| OLD | NEW |