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

Side by Side Diff: Source/core/rendering/RenderLayerModelObject.cpp

Issue 706353002: Revert paint-invalidation-container ASSERT (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added a missing test to rebaselin. 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
« 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010, 2012 Google Inc. All rights reserved. 7 * Copyright (C) 2010, 2012 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 174
175 void RenderLayerModelObject::invalidateTreeIfNeeded(const PaintInvalidationState & paintInvalidationState) 175 void RenderLayerModelObject::invalidateTreeIfNeeded(const PaintInvalidationState & paintInvalidationState)
176 { 176 {
177 ASSERT(!needsLayout()); 177 ASSERT(!needsLayout());
178 178
179 if (!shouldCheckForPaintInvalidation(paintInvalidationState)) 179 if (!shouldCheckForPaintInvalidation(paintInvalidationState))
180 return; 180 return;
181 181
182 bool establishesNewPaintInvalidationContainer = isPaintInvalidationContainer (); 182 bool establishesNewPaintInvalidationContainer = isPaintInvalidationContainer ();
183 const RenderLayerModelObject& newPaintInvalidationContainer = *adjustComposi tedContainerForSpecialAncestors(establishesNewPaintInvalidationContainer ? this : &paintInvalidationState.paintInvalidationContainer()); 183 const RenderLayerModelObject& newPaintInvalidationContainer = *adjustComposi tedContainerForSpecialAncestors(establishesNewPaintInvalidationContainer ? this : &paintInvalidationState.paintInvalidationContainer());
184 ASSERT(&newPaintInvalidationContainer == containerForPaintInvalidation()); 184 // FIXME: This assert should be re-enabled when we move paint invalidation t o after compositing update. crbug.com/360286
185 // ASSERT(&newPaintInvalidationContainer == containerForPaintInvalidation()) ;
185 186
186 PaintInvalidationReason reason = invalidatePaintIfNeeded(paintInvalidationSt ate, newPaintInvalidationContainer); 187 PaintInvalidationReason reason = invalidatePaintIfNeeded(paintInvalidationSt ate, newPaintInvalidationContainer);
187 clearPaintInvalidationState(paintInvalidationState); 188 clearPaintInvalidationState(paintInvalidationState);
188 189
189 PaintInvalidationState childTreeWalkState(paintInvalidationState, *this, new PaintInvalidationContainer); 190 PaintInvalidationState childTreeWalkState(paintInvalidationState, *this, new PaintInvalidationContainer);
190 if (reason == PaintInvalidationLocationChange) 191 if (reason == PaintInvalidationLocationChange)
191 childTreeWalkState.setForceCheckForPaintInvalidation(); 192 childTreeWalkState.setForceCheckForPaintInvalidation();
192 invalidatePaintOfSubtreesIfNeeded(childTreeWalkState); 193 invalidatePaintOfSubtreesIfNeeded(childTreeWalkState);
193 } 194 }
194 195
(...skipping 10 matching lines...) Expand all
205 // Note: the subpixel accumulation of layer() does not need to be ad ded here. It is already taken into account. 206 // Note: the subpixel accumulation of layer() does not need to be ad ded here. It is already taken into account.
206 squashingLayer->setNeedsDisplayInRect(pixelSnappedIntRect(paintInval idationRect), invalidationReason); 207 squashingLayer->setNeedsDisplayInRect(pixelSnappedIntRect(paintInval idationRect), invalidationReason);
207 } 208 }
208 } else { 209 } else {
209 layer()->compositedLayerMapping()->setContentsNeedDisplayInRect(r, inval idationReason); 210 layer()->compositedLayerMapping()->setContentsNeedDisplayInRect(r, inval idationReason);
210 } 211 }
211 } 212 }
212 213
213 } // namespace blink 214 } // namespace blink
214 215
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