Remove enter_key_hint_names.json5 and input_mode_names.json5.

Now keywords specified by ReflectOnly in IDL files need to be added to
keywords.json5, and keywords for enterkeyhint and inputmode attributes are
in keywords.json5. This CL removes enter_key_hint_names.json5 and
input_mode_names.json5 because they are redundant.

This CL has no behavior changes.

Bug: 1024669
Change-Id: I49ea9d26cae9bc98da8849ed9bcfab875f487017
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1918784
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#716408}

third_party/blink/renderer/core/BUILD.gn

@@ -764,11 +764,6 @@ make_names("make_core_generated_input_type_names") {
   output_dir = blink_core_output_dir
 }
 
-make_names("make_core_generated_input_mode_names") {
-  in_files = [ "editing/input_mode_names.json5" ]
-  output_dir = blink_core_output_dir
-}
-
 make_names("make_core_generated_keywords") {
   in_files = [ "html/keywords.json5" ]
   output_dir = blink_core_output_dir
@@ -779,11 +774,6 @@ make_names("make_core_generated_performance_entry_names") {
   output_dir = blink_core_output_dir
 }
 
-make_names("make_core_generated_enter_key_hint_names") {
-  in_files = [ "editing/enter_key_hint_names.json5" ]
-  output_dir = blink_core_output_dir
-}
-
 # make_qualified_names ---------------------------------------------------------
 
 make_qualified_names("make_core_generated_xlink_names") {
@@ -986,7 +976,6 @@ targets_generating_sources = [
   ":make_core_generated_css_property_instances",
   ":make_core_generated_css_value_id_mappings",
   ":make_core_generated_cssom_types",
-  ":make_core_generated_enter_key_hint_names",
   ":make_core_generated_event_factory",
   ":make_core_generated_event_names",
   ":make_core_generated_event_target_names",
@@ -996,7 +985,6 @@ targets_generating_sources = [
   ":make_core_generated_html_element_lookup_trie",
   ":make_core_generated_html_entity_table",
   ":make_core_generated_html_tokenizer_names",
-  ":make_core_generated_input_mode_names",
   ":make_core_generated_input_type_names",
   ":make_core_generated_keywords",
   ":make_core_generated_mathml_names",

third_party/blink/renderer/core/core_initializer.cc

@@ -38,15 +38,13 @@
 #include "third_party/blink/renderer/core/css/parser/css_parser_token_range.h"
 #include "third_party/blink/renderer/core/css/style_change_reason.h"
 #include "third_party/blink/renderer/core/dom/document.h"
-#include "third_party/blink/renderer/core/enter_key_hint_names.h"
 #include "third_party/blink/renderer/core/event_interface_names.h"
 #include "third_party/blink/renderer/core/event_target_names.h"
 #include "third_party/blink/renderer/core/event_type_names.h"
 #include "third_party/blink/renderer/core/events/event_factory.h"
 #include "third_party/blink/renderer/core/html/canvas/canvas_rendering_context_factory.h"
 #include "third_party/blink/renderer/core/html_names.h"
 #include "third_party/blink/renderer/core/html_tokenizer_names.h"
-#include "third_party/blink/renderer/core/input_mode_names.h"
 #include "third_party/blink/renderer/core/input_type_names.h"
 #include "third_party/blink/renderer/core/keywords.h"
 #include "third_party/blink/renderer/core/mathml_names.h"
@@ -100,10 +98,9 @@ void CoreInitializer::Initialize() {
 
   const unsigned kCoreStaticStringsCount =
       kQualifiedNamesCount + event_interface_names::kNamesCount +
-      enter_key_hint_names::kNamesCount + event_target_names::kNamesCount +
-      event_type_names::kNamesCount + fetch_initiator_type_names::kNamesCount +
-      font_family_names::kNamesCount + html_tokenizer_names::kNamesCount +
-      http_names::kNamesCount + input_mode_names::kNamesCount +
+      event_target_names::kNamesCount + event_type_names::kNamesCount +
+      fetch_initiator_type_names::kNamesCount + font_family_names::kNamesCount +
+      html_tokenizer_names::kNamesCount + http_names::kNamesCount +
       input_type_names::kNamesCount + keywords::kNamesCount +
       media_feature_names::kNamesCount + media_type_names::kNamesCount +
       performance_entry_names::kNamesCount;
@@ -122,14 +119,12 @@ void CoreInitializer::Initialize() {
   xmlns_names::Init();
 
   event_interface_names::Init();
-  enter_key_hint_names::Init();
   event_target_names::Init();
   event_type_names::Init();
   fetch_initiator_type_names::Init();
   font_family_names::Init();
   html_tokenizer_names::Init();
   http_names::Init();
-  input_mode_names::Init();
   input_type_names::Init();
   keywords::Init();
   media_feature_names::Init();

third_party/blink/renderer/core/editing/ime/input_method_controller.cc

@@ -47,15 +47,14 @@
 #include "third_party/blink/renderer/core/editing/spellcheck/spell_checker.h"
 #include "third_party/blink/renderer/core/editing/state_machines/backward_code_point_state_machine.h"
 #include "third_party/blink/renderer/core/editing/state_machines/forward_code_point_state_machine.h"
-#include "third_party/blink/renderer/core/enter_key_hint_names.h"
 #include "third_party/blink/renderer/core/events/composition_event.h"
 #include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
 #include "third_party/blink/renderer/core/html/forms/html_input_element.h"
 #include "third_party/blink/renderer/core/html/forms/html_text_area_element.h"
 #include "third_party/blink/renderer/core/input/event_handler.h"
-#include "third_party/blink/renderer/core/input_mode_names.h"
 #include "third_party/blink/renderer/core/input_type_names.h"
+#include "third_party/blink/renderer/core/keywords.h"
 #include "third_party/blink/renderer/core/layout/layout_object.h"
 #include "third_party/blink/renderer/core/layout/layout_theme.h"
 #include "third_party/blink/renderer/core/page/focus_controller.h"
@@ -1447,19 +1446,19 @@ ui::TextInputAction InputMethodController::InputActionOfFocusedElement() const {
 
   if (action.IsEmpty())
     return ui::TextInputAction::kDefault;
-  if (action == enter_key_hint_names::kEnter)
+  if (action == keywords::kEnter)
     return ui::TextInputAction::kEnter;
-  if (action == enter_key_hint_names::kDone)
+  if (action == keywords::kDone)
     return ui::TextInputAction::kDone;
-  if (action == enter_key_hint_names::kGo)
+  if (action == keywords::kGo)
     return ui::TextInputAction::kGo;
-  if (action == enter_key_hint_names::kNext)
+  if (action == keywords::kNext)
     return ui::TextInputAction::kNext;
-  if (action == enter_key_hint_names::kPrevious)
+  if (action == keywords::kPrevious)
     return ui::TextInputAction::kPrevious;
-  if (action == enter_key_hint_names::kSearch)
+  if (action == keywords::kSearch)
     return ui::TextInputAction::kSearch;
-  if (action == enter_key_hint_names::kSend)
+  if (action == keywords::kSend)
     return ui::TextInputAction::kSend;
   return ui::TextInputAction::kDefault;
 }
@@ -1469,21 +1468,21 @@ WebTextInputMode InputMethodController::InputModeOfFocusedElement() const {
 
   if (mode.IsEmpty())
     return kWebTextInputModeDefault;
-  if (mode == input_mode_names::kNone)
+  if (mode == keywords::kNone)
     return kWebTextInputModeNone;
-  if (mode == input_mode_names::kText)
+  if (mode == keywords::kText)
     return kWebTextInputModeText;
-  if (mode == input_mode_names::kTel)
+  if (mode == keywords::kTel)
     return kWebTextInputModeTel;
-  if (mode == input_mode_names::kUrl)
+  if (mode == keywords::kUrl)
     return kWebTextInputModeUrl;
-  if (mode == input_mode_names::kEmail)
+  if (mode == keywords::kEmail)
     return kWebTextInputModeEmail;
-  if (mode == input_mode_names::kNumeric)
+  if (mode == keywords::kNumeric)
     return kWebTextInputModeNumeric;
-  if (mode == input_mode_names::kDecimal)
+  if (mode == keywords::kDecimal)
     return kWebTextInputModeDecimal;
-  if (mode == input_mode_names::kSearch)
+  if (mode == keywords::kSearch)
     return kWebTextInputModeSearch;
   return kWebTextInputModeDefault;
 }