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

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

Issue 397733004: Allow assertions to be enabled in Blink Release builds. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased. Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/core/rendering/SubtreeLayoutScope.h » ('j') | 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 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 165
166 void RenderView::layoutContent() 166 void RenderView::layoutContent()
167 { 167 {
168 ASSERT(needsLayout()); 168 ASSERT(needsLayout());
169 169
170 RenderBlockFlow::layout(); 170 RenderBlockFlow::layout();
171 171
172 if (RuntimeEnabledFeatures::dialogElementEnabled()) 172 if (RuntimeEnabledFeatures::dialogElementEnabled())
173 positionDialogs(); 173 positionDialogs();
174 174
175 #ifndef NDEBUG 175 #if ENABLE(ASSERT)
176 checkLayoutState(); 176 checkLayoutState();
177 #endif 177 #endif
178 } 178 }
179 179
180 #ifndef NDEBUG 180 #if ENABLE(ASSERT)
181 void RenderView::checkLayoutState() 181 void RenderView::checkLayoutState()
182 { 182 {
183 ASSERT(!m_layoutState->next()); 183 ASSERT(!m_layoutState->next());
184 } 184 }
185 #endif 185 #endif
186 186
187 bool RenderView::shouldDoFullRepaintForNextLayout() const 187 bool RenderView::shouldDoFullRepaintForNextLayout() const
188 { 188 {
189 // It's hard to predict here which of full repaint or per-descendant repaint costs less. 189 // It's hard to predict here which of full repaint or per-descendant repaint costs less.
190 // For vertical writing mode or width change it's more likely that per-desce ndant repaint 190 // For vertical writing mode or width change it's more likely that per-desce ndant repaint
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 ASSERT(!m_layoutState); 247 ASSERT(!m_layoutState);
248 if (!needsLayout()) 248 if (!needsLayout())
249 return; 249 return;
250 250
251 LayoutState rootLayoutState(pageLogicalHeight(), pageLogicalHeightChanged(), *this); 251 LayoutState rootLayoutState(pageLogicalHeight(), pageLogicalHeightChanged(), *this);
252 252
253 m_pageLogicalHeightChanged = false; 253 m_pageLogicalHeightChanged = false;
254 254
255 layoutContent(); 255 layoutContent();
256 256
257 #ifndef NDEBUG 257 #if ENABLE(ASSERT)
258 checkLayoutState(); 258 checkLayoutState();
259 #endif 259 #endif
260 clearNeedsLayout(); 260 clearNeedsLayout();
261 } 261 }
262 262
263 void RenderView::mapLocalToContainer(const RenderLayerModelObject* repaintContai ner, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, c onst PaintInvalidationState* paintInvalidationState) const 263 void RenderView::mapLocalToContainer(const RenderLayerModelObject* repaintContai ner, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, c onst PaintInvalidationState* paintInvalidationState) const
264 { 264 {
265 ASSERT_UNUSED(wasFixed, !wasFixed || *wasFixed == static_cast<bool>(mode & I sFixed)); 265 ASSERT_UNUSED(wasFixed, !wasFixed || *wasFixed == static_cast<bool>(mode & I sFixed));
266 266
267 if (!repaintContainer && mode & UseTransforms && shouldUseTransformFromConta iner(0)) { 267 if (!repaintContainer && mode & UseTransforms && shouldUseTransformFromConta iner(0)) {
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 return viewWidth(IncludeScrollbars) / scale; 993 return viewWidth(IncludeScrollbars) / scale;
994 } 994 }
995 995
996 double RenderView::layoutViewportHeight() const 996 double RenderView::layoutViewportHeight() const
997 { 997 {
998 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; 998 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1;
999 return viewHeight(IncludeScrollbars) / scale; 999 return viewHeight(IncludeScrollbars) / scale;
1000 } 1000 }
1001 1001
1002 } // namespace WebCore 1002 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/core/rendering/SubtreeLayoutScope.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698