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

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: Rename isTextDirectionHasAutoAttribute to hasDirectionAutoAttribute 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 dacff4069ead02e8d5f39e0d2d15bf0d9294ea25..fba587d1ee3cf603ff064bdf5d663f6140f16eca 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 hasDirectionAutoAttribute(Node* node)
+{
+ bool isAuto = node->selfOrAncestorHasDirAutoAttribute();
+ if (node->isInShadowTree())
+ isAuto = equalIgnoringCase(node->shadowHost()->fastGetAttribute(dirAttr), "auto");
leviw_travelin_and_unemployed 2014/06/02 18:00:29 This seems specific to TextArea. If you're inside
esprehn 2014/06/02 18:06:13 I don't think this is correct, what if you're mult
Habib Virji 2014/06/03 16:35:57 @levi: If I get some assistance about how to find
Habib Virji 2014/06/03 16:35:57 @esprehn: i have upload a new patch which check mu
+ return isAuto;
+}
+
Position::Position(PassRefPtrWillBeRawPtr<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 (hasDirectionAutoAttribute(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