Move text input mode/info/type into InputMethodController

third_party/WebKit/Source/core/editing/InputMethodController.h

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 15 matching lines @@
 #ifndef InputMethodController_h
 #define InputMethodController_h
 
 #include "core/CoreExport.h"
 #include "core/dom/Range.h"
 #include "core/editing/CompositionUnderline.h"
 #include "core/editing/EphemeralRange.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/PlainTextRange.h"
 #include "platform/heap/Handle.h"
+#include "public/platform/WebTextInputInfo.h"
+#include "public/platform/WebTextInputType.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class Editor;
 class LocalFrame;
 class Range;
 class Text;
 
 class CORE_EXPORT InputMethodController final
@@ skipping 41 matching lines @@
 
   PlainTextRange getSelectionOffsets() const;
   // Returns true if setting selection to specified offsets, otherwise false.
   bool setEditableSelectionOffsets(
       const PlainTextRange&,
       FrameSelection::SetSelectionOptions = FrameSelection::CloseTyping);
   void extendSelectionAndDelete(int before, int after);
   PlainTextRange createRangeForSelection(int start,
                                          int end,
                                          size_t textLength) const;
+  WebTextInputInfo textInputInfo() const;
+  WebTextInputType textInputType() const;
 
  private:
   Member<LocalFrame> m_frame;
   Member<Range> m_compositionRange;
   bool m_isDirty;
   bool m_hasComposition;
 
   explicit InputMethodController(LocalFrame&);
 
   Editor& editor() const;
@@ skipping 21 matching lines @@
   // Returns true if moved caret successfully.
   bool moveCaret(int newCaretPosition);
 
   PlainTextRange createSelectionRangeForSetComposition(int selectionStart,
                                                        int selectionEnd,
                                                        size_t textLength) const;
   void setCompositionWithIncrementalText(const String&,
                                          const Vector<CompositionUnderline>&,
                                          int selectionStart,
                                          int selectionEnd);
+  int textInputFlags() const;
+  // TODO(dtapuska): Change this from a WebString to a WebTextInputMode.
+  WebString inputModeOfFocusedElement() const;

[esprehn, 2016/10/14 16:49:35]

No WebString inside core, just use String.

[dtapuska, 2016/10/14 17:21:28]

Done.

 };
 
 }  // namespace blink
 
 #endif  // InputMethodController_h