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

Side by Side Diff: third_party/WebKit/Source/core/layout/line/InlineFlowBox.h

Issue 2643413002: Fix 'text-underline-position: under' to use em height ascent/descent (Closed)
Patch Set: eae review Created 3 years, 7 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) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 const LayoutRect& logical_visual_overflow, 385 const LayoutRect& logical_visual_overflow,
386 LayoutUnit line_top, 386 LayoutUnit line_top,
387 LayoutUnit line_bottom) { 387 LayoutUnit line_bottom) {
388 // If we are setting an overflow, then we can't pretend not to have an 388 // If we are setting an overflow, then we can't pretend not to have an
389 // overflow. 389 // overflow.
390 ClearKnownToHaveNoOverflow(); 390 ClearKnownToHaveNoOverflow();
391 SetOverflowFromLogicalRects(logical_layout_overflow, 391 SetOverflowFromLogicalRects(logical_layout_overflow,
392 logical_visual_overflow, line_top, line_bottom); 392 logical_visual_overflow, line_top, line_bottom);
393 } 393 }
394 394
395 LayoutUnit MaxLogicalBottomForUnderline(LineLayoutItem decoration_object, 395 LayoutUnit FarthestPositionForUnderline(LineLayoutItem decorating_box,
396 LayoutUnit max_logical_bottom) const; 396 LineVerticalPositionType,
397 LayoutUnit MinLogicalTopForUnderline(LineLayoutItem decoration_object, 397 FontBaseline,
398 LayoutUnit min_logical_top) const; 398 LayoutUnit current) const;
399 399
400 private: 400 private:
401 void PlaceBoxRangeInInlineDirection(InlineBox* first_child, 401 void PlaceBoxRangeInInlineDirection(InlineBox* first_child,
402 InlineBox* last_child, 402 InlineBox* last_child,
403 LayoutUnit& logical_left, 403 LayoutUnit& logical_left,
404 LayoutUnit& min_logical_left, 404 LayoutUnit& min_logical_left,
405 LayoutUnit& max_logical_right, 405 LayoutUnit& max_logical_right,
406 bool& needs_word_spacing); 406 bool& needs_word_spacing);
407 void BeginPlacingBoxRangesInInlineDirection(LayoutUnit logical_left) { 407 void BeginPlacingBoxRangesInInlineDirection(LayoutUnit logical_left) {
408 SetLogicalLeft(logical_left); 408 SetLogicalLeft(logical_left);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 489
490 inline void InlineFlowBox::SetHasBadChildList() { 490 inline void InlineFlowBox::SetHasBadChildList() {
491 #if DCHECK_IS_ON() 491 #if DCHECK_IS_ON()
492 has_bad_child_list_ = true; 492 has_bad_child_list_ = true;
493 #endif 493 #endif
494 } 494 }
495 495
496 } // namespace blink 496 } // namespace blink
497 497
498 #endif // InlineFlowBox_h 498 #endif // InlineFlowBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698