| 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 * Copyright (C) 2014 Google Inc. All rights reserved. | 3 * Copyright (C) 2014 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 CompositedLayerMapping* mapping = layer.compositedLayerMapping(); | 92 CompositedLayerMapping* mapping = layer.compositedLayerMapping(); |
| 93 | 93 |
| 94 if (updateType == ForceUpdate || mapping->needsGraphicsLayerUpdate()) { | 94 if (updateType == ForceUpdate || mapping->needsGraphicsLayerUpdate()) { |
| 95 const PaintLayer* compositingContainer = context.compositingContaine
r(layer); | 95 const PaintLayer* compositingContainer = context.compositingContaine
r(layer); |
| 96 ASSERT(compositingContainer == layer.enclosingLayerWithCompositedLay
erMapping(ExcludeSelf)); | 96 ASSERT(compositingContainer == layer.enclosingLayerWithCompositedLay
erMapping(ExcludeSelf)); |
| 97 | 97 |
| 98 if (mapping->updateGraphicsLayerConfiguration()) | 98 if (mapping->updateGraphicsLayerConfiguration()) |
| 99 m_needsRebuildTree = true; | 99 m_needsRebuildTree = true; |
| 100 | 100 |
| 101 mapping->updateGraphicsLayerGeometry(compositingContainer, context.c
ompositingStackingContext(), layersNeedingPaintInvalidation); | 101 mapping->updateGraphicsLayerGeometry(compositingContainer, context.c
ompositingStackingContext(), layersNeedingPaintInvalidation); |
| 102 if (PaintLayerScrollableArea* scrollableArea = layer.scrollableArea(
)) | 102 if (PaintLayerScrollableArea* scrollableArea = layer.getScrollableAr
ea()) |
| 103 scrollableArea->positionOverflowControls(); | 103 scrollableArea->positionOverflowControls(); |
| 104 updateType = mapping->updateTypeForChildren(updateType); | 104 updateType = mapping->updateTypeForChildren(updateType); |
| 105 mapping->clearNeedsGraphicsLayerUpdate(); | 105 mapping->clearNeedsGraphicsLayerUpdate(); |
| 106 } | 106 } |
| 107 } | 107 } |
| 108 | 108 |
| 109 UpdateContext childContext(context, layer); | 109 UpdateContext childContext(context, layer); |
| 110 for (PaintLayer* child = layer.firstChild(); child; child = child->nextSibli
ng()) | 110 for (PaintLayer* child = layer.firstChild(); child; child = child->nextSibli
ng()) |
| 111 updateRecursive(*child, updateType, childContext, layersNeedingPaintInva
lidation); | 111 updateRecursive(*child, updateType, childContext, layersNeedingPaintInva
lidation); |
| 112 } | 112 } |
| 113 | 113 |
| 114 #if ENABLE(ASSERT) | 114 #if ENABLE(ASSERT) |
| 115 | 115 |
| 116 void GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(PaintLaye
r& layer) | 116 void GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(PaintLaye
r& layer) |
| 117 { | 117 { |
| 118 if (layer.hasCompositedLayerMapping()) | 118 if (layer.hasCompositedLayerMapping()) |
| 119 layer.compositedLayerMapping()->assertNeedsToUpdateGraphicsLayerBitsClea
red(); | 119 layer.compositedLayerMapping()->assertNeedsToUpdateGraphicsLayerBitsClea
red(); |
| 120 | 120 |
| 121 for (PaintLayer* child = layer.firstChild(); child; child = child->nextSibli
ng()) | 121 for (PaintLayer* child = layer.firstChild(); child; child = child->nextSibli
ng()) |
| 122 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); | 122 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); |
| 123 } | 123 } |
| 124 | 124 |
| 125 #endif | 125 #endif |
| 126 | 126 |
| 127 } // namespace blink | 127 } // namespace blink |
| OLD | NEW |