Move KillRing to core/editing

This is a small wrapper around NSKillRing functions,
solely used by editing code. There is no need to put it
separately from the rest of editing.

Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng
Change-Id: Ie529f834464a413bd252fcf0a45778ae17b48a61
Reviewed-on: https://chromium-review.googlesource.com/1140509Reviewed-by: Xiaocheng Hu <xiaochengh@chromium.org>
Reviewed-by: Yoshifumi Inoue <yosin@chromium.org>
Commit-Queue: Dmitry Gozman <dgozman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575906}

third_party/blink/renderer/core/editing/BUILD.gn

@@ -176,6 +176,7 @@ blink_core_sources("editing") {
     "iterators/text_iterator_text_state.h",
     "iterators/text_searcher_icu.cc",
     "iterators/text_searcher_icu.h",
+    "kill_ring.h",
     "layout_selection.cc",
     "layout_selection.h",
     "local_caret_rect.cc",
@@ -324,7 +325,12 @@ blink_core_sources("editing") {
   ]
 
   if (is_mac) {
-    sources += [ "commands/smart_replace_cf.cc" ]
+    sources += [
+      "commands/smart_replace_cf.cc",
+      "kill_ring_mac.mm",
+    ]
+  } else {
+    sources += [ "kill_ring_none.cc" ]
   }
 }
 

third_party/blink/renderer/core/editing/commands/editor_command.cc

@@ -52,6 +52,7 @@
 #include "third_party/blink/renderer/core/editing/ephemeral_range.h"
 #include "third_party/blink/renderer/core/editing/frame_selection.h"
 #include "third_party/blink/renderer/core/editing/iterators/text_iterator.h"
+#include "third_party/blink/renderer/core/editing/kill_ring.h"
 #include "third_party/blink/renderer/core/editing/selection_modifier.h"
 #include "third_party/blink/renderer/core/editing/selection_template.h"
 #include "third_party/blink/renderer/core/editing/set_selection_options.h"
@@ -65,7 +66,6 @@
 #include "third_party/blink/renderer/core/page/page.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/histogram.h"
-#include "third_party/blink/renderer/platform/kill_ring.h"
 #include "third_party/blink/renderer/platform/scroll/scrollbar.h"
 #include "third_party/blink/renderer/platform/wtf/text/atomic_string.h"
 

third_party/blink/renderer/core/editing/editor.cc

@@ -56,6 +56,7 @@
 #include "third_party/blink/renderer/core/editing/frame_selection.h"
 #include "third_party/blink/renderer/core/editing/ime/input_method_controller.h"
 #include "third_party/blink/renderer/core/editing/iterators/search_buffer.h"
+#include "third_party/blink/renderer/core/editing/kill_ring.h"
 #include "third_party/blink/renderer/core/editing/markers/document_marker.h"
 #include "third_party/blink/renderer/core/editing/markers/document_marker_controller.h"
 #include "third_party/blink/renderer/core/editing/selection_template.h"
@@ -86,7 +87,6 @@
 #include "third_party/blink/renderer/core/page/focus_controller.h"
 #include "third_party/blink/renderer/core/page/page.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
-#include "third_party/blink/renderer/platform/kill_ring.h"
 #include "third_party/blink/renderer/platform/scroll/scroll_alignment.h"
 #include "third_party/blink/renderer/platform/weborigin/kurl.h"
 #include "third_party/blink/renderer/platform/wtf/text/character_names.h"

third_party/blink/renderer/platform/kill_ring.h → third_party/blink/renderer/core/editing/kill_ring.h

@@ -23,16 +23,16 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_KILL_RING_H_
-#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_KILL_RING_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_EDITING_KILL_RING_H_
+#define THIRD_PARTY_BLINK_RENDERER_CORE_EDITING_KILL_RING_H_
 
 #include "base/macros.h"
-#include "third_party/blink/renderer/platform/platform_export.h"
+#include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 
 namespace blink {
 
-class PLATFORM_EXPORT KillRing {
+class CORE_EXPORT KillRing {
   USING_FAST_MALLOC(KillRing);
 
  public:
@@ -48,4 +48,4 @@ class PLATFORM_EXPORT KillRing {
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_RENDERER_PLATFORM_KILL_RING_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_CORE_EDITING_KILL_RING_H_

third_party/blink/renderer/platform/mac/kill_ring_mac.mm → third_party/blink/renderer/core/editing/kill_ring_mac.mm

@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "third_party/blink/renderer/platform/kill_ring.h"
+#import "third_party/blink/renderer/core/editing/kill_ring.h"
 
 namespace blink {
 

third_party/blink/renderer/platform/kill_ring_none.cc → third_party/blink/renderer/core/editing/kill_ring_none.cc

@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "third_party/blink/renderer/platform/kill_ring.h"
+#include "third_party/blink/renderer/core/editing/kill_ring.h"
 
 namespace blink {
 

third_party/blink/renderer/platform/BUILD.gn

@@ -1146,8 +1146,6 @@ jumbo_component("platform") {
     "json/json_values.cc",
     "json/json_values.h",
     "keyboard_codes.h",
-    "kill_ring.h",
-    "kill_ring_none.cc",
     "language.cc",
     "language.h",
     "layout_test_support.cc",
@@ -1173,7 +1171,6 @@ jumbo_component("platform") {
     "mac/color_mac.mm",
     "mac/graphics_context_canvas.h",
     "mac/graphics_context_canvas.mm",
-    "mac/kill_ring_mac.mm",
     "mac/local_current_graphics_context.h",
     "mac/local_current_graphics_context.mm",
     "mac/ns_scroller_imp_details.h",
@@ -1517,10 +1514,8 @@ jumbo_component("platform") {
 
   if (is_mac) {
     sources -= [
-      # Uses KillRingMac.mm instead.
       "fonts/skia/font_cache_skia.cc",
       "fonts/web_font_render_style.cc",
-      "kill_ring_none.cc",
       "scroll/scroll_animator.cc",
       "scroll/scroll_animator.h",
 

third_party/blink/renderer/platform/mac/DEPS

@@ -11,7 +11,6 @@ include_rules = [
     "+third_party/blink/renderer/platform/geometry",
     "+third_party/blink/renderer/platform/graphics",
     "+third_party/blink/renderer/platform/heap",
-    "+third_party/blink/renderer/platform/kill_ring.h",
     "+third_party/blink/renderer/platform/platform_export.h",
     "+third_party/blink/renderer/platform/runtime_enabled_features.h",
     "+third_party/blink/renderer/platform/scheduler",