OOPIF IME: Renderer Side Changes

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <memory>
 
@@ skipping 2714 matching lines @@
 }
 
 void RenderViewImpl::SetFocus(bool enable) {
   RenderWidget::OnSetFocus(enable);
 
   // Notify all BrowserPlugins of the RenderView's focus state.
   if (BrowserPluginManager::Get())
     BrowserPluginManager::Get()->UpdateFocusState();
 }
 
-void RenderViewImpl::OnImeSetComposition(
-    const base::string16& text,
-    const std::vector<blink::WebCompositionUnderline>& underlines,
-    const gfx::Range& replacement_range,
-    int selection_start,
-    int selection_end) {
-#if defined(ENABLE_PLUGINS)
-  PepperPluginInstanceImpl* focused_pepper_plugin = GetFocusedPepperPlugin();
-  if (focused_pepper_plugin) {
-    focused_pepper_plugin->render_frame()->OnImeSetComposition(
-        text, underlines, selection_start, selection_end);
-    return;
-  }
-#endif  // ENABLE_PLUGINS
-  if (replacement_range.IsValid() && webview()) {
-    // Select the text in |replacement_range|, it will then be replaced by
-    // text added by the call to RenderWidget::OnImeSetComposition().
-    if (WebLocalFrame* frame = webview()->focusedFrame()->toWebLocalFrame()) {
-      WebRange webrange = WebRange::fromDocumentRange(
-          frame, replacement_range.start(), replacement_range.length());
-      if (!webrange.isNull())
-        frame->selectRange(webrange);
-    }
-  }
-  RenderWidget::OnImeSetComposition(text,
-                                    underlines,
-                                    replacement_range,
-                                    selection_start,
-                                    selection_end);
-}
-
-void RenderViewImpl::OnImeConfirmComposition(
-    const base::string16& text,
-    const gfx::Range& replacement_range,
-    bool keep_selection) {
-#if defined(ENABLE_PLUGINS)
-  PepperPluginInstanceImpl* focused_pepper_plugin = GetFocusedPepperPlugin();
-  if (focused_pepper_plugin) {
-    focused_pepper_plugin->render_frame()->OnImeConfirmComposition(
-        text, replacement_range, keep_selection);
-    return;
-  }
-#endif  // ENABLE_PLUGINS
-  if (replacement_range.IsValid() && webview()) {
-    // Select the text in |replacement_range|, it will then be replaced by
-    // text added by the call to RenderWidget::OnImeConfirmComposition().
-    if (WebLocalFrame* frame = webview()->focusedFrame()->toWebLocalFrame()) {
-      WebRange webrange = WebRange::fromDocumentRange(
-          frame, replacement_range.start(), replacement_range.length());
-      if (!webrange.isNull())
-        frame->selectRange(webrange);
-    }
-  }
-  RenderWidget::OnImeConfirmComposition(text,
-                                        replacement_range,
-                                        keep_selection);
-}
-
 void RenderViewImpl::RenderWidgetDidSetColorProfile(
     const std::vector<char>& profile) {
   if (webview()) {
     bool was_reset = (profile.size() == 1 && profile[0] == '0');
 
     if (was_reset) {
       webview()->resetDeviceColorProfileForTesting();
     } else {
       WebVector<char> colorProfile = profile;
       webview()->setDeviceColorProfile(colorProfile);
     }
   }
 }
 
