[reland, refactor] - Move textInputInfo() and textInputType() from WebWidget to WebInputMethodContr…

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

 /*
  * Copyright (C) 2014 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 385 matching lines @@
   if (m_baseBackgroundColor == color)
     return;
 
   m_baseBackgroundColor = color;
 
   m_localRoot->frameView()->setBaseBackgroundColor(color);
 }
 
 WebInputMethodControllerImpl*
 WebFrameWidgetImpl::getActiveWebInputMethodController() const {
-  return WebInputMethodControllerImpl::fromFrame(
-      focusedLocalFrameAvailableForIme());
+  return WebInputMethodControllerImpl::fromFrame(focusedLocalFrameInWidget());
 }
 
 void WebFrameWidgetImpl::scheduleAnimation() {
   if (m_layerTreeView) {
     m_layerTreeView->setNeedsBeginFrame();
     return;
   }
   if (m_client)
     m_client->scheduleAnimation();
 }
@@ skipping 40 matching lines @@
           // updateFocusAppearance() selects all the text of
           // contentseditable DIVs. So we set the selection explicitly
           // instead. Note that this has the side effect of moving the
           // caret back to the beginning of the text.
           Position position(element, 0);
           focusedFrame->selection().setSelection(
               SelectionInDOMTree::Builder().collapse(position).build());
         }
       }
     }
+    m_imeAcceptEvents = true;

[EhsanK, 2017/01/04 20:26:53]

This is irrelevant to this change but I happened to notice that we were not
setting its value when widget gets focus.

I also think we might be able to get rid of this state altogether given that
RenderWidget will not make any IME calls when the page focus is lost.

[wjmaclean, 2017/01/05 21:24:57]

Perhaps add a TODO to follow up on a potential removal in another CL?

[EhsanK, 2017/01/05 21:46:43]

Done. Thanks!

   } else {
     LocalFrame* focusedFrame = focusedLocalFrameInWidget();
     if (focusedFrame) {
       // Finish an ongoing composition to delete the composition node.
       if (focusedFrame->inputMethodController().hasComposition()) {
         WebAutofillClient* autofillClient =
             WebLocalFrameImpl::fromFrame(focusedFrame)->autofillClient();
 
         if (autofillClient)
           autofillClient->setIgnoreTextChanges(true);
@@ skipping 31 matching lines @@
       focused->selection().rootEditableElementOrDocumentElement();
   DCHECK(editable);
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   editable->document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   return PlainTextRange::create(*editable, range);
 }
 
-WebTextInputInfo WebFrameWidgetImpl::textInputInfo() {
-  LocalFrame* focused = focusedLocalFrameInWidget();
-  if (!focused)
-    return WebTextInputInfo();
-  return focused->inputMethodController().textInputInfo();
-}
-
-WebTextInputType WebFrameWidgetImpl::textInputType() {
-  LocalFrame* focused = focusedLocalFrameInWidget();
-  if (!focused)
-    return WebTextInputTypeNone;
-  return focused->inputMethodController().textInputType();
-}
-
 WebColor WebFrameWidgetImpl::backgroundColor() const {
   if (isTransparent())
     return Color::transparent;
   if (!m_localRoot->frameView())
     return m_baseBackgroundColor;
   FrameView* view = m_localRoot->frameView();
   return view->documentBackgroundColor().rgb();
 }
 
 // TODO(ekaramad):This method is almost duplicated in WebViewImpl as well. This
@@ skipping 596 matching lines @@
   return nullptr;
 }
 
 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const {
   if (!m_imeAcceptEvents)
     return nullptr;
   return focusedLocalFrameInWidget();
 }
 
 }  // namespace blink