DO NOT SUBMIT: Bundle IME-related messages into one for batch edit

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 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 1203 matching lines @@
 {
     TRACE_EVENT0("blink", "WebLocalFrameImpl::moveCaretSelection");
     Element* editable = frame()->selection().rootEditableElement();
     if (!editable)
         return;
 
     VisiblePosition position = visiblePositionForViewportPoint(pointInViewport);
     frame()->selection().moveTo(position, UserTriggered);
 }
 
-bool WebLocalFrameImpl::setEditableSelectionOffsets(int start, int end)
-{
-    TRACE_EVENT0("blink", "WebLocalFrameImpl::setEditableSelectionOffsets");
-
-    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
-    // needs to be audited.  See http://crbug.com/590369 for more details.
-    frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
-
-    return frame()->inputMethodController().setEditableSelectionOffsets(PlainTextRange(start, end));
-}
-
-bool WebLocalFrameImpl::setCompositionFromExistingText(int compositionStart, int compositionEnd, const WebVector<WebCompositionUnderline>& underlines)
-{
-    TRACE_EVENT0("blink", "WebLocalFrameImpl::setCompositionFromExistingText");
-    if (!frame()->editor().canEdit())
-        return false;
-
-    InputMethodController& inputMethodController = frame()->inputMethodController();
-    inputMethodController.cancelComposition();
-
-    if (compositionStart == compositionEnd)
-        return true;
-
-    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
-    // needs to be audited.  See http://crbug.com/590369 for more details.
-    frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
-
-    inputMethodController.setCompositionFromExistingText(CompositionUnderlineVectorBuilder(underlines), compositionStart, compositionEnd);
-
-    return true;
-}
-
-void WebLocalFrameImpl::extendSelectionAndDelete(int before, int after)
-{
-    TRACE_EVENT0("blink", "WebLocalFrameImpl::extendSelectionAndDelete");
-    if (WebPlugin* plugin = focusedPluginIfInputMethodSupported()) {
-        plugin->extendSelectionAndDelete(before, after);
-        return;
-    }
-
-    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
-    // needs to be audited.  See http://crbug.com/590369 for more details.
-    frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
-
-    frame()->inputMethodController().extendSelectionAndDelete(before, after);
-}
-
 void WebLocalFrameImpl::setCaretVisible(bool visible)
 {
     frame()->selection().setCaretVisible(visible);
 }
 
 VisiblePosition WebLocalFrameImpl::visiblePositionForViewportPoint(const WebPoint& pointInViewport)
 {
     return visiblePositionForContentsPoint(frame()->view()->viewportToContents(pointInViewport), frame());
 }
 
@@ skipping 954 matching lines @@
         feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol;
     } else if (metric == "wasAlternateProtocolAvailable") {
         feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable;
     } else if (metric == "connectionInfo") {
         feature = UseCounter::ChromeLoadTimesConnectionInfo;
     }
     UseCounter::count(frame(), feature);
 }
 
 } // namespace blink