-ui::TextInputType RenderViewImpl::GetTextInputType() {
-#if defined(ENABLE_PLUGINS)
-  PepperPluginInstanceImpl* focused_pepper_plugin = GetFocusedPepperPlugin();
-  if (focused_pepper_plugin)
-    return focused_pepper_plugin->text_input_type();
-#endif
-  return RenderWidget::GetTextInputType();
-}
-
-void RenderViewImpl::GetSelectionBounds(gfx::Rect* start, gfx::Rect* end) {
-#if defined(ENABLE_PLUGINS)
-  PepperPluginInstanceImpl* focused_pepper_plugin = GetFocusedPepperPlugin();
-  if (focused_pepper_plugin) {
-    // TODO(kinaba) http://crbug.com/101101
-    // Current Pepper IME API does not handle selection bounds. So we simply
-    // use the caret position as an empty range for now. It will be updated
-    // after Pepper API equips features related to surrounding text retrieval.
-    blink::WebRect caret(focused_pepper_plugin->GetCaretBounds());
-    ConvertViewportToWindowViaWidget(&caret);
-    *start = caret;
-    *end = caret;
-    return;
-  }
-#endif
-  RenderWidget::GetSelectionBounds(start, end);
-}
-
-void RenderViewImpl::GetCompositionCharacterBounds(
-    std::vector<gfx::Rect>* bounds_in_window) {
-  DCHECK(bounds_in_window);
-  bounds_in_window->clear();
-
-#if defined(ENABLE_PLUGINS)
-  PepperPluginInstanceImpl* focused_pepper_plugin = GetFocusedPepperPlugin();
-  if (focused_pepper_plugin)
-    return;
-#endif
-
-  if (!webview())
-    return;
-  size_t start_offset = 0;
-  size_t character_count = 0;
-  if (!webview()->compositionRange(&start_offset, &character_count))
-    return;
-  if (character_count == 0)
-    return;
-
-  blink::WebFrame* frame = webview()->focusedFrame();
-  if (!frame)
-    return;
-
-  bounds_in_window->reserve(character_count);
-  blink::WebRect webrect;
-  for (size_t i = 0; i < character_count; ++i) {
-    if (!frame->firstRectForCharacterRange(start_offset + i, 1, webrect)) {
-      DLOG(ERROR) << "Could not retrieve character rectangle at " << i;
-      bounds_in_window->clear();
-      return;
-    }
-    ConvertViewportToWindowViaWidget(&webrect);
-    bounds_in_window->push_back(webrect);
-  }
-}
-
-void RenderViewImpl::GetCompositionRange(gfx::Range* range) {
-#if defined(ENABLE_PLUGINS)
-  PepperPluginInstanceImpl* focused_pepper_plugin = GetFocusedPepperPlugin();
-  if (focused_pepper_plugin)
-    return;
-#endif
-  RenderWidget::GetCompositionRange(range);
-}
-
-bool RenderViewImpl::CanComposeInline() {
-#if defined(ENABLE_PLUGINS)
-  PepperPluginInstanceImpl* focused_pepper_plugin = GetFocusedPepperPlugin();
-  if (focused_pepper_plugin)
-    return focused_pepper_plugin->IsPluginAcceptingCompositionEvents();
-#endif
-  return true;
-}
-
 void RenderViewImpl::DidCompletePageScaleAnimation() {
   GetWidget()->FocusChangeComplete();
 }
 
 void RenderViewImpl::OnDeviceScaleFactorChanged() {
   RenderWidget::OnDeviceScaleFactorChanged();
   UpdateWebViewWithDeviceScaleFactor();
   if (auto_resize_mode_)
     AutoResizeCompositor();
 }
@@ skipping 350 matching lines @@
   if (IsUseZoomForDSFEnabled()) {
     webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
   } else {
     webview()->setDeviceScaleFactor(device_scale_factor_);
   }
   webview()->settings()->setPreferCompositingToLCDTextEnabled(
       PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
 }
 
 #if defined(ENABLE_PLUGINS)
 PepperPluginInstanceImpl* RenderViewImpl::GetFocusedPepperPlugin() {

[lfg, 2016/07/05 18:30:46]

Is this still needed?

[EhsanK, 2016/07/07 14:40:47]

I think it will be really nice to not have this. But apparently there is
external dependency on this from TextInputClientObserver:
https://cs.chromium.org/chromium/src/content/renderer/text_input_client_obser...

The TextInputClientObserver observers the RenderView but also keeps a reference
to it ONLY to get the pepper plugin. I am leaving a TODO here abd followup with
that class soon (since it is IME related) to see if I need to change the
signature to take RenderWidget instead/as well. If so, I will then safely
comeback and remove this method.

   blink::WebFrame* frame = GetWebView()->mainFrame();
 
   while (frame) {
     if (frame->isWebLocalFrame()) {
       RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
       if (render_frame->focused_pepper_plugin())
         return render_frame->focused_pepper_plugin();
     }
     frame = frame->traverseNext(false);
   }
 
   return nullptr;
 }
 #endif
 
 }  // namespace content