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

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

Issue 2394683005: Remove ASSERT_UNUSED (Closed)
Patch Set: Created 4 years, 2 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 LayoutUnit* extraWidthToEndOfLine) { 271 LayoutUnit* extraWidthToEndOfLine) {
272 if (firstChild()) { 272 if (firstChild()) {
273 // This condition is possible if the LayoutInline is at an editing boundary, 273 // This condition is possible if the LayoutInline is at an editing boundary,
274 // i.e. the VisiblePosition is: 274 // i.e. the VisiblePosition is:
275 // <LayoutInline editingBoundary=true>|<LayoutText> </LayoutText></LayoutI nline> 275 // <LayoutInline editingBoundary=true>|<LayoutText> </LayoutText></LayoutI nline>
276 // FIXME: need to figure out how to make this return a valid rect, note that 276 // FIXME: need to figure out how to make this return a valid rect, note that
277 // there are no line boxes created in the above case. 277 // there are no line boxes created in the above case.
278 return LayoutRect(); 278 return LayoutRect();
279 } 279 }
280 280
281 ASSERT_UNUSED(inlineBox, !inlineBox); 281 DCHECK(!inlineBox);
282 282
283 if (extraWidthToEndOfLine) 283 if (extraWidthToEndOfLine)
284 *extraWidthToEndOfLine = LayoutUnit(); 284 *extraWidthToEndOfLine = LayoutUnit();
285 285
286 LayoutRect caretRect = 286 LayoutRect caretRect =
287 localCaretRectForEmptyElement(borderAndPaddingWidth(), LayoutUnit()); 287 localCaretRectForEmptyElement(borderAndPaddingWidth(), LayoutUnit());
288 288
289 if (InlineBox* firstBox = firstLineBox()) { 289 if (InlineBox* firstBox = firstLineBox()) {
290 // FIXME: the call to roundedLayoutPoint() below is temporary and should be removed once 290 // FIXME: the call to roundedLayoutPoint() below is temporary and should be removed once
291 // the transition to LayoutUnit-based types is complete (crbug.com/321237) 291 // the transition to LayoutUnit-based types is complete (crbug.com/321237)
(...skipping 1227 matching lines...) Expand 10 before | Expand all | Expand 10 after
1519 paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason); 1519 paintInvalidator.invalidateDisplayItemClient(*box, invalidationReason);
1520 } 1520 }
1521 1521
1522 // TODO(lunalu): Not to just dump 0, 0 as the x and y here 1522 // TODO(lunalu): Not to just dump 0, 0 as the x and y here
1523 LayoutRect LayoutInline::debugRect() const { 1523 LayoutRect LayoutInline::debugRect() const {
1524 IntRect linesBox = enclosingIntRect(linesBoundingBox()); 1524 IntRect linesBox = enclosingIntRect(linesBoundingBox());
1525 return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height())); 1525 return LayoutRect(IntRect(0, 0, linesBox.width(), linesBox.height()));
1526 } 1526 }
1527 1527
1528 } // namespace blink 1528 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698