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

Side by Side Diff: third_party/WebKit/Source/core/layout/compositing/GraphicsLayerUpdater.cpp

Issue 2748103015: Replace ASSERT with DCHECK in core/layout/<sub dirs> (Closed)
Patch Set: Rebase with latest Created 3 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
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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 PaintLayer& layer, 93 PaintLayer& layer,
94 UpdateType updateType, 94 UpdateType updateType,
95 const UpdateContext& context, 95 const UpdateContext& context,
96 Vector<PaintLayer*>& layersNeedingPaintInvalidation) { 96 Vector<PaintLayer*>& layersNeedingPaintInvalidation) {
97 if (layer.hasCompositedLayerMapping()) { 97 if (layer.hasCompositedLayerMapping()) {
98 CompositedLayerMapping* mapping = layer.compositedLayerMapping(); 98 CompositedLayerMapping* mapping = layer.compositedLayerMapping();
99 99
100 if (updateType == ForceUpdate || mapping->needsGraphicsLayerUpdate()) { 100 if (updateType == ForceUpdate || mapping->needsGraphicsLayerUpdate()) {
101 const PaintLayer* compositingContainer = 101 const PaintLayer* compositingContainer =
102 context.compositingContainer(layer); 102 context.compositingContainer(layer);
103 ASSERT(compositingContainer == 103 DCHECK_EQ(compositingContainer,
104 layer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf)); 104 layer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf));
105 105
106 if (mapping->updateGraphicsLayerConfiguration()) 106 if (mapping->updateGraphicsLayerConfiguration())
107 m_needsRebuildTree = true; 107 m_needsRebuildTree = true;
108 108
109 mapping->updateGraphicsLayerGeometry(compositingContainer, 109 mapping->updateGraphicsLayerGeometry(compositingContainer,
110 context.compositingStackingContext(), 110 context.compositingStackingContext(),
111 layersNeedingPaintInvalidation); 111 layersNeedingPaintInvalidation);
112 if (PaintLayerScrollableArea* scrollableArea = layer.getScrollableArea()) 112 if (PaintLayerScrollableArea* scrollableArea = layer.getScrollableArea())
113 scrollableArea->positionOverflowControls(); 113 scrollableArea->positionOverflowControls();
114 updateType = mapping->updateTypeForChildren(updateType); 114 updateType = mapping->updateTypeForChildren(updateType);
(...skipping 17 matching lines...) Expand all
132 ->assertNeedsToUpdateGraphicsLayerBitsCleared(); 132 ->assertNeedsToUpdateGraphicsLayerBitsCleared();
133 133
134 for (PaintLayer* child = layer.firstChild(); child; 134 for (PaintLayer* child = layer.firstChild(); child;
135 child = child->nextSibling()) 135 child = child->nextSibling())
136 assertNeedsToUpdateGraphicsLayerBitsCleared(*child); 136 assertNeedsToUpdateGraphicsLayerBitsCleared(*child);
137 } 137 }
138 138
139 #endif 139 #endif
140 140
141 } // namespace blink 141 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698