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

Side by Side Diff: third_party/WebKit/Source/core/layout/line/InlineTextBox.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 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Apple Inc. 4 * Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 Apple Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 const InlineTextBox* second) { 92 const InlineTextBox* second) {
93 return first->Start() < second->Start(); 93 return first->Start() < second->Start();
94 } 94 }
95 95
96 int BaselinePosition(FontBaseline) const final; 96 int BaselinePosition(FontBaseline) const final;
97 LayoutUnit LineHeight() const final; 97 LayoutUnit LineHeight() const final;
98 98
99 bool GetEmphasisMarkPosition(const ComputedStyle&, 99 bool GetEmphasisMarkPosition(const ComputedStyle&,
100 TextEmphasisPosition&) const; 100 TextEmphasisPosition&) const;
101 101
102 LayoutUnit OffsetTo(LineVerticalPositionType, FontBaseline) const;
103 LayoutUnit VerticalPosition(LineVerticalPositionType, FontBaseline) const;
104
102 LayoutRect LogicalOverflowRect() const; 105 LayoutRect LogicalOverflowRect() const;
103 void SetLogicalOverflowRect(const LayoutRect&); 106 void SetLogicalOverflowRect(const LayoutRect&);
104 LayoutUnit LogicalTopVisualOverflow() const { 107 LayoutUnit LogicalTopVisualOverflow() const {
105 return LogicalOverflowRect().Y(); 108 return LogicalOverflowRect().Y();
106 } 109 }
107 LayoutUnit LogicalBottomVisualOverflow() const { 110 LayoutUnit LogicalBottomVisualOverflow() const {
108 return LogicalOverflowRect().MaxY(); 111 return LogicalOverflowRect().MaxY();
109 } 112 }
110 113
111 // charactersWithHyphen, if provided, must not be destroyed before the 114 // charactersWithHyphen, if provided, must not be destroyed before the
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 (Expansion() && NextLeafChild() ? TextRun::kAllowTrailingExpansion 243 (Expansion() && NextLeafChild() ? TextRun::kAllowTrailingExpansion
241 : TextRun::kForbidTrailingExpansion); 244 : TextRun::kForbidTrailingExpansion);
242 } 245 }
243 }; 246 };
244 247
245 DEFINE_INLINE_BOX_TYPE_CASTS(InlineTextBox); 248 DEFINE_INLINE_BOX_TYPE_CASTS(InlineTextBox);
246 249
247 } // namespace blink 250 } // namespace blink
248 251
249 #endif // InlineTextBox_h 252 #endif // InlineTextBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698