| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 2041 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2052 paintInfo.isBackgroundLayer = false; | 2052 paintInfo.isBackgroundLayer = false; |
| 2053 | 2053 |
| 2054 // Change tracking on squashing layers: at the first sign of something chang
ed, just invalidate the layer. | 2054 // Change tracking on squashing layers: at the first sign of something chang
ed, just invalidate the layer. |
| 2055 // FIXME: Perhaps we can find a tighter more clever mechanism later. | 2055 // FIXME: Perhaps we can find a tighter more clever mechanism later. |
| 2056 bool updatedAssignment = false; | 2056 bool updatedAssignment = false; |
| 2057 if (nextSquashedLayerIndex < m_squashedLayers.size()) { | 2057 if (nextSquashedLayerIndex < m_squashedLayers.size()) { |
| 2058 if (!paintInfo.isEquivalentForSquashing(m_squashedLayers[nextSquashedLay
erIndex])) { | 2058 if (!paintInfo.isEquivalentForSquashing(m_squashedLayers[nextSquashedLay
erIndex])) { |
| 2059 updatedAssignment = true; | 2059 updatedAssignment = true; |
| 2060 } | 2060 } |
| 2061 m_squashedLayers[nextSquashedLayerIndex] = paintInfo; | 2061 m_squashedLayers[nextSquashedLayerIndex] = paintInfo; |
| 2062 m_needToUpdateGeometry = true; |
| 2062 } else { | 2063 } else { |
| 2063 m_squashedLayers.append(paintInfo); | 2064 m_squashedLayers.append(paintInfo); |
| 2064 updatedAssignment = true; | 2065 updatedAssignment = true; |
| 2065 } | 2066 } |
| 2066 layer->setGroupedMapping(this); | 2067 layer->setGroupedMapping(this); |
| 2067 return updatedAssignment; | 2068 return updatedAssignment; |
| 2068 } | 2069 } |
| 2069 | 2070 |
| 2070 void CompositedLayerMapping::removeRenderLayerFromSquashingGraphicsLayer(const R
enderLayer* layer) | 2071 void CompositedLayerMapping::removeRenderLayerFromSquashingGraphicsLayer(const R
enderLayer* layer) |
| 2071 { | 2072 { |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2127 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2128 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2128 name = "Scrolling Contents Layer"; | 2129 name = "Scrolling Contents Layer"; |
| 2129 } else { | 2130 } else { |
| 2130 ASSERT_NOT_REACHED(); | 2131 ASSERT_NOT_REACHED(); |
| 2131 } | 2132 } |
| 2132 | 2133 |
| 2133 return name; | 2134 return name; |
| 2134 } | 2135 } |
| 2135 | 2136 |
| 2136 } // namespace WebCore | 2137 } // namespace WebCore |
| OLD | NEW |