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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBox.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) 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 2426 matching lines...) Expand 10 before | Expand all | Expand 10 after
2437 LogicalExtentComputedValues computedValues; 2437 LogicalExtentComputedValues computedValues;
2438 computeLogicalWidth(computedValues); 2438 computeLogicalWidth(computedValues);
2439 2439
2440 setLogicalWidth(computedValues.m_extent); 2440 setLogicalWidth(computedValues.m_extent);
2441 setLogicalLeft(computedValues.m_position); 2441 setLogicalLeft(computedValues.m_position);
2442 setMarginStart(computedValues.m_margins.m_start); 2442 setMarginStart(computedValues.m_margins.m_start);
2443 setMarginEnd(computedValues.m_margins.m_end); 2443 setMarginEnd(computedValues.m_margins.m_end);
2444 } 2444 }
2445 2445
2446 static float getMaxWidthListMarker(const LayoutBox* layoutObject) { 2446 static float getMaxWidthListMarker(const LayoutBox* layoutObject) {
2447 #if ENABLE(ASSERT) 2447 #if DCHECK_IS_ON()
2448 ASSERT(layoutObject); 2448 ASSERT(layoutObject);
2449 Node* parentNode = layoutObject->generatingNode(); 2449 Node* parentNode = layoutObject->generatingNode();
2450 ASSERT(parentNode); 2450 ASSERT(parentNode);
2451 ASSERT(isHTMLOListElement(parentNode) || isHTMLUListElement(parentNode)); 2451 ASSERT(isHTMLOListElement(parentNode) || isHTMLUListElement(parentNode));
2452 ASSERT(layoutObject->style()->textAutosizingMultiplier() != 1); 2452 ASSERT(layoutObject->style()->textAutosizingMultiplier() != 1);
2453 #endif 2453 #endif
2454 float maxWidth = 0; 2454 float maxWidth = 0;
2455 for (LayoutObject* child = layoutObject->slowFirstChild(); child; 2455 for (LayoutObject* child = layoutObject->slowFirstChild(); child;
2456 child = child->nextSibling()) { 2456 child = child->nextSibling()) {
2457 if (!child->isListItem()) 2457 if (!child->isListItem())
(...skipping 3235 matching lines...) Expand 10 before | Expand all | Expand 10 after
5693 block->adjustChildDebugRect(rect); 5693 block->adjustChildDebugRect(rect);
5694 5694
5695 return rect; 5695 return rect;
5696 } 5696 }
5697 5697
5698 bool LayoutBox::shouldClipOverflow() const { 5698 bool LayoutBox::shouldClipOverflow() const {
5699 return hasOverflowClip() || styleRef().containsPaint() || hasControlClip(); 5699 return hasOverflowClip() || styleRef().containsPaint() || hasControlClip();
5700 } 5700 }
5701 5701
5702 } // namespace blink 5702 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698