CONTINUED Make FrameSelection to hold non-canonicalized positions

third_party/WebKit/Source/core/layout/LayoutObject.cpp

Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
index 70693ab1bb91a858754eb9e84fa5efa1e13bac08..0ec13d0a4b69ba796ccc050bdcc5c2ae41b97855 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
@@ -1542,9 +1542,18 @@ StyleDifference LayoutObject::adjustStyleDifference(
         // be skipped or we will miss invalidating decorations (e.g.,
         // underlines).
         || (isText() && !isBR() && toLayoutText(this)->hasTextBoxes())
-        // Caret is painted in text color.
-        || (isLayoutBlock() && toLayoutBlock(this)->hasCaret()) ||
-        (isSVG() && style()->svgStyle().isFillColorCurrentColor()) ||
+#if 0
+            // TODO(yosin): Do we really need to invalidate |LayoutBlock| if
+            // it has caret? Caret rect invalidation should be done by
+            // |CaretBase| class. Also, we don't know caret position until
+            // layout finished, so we can't check whether this |LayoutBlock|
+            // has caret or not here.
+            // Caret is painted in text color.
+            // See http://crrev.com/1381353003
+            // Test: paint/invalidation/caret-color.html
+            || (isLayoutBlock() && toLayoutBlock(this)->hasCaret())
+#endif
+        || (isSVG() && style()->svgStyle().isFillColorCurrentColor()) ||
         (isSVG() && style()->svgStyle().isStrokeColorCurrentColor()) ||
         isListMarker())
       diff.setNeedsPaintInvalidationObject();