| 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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 squashingState.mostRecentMapping->updateSquashingLayerAssignment( | 231 squashingState.mostRecentMapping->updateSquashingLayerAssignment( |
| 232 layer, squashingState.nextSquashedLayerIndex); | 232 layer, squashingState.nextSquashedLayerIndex); |
| 233 if (!changedSquashingLayer) | 233 if (!changedSquashingLayer) |
| 234 return; | 234 return; |
| 235 | 235 |
| 236 // If we've modified the collection of squashed layers, we must update | 236 // If we've modified the collection of squashed layers, we must update |
| 237 // the graphics layer geometry. | 237 // the graphics layer geometry. |
| 238 squashingState.mostRecentMapping->setNeedsGraphicsLayerUpdate( | 238 squashingState.mostRecentMapping->setNeedsGraphicsLayerUpdate( |
| 239 GraphicsLayerUpdateSubtree); | 239 GraphicsLayerUpdateSubtree); |
| 240 | 240 |
| 241 layer->clipper().clearClipRectsIncludingDescendants(); | 241 layer->clipper(PaintLayer::DoNotUseGeometryMapper) |
| 242 .clearClipRectsIncludingDescendants(); |
| 242 | 243 |
| 243 // Issue a paint invalidation, since |layer| may have been added to an | 244 // Issue a paint invalidation, since |layer| may have been added to an |
| 244 // already-existing squashing layer. | 245 // already-existing squashing layer. |
| 245 TRACE_LAYER_INVALIDATION( | 246 TRACE_LAYER_INVALIDATION( |
| 246 layer, InspectorLayerInvalidationTrackingEvent::AddedToSquashingLayer); | 247 layer, InspectorLayerInvalidationTrackingEvent::AddedToSquashingLayer); |
| 247 layersNeedingPaintInvalidation.push_back(layer); | 248 layersNeedingPaintInvalidation.push_back(layer); |
| 248 m_layersChanged = true; | 249 m_layersChanged = true; |
| 249 } else if (compositedLayerUpdate == RemoveFromSquashingLayer) { | 250 } else if (compositedLayerUpdate == RemoveFromSquashingLayer) { |
| 250 if (layer->groupedMapping()) { | 251 if (layer->groupedMapping()) { |
| 251 // Before removing |layer| from an already-existing squashing layer that | 252 // Before removing |layer| from an already-existing squashing layer that |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 while (PaintLayerStackingNode* curNode = iterator.next()) | 349 while (PaintLayerStackingNode* curNode = iterator.next()) |
| 349 assignLayersToBackingsInternal(curNode->layer(), squashingState, | 350 assignLayersToBackingsInternal(curNode->layer(), squashingState, |
| 350 layersNeedingPaintInvalidation); | 351 layersNeedingPaintInvalidation); |
| 351 | 352 |
| 352 if (squashingState.hasMostRecentMapping && | 353 if (squashingState.hasMostRecentMapping && |
| 353 &squashingState.mostRecentMapping->owningLayer() == layer) | 354 &squashingState.mostRecentMapping->owningLayer() == layer) |
| 354 squashingState.haveAssignedBackingsToEntireSquashingLayerSubtree = true; | 355 squashingState.haveAssignedBackingsToEntireSquashingLayerSubtree = true; |
| 355 } | 356 } |
| 356 | 357 |
| 357 } // namespace blink | 358 } // namespace blink |
| OLD | NEW |