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

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

Issue 204983002: Re-land of issue 200623006: Set geometry dirty bits on composited layer mappings w/squashing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed cras. Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 169
170 createPrimaryGraphicsLayer(); 170 createPrimaryGraphicsLayer();
171 } 171 }
172 172
173 CompositedLayerMapping::~CompositedLayerMapping() 173 CompositedLayerMapping::~CompositedLayerMapping()
174 { 174 {
175 // Do not leave the destroyed pointer dangling on any RenderLayers that pain ted to this mapping's squashing layer. 175 // Do not leave the destroyed pointer dangling on any RenderLayers that pain ted to this mapping's squashing layer.
176 for (size_t i = 0; i < m_squashedLayers.size(); ++i) { 176 for (size_t i = 0; i < m_squashedLayers.size(); ++i) {
177 RenderLayer* oldSquashedLayer = m_squashedLayers[i].renderLayer; 177 RenderLayer* oldSquashedLayer = m_squashedLayers[i].renderLayer;
178 if (oldSquashedLayer->groupedMapping() == this) { 178 if (oldSquashedLayer->groupedMapping() == this) {
179 oldSquashedLayer->setGroupedMapping(0); 179 oldSquashedLayer->setGroupedMapping(0, true);
180 oldSquashedLayer->setLostGroupedMapping(true); 180 oldSquashedLayer->setLostGroupedMapping(true);
181 } 181 }
182 } 182 }
183 183
184 updateClippingLayers(false, false); 184 updateClippingLayers(false, false);
185 updateOverflowControlsLayers(false, false, false); 185 updateOverflowControlsLayers(false, false, false);
186 updateChildTransformLayer(false); 186 updateChildTransformLayer(false);
187 updateForegroundLayer(false); 187 updateForegroundLayer(false);
188 updateBackgroundLayer(false); 188 updateBackgroundLayer(false);
189 updateMaskLayer(false); 189 updateMaskLayer(false);
(...skipping 1942 matching lines...) Expand 10 before | Expand all | Expand 10 after
2132 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { 2132 } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
2133 name = "Scrolling Contents Layer"; 2133 name = "Scrolling Contents Layer";
2134 } else { 2134 } else {
2135 ASSERT_NOT_REACHED(); 2135 ASSERT_NOT_REACHED();
2136 } 2136 }
2137 2137
2138 return name; 2138 return name;
2139 } 2139 }
2140 2140
2141 } // namespace WebCore 2141 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698