| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 const bool hasCompositedLayerMapping = layer.hasCompositedLayerMapping(); | 71 const bool hasCompositedLayerMapping = layer.hasCompositedLayerMapping(); |
| 72 CompositedLayerMappingPtr currentCompositedLayerMapping = layer.compositedLa
yerMapping(); | 72 CompositedLayerMappingPtr currentCompositedLayerMapping = layer.compositedLa
yerMapping(); |
| 73 | 73 |
| 74 updateType = update(layer, updateType); | 74 updateType = update(layer, updateType); |
| 75 | 75 |
| 76 // Grab some stats for histograms. | 76 // Grab some stats for histograms. |
| 77 if (hasCompositedLayerMapping) { | 77 if (hasCompositedLayerMapping) { |
| 78 m_pixelsWithoutPromotingAllTransitions += layer.size().height() * layer.
size().width(); | 78 m_pixelsWithoutPromotingAllTransitions += layer.size().height() * layer.
size().width(); |
| 79 } else { | 79 } else { |
| 80 if ((layer.renderer()->style()->transitionForProperty(CSSPropertyOpacity
) || | 80 if ((layer.renderer()->style()->transitionForProperty(CSSPropertyOpacity
) || |
| 81 layer.renderer()->style()->transitionForProperty(CSSPropertyTransfo
rm) || |
| 81 layer.renderer()->style()->transitionForProperty(CSSPropertyWebkitT
ransform)) && | 82 layer.renderer()->style()->transitionForProperty(CSSPropertyWebkitT
ransform)) && |
| 82 m_renderView.viewRect().intersects(layer.absoluteBoundingBox())) | 83 m_renderView.viewRect().intersects(layer.absoluteBoundingBox())) |
| 83 m_pixelsAddedByPromotingAllTransitions += layer.size().height() * la
yer.size().width(); | 84 m_pixelsAddedByPromotingAllTransitions += layer.size().height() * la
yer.size().width(); |
| 84 } | 85 } |
| 85 | 86 |
| 86 // If this layer has a compositedLayerMapping, then that is where we place s
ubsequent children GraphicsLayers. | 87 // If this layer has a compositedLayerMapping, then that is where we place s
ubsequent children GraphicsLayers. |
| 87 // Otherwise children continue to append to the child list of the enclosing
layer. | 88 // Otherwise children continue to append to the child list of the enclosing
layer. |
| 88 GraphicsLayerVector layerChildren; | 89 GraphicsLayerVector layerChildren; |
| 89 GraphicsLayerVector& childList = hasCompositedLayerMapping ? layerChildren :
childLayersOfEnclosingLayer; | 90 GraphicsLayerVector& childList = hasCompositedLayerMapping ? layerChildren :
childLayersOfEnclosingLayer; |
| 90 | 91 |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 if (!layer.parent()) | 181 if (!layer.parent()) |
| 181 layer.compositor()->updateRootLayerPosition(); | 182 layer.compositor()->updateRootLayerPosition(); |
| 182 | 183 |
| 183 if (mapping->hasUnpositionedOverflowControlsLayers()) | 184 if (mapping->hasUnpositionedOverflowControlsLayers()) |
| 184 layer.scrollableArea()->positionOverflowControls(); | 185 layer.scrollableArea()->positionOverflowControls(); |
| 185 | 186 |
| 186 return updateType; | 187 return updateType; |
| 187 } | 188 } |
| 188 | 189 |
| 189 } // namespace WebCore | 190 } // namespace WebCore |
| OLD | NEW |