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

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

Issue 2758683002: Replace ASSERT_NOT_REACHED with NOTREACHED in core/layout/ (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) 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 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 } 454 }
455 455
456 DISABLE_CFI_PERF 456 DISABLE_CFI_PERF
457 bool LayoutBlock::updateLogicalWidthAndColumnWidth() { 457 bool LayoutBlock::updateLogicalWidthAndColumnWidth() {
458 LayoutUnit oldWidth = logicalWidth(); 458 LayoutUnit oldWidth = logicalWidth();
459 updateLogicalWidth(); 459 updateLogicalWidth();
460 return oldWidth != logicalWidth() || widthAvailableToChildrenHasChanged(); 460 return oldWidth != logicalWidth() || widthAvailableToChildrenHasChanged();
461 } 461 }
462 462
463 void LayoutBlock::layoutBlock(bool) { 463 void LayoutBlock::layoutBlock(bool) {
464 ASSERT_NOT_REACHED(); 464 NOTREACHED();
465 clearNeedsLayout(); 465 clearNeedsLayout();
466 } 466 }
467 467
468 void LayoutBlock::addOverflowFromChildren() { 468 void LayoutBlock::addOverflowFromChildren() {
469 if (childrenInline()) 469 if (childrenInline())
470 toLayoutBlockFlow(this)->addOverflowFromInlineChildren(); 470 toLayoutBlockFlow(this)->addOverflowFromInlineChildren();
471 else 471 else
472 addOverflowFromBlockChildren(); 472 addOverflowFromBlockChildren();
473 } 473 }
474 474
(...skipping 1485 matching lines...) Expand 10 before | Expand all | Expand 10 after
1960 return child->isLayoutBlock() ? toLayoutBlock(child)->hasMarginBeforeQuirk() 1960 return child->isLayoutBlock() ? toLayoutBlock(child)->hasMarginBeforeQuirk()
1961 : child->style()->hasMarginBeforeQuirk(); 1961 : child->style()->hasMarginBeforeQuirk();
1962 1962
1963 // The child is perpendicular to us and box sides are never quirky in 1963 // The child is perpendicular to us and box sides are never quirky in
1964 // html.css, and we don't really care about whether or not authors specified 1964 // html.css, and we don't really care about whether or not authors specified
1965 // quirky ems, since they're an implementation detail. 1965 // quirky ems, since they're an implementation detail.
1966 return false; 1966 return false;
1967 } 1967 }
1968 1968
1969 const char* LayoutBlock::name() const { 1969 const char* LayoutBlock::name() const {
1970 ASSERT_NOT_REACHED(); 1970 NOTREACHED();
1971 return "LayoutBlock"; 1971 return "LayoutBlock";
1972 } 1972 }
1973 1973
1974 LayoutBlock* LayoutBlock::createAnonymousWithParentAndDisplay( 1974 LayoutBlock* LayoutBlock::createAnonymousWithParentAndDisplay(
1975 const LayoutObject* parent, 1975 const LayoutObject* parent,
1976 EDisplay display) { 1976 EDisplay display) {
1977 // FIXME: Do we need to convert all our inline displays to block-type in the 1977 // FIXME: Do we need to convert all our inline displays to block-type in the
1978 // anonymous logic ? 1978 // anonymous logic ?
1979 EDisplay newDisplay; 1979 EDisplay newDisplay;
1980 LayoutBlock* newBox = nullptr; 1980 LayoutBlock* newBox = nullptr;
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
2192 } 2192 }
2193 2193
2194 return availableHeight; 2194 return availableHeight;
2195 } 2195 }
2196 2196
2197 bool LayoutBlock::hasDefiniteLogicalHeight() const { 2197 bool LayoutBlock::hasDefiniteLogicalHeight() const {
2198 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1); 2198 return availableLogicalHeightForPercentageComputation() != LayoutUnit(-1);
2199 } 2199 }
2200 2200
2201 } // namespace blink 2201 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutAnalyzer.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698