Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. | 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. |
| 3 * All rights reserved. | 3 * All rights reserved. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 762 borderPaddingHeight = boxObject.borderAndPaddingLogicalHeight(); | 762 borderPaddingHeight = boxObject.borderAndPaddingLogicalHeight(); |
| 763 } | 763 } |
| 764 newLogicalTopIncludingMargins = newLogicalTop; | 764 newLogicalTopIncludingMargins = newLogicalTop; |
| 765 } else if (!curr->getLineLayoutItem().isBR()) { | 765 } else if (!curr->getLineLayoutItem().isBR()) { |
| 766 LineLayoutBox box = LineLayoutBox(curr->getLineLayoutItem()); | 766 LineLayoutBox box = LineLayoutBox(curr->getLineLayoutItem()); |
| 767 newLogicalTopIncludingMargins = newLogicalTop; | 767 newLogicalTopIncludingMargins = newLogicalTop; |
| 768 // TODO(kojii): isHorizontal() does not match to | 768 // TODO(kojii): isHorizontal() does not match to |
| 769 // m_layoutObject.isHorizontalWritingMode(). crbug.com/552954 | 769 // m_layoutObject.isHorizontalWritingMode(). crbug.com/552954 |
| 770 // ASSERT(curr->isHorizontal() == | 770 // ASSERT(curr->isHorizontal() == |
| 771 // curr->getLineLayoutItem().style()->isHorizontalWritingMode()); | 771 // curr->getLineLayoutItem().style()->isHorizontalWritingMode()); |
| 772 // InlineFlowBox::placeBoxesInBlockDirection will flip lines in | |
|
mstensho (USE GERRIT)
2016/12/02 11:38:03
InlineFlowBox::placeBoxesInBlockDirection happens
jfernandez
2016/12/05 23:57:28
:) Yes, better said that way.
| |
| 773 // case of verticalLR mode, so we can assume verticalRL for now. | |
| 772 LayoutUnit overSideMargin = | 774 LayoutUnit overSideMargin = |
| 773 curr->isHorizontal() ? box.marginTop() : box.marginRight(); | 775 curr->isHorizontal() ? box.marginTop() : box.marginRight(); |
| 774 LayoutUnit underSideMargin = | 776 LayoutUnit underSideMargin = |
| 775 curr->isHorizontal() ? box.marginBottom() : box.marginLeft(); | 777 curr->isHorizontal() ? box.marginBottom() : box.marginLeft(); |
| 776 newLogicalTop += overSideMargin; | 778 newLogicalTop += overSideMargin; |
| 777 boxHeightIncludingMargins += overSideMargin + underSideMargin; | 779 boxHeightIncludingMargins += overSideMargin + underSideMargin; |
| 778 } | 780 } |
| 779 | 781 |
| 780 curr->setLogicalTop(newLogicalTop); | 782 curr->setLogicalTop(newLogicalTop); |
| 781 | 783 |
| (...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1642 ASSERT(child->prevOnLine() == prev); | 1644 ASSERT(child->prevOnLine() == prev); |
| 1643 prev = child; | 1645 prev = child; |
| 1644 } | 1646 } |
| 1645 ASSERT(prev == m_lastChild); | 1647 ASSERT(prev == m_lastChild); |
| 1646 #endif | 1648 #endif |
| 1647 } | 1649 } |
| 1648 | 1650 |
| 1649 #endif | 1651 #endif |
| 1650 | 1652 |
| 1651 } // namespace blink | 1653 } // namespace blink |
| OLD | NEW |