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