Move CaretBase::invalidateCaretRect() to DragCaretController

third_party/WebKit/Source/core/editing/DragCaretController.cpp

Index: third_party/WebKit/Source/core/editing/DragCaretController.cpp
diff --git a/third_party/WebKit/Source/core/editing/DragCaretController.cpp b/third_party/WebKit/Source/core/editing/DragCaretController.cpp
index 0ea817ca90ad3efcd4fff33d4df25c0cfa5652be..01eb293f380512962c9936a68b3bc5ecd62e543c 100644
--- a/third_party/WebKit/Source/core/editing/DragCaretController.cpp
+++ b/third_party/WebKit/Source/core/editing/DragCaretController.cpp
@@ -53,6 +53,19 @@ bool DragCaretController::isContentRichlyEditable() const {
   return isRichlyEditablePosition(m_position.position());
 }
 
+void DragCaretController::invalidateCaretRect(
+    Node* node,
+    const LayoutRect& caretLocalRect) {
+  // TODO(editing-dev): The use of updateStyleAndLayout
+  // needs to be audited.  See http://crbug.com/590369 for more details.
+  // In the long term we should use idle time spell checker to prevent
+  // synchronous layout caused by spell checking (see crbug.com/517298).
+  node->document().updateStyleAndLayoutTree();
+  if (!hasEditableStyle(*node))
+    return;
+  m_caretBase->invalidateLocalCaretRect(node, caretLocalRect);
+}
+
 void DragCaretController::setCaretPosition(
     const PositionWithAffinity& position) {
   // for querying Layer::compositingState()
@@ -61,11 +74,11 @@ void DragCaretController::setCaretPosition(
   DisableCompositingQueryAsserts disabler;
 
   if (Node* node = m_position.anchorNode())
-    m_caretBase->invalidateCaretRect(node, m_caretLocalRect);
+    invalidateCaretRect(node, m_caretLocalRect);
   m_position = createVisiblePosition(position).toPositionWithAffinity();
   Document* document = nullptr;
   if (Node* node = m_position.anchorNode()) {
-    m_caretBase->invalidateCaretRect(node, m_caretLocalRect);
+    invalidateCaretRect(node, m_caretLocalRect);
     document = &node->document();
     setContext(document);
   }