Mixing content editable and non-editable in direction RTL

Source/core/editing/VisiblePosition.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Portions Copyright (c) 2011 Motorola Mobility, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 262 matching lines @@
     // FIXME: Why can't we move left from the last position in a tree?
     if (pos.atStartOfTree() || pos.atEndOfTree())
         return VisiblePosition();
 
     VisiblePosition left = VisiblePosition(pos, DOWNSTREAM);
     ASSERT(left != *this);
 
     if (!stayInEditableContent)
         return left;
 
     // FIXME: This may need to do something different from "before".

[yosin_UTC9, 2014/09/29 01:29:03]

Q: Can we remove this FIXME by this patch?

[Habib Virji, 2014/09/29 11:13:43]

Done.

-    return honorEditingBoundaryAtOrBefore(left);
+    return directionOfEnclosingBlock(left.deepEquivalent()) == LTR ? honorEditingBoundaryAtOrBefore(left) : honorEditingBoundaryAtOrAfter(left);

[yosin_UTC9, 2014/09/29 01:29:03]

nit: It is better to use |isLeftToRightDirection(TextDirection)|.

[Habib Virji, 2014/09/29 11:13:43]

Done.

 }
 
 Position VisiblePosition::rightVisuallyDistinctCandidate() const
 {
     Position p = m_deepPosition;
     if (p.isNull())
         return Position();
 
     Position downstreamStart = p.downstream();
     TextDirection primaryDirection = p.primaryDirection();
@@ skipping 146 matching lines @@
     // FIXME: Why can't we move left from the last position in a tree?
     if (pos.atStartOfTree() || pos.atEndOfTree())
         return VisiblePosition();
 
     VisiblePosition right = VisiblePosition(pos, DOWNSTREAM);
     ASSERT(right != *this);
 
     if (!stayInEditableContent)
         return right;
 
     // FIXME: This may need to do something different from "after".

[yosin_UTC9, 2014/09/29 01:29:03]

Q: Can we remove this FIXME by this patch?

[Habib Virji, 2014/09/29 11:13:43]

Done.

-    return honorEditingBoundaryAtOrAfter(right);
+    return directionOfEnclosingBlock(right.deepEquivalent()) == LTR ? honorEditingBoundaryAtOrAfter(right) : honorEditingBoundaryAtOrBefore(right);

[yosin_UTC9, 2014/09/29 01:29:03]

nit: It is better to use |isLeftToRightDirection(TextDirection)|.

[Habib Virji, 2014/09/29 11:13:43]

Done.

 }
 
 VisiblePosition VisiblePosition::honorEditingBoundaryAtOrBefore(const VisiblePosition &pos) const
 {
     if (pos.isNull())
         return pos;
 
     ContainerNode* highestRoot = highestEditableRoot(deepEquivalent());
 
     // Return empty position if pos is not somewhere inside the editable region containing this position
@@ skipping 325 matching lines @@
     if (vpos)
         vpos->showTreeForThis();
 }
 
 void showTree(const blink::VisiblePosition& vpos)
 {
     vpos.showTreeForThis();
 }
 
 #endif