| 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 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 } | 332 } |
| 333 | 333 |
| 334 if (updateType != CompositingUpdateNone) { | 334 if (updateType != CompositingUpdateNone) { |
| 335 TRACE_EVENT0("blink_rendering", "GraphicsLayerUpdater::updateRecursive")
; | 335 TRACE_EVENT0("blink_rendering", "GraphicsLayerUpdater::updateRecursive")
; |
| 336 GraphicsLayerUpdater updater; | 336 GraphicsLayerUpdater updater; |
| 337 updater.update(*updateRoot); | 337 updater.update(*updateRoot); |
| 338 | 338 |
| 339 if (updater.needsRebuildTree()) | 339 if (updater.needsRebuildTree()) |
| 340 updateType = std::max(updateType, CompositingUpdateRebuildTree); | 340 updateType = std::max(updateType, CompositingUpdateRebuildTree); |
| 341 | 341 |
| 342 #if !ASSERT_DISABLED | 342 #if ASSERT_ENABLED |
| 343 // FIXME: Move this check to the end of the compositing update. | 343 // FIXME: Move this check to the end of the compositing update. |
| 344 GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(*updat
eRoot); | 344 GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(*updat
eRoot); |
| 345 #endif | 345 #endif |
| 346 } | 346 } |
| 347 | 347 |
| 348 if (updateType >= CompositingUpdateRebuildTree) { | 348 if (updateType >= CompositingUpdateRebuildTree) { |
| 349 GraphicsLayerVector childList; | 349 GraphicsLayerVector childList; |
| 350 { | 350 { |
| 351 TRACE_EVENT0("blink_rendering", "GraphicsLayerTreeBuilder::rebuild")
; | 351 TRACE_EVENT0("blink_rendering", "GraphicsLayerTreeBuilder::rebuild")
; |
| 352 GraphicsLayerTreeBuilder().rebuild(*updateRoot, childList); | 352 GraphicsLayerTreeBuilder().rebuild(*updateRoot, childList); |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 671 { | 671 { |
| 672 recursiveRepaintLayer(rootRenderLayer()); | 672 recursiveRepaintLayer(rootRenderLayer()); |
| 673 } | 673 } |
| 674 | 674 |
| 675 void RenderLayerCompositor::recursiveRepaintLayer(RenderLayer* layer) | 675 void RenderLayerCompositor::recursiveRepaintLayer(RenderLayer* layer) |
| 676 { | 676 { |
| 677 // FIXME: This method does not work correctly with transforms. | 677 // FIXME: This method does not work correctly with transforms. |
| 678 if (layer->compositingState() == PaintsIntoOwnBacking) | 678 if (layer->compositingState() == PaintsIntoOwnBacking) |
| 679 layer->repainter().setBackingNeedsRepaint(); | 679 layer->repainter().setBackingNeedsRepaint(); |
| 680 | 680 |
| 681 #if !ASSERT_DISABLED | 681 #if ASSERT_ENABLED |
| 682 LayerListMutationDetector mutationChecker(layer->stackingNode()); | 682 LayerListMutationDetector mutationChecker(layer->stackingNode()); |
| 683 #endif | 683 #endif |
| 684 | 684 |
| 685 unsigned childrenToVisit = NormalFlowChildren; | 685 unsigned childrenToVisit = NormalFlowChildren; |
| 686 if (layer->hasCompositingDescendant()) | 686 if (layer->hasCompositingDescendant()) |
| 687 childrenToVisit |= PositiveZOrderChildren | NegativeZOrderChildren; | 687 childrenToVisit |= PositiveZOrderChildren | NegativeZOrderChildren; |
| 688 RenderLayerStackingNodeIterator iterator(*layer->stackingNode(), childrenToV
isit); | 688 RenderLayerStackingNodeIterator iterator(*layer->stackingNode(), childrenToV
isit); |
| 689 while (RenderLayerStackingNode* curNode = iterator.next()) | 689 while (RenderLayerStackingNode* curNode = iterator.next()) |
| 690 recursiveRepaintLayer(curNode->layer()); | 690 recursiveRepaintLayer(curNode->layer()); |
| 691 } | 691 } |
| (...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1258 } else if (graphicsLayer == m_scrollLayer.get()) { | 1258 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 1259 name = "LocalFrame Scrolling Layer"; | 1259 name = "LocalFrame Scrolling Layer"; |
| 1260 } else { | 1260 } else { |
| 1261 ASSERT_NOT_REACHED(); | 1261 ASSERT_NOT_REACHED(); |
| 1262 } | 1262 } |
| 1263 | 1263 |
| 1264 return name; | 1264 return name; |
| 1265 } | 1265 } |
| 1266 | 1266 |
| 1267 } // namespace WebCore | 1267 } // namespace WebCore |
| OLD | NEW |