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

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

Issue 2553653003: Make ifdefs consistent in WebKit/Source/core/layout/ . (Closed)
Patch Set: Update after review. Created 4 years 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 | « no previous file | third_party/WebKit/Source/core/layout/LayoutObject.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 * (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, 2010 Apple Inc. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1141 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 1152
1153 void LayoutBox::computeIntrinsicLogicalWidths( 1153 void LayoutBox::computeIntrinsicLogicalWidths(
1154 LayoutUnit& minLogicalWidth, 1154 LayoutUnit& minLogicalWidth,
1155 LayoutUnit& maxLogicalWidth) const { 1155 LayoutUnit& maxLogicalWidth) const {
1156 minLogicalWidth = minPreferredLogicalWidth() - borderAndPaddingLogicalWidth(); 1156 minLogicalWidth = minPreferredLogicalWidth() - borderAndPaddingLogicalWidth();
1157 maxLogicalWidth = maxPreferredLogicalWidth() - borderAndPaddingLogicalWidth(); 1157 maxLogicalWidth = maxPreferredLogicalWidth() - borderAndPaddingLogicalWidth();
1158 } 1158 }
1159 1159
1160 LayoutUnit LayoutBox::minPreferredLogicalWidth() const { 1160 LayoutUnit LayoutBox::minPreferredLogicalWidth() const {
1161 if (preferredLogicalWidthsDirty()) { 1161 if (preferredLogicalWidthsDirty()) {
1162 #if ENABLE(ASSERT) 1162 #if DCHECK_IS_ON()
1163 SetLayoutNeededForbiddenScope layoutForbiddenScope( 1163 SetLayoutNeededForbiddenScope layoutForbiddenScope(
1164 const_cast<LayoutBox&>(*this)); 1164 const_cast<LayoutBox&>(*this));
1165 #endif 1165 #endif
1166 const_cast<LayoutBox*>(this)->computePreferredLogicalWidths(); 1166 const_cast<LayoutBox*>(this)->computePreferredLogicalWidths();
1167 ASSERT(!preferredLogicalWidthsDirty()); 1167 ASSERT(!preferredLogicalWidthsDirty());
1168 } 1168 }
1169 1169
1170 return m_minPreferredLogicalWidth; 1170 return m_minPreferredLogicalWidth;
1171 } 1171 }
1172 1172
1173 DISABLE_CFI_PERF 1173 DISABLE_CFI_PERF
1174 LayoutUnit LayoutBox::maxPreferredLogicalWidth() const { 1174 LayoutUnit LayoutBox::maxPreferredLogicalWidth() const {
1175 if (preferredLogicalWidthsDirty()) { 1175 if (preferredLogicalWidthsDirty()) {
1176 #if ENABLE(ASSERT) 1176 #if DCHECK_IS_ON()
1177 SetLayoutNeededForbiddenScope layoutForbiddenScope( 1177 SetLayoutNeededForbiddenScope layoutForbiddenScope(
1178 const_cast<LayoutBox&>(*this)); 1178 const_cast<LayoutBox&>(*this));
1179 #endif 1179 #endif
1180 const_cast<LayoutBox*>(this)->computePreferredLogicalWidths(); 1180 const_cast<LayoutBox*>(this)->computePreferredLogicalWidths();
1181 ASSERT(!preferredLogicalWidthsDirty()); 1181 ASSERT(!preferredLogicalWidthsDirty());
1182 } 1182 }
1183 1183
1184 return m_maxPreferredLogicalWidth; 1184 return m_maxPreferredLogicalWidth;
1185 } 1185 }
1186 1186
(...skipping 4436 matching lines...) Expand 10 before | Expand all | Expand 10 after
5623 LayoutRect rect = frameRect(); 5623 LayoutRect rect = frameRect();
5624 5624
5625 LayoutBlock* block = containingBlock(); 5625 LayoutBlock* block = containingBlock();
5626 if (block) 5626 if (block)
5627 block->adjustChildDebugRect(rect); 5627 block->adjustChildDebugRect(rect);
5628 5628
5629 return rect; 5629 return rect;
5630 } 5630 }
5631 5631
5632 } // namespace blink 5632 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698