| 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 159 |
| 160 GraphicsLayerUpdater::UpdateType GraphicsLayerUpdater::update(RenderLayer& layer
, UpdateType updateType) | 160 GraphicsLayerUpdater::UpdateType GraphicsLayerUpdater::update(RenderLayer& layer
, UpdateType updateType) |
| 161 { | 161 { |
| 162 if (!layer.hasCompositedLayerMapping()) | 162 if (!layer.hasCompositedLayerMapping()) |
| 163 return updateType; | 163 return updateType; |
| 164 | 164 |
| 165 CompositedLayerMappingPtr mapping = layer.compositedLayerMapping(); | 165 CompositedLayerMappingPtr mapping = layer.compositedLayerMapping(); |
| 166 | 166 |
| 167 // Note carefully: here we assume that the compositing state of all descenda
nts have been updated already, | 167 // Note carefully: here we assume that the compositing state of all descenda
nts have been updated already, |
| 168 // so it is legitimate to compute and cache the composited bounds for this l
ayer. | 168 // so it is legitimate to compute and cache the composited bounds for this l
ayer. |
| 169 mapping->updateCompositedBounds(); | 169 mapping->updateCompositedBounds(updateType); |
| 170 | 170 |
| 171 if (RenderLayerReflectionInfo* reflection = layer.reflectionInfo()) { | 171 if (RenderLayerReflectionInfo* reflection = layer.reflectionInfo()) { |
| 172 if (reflection->reflectionLayer()->hasCompositedLayerMapping()) | 172 if (reflection->reflectionLayer()->hasCompositedLayerMapping()) |
| 173 reflection->reflectionLayer()->compositedLayerMapping()->updateCompo
sitedBounds(); | 173 reflection->reflectionLayer()->compositedLayerMapping()->updateCompo
sitedBounds(ForceUpdate); |
| 174 } | 174 } |
| 175 | 175 |
| 176 mapping->updateGraphicsLayerConfiguration(); | 176 mapping->updateGraphicsLayerConfiguration(); |
| 177 updateType = mapping->updateGraphicsLayerGeometry(updateType); | 177 updateType = mapping->updateGraphicsLayerGeometry(updateType); |
| 178 mapping->clearNeedsGeometryUpdate(); | 178 mapping->clearNeedsGeometryUpdate(); |
| 179 | 179 |
| 180 if (!layer.parent()) | 180 if (!layer.parent()) |
| 181 layer.compositor()->updateRootLayerPosition(); | 181 layer.compositor()->updateRootLayerPosition(); |
| 182 | 182 |
| 183 if (mapping->hasUnpositionedOverflowControlsLayers()) | 183 if (mapping->hasUnpositionedOverflowControlsLayers()) |
| 184 layer.scrollableArea()->positionOverflowControls(); | 184 layer.scrollableArea()->positionOverflowControls(); |
| 185 | 185 |
| 186 return updateType; | 186 return updateType; |
| 187 } | 187 } |
| 188 | 188 |
| 189 } // namespace WebCore | 189 } // namespace WebCore |
| OLD | NEW |