OLD | NEW |
1 /* | 1 /* |
2 * (C) 1999 Lars Knoll (knoll@kde.org) | 2 * (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 2000 Dirk Mueller (mueller@kde.org) | 3 * (C) 2000 Dirk Mueller (mueller@kde.org) |
4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. | 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. |
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) | 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) |
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
687 break; | 687 break; |
688 case JUSTIFY: | 688 case JUSTIFY: |
689 case TASTART: | 689 case TASTART: |
690 rightAligned = !cbStyle->isLeftToRightDirection(); | 690 rightAligned = !cbStyle->isLeftToRightDirection(); |
691 break; | 691 break; |
692 case TAEND: | 692 case TAEND: |
693 rightAligned = cbStyle->isLeftToRightDirection(); | 693 rightAligned = cbStyle->isLeftToRightDirection(); |
694 break; | 694 break; |
695 } | 695 } |
696 | 696 |
| 697 // for dir=auto, use inlineBoxBidiLevel() to test the correct direction for
the cursor. |
| 698 if (rightAligned && (node() && node()->selfOrAncestorHasDirAutoAttribute()))
{ |
| 699 if (inlineBox->bidiLevel()%2 != 1) |
| 700 rightAligned = false; |
| 701 } |
| 702 |
697 if (rightAligned) { | 703 if (rightAligned) { |
698 left = std::max(left, leftEdge); | 704 left = std::max(left, leftEdge); |
699 left = std::min(left, rootRight - caretWidth); | 705 left = std::min(left, rootRight - caretWidth); |
700 } else { | 706 } else { |
701 left = std::min(left, rightEdge - caretWidthRightOfOffset); | 707 left = std::min(left, rightEdge - caretWidthRightOfOffset); |
702 left = std::max(left, rootLeft); | 708 left = std::max(left, rootLeft); |
703 } | 709 } |
704 | 710 |
705 return style()->isHorizontalWritingMode() ? IntRect(left, top, caretWidth, h
eight) : IntRect(top, left, height, caretWidth); | 711 return style()->isHorizontalWritingMode() ? IntRect(left, top, caretWidth, h
eight) : IntRect(top, left, height, caretWidth); |
706 } | 712 } |
(...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1873 } | 1879 } |
1874 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); | 1880 secureTextTimer->restartWithNewText(lastTypedCharacterOffset); |
1875 } | 1881 } |
1876 | 1882 |
1877 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() | 1883 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox() |
1878 { | 1884 { |
1879 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); | 1885 return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox); |
1880 } | 1886 } |
1881 | 1887 |
1882 } // namespace blink | 1888 } // namespace blink |
OLD | NEW |