| 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 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 | 552 |
| 553 bool RenderLayerCompositor::scrollingLayerDidChange(RenderLayer* layer) | 553 bool RenderLayerCompositor::scrollingLayerDidChange(RenderLayer* layer) |
| 554 { | 554 { |
| 555 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator(
)) | 555 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator(
)) |
| 556 return scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer->s
crollableArea()); | 556 return scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer->s
crollableArea()); |
| 557 return false; | 557 return false; |
| 558 } | 558 } |
| 559 | 559 |
| 560 String RenderLayerCompositor::layerTreeAsText(LayerTreeFlags flags) | 560 String RenderLayerCompositor::layerTreeAsText(LayerTreeFlags flags) |
| 561 { | 561 { |
| 562 ASSERT(lifecycle().state() >= DocumentLifecycle::CompositingClean); | 562 ASSERT(lifecycle().state() >= DocumentLifecycle::PaintInvalidationClean); |
| 563 | 563 |
| 564 if (!m_rootContentLayer) | 564 if (!m_rootContentLayer) |
| 565 return String(); | 565 return String(); |
| 566 | 566 |
| 567 // We skip dumping the scroll and clip layers to keep layerTreeAsText output | 567 // We skip dumping the scroll and clip layers to keep layerTreeAsText output |
| 568 // similar between platforms (unless we explicitly request dumping from the | 568 // similar between platforms (unless we explicitly request dumping from the |
| 569 // root. | 569 // root. |
| 570 GraphicsLayer* rootLayer = m_rootContentLayer.get(); | 570 GraphicsLayer* rootLayer = m_rootContentLayer.get(); |
| 571 if (flags & LayerTreeIncludesRootLayer) | 571 if (flags & LayerTreeIncludesRootLayer) |
| 572 rootLayer = rootGraphicsLayer(); | 572 rootLayer = rootGraphicsLayer(); |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 839 } | 839 } |
| 840 | 840 |
| 841 void RenderLayerCompositor::resetTrackedRepaintRects() | 841 void RenderLayerCompositor::resetTrackedRepaintRects() |
| 842 { | 842 { |
| 843 if (GraphicsLayer* rootLayer = rootGraphicsLayer()) | 843 if (GraphicsLayer* rootLayer = rootGraphicsLayer()) |
| 844 resetTrackedRepaintRectsRecursive(rootLayer); | 844 resetTrackedRepaintRectsRecursive(rootLayer); |
| 845 } | 845 } |
| 846 | 846 |
| 847 void RenderLayerCompositor::setTracksRepaints(bool tracksRepaints) | 847 void RenderLayerCompositor::setTracksRepaints(bool tracksRepaints) |
| 848 { | 848 { |
| 849 ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean); | 849 ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean); |
| 850 m_isTrackingRepaints = tracksRepaints; | 850 m_isTrackingRepaints = tracksRepaints; |
| 851 } | 851 } |
| 852 | 852 |
| 853 bool RenderLayerCompositor::isTrackingRepaints() const | 853 bool RenderLayerCompositor::isTrackingRepaints() const |
| 854 { | 854 { |
| 855 return m_isTrackingRepaints; | 855 return m_isTrackingRepaints; |
| 856 } | 856 } |
| 857 | 857 |
| 858 static bool shouldCompositeOverflowControls(FrameView* view) | 858 static bool shouldCompositeOverflowControls(FrameView* view) |
| 859 { | 859 { |
| (...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1167 } else if (graphicsLayer == m_scrollLayer.get()) { | 1167 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1168 name = "LocalFrame Scrolling Layer"; | 1168 name = "LocalFrame Scrolling Layer"; |
| 1169 } else { | 1169 } else { |
| 1170 ASSERT_NOT_REACHED(); | 1170 ASSERT_NOT_REACHED(); |
| 1171 } | 1171 } |
| 1172 | 1172 |
| 1173 return name; | 1173 return name; |
| 1174 } | 1174 } |
| 1175 | 1175 |
| 1176 } // namespace WebCore | 1176 } // namespace WebCore |
| OLD | NEW |