Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Side by Side Diff: Source/core/rendering/compositing/CompositingLayerAssigner.cpp

Issue 708213002: Remove the HasOwnBackingButPaintsIntoAncestor compositing state. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Removed more tests. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 } 268 }
269 } 269 }
270 270
271 if (layer->stackingNode()->isStackingContext()) { 271 if (layer->stackingNode()->isStackingContext()) {
272 RenderLayerStackingNodeIterator iterator(*layer->stackingNode(), Negativ eZOrderChildren); 272 RenderLayerStackingNodeIterator iterator(*layer->stackingNode(), Negativ eZOrderChildren);
273 while (RenderLayerStackingNode* curNode = iterator.next()) 273 while (RenderLayerStackingNode* curNode = iterator.next())
274 assignLayersToBackingsInternal(curNode->layer(), squashingState, lay ersNeedingPaintInvalidation); 274 assignLayersToBackingsInternal(curNode->layer(), squashingState, lay ersNeedingPaintInvalidation);
275 } 275 }
276 276
277 if (m_layerSquashingEnabled) { 277 if (m_layerSquashingEnabled) {
278 // At this point, if the layer is to be "separately" composited, then it s backing becomes the most recent in paint-order. 278 // At this point, if the layer is to be separately composited, then its backing becomes the most recent in paint-order.
279 if (layer->compositingState() == PaintsIntoOwnBacking || layer->composit ingState() == HasOwnBackingButPaintsIntoAncestor) { 279 if (layer->compositingState() == PaintsIntoOwnBacking) {
280 ASSERT(!requiresSquashing(layer->compositingReasons())); 280 ASSERT(!requiresSquashing(layer->compositingReasons()));
281 squashingState.updateSquashingStateForNewMapping(layer->compositedLa yerMapping(), layer->hasCompositedLayerMapping()); 281 squashingState.updateSquashingStateForNewMapping(layer->compositedLa yerMapping(), layer->hasCompositedLayerMapping());
282 } 282 }
283 } 283 }
284 284
285 if (layer->scrollParent()) 285 if (layer->scrollParent())
286 layer->scrollParent()->scrollableArea()->setTopmostScrollChild(layer); 286 layer->scrollParent()->scrollableArea()->setTopmostScrollChild(layer);
287 287
288 if (layer->needsCompositedScrolling()) 288 if (layer->needsCompositedScrolling())
289 layer->scrollableArea()->setTopmostScrollChild(0); 289 layer->scrollableArea()->setTopmostScrollChild(0);
290 290
291 RenderLayerStackingNodeIterator iterator(*layer->stackingNode(), NormalFlowC hildren | PositiveZOrderChildren); 291 RenderLayerStackingNodeIterator iterator(*layer->stackingNode(), NormalFlowC hildren | PositiveZOrderChildren);
292 while (RenderLayerStackingNode* curNode = iterator.next()) 292 while (RenderLayerStackingNode* curNode = iterator.next())
293 assignLayersToBackingsInternal(curNode->layer(), squashingState, layersN eedingPaintInvalidation); 293 assignLayersToBackingsInternal(curNode->layer(), squashingState, layersN eedingPaintInvalidation);
294 294
295 if (squashingState.hasMostRecentMapping && &squashingState.mostRecentMapping ->owningLayer() == layer) 295 if (squashingState.hasMostRecentMapping && &squashingState.mostRecentMapping ->owningLayer() == layer)
296 squashingState.haveAssignedBackingsToEntireSquashingLayerSubtree = true; 296 squashingState.haveAssignedBackingsToEntireSquashingLayerSubtree = true;
297 } 297 }
298 298
299 } 299 }
OLDNEW
« no previous file with comments | « Source/core/rendering/compositing/CompositedLayerMapping.cpp ('k') | Source/core/rendering/compositing/CompositingState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698