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

Unified Diff: Source/core/dom/Position.cpp

Issue 302433015: Use correct offset when attribute auto is present (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated as per code review comments Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/editing/selection/caret-in-textarea-auto-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Position.cpp
diff --git a/Source/core/dom/Position.cpp b/Source/core/dom/Position.cpp
index 64f8730cc6f540937921deecae0cba42dc7c9d30..76324f6f02c07cedb10e9c51750b0b272049b719 100644
--- a/Source/core/dom/Position.cpp
+++ b/Source/core/dom/Position.cpp
@@ -79,6 +79,14 @@ static Node* previousRenderedEditable(Node* node)
return 0;
}
+static bool isTextDirectionAuto(Node *node)
leviw_travelin_and_unemployed 2014/05/29 16:32:18 This is asking to be misused. This function doesn'
+{
+ bool isAuto = false;
+ if (node->document().focusedElement())
leviw_travelin_and_unemployed 2014/05/29 16:32:18 This just isn't right. getInlineBoxAndOffset shoul
Habib Virji 2014/05/30 16:05:10 On 2014/05/29 16:32:18, leviw wrote: @leviw: An up
+ toHTMLElement(node->document().focusedElement())->directionalityIfhasDirAutoAttribute(isAuto);
+ return isAuto;
+}
+
Position::Position(PassRefPtr<Node> anchorNode, LegacyEditingOffset offset)
: m_anchorNode(anchorNode)
, m_offset(offset.value())
@@ -1260,7 +1268,10 @@ void Position::getInlineBoxAndOffset(EAffinity affinity, TextDirection primaryDi
break;
inlineBox = prevBox;
}
- caretOffset = inlineBox->caretLeftmostOffset();
+ if (isTextDirectionAuto(m_anchorNode.get()))
+ caretOffset = (inlineBox->bidiLevel() < level) ? inlineBox->caretLeftmostOffset() : inlineBox->caretRightmostOffset();
+ else
+ caretOffset = inlineBox->caretLeftmostOffset();
} else if (nextBox->bidiLevel() > level) {
// Left edge of a "tertiary" run. Set to the right edge of that run.
while (InlineBox* tertiaryBox = inlineBox->nextLeafChildIgnoringLineBreak()) {
« no previous file with comments | « LayoutTests/editing/selection/caret-in-textarea-auto-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698