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

Side by Side Diff: Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp

Issue 1209033009: Clear the groupedMapping parameter in layers when removed from the group (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Switch to enum Created 5 years, 5 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 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 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 445
446 // If we need to issue paint invalidations, do so before allocating the compositedDeprecatedPaintLayerMapping and clearing out the groupedMapping. 446 // If we need to issue paint invalidations, do so before allocating the compositedDeprecatedPaintLayerMapping and clearing out the groupedMapping.
447 paintInvalidationOnCompositingChange(layer); 447 paintInvalidationOnCompositingChange(layer);
448 448
449 // If this layer was previously squashed, we need to remove its referenc e to a groupedMapping right away, so 449 // If this layer was previously squashed, we need to remove its referenc e to a groupedMapping right away, so
450 // that computing paint invalidation rects will know the layer's correct compositingState. 450 // that computing paint invalidation rects will know the layer's correct compositingState.
451 // FIXME: do we need to also remove the layer from it's location in the squashing list of its groupedMapping? 451 // FIXME: do we need to also remove the layer from it's location in the squashing list of its groupedMapping?
452 // Need to create a test where a squashed layer pops into compositing. A nd also to cover all other 452 // Need to create a test where a squashed layer pops into compositing. A nd also to cover all other
453 // sorts of compositingState transitions. 453 // sorts of compositingState transitions.
454 layer->setLostGroupedMapping(false); 454 layer->setLostGroupedMapping(false);
455 layer->setGroupedMapping(nullptr); 455 layer->setGroupedMapping(nullptr, DeprecatedPaintLayer::InvalidateLayerA ndRemoveFromMapping);
456 456
457 layer->ensureCompositedDeprecatedPaintLayerMapping(); 457 layer->ensureCompositedDeprecatedPaintLayerMapping();
458 compositedDeprecatedPaintLayerMappingChanged = true; 458 compositedDeprecatedPaintLayerMappingChanged = true;
459 459
460 // At this time, the ScrollingCooridnator only supports the top-level fr ame. 460 // At this time, the ScrollingCooridnator only supports the top-level fr ame.
461 if (layer->isRootLayer() && m_layoutView.frame()->isLocalRoot()) { 461 if (layer->isRootLayer() && m_layoutView.frame()->isLocalRoot()) {
462 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoor dinator()) 462 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoor dinator())
463 scrollingCoordinator->frameViewRootLayerDidChange(m_layoutView.f rameView()); 463 scrollingCoordinator->frameViewRootLayerDidChange(m_layoutView.f rameView());
464 } 464 }
465 break; 465 break;
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 } else if (graphicsLayer == m_scrollLayer.get()) { 1206 } else if (graphicsLayer == m_scrollLayer.get()) {
1207 name = "LocalFrame Scrolling Layer"; 1207 name = "LocalFrame Scrolling Layer";
1208 } else { 1208 } else {
1209 ASSERT_NOT_REACHED(); 1209 ASSERT_NOT_REACHED();
1210 } 1210 }
1211 1211
1212 return name; 1212 return name;
1213 } 1213 }
1214 1214
1215 } // namespace blink 1215 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/compositing/CompositingLayerAssigner.cpp ('k') | Source/core/paint/DeprecatedPaintLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698