| 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 mapping->updateGraphicsLayerGeometry(updateType, compositingContainer); | 87 mapping->updateGraphicsLayerGeometry(updateType, compositingContainer); |
| 88 | 88 |
| 89 updateType = mapping->updateTypeForChildren(updateType); | 89 updateType = mapping->updateTypeForChildren(updateType); |
| 90 mapping->clearNeedsGraphicsLayerUpdate(); | 90 mapping->clearNeedsGraphicsLayerUpdate(); |
| 91 | 91 |
| 92 if (!layer.parent()) | 92 if (!layer.parent()) |
| 93 layer.compositor()->updateRootLayerPosition(); | 93 layer.compositor()->updateRootLayerPosition(); |
| 94 | 94 |
| 95 if (mapping->hasUnpositionedOverflowControlsLayers()) | 95 if (mapping->hasUnpositionedOverflowControlsLayers()) |
| 96 layer.scrollableArea()->positionOverflowControls(IntSize()); | 96 layer.scrollableArea()->positionOverflowControls(IntSize()); |
| 97 |
| 98 mapping->updateScrollingBlockSelection(); |
| 97 } | 99 } |
| 98 | 100 |
| 99 UpdateContext childContext(context, layer); | 101 UpdateContext childContext(context, layer); |
| 100 for (RenderLayer* child = layer.firstChild(); child; child = child->nextSibl
ing()) | 102 for (RenderLayer* child = layer.firstChild(); child; child = child->nextSibl
ing()) |
| 101 update(*child, updateType, childContext); | 103 update(*child, updateType, childContext); |
| 102 } | 104 } |
| 103 | 105 |
| 104 #if ASSERT_ENABLED | 106 #if ASSERT_ENABLED |
| 105 | 107 |
| 106 void GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(RenderLay
er& layer) | 108 void GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(RenderLay
er& layer) |
| 107 { | 109 { |
| 108 if (layer.hasCompositedLayerMapping()) | 110 if (layer.hasCompositedLayerMapping()) |
| 109 layer.compositedLayerMapping()->assertNeedsToUpdateGraphicsLayerBitsClea
red(); | 111 layer.compositedLayerMapping()->assertNeedsToUpdateGraphicsLayerBitsClea
red(); |
| 110 | 112 |
| 111 for (RenderLayer* child = layer.firstChild(); child; child = child->nextSibl
ing()) | 113 for (RenderLayer* child = layer.firstChild(); child; child = child->nextSibl
ing()) |
| 112 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); | 114 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); |
| 113 } | 115 } |
| 114 | 116 |
| 115 #endif | 117 #endif |
| 116 | 118 |
| 117 } // namespace WebCore | 119 } // namespace WebCore |
| OLD | NEW |