| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 { | 59 { |
| 60 } | 60 } |
| 61 | 61 |
| 62 void GraphicsLayerUpdater::rebuildTree(RenderLayer& layer, UpdateType updateType
, GraphicsLayerVector& childLayersOfEnclosingLayer, int depth) | 62 void GraphicsLayerUpdater::rebuildTree(RenderLayer& layer, UpdateType updateType
, GraphicsLayerVector& childLayersOfEnclosingLayer, int depth) |
| 63 { | 63 { |
| 64 // Make the layer compositing if necessary, and set up clipping and content
layers. | 64 // Make the layer compositing if necessary, and set up clipping and content
layers. |
| 65 // Note that we can only do work here that is independent of whether the des
cendant layers | 65 // Note that we can only do work here that is independent of whether the des
cendant layers |
| 66 // have been processed. computeCompositingRequirements() will already have d
one the repaint if necessary. | 66 // have been processed. computeCompositingRequirements() will already have d
one the repaint if necessary. |
| 67 | 67 |
| 68 layer.stackingNode()->updateLayerListsIfNeeded(); | 68 layer.stackingNode()->updateLayerListsIfNeeded(); |
| 69 layer.update3dRenderingContext(); | |
| 70 | 69 |
| 71 const bool hasCompositedLayerMapping = layer.hasCompositedLayerMapping(); | 70 const bool hasCompositedLayerMapping = layer.hasCompositedLayerMapping(); |
| 72 CompositedLayerMappingPtr currentCompositedLayerMapping = layer.compositedLa
yerMapping(); | 71 CompositedLayerMappingPtr currentCompositedLayerMapping = layer.compositedLa
yerMapping(); |
| 73 | 72 |
| 74 updateType = update(layer, updateType); | 73 updateType = update(layer, updateType); |
| 75 | 74 |
| 76 // Grab some stats for histograms. | 75 // Grab some stats for histograms. |
| 77 if (hasCompositedLayerMapping) { | 76 if (hasCompositedLayerMapping) { |
| 78 m_pixelsWithoutPromotingAllTransitions += layer.size().height() * layer.
size().width(); | 77 m_pixelsWithoutPromotingAllTransitions += layer.size().height() * layer.
size().width(); |
| 79 } else { | 78 } else { |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 if (!layer.parent()) | 179 if (!layer.parent()) |
| 181 layer.compositor()->updateRootLayerPosition(); | 180 layer.compositor()->updateRootLayerPosition(); |
| 182 | 181 |
| 183 if (mapping->hasUnpositionedOverflowControlsLayers()) | 182 if (mapping->hasUnpositionedOverflowControlsLayers()) |
| 184 layer.scrollableArea()->positionOverflowControls(); | 183 layer.scrollableArea()->positionOverflowControls(); |
| 185 | 184 |
| 186 return updateType; | 185 return updateType; |
| 187 } | 186 } |
| 188 | 187 |
| 189 } // namespace WebCore | 188 } // namespace WebCore |
| OLD | NEW |