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

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

Issue 2640163004: Replace ENABLE(ASSERT) with DCHECK_IS_ON(). (Closed)
Patch Set: Created 3 years, 11 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) 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) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. 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 2098 matching lines...) Expand 10 before | Expand all | Expand 10 after
2109 } 2109 }
2110 2110
2111 setLogicalHeight(computedValues.m_extent); 2111 setLogicalHeight(computedValues.m_extent);
2112 setLogicalTop(computedValues.m_position); 2112 setLogicalTop(computedValues.m_position);
2113 setMarginBefore(computedValues.m_margins.m_before); 2113 setMarginBefore(computedValues.m_margins.m_before);
2114 setMarginAfter(computedValues.m_margins.m_after); 2114 setMarginAfter(computedValues.m_margins.m_after);
2115 2115
2116 return true; 2116 return true;
2117 } 2117 }
2118 2118
2119 #if ENABLE(ASSERT) 2119 #if DCHECK_IS_ON()
2120 void LayoutBlock::checkPositionedObjectsNeedLayout() { 2120 void LayoutBlock::checkPositionedObjectsNeedLayout() {
2121 if (!gPositionedDescendantsMap) 2121 if (!gPositionedDescendantsMap)
2122 return; 2122 return;
2123 2123
2124 if (TrackedLayoutBoxListHashSet* positionedDescendantSet = 2124 if (TrackedLayoutBoxListHashSet* positionedDescendantSet =
2125 positionedObjects()) { 2125 positionedObjects()) {
2126 TrackedLayoutBoxListHashSet::const_iterator end = 2126 TrackedLayoutBoxListHashSet::const_iterator end =
2127 positionedDescendantSet->end(); 2127 positionedDescendantSet->end();
2128 for (TrackedLayoutBoxListHashSet::const_iterator it = 2128 for (TrackedLayoutBoxListHashSet::const_iterator it =
2129 positionedDescendantSet->begin(); 2129 positionedDescendantSet->begin();
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
2200 } 2200 }
2201 2201
2202 return availableHeight; 2202 return availableHeight;
2203 } 2203 }
2204 2204
2205 bool LayoutBlock::hasDefiniteLogicalHeight() const { 2205 bool LayoutBlock::hasDefiniteLogicalHeight() const {
2206 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1); 2206 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1);
2207 } 2207 }
2208 2208
2209 } // namespace blink 2209 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698