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

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

Issue 2546333002: Changed Order to an enum class and renamed its members (Closed)
Patch Set: Created 4 years 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 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after
1565 unsigned char maxLevel = 0; 1565 unsigned char maxLevel = 0;
1566 1566
1567 // First find highest and lowest levels, and initialize 1567 // First find highest and lowest levels, and initialize
1568 // leafBoxesInLogicalOrder with the leaf boxes in visual order. 1568 // leafBoxesInLogicalOrder with the leaf boxes in visual order.
1569 for (; leaf; leaf = leaf->nextLeafChild()) { 1569 for (; leaf; leaf = leaf->nextLeafChild()) {
1570 minLevel = std::min(minLevel, leaf->bidiLevel()); 1570 minLevel = std::min(minLevel, leaf->bidiLevel());
1571 maxLevel = std::max(maxLevel, leaf->bidiLevel()); 1571 maxLevel = std::max(maxLevel, leaf->bidiLevel());
1572 leafBoxesInLogicalOrder.append(leaf); 1572 leafBoxesInLogicalOrder.append(leaf);
1573 } 1573 }
1574 1574
1575 if (getLineLayoutItem().style()->rtlOrdering() == VisualOrder) 1575 if (getLineLayoutItem().style()->rtlOrdering() == EOrder::Visual)
1576 return; 1576 return;
1577 1577
1578 // Reverse of reordering of the line (L2 according to Bidi spec): 1578 // Reverse of reordering of the line (L2 according to Bidi spec):
1579 // L2. From the highest level found in the text to the lowest odd level on 1579 // L2. From the highest level found in the text to the lowest odd level on
1580 // each line, reverse any contiguous sequence of characters that are at that 1580 // each line, reverse any contiguous sequence of characters that are at that
1581 // level or higher. 1581 // level or higher.
1582 1582
1583 // Reversing the reordering of the line is only done up to the lowest odd 1583 // Reversing the reordering of the line is only done up to the lowest odd
1584 // level. 1584 // level.
1585 if (!(minLevel % 2)) 1585 if (!(minLevel % 2))
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
1642 ASSERT(child->prevOnLine() == prev); 1642 ASSERT(child->prevOnLine() == prev);
1643 prev = child; 1643 prev = child;
1644 } 1644 }
1645 ASSERT(prev == m_lastChild); 1645 ASSERT(prev == m_lastChild);
1646 #endif 1646 #endif
1647 } 1647 }
1648 1648
1649 #endif 1649 #endif
1650 1650
1651 } // namespace blink 1651 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698