Move logic of WebLocalFrameImpl::replaceSelection to Editor

This patch moves the main logic of WebLocalFrameImpl::replaceSelection to Editor, so that the web/ layer becomes thinner, and less details of editing are exposed. No behavior is changed. This patch is also a preparation for https://codereview.chromium.org/2576903002. BUG=673789 Review-Url: https://codereview.chromium.org/2575343002 Cr-Commit-Position: refs/heads/master@{#438757}

Move logic of WebLocalFrameImpl::replaceSelection to Editor
This patch moves the main logic of WebLocalFrameImpl::replaceSelection to Editor, so that the web/ layer becomes thinner, and less details of editing are exposed. No behavior is changed. This patch is also a preparation for https://codereview.chromium.org/2576903002. BUG=673789 Review-Url: https://codereview.chromium.org/2575343002 Cr-Commit-Position: refs/heads/master@{#438757}
7966ad31 · xiaochengh · Commit bot · 09721f55 · 7966ad31 · 7966ad31
Commit 7966ad31 authored Dec 14, 2016 by xiaochengh Committed by Commit bot Dec 15, 2016
3 changed files
--- a/third_party/WebKit/Source/core/editing/Editor.cpp
+++ b/third_party/WebKit/Source/core/editing/Editor.cpp
@@ -1665,6 +1665,14 @@ void Editor::tidyUpHTMLStructure(Document& document) {
  // TODO(tkent): Should we check and move Text node children of <html>?
 }

+void Editor::replaceSelection(const String& text) {
+  DCHECK(!frame().document()->needsLayoutTreeUpdate());
+  bool selectReplacement = behavior().shouldSelectReplacement();
+  bool smartReplace = true;
+  replaceSelectionWithText(text, selectReplacement, smartReplace,
+                           InputEvent::InputType::InsertReplacementText);
+}
+
 DEFINE_TRACE(Editor) {
  visitor->trace(m_frame);
  visitor->trace(m_lastEditCommand);

--- a/third_party/WebKit/Source/core/editing/Editor.h
+++ b/third_party/WebKit/Source/core/editing/Editor.h
@@ -261,7 +261,9 @@ class CORE_EXPORT Editor final : public GarbageCollectedFinalized<Editor> {
                                bool smartReplace,
                                InputEvent::InputType);

-  // TODO(xiaochengh): Replace |bool| parameters by |enum|.
+  // Implementation of WebLocalFrameImpl::replaceSelection.
+  void replaceSelection(const String&);
+
  void replaceSelectionAfterDragging(DocumentFragment*,
                                     InsertMode,
                                     DragSourceType);

--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -949,12 +949,7 @@ void WebLocalFrameImpl::replaceSelection(const WebString& text) {
  // needs to be audited.  See http://crbug.com/590369 for more details.
  frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();

-  bool selectReplacement =
-      frame()->editor().behavior().shouldSelectReplacement();
-  bool smartReplace = true;
-  frame()->editor().replaceSelectionWithText(
-      text, selectReplacement, smartReplace,
-      InputEvent::InputType::InsertReplacementText);
+  frame()->editor().replaceSelection(text);
 }

 void WebLocalFrameImpl::setMarkedText(const WebString& text,