Make InputMethodController::TextInputType() to use canonicalized position

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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
@@ skipping 245 matching lines @@
     ++deletion_end;
   }
   if (!forward_machine.AtCodePointBoundary())
     return kInvalidDeletionLength;
 
   const int offset = forward_machine.GetBoundaryOffset();
   DCHECK_EQ(offset, deletion_end - selection_end);
   return offset;
 }
 
-Element* RootEditableElementOfSelection(const FrameSelection& selection) {
-  return RootEditableElementOf(selection.GetSelectionInDOMTree().Base());
+Element* RootEditableElementOfSelection(const FrameSelection& frameSelection) {
+  const SelectionInDOMTree& selection = frameSelection.GetSelectionInDOMTree();
+  if (selection.IsNone())
+    return nullptr;
+  // To avoid update layout, we attempt to get root editable element from
+  // a position where script/user specified.
+  if (Element* editable = RootEditableElementOf(selection.Base()))
+    return editable;
+
+  // This is work around for applications assumes a position before editable
+  // element as editable[1]
+  // [1] http://crbug.com/712761
+
+  // TODO(editing-dev): Use of updateStyleAndLayoutIgnorePendingStylesheets
+  // needs to be audited. see http://crbug.com/590369 for more details.
+  frameSelection.GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets();
+  const VisibleSelection& visibleSeleciton =
+      frameSelection.ComputeVisibleSelectionInDOMTree();
+  return RootEditableElementOf(visibleSeleciton.Start());
 }
 
 }  // anonymous namespace
 
 InputMethodController* InputMethodController::Create(LocalFrame& frame) {
   return new InputMethodController(frame);
 }
 
 InputMethodController::InputMethodController(LocalFrame& frame)
     : frame_(&frame), has_composition_(false) {}
@@ skipping 952 matching lines @@
   FinishComposingText(kKeepSelection);
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->Trace(frame_);
   visitor->Trace(composition_range_);
   SynchronousMutationObserver::Trace(visitor);
 }
 
 }  // namespace blink