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

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

Issue 2602793004: Fix positioning of "text-underline-position:under" for multi-elements (Closed)
Patch Set: drott nit 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) 2003, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2008 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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 if (annotationsAdjustment) { 295 if (annotationsAdjustment) {
296 // FIXME: Need to handle pagination here. We might have to move to the next 296 // FIXME: Need to handle pagination here. We might have to move to the next
297 // page/column as a result of the ruby expansion. 297 // page/column as a result of the ruby expansion.
298 moveInBlockDirection(annotationsAdjustment); 298 moveInBlockDirection(annotationsAdjustment);
299 heightOfBlock += annotationsAdjustment; 299 heightOfBlock += annotationsAdjustment;
300 } 300 }
301 301
302 return heightOfBlock + maxHeight; 302 return heightOfBlock + maxHeight;
303 } 303 }
304 304
305 LayoutUnit RootInlineBox::maxLogicalTop() const {
306 LayoutUnit maxLogicalTop;
307 computeMaxLogicalTop(maxLogicalTop);
308 return maxLogicalTop;
309 }
310
311 LayoutUnit RootInlineBox::beforeAnnotationsAdjustment() const { 305 LayoutUnit RootInlineBox::beforeAnnotationsAdjustment() const {
312 LayoutUnit result; 306 LayoutUnit result;
313 307
314 if (!getLineLayoutItem().style()->isFlippedLinesWritingMode()) { 308 if (!getLineLayoutItem().style()->isFlippedLinesWritingMode()) {
315 // Annotations under the previous line may push us down. 309 // Annotations under the previous line may push us down.
316 if (prevRootBox() && prevRootBox()->hasAnnotationsAfter()) 310 if (prevRootBox() && prevRootBox()->hasAnnotationsAfter())
317 result = prevRootBox()->computeUnderAnnotationAdjustment(lineTop()); 311 result = prevRootBox()->computeUnderAnnotationAdjustment(lineTop());
318 312
319 if (!hasAnnotationsBefore()) 313 if (!hasAnnotationsBefore())
320 return result; 314 return result;
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 } 776 }
783 endBox = nullptr; 777 endBox = nullptr;
784 return nullptr; 778 return nullptr;
785 } 779 }
786 780
787 const char* RootInlineBox::boxName() const { 781 const char* RootInlineBox::boxName() const {
788 return "RootInlineBox"; 782 return "RootInlineBox";
789 } 783 }
790 784
791 } // namespace blink 785 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698