OOPIF IME: Renderer Side Changes

third_party/WebKit/Source/web/WebViewImpl.cpp

Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index fad565d27c6eaef57d89c1087056567fb40a7363..39a822233022a5380db12dc6fe8ca90fc5702f2c 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -2804,6 +2804,42 @@ void WebViewImpl::reportFixedRasterScaleUseCounters(bool hasBlurryContent, bool
         UseCounter::count(document, UseCounter::FixedRasterScalePotentialPerformanceRegression);
 }
 
+bool WebViewImpl::getCompositionCharacterBounds(WebVector<WebRect>& bounds)

[kenrb, 2016/06/10 20:52:03]

I'm a bit confused here, I thought all of this was coming out of WebViewImpl.
Can we move these and all the other IME methods from WebViewImpl into
WebViewFrameWidget.cpp? Conceivably we might want to duplicated it all between
there and WebFrameWidgetImpl, until WebViewFrameWidget goes away and then the
WebFrameWidgetImpl will be the one that handles it all.

[EhsanK, 2016/06/27 21:14:50]

What (I think) I did was to move the code out of RenderViewImpl into
RenderWidget. So these methods are called on |webwidget_| rather than
|frame_widget_|. I think it should stay in WebFrameWidgetImpl and WebViewImpl. I
think it should be removed from here if RenderView is not a RenderWidget.

+{
+    size_t offset = 0;
+    size_t characterCount = 0;
+    if (!compositionRange(&offset, &characterCount))
+        return false;
+
+    if (characterCount == 0)
+        return false;
+
+    WebLocalFrame* frame = focusedFrame()->toWebLocalFrame();
+    if (!frame)
+        return false;
+
+    WebVector<WebRect> result(characterCount);
+    WebRect webrect;
+    for (size_t i = 0; i < characterCount; ++i) {
+        if (!frame->firstRectForCharacterRange(offset + i, 1, webrect)) {
+            DLOG(ERROR) << "Could not retrieve character rectangle at " << i;
+            return false;
+        }
+        result[i] = webrect;
+    }
+    bounds.swap(result);
+    return true;
+}
+
+void WebViewImpl::adjustReplacementRangeForAccentedCharacters(int start, int length)
+{
+    if (WebLocalFrame* frame = focusedFrame()->toWebLocalFrame()) {
+        WebRange webrange = WebRange::fromDocumentRange(frame, start, length);
+        if (!webrange.isNull())
+            frame->selectRange(webrange);
+    }
+}
+
 // WebView --------------------------------------------------------------------
 
 WebSettingsImpl* WebViewImpl::settingsImpl()