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

Side by Side Diff: sky/engine/core/rendering/InlineFlowBox.cpp

Issue 683803006: Remove all writing mode function arguments and remove writing mode from RenderStyle. (Closed) Base URL: git@github.com:domokit/mojo.git@writingmode
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « sky/engine/core/dom/Document.cpp ('k') | sky/engine/core/rendering/RenderBox.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 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 766 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 // border-image-outset on root line boxes is applying to the block and not t o the lines. 777 // border-image-outset on root line boxes is applying to the block and not t o the lines.
778 if (!parent()) 778 if (!parent())
779 return; 779 return;
780 780
781 RenderStyle* style = renderer().style(isFirstLineStyle()); 781 RenderStyle* style = renderer().style(isFirstLineStyle());
782 if (!style->hasBorderImageOutsets()) 782 if (!style->hasBorderImageOutsets())
783 return; 783 return;
784 784
785 LayoutBoxExtent borderOutsets = style->borderImageOutsets(); 785 LayoutBoxExtent borderOutsets = style->borderImageOutsets();
786 786
787 LayoutUnit borderOutsetLogicalTop = borderOutsets.logicalTop(style->writingM ode()); 787 LayoutUnit borderOutsetLogicalTop = borderOutsets.logicalTop();
788 LayoutUnit borderOutsetLogicalBottom = borderOutsets.logicalBottom(style->wr itingMode()); 788 LayoutUnit borderOutsetLogicalBottom = borderOutsets.logicalBottom();
789 LayoutUnit borderOutsetLogicalLeft = borderOutsets.logicalLeft(style->writin gMode()); 789 LayoutUnit borderOutsetLogicalLeft = borderOutsets.logicalLeft();
790 LayoutUnit borderOutsetLogicalRight = borderOutsets.logicalRight(style->writ ingMode()); 790 LayoutUnit borderOutsetLogicalRight = borderOutsets.logicalRight();
791 791
792 // Similar to how glyph overflow works, if our lines are flipped, then it's actually the opposite border that applies, since 792 // Similar to how glyph overflow works, if our lines are flipped, then it's actually the opposite border that applies, since
793 // the line is "upside down" in terms of block coordinates. vertical-rl and horizontal-bt are the flipped line modes. 793 // the line is "upside down" in terms of block coordinates. vertical-rl and horizontal-bt are the flipped line modes.
794 LayoutUnit outsetLogicalTop = style->isFlippedLinesWritingMode() ? borderOut setLogicalBottom : borderOutsetLogicalTop; 794 LayoutUnit outsetLogicalTop = style->isFlippedLinesWritingMode() ? borderOut setLogicalBottom : borderOutsetLogicalTop;
795 LayoutUnit outsetLogicalBottom = style->isFlippedLinesWritingMode() ? border OutsetLogicalTop : borderOutsetLogicalBottom; 795 LayoutUnit outsetLogicalBottom = style->isFlippedLinesWritingMode() ? border OutsetLogicalTop : borderOutsetLogicalBottom;
796 796
797 LayoutUnit logicalTopVisualOverflow = std::min(pixelSnappedLogicalTop() - ou tsetLogicalTop, logicalVisualOverflow.y()); 797 LayoutUnit logicalTopVisualOverflow = std::min(pixelSnappedLogicalTop() - ou tsetLogicalTop, logicalVisualOverflow.y());
798 LayoutUnit logicalBottomVisualOverflow = std::max(pixelSnappedLogicalBottom( ) + outsetLogicalBottom, logicalVisualOverflow.maxY()); 798 LayoutUnit logicalBottomVisualOverflow = std::max(pixelSnappedLogicalBottom( ) + outsetLogicalBottom, logicalVisualOverflow.maxY());
799 799
800 LayoutUnit outsetLogicalLeft = includeLogicalLeftEdge() ? borderOutsetLogica lLeft : LayoutUnit(); 800 LayoutUnit outsetLogicalLeft = includeLogicalLeftEdge() ? borderOutsetLogica lLeft : LayoutUnit();
(...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
1552 ASSERT(child->prevOnLine() == prev); 1552 ASSERT(child->prevOnLine() == prev);
1553 prev = child; 1553 prev = child;
1554 } 1554 }
1555 ASSERT(prev == m_lastChild); 1555 ASSERT(prev == m_lastChild);
1556 #endif 1556 #endif
1557 } 1557 }
1558 1558
1559 #endif 1559 #endif
1560 1560
1561 } // namespace blink 1561 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Document.cpp ('k') | sky/engine/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698