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

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

Issue 2602793004: Fix positioning of "text-underline-position:under" for multi-elements (Closed)
Patch Set: drott nit Created 3 years, 10 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 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 const LayoutRect& logicalVisualOverflow, 386 const LayoutRect& logicalVisualOverflow,
387 LayoutUnit lineTop, 387 LayoutUnit lineTop,
388 LayoutUnit lineBottom) { 388 LayoutUnit lineBottom) {
389 // If we are setting an overflow, then we can't pretend not to have an 389 // If we are setting an overflow, then we can't pretend not to have an
390 // overflow. 390 // overflow.
391 clearKnownToHaveNoOverflow(); 391 clearKnownToHaveNoOverflow();
392 setOverflowFromLogicalRects(logicalLayoutOverflow, logicalVisualOverflow, 392 setOverflowFromLogicalRects(logicalLayoutOverflow, logicalVisualOverflow,
393 lineTop, lineBottom); 393 lineTop, lineBottom);
394 } 394 }
395 395
396 LayoutUnit maxLogicalBottomForUnderline(LineLayoutItem decorationObject,
397 LayoutUnit maxLogicalBottom) const;
398 LayoutUnit minLogicalTopForUnderline(LineLayoutItem decorationObject,
399 LayoutUnit minLogicalTop) const;
400
396 private: 401 private:
397 void placeBoxRangeInInlineDirection(InlineBox* firstChild, 402 void placeBoxRangeInInlineDirection(InlineBox* firstChild,
398 InlineBox* lastChild, 403 InlineBox* lastChild,
399 LayoutUnit& logicalLeft, 404 LayoutUnit& logicalLeft,
400 LayoutUnit& minLogicalLeft, 405 LayoutUnit& minLogicalLeft,
401 LayoutUnit& maxLogicalRight, 406 LayoutUnit& maxLogicalRight,
402 bool& needsWordSpacing); 407 bool& needsWordSpacing);
403 void beginPlacingBoxRangesInInlineDirection(LayoutUnit logicalLeft) { 408 void beginPlacingBoxRangesInInlineDirection(LayoutUnit logicalLeft) {
404 setLogicalLeft(logicalLeft); 409 setLogicalLeft(logicalLeft);
405 } 410 }
(...skipping 30 matching lines...) Expand all
436 441
437 bool isInlineFlowBox() const final { return true; } 442 bool isInlineFlowBox() const final { return true; }
438 443
439 InlineBox* m_firstChild; 444 InlineBox* m_firstChild;
440 InlineBox* m_lastChild; 445 InlineBox* m_lastChild;
441 446
442 InlineFlowBox* 447 InlineFlowBox*
443 m_prevLineBox; // The previous box that also uses our LayoutObject 448 m_prevLineBox; // The previous box that also uses our LayoutObject
444 InlineFlowBox* m_nextLineBox; // The next box that also uses our LayoutObject 449 InlineFlowBox* m_nextLineBox; // The next box that also uses our LayoutObject
445 450
446 // Maximum logicalTop among all children of an InlineFlowBox. Used to
447 // calculate the offset for TextUnderlinePositionUnder.
448 void computeMaxLogicalTop(LayoutUnit& maxLogicalTop) const;
449
450 private: 451 private:
451 unsigned m_includeLogicalLeftEdge : 1; 452 unsigned m_includeLogicalLeftEdge : 1;
452 unsigned m_includeLogicalRightEdge : 1; 453 unsigned m_includeLogicalRightEdge : 1;
453 unsigned m_hasTextChildren : 1; 454 unsigned m_hasTextChildren : 1;
454 unsigned m_hasTextDescendants : 1; 455 unsigned m_hasTextDescendants : 1;
455 unsigned m_descendantsHaveSameLineHeightAndBaseline : 1; 456 unsigned m_descendantsHaveSameLineHeightAndBaseline : 1;
456 457
457 protected: 458 protected:
458 // The following members are only used by RootInlineBox but moved here to keep 459 // The following members are only used by RootInlineBox but moved here to keep
459 // the bits packed. 460 // the bits packed.
(...skipping 28 matching lines...) Expand all
488 489
489 inline void InlineFlowBox::setHasBadChildList() { 490 inline void InlineFlowBox::setHasBadChildList() {
490 #if DCHECK_IS_ON() 491 #if DCHECK_IS_ON()
491 m_hasBadChildList = true; 492 m_hasBadChildList = true;
492 #endif 493 #endif
493 } 494 }
494 495
495 } // namespace blink 496 } // namespace blink
496 497
497 #endif // InlineFlowBox_h 498 #endif // InlineFlowBox_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/line/InlineBox.h ('k') | third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698