Move caret to correct position when dir=auto

Source/core/rendering/RenderText.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 676 matching lines @@
         break;
     case JUSTIFY:
     case TASTART:
         rightAligned = !cbStyle->isLeftToRightDirection();
         break;
     case TAEND:
         rightAligned = cbStyle->isLeftToRightDirection();
         break;
     }
 
-    if (rightAligned) {
-        left = std::max(left, leftEdge);
-        left = std::min(left, rootRight - caretWidth);
+    if (node() && node()->selfOrAncestorHasDirAutoAttribute()) {
+        if (rightAligned && inlineBox->bidiLevel()%2) {
+            left = std::max(left, leftEdge);
+            left = std::min(left, rootRight - caretWidth);
+        } else {
+            left = std::min(left, rightEdge - caretWidthRightOfOffset);
+            left = std::max(left, rootLeft);
+        }
     } else {
-        left = std::min(left, rightEdge - caretWidthRightOfOffset);
-        left = std::max(left, rootLeft);
+        if (rightAligned) {
+            left = std::max(left, leftEdge);

[eae, 2014/09/08 18:58:50]

The code in this block is identical to that in the block above. Please try to
avoid this level of code duplication.

[Habib Virji, 2014/09/09 10:44:02]

Done.

+            left = std::min(left, rootRight - caretWidth);
+        } else {
+            left = std::min(left, rightEdge - caretWidthRightOfOffset);
+            left = std::max(left, rootLeft);
+        }
     }
 
     return style()->isHorizontalWritingMode() ? IntRect(left, top, caretWidth, height) : IntRect(top, left, height, caretWidth);
 }
 
 ALWAYS_INLINE float RenderText::widthFromCache(const Font& f, int start, int len, float xPos, TextDirection textDirection, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
 {
     if (style()->hasTextCombine() && isCombineText()) {
         const RenderCombineText* combineText = toRenderCombineText(this);
         if (combineText->isCombined())
@@ skipping 1159 matching lines @@
     }
     secureTextTimer->restartWithNewText(lastTypedCharacterOffset);
 }
 
 PassRefPtr<AbstractInlineTextBox> RenderText::firstAbstractInlineTextBox()
 {
     return AbstractInlineTextBox::getOrCreate(this, m_firstTextBox);
 }
 
 } // namespace blink