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

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

Issue 2622623003: Moved -webkit-rtl-ordering to be generated in ComputedStyleBase. (Closed)
Patch Set: 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, 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 1559 matching lines...) Expand 10 before | Expand all | Expand 10 after
1570 unsigned char maxLevel = 0; 1570 unsigned char maxLevel = 0;
1571 1571
1572 // First find highest and lowest levels, and initialize 1572 // First find highest and lowest levels, and initialize
1573 // leafBoxesInLogicalOrder with the leaf boxes in visual order. 1573 // leafBoxesInLogicalOrder with the leaf boxes in visual order.
1574 for (; leaf; leaf = leaf->nextLeafChild()) { 1574 for (; leaf; leaf = leaf->nextLeafChild()) {
1575 minLevel = std::min(minLevel, leaf->bidiLevel()); 1575 minLevel = std::min(minLevel, leaf->bidiLevel());
1576 maxLevel = std::max(maxLevel, leaf->bidiLevel()); 1576 maxLevel = std::max(maxLevel, leaf->bidiLevel());
1577 leafBoxesInLogicalOrder.push_back(leaf); 1577 leafBoxesInLogicalOrder.push_back(leaf);
1578 } 1578 }
1579 1579
1580 if (getLineLayoutItem().style()->rtlOrdering() == EOrder::Visual) 1580 if (getLineLayoutItem().style()->rtlOrdering() == EOrder::kVisual)
1581 return; 1581 return;
1582 1582
1583 // Reverse of reordering of the line (L2 according to Bidi spec): 1583 // Reverse of reordering of the line (L2 according to Bidi spec):
1584 // L2. From the highest level found in the text to the lowest odd level on 1584 // L2. From the highest level found in the text to the lowest odd level on
1585 // each line, reverse any contiguous sequence of characters that are at that 1585 // each line, reverse any contiguous sequence of characters that are at that
1586 // level or higher. 1586 // level or higher.
1587 1587
1588 // Reversing the reordering of the line is only done up to the lowest odd 1588 // Reversing the reordering of the line is only done up to the lowest odd
1589 // level. 1589 // level.
1590 if (!(minLevel % 2)) 1590 if (!(minLevel % 2))
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
1647 ASSERT(child->prevOnLine() == prev); 1647 ASSERT(child->prevOnLine() == prev);
1648 prev = child; 1648 prev = child;
1649 } 1649 }
1650 ASSERT(prev == m_lastChild); 1650 ASSERT(prev == m_lastChild);
1651 #endif 1651 #endif
1652 } 1652 }
1653 1653
1654 #endif 1654 #endif
1655 1655
1656 } // namespace blink 1656 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698