| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 { | 56 { |
| 57 } | 57 } |
| 58 | 58 |
| 59 void GraphicsLayerUpdater::rebuildTree(RenderLayer& layer, UpdateType updateType
, GraphicsLayerVector& childLayersOfEnclosingLayer) | 59 void GraphicsLayerUpdater::rebuildTree(RenderLayer& layer, UpdateType updateType
, GraphicsLayerVector& childLayersOfEnclosingLayer) |
| 60 { | 60 { |
| 61 // Make the layer compositing if necessary, and set up clipping and content
layers. | 61 // Make the layer compositing if necessary, and set up clipping and content
layers. |
| 62 // Note that we can only do work here that is independent of whether the des
cendant layers | 62 // Note that we can only do work here that is independent of whether the des
cendant layers |
| 63 // have been processed. computeCompositingRequirements() will already have d
one the repaint if necessary. | 63 // have been processed. computeCompositingRequirements() will already have d
one the repaint if necessary. |
| 64 | 64 |
| 65 layer.stackingNode()->updateLayerListsIfNeeded(); | 65 layer.stackingNode()->updateLayerListsIfNeeded(); |
| 66 layer.update3dRenderingContext(); | |
| 67 | 66 |
| 68 const bool hasCompositedLayerMapping = layer.hasCompositedLayerMapping(); | 67 const bool hasCompositedLayerMapping = layer.hasCompositedLayerMapping(); |
| 69 CompositedLayerMappingPtr currentCompositedLayerMapping = layer.compositedLa
yerMapping(); | 68 CompositedLayerMappingPtr currentCompositedLayerMapping = layer.compositedLa
yerMapping(); |
| 70 | 69 |
| 71 updateType = update(layer, updateType); | 70 updateType = update(layer, updateType); |
| 72 | 71 |
| 73 // If this layer has a compositedLayerMapping, then that is where we place s
ubsequent children GraphicsLayers. | 72 // If this layer has a compositedLayerMapping, then that is where we place s
ubsequent children GraphicsLayers. |
| 74 // Otherwise children continue to append to the child list of the enclosing
layer. | 73 // Otherwise children continue to append to the child list of the enclosing
layer. |
| 75 GraphicsLayerVector layerChildren; | 74 GraphicsLayerVector layerChildren; |
| 76 GraphicsLayerVector& childList = hasCompositedLayerMapping ? layerChildren :
childLayersOfEnclosingLayer; | 75 GraphicsLayerVector& childList = hasCompositedLayerMapping ? layerChildren :
childLayersOfEnclosingLayer; |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 if (!layer.parent()) | 161 if (!layer.parent()) |
| 163 layer.compositor()->updateRootLayerPosition(); | 162 layer.compositor()->updateRootLayerPosition(); |
| 164 | 163 |
| 165 if (mapping->hasUnpositionedOverflowControlsLayers()) | 164 if (mapping->hasUnpositionedOverflowControlsLayers()) |
| 166 layer.scrollableArea()->positionOverflowControls(); | 165 layer.scrollableArea()->positionOverflowControls(); |
| 167 | 166 |
| 168 return updateType; | 167 return updateType; |
| 169 } | 168 } |
| 170 | 169 |
| 171 } // namespace WebCore | 170 } // namespace WebCore |
| OLD | NEW |