| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 if (mapping->updateRequiresOwnBackingStoreForAncestorReasons(composi
tingContainer)) { | 97 if (mapping->updateRequiresOwnBackingStoreForAncestorReasons(composi
tingContainer)) { |
| 98 layersNeedingPaintInvalidation.append(&layer); | 98 layersNeedingPaintInvalidation.append(&layer); |
| 99 updateType = ForceUpdate; | 99 updateType = ForceUpdate; |
| 100 } | 100 } |
| 101 | 101 |
| 102 if (mapping->updateGraphicsLayerConfiguration()) | 102 if (mapping->updateGraphicsLayerConfiguration()) |
| 103 m_needsRebuildTree = true; | 103 m_needsRebuildTree = true; |
| 104 | 104 |
| 105 mapping->updateGraphicsLayerGeometry(compositingContainer, context.c
ompositingStackingContext(), layersNeedingPaintInvalidation); | 105 mapping->updateGraphicsLayerGeometry(compositingContainer, context.c
ompositingStackingContext(), layersNeedingPaintInvalidation); |
| 106 | 106 |
| 107 if (mapping->hasUnpositionedOverflowControlsLayers()) | |
| 108 layer.scrollableArea()->positionOverflowControls(IntSize()); | |
| 109 | |
| 110 updateType = mapping->updateTypeForChildren(updateType); | 107 updateType = mapping->updateTypeForChildren(updateType); |
| 111 mapping->clearNeedsGraphicsLayerUpdate(); | 108 mapping->clearNeedsGraphicsLayerUpdate(); |
| 112 } | 109 } |
| 113 } | 110 } |
| 114 | 111 |
| 115 UpdateContext childContext(context, layer); | 112 UpdateContext childContext(context, layer); |
| 116 for (RenderLayer* child = layer.firstChild(); child; child = child->nextSibl
ing()) | 113 for (RenderLayer* child = layer.firstChild(); child; child = child->nextSibl
ing()) |
| 117 updateRecursive(*child, updateType, childContext, layersNeedingPaintInva
lidation); | 114 updateRecursive(*child, updateType, childContext, layersNeedingPaintInva
lidation); |
| 118 } | 115 } |
| 119 | 116 |
| 120 #if ENABLE(ASSERT) | 117 #if ENABLE(ASSERT) |
| 121 | 118 |
| 122 void GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(RenderLay
er& layer) | 119 void GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(RenderLay
er& layer) |
| 123 { | 120 { |
| 124 if (layer.hasCompositedLayerMapping()) | 121 if (layer.hasCompositedLayerMapping()) |
| 125 layer.compositedLayerMapping()->assertNeedsToUpdateGraphicsLayerBitsClea
red(); | 122 layer.compositedLayerMapping()->assertNeedsToUpdateGraphicsLayerBitsClea
red(); |
| 126 | 123 |
| 127 for (RenderLayer* child = layer.firstChild(); child; child = child->nextSibl
ing()) | 124 for (RenderLayer* child = layer.firstChild(); child; child = child->nextSibl
ing()) |
| 128 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); | 125 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); |
| 129 } | 126 } |
| 130 | 127 |
| 131 #endif | 128 #endif |
| 132 | 129 |
| 133 } // namespace blink | 130 } // namespace blink |
| OLD | NEW |