OOPIF IME: Renderer Side Changes

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 32 matching lines @@
 #include "core/input/EventHandler.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/page/ContextMenuController.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "platform/KeyboardCodes.h"
 #include "platform/graphics/CompositorMutatorClient.h"
 #include "public/platform/WebFrameScheduler.h"
+#include "public/web/WebRange.h"
 #include "public/web/WebWidgetClient.h"
 #include "web/CompositorMutatorImpl.h"
 #include "web/CompositorProxyClientImpl.h"
 #include "web/ContextMenuAllowedScope.h"
 #include "web/WebDevToolsAgentImpl.h"
 #include "web/WebInputEventConversion.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebPluginContainerImpl.h"
 #include "web/WebRemoteFrameImpl.h"
 #include "web/WebViewFrameWidget.h"
@@ skipping 396 matching lines @@
         }
     }
 }
 
 bool WebFrameWidgetImpl::setComposition(
     const WebString& text,
     const WebVector<WebCompositionUnderline>& underlines,
     int selectionStart,
     int selectionEnd)
 {
-    // FIXME: To be implemented.
-    return false;
+    return view()->setComposition(text, underlines, selectionStart, selectionEnd);
 }
 
 bool WebFrameWidgetImpl::confirmComposition()
 {
     // FIXME: To be implemented.
-    return false;
+    return view()->confirmComposition();
 }
 
 bool WebFrameWidgetImpl::confirmComposition(ConfirmCompositionBehavior selectionBehavior)
 {
-    // FIXME: To be implemented.
-    return false;
+    return view()->confirmComposition(selectionBehavior);
 }
 
 bool WebFrameWidgetImpl::confirmComposition(const WebString& text)
 {
-    // FIXME: To be implemented.
-    return false;
+    return view()->confirmComposition(text);
 }
 
 bool WebFrameWidgetImpl::compositionRange(size_t* location, size_t* length)
 {
-    // FIXME: To be implemented.
-    return false;
+    return view()->compositionRange(location, length);
 }
 
 WebTextInputInfo WebFrameWidgetImpl::textInputInfo()
 {
     return view()->textInputInfo();
 }
 
 WebTextInputType WebFrameWidgetImpl::textInputType()
 {
     return view()->textInputType();
@@ skipping 133 matching lines @@
     m_layerTreeView = nullptr;
     m_layerTreeViewClosed = true;
 }
 
 void WebFrameWidgetImpl::didChangeWindowResizerRect()
 {
     if (m_localRoot->frameView())
         m_localRoot->frameView()->windowResizerRectChanged();
 }
 
+bool WebFrameWidgetImpl::getCompositionCharacterBounds(WebVector<WebRect>& bounds)
+{
+    size_t offset = 0;
+    size_t characterCount = 0;
+    if (!compositionRange(&offset, &characterCount))
+        return false;
+
+    if (characterCount == 0)
+        return false;
+
+    WebLocalFrame* frame = view()->focusedFrame()->toWebLocalFrame();

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

Should this call focusedWebLocalFrameInWidget()?

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

Yes, I think it has to. Thanks for pointing this out.

As I understand anything on the compositing code path must be called on 
one widget only. Here is the stack:
WebFrameWidgetImpl::getCompositionCharacterBounds()
RenderWidget::GetCompositionSelectionBounds()
RenderWidget::UpdateSelectionBounds()
RenderWidget::WillBeginCompositorFrame()

So if we don't, we might get multiples from different widgets. Also need to
address this for WebViewImpl's copy.

+    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 WebFrameWidgetImpl::adjustReplacementRangeForAccentedCharacters(int start, int length)
+{
+    if (WebLocalFrame* frame = focusedWebLocalFrameInWidget()) {
+        WebRange webrange = WebRange::fromDocumentRange(frame, start, length);
+        if (!webrange.isNull())
+            frame->selectRange(webrange);
+    }
+}
+
 void WebFrameWidgetImpl::handleMouseLeave(LocalFrame& mainFrame, const WebMouseEvent& event)
 {
     // FIXME: WebWidget doesn't have the method below.
     // m_client->setMouseOverURL(WebURL());
     PageWidgetEventHandler::handleMouseLeave(mainFrame, event);
 }
 
 void WebFrameWidgetImpl::handleMouseDown(LocalFrame& mainFrame, const WebMouseEvent& event)
 {
     // Take capture on a mouse down on a plugin so we can send it mouse events.
@@ skipping 451 matching lines @@
 }
 
 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& posInRootFrame)
 {
     IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRootFrame));
     HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtPoint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active);
     result.setToShadowHostIfInUserAgentShadowRoot();
     return result;
 }
 
+WebLocalFrame* WebFrameWidgetImpl::focusedWebLocalFrameInWidget() const
+{
+    LocalFrame* frame = page()->focusController().focusedFrame();
+    return m_localRoot->frame() == frame ? WebLocalFrameImpl::fromFrame(frame) : nullptr;

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

This is wrong for a couple of reasons, I think you need this:
LocalFrame* frame = page()->focusController().focusedFrame();
return (frame && frame->localFrameRoot() == m_localRoot->frame()) ?
WebLocalFrameImpl::fromFrame(frame) : nullptr;

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

Yes I think I missed the frame->localFrameRoot() part and also did not think of
frame being nullptr. Sorry for the error.

+}
+
 } // namespace blink