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

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

Issue 233063004: Suppress layer creation for descendants of GPU-rasterized layers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Move assert disabler in ~CompositedLayerMapping Created 6 years, 8 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
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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 , m_needToUpdateGraphicsLayerOfAllDecendants(false) 176 , m_needToUpdateGraphicsLayerOfAllDecendants(false)
177 { 177 {
178 if (layer.isRootLayer() && renderer()->frame()->isMainFrame()) 178 if (layer.isRootLayer() && renderer()->frame()->isMainFrame())
179 m_isMainFrameRenderViewLayer = true; 179 m_isMainFrameRenderViewLayer = true;
180 180
181 createPrimaryGraphicsLayer(); 181 createPrimaryGraphicsLayer();
182 } 182 }
183 183
184 CompositedLayerMapping::~CompositedLayerMapping() 184 CompositedLayerMapping::~CompositedLayerMapping()
185 { 185 {
186 // Hits in compositing/squashing/squash-onto-nephew.html.
187 DisableCompositingQueryAsserts disabler;
188
186 // Do not leave the destroyed pointer dangling on any RenderLayers that pain ted to this mapping's squashing layer. 189 // Do not leave the destroyed pointer dangling on any RenderLayers that pain ted to this mapping's squashing layer.
187 for (size_t i = 0; i < m_squashedLayers.size(); ++i) { 190 for (size_t i = 0; i < m_squashedLayers.size(); ++i) {
188 RenderLayer* oldSquashedLayer = m_squashedLayers[i].renderLayer; 191 RenderLayer* oldSquashedLayer = m_squashedLayers[i].renderLayer;
189 if (oldSquashedLayer->groupedMapping() == this) { 192 if (oldSquashedLayer->groupedMapping() == this) {
190 oldSquashedLayer->setGroupedMapping(0, true); 193 oldSquashedLayer->setGroupedMapping(0, true);
191 oldSquashedLayer->setLostGroupedMapping(true); 194 oldSquashedLayer->setLostGroupedMapping(true);
192 } 195 }
193 } 196 }
194 197
195 updateClippingLayers(false, false); 198 updateClippingLayers(false, false);
(...skipping 1957 matching lines...) Expand 10 before | Expand all | Expand 10 after
2153 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { 2156 } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
2154 name = "Scrolling Contents Layer"; 2157 name = "Scrolling Contents Layer";
2155 } else { 2158 } else {
2156 ASSERT_NOT_REACHED(); 2159 ASSERT_NOT_REACHED();
2157 } 2160 }
2158 2161
2159 return name; 2162 return name;
2160 } 2163 }
2161 2164
2162 } // namespace WebCore 2165 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/compositing/CompositingReasonFinder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698