Add supportsInputMethod() interface for WebPlugin.

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 70 matching lines @@
 #include "core/dom/Text.h"
 #include "core/dom/WheelController.h"
 #include "core/editing/Editor.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/InputMethodController.h"
 #include "core/editing/TextIterator.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/WheelEvent.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLMediaElement.h"
+#include "core/html/HTMLPlugInElement.h"
 #include "core/html/HTMLTextAreaElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ime/InputMethodContext.h"
 #include "core/inspector/InspectorController.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/UniqueIdentifier.h"
 #include "core/page/Chrome.h"
 #include "core/page/ContextMenuController.h"
 #include "core/page/DragController.h"
@@ skipping 1955 matching lines @@
 bool WebViewImpl::setComposition(
     const WebString& text,
     const WebVector<WebCompositionUnderline>& underlines,
     int selectionStart,
     int selectionEnd)
 {
     Frame* focused = focusedWebCoreFrame();
     if (!focused || !m_imeAcceptEvents)
         return false;
 
+    WebPlugin* plugin = getFocusedPluginIfInputMethodSupported();

[tkent, 2013/12/10 07:22:57]

nit: We can simplify the code like:

if (WebPlugin* plugin = ...)
    return plugin->setComposition(text, underlines, selectionStart,
selectionEnd);

[kochi, 2013/12/10 08:20:56]

Done.

+    if (plugin)
+        return plugin->setComposition(text, underlines, selectionStart, selectionEnd);
+
     // The input focus has been moved to another WebWidget object.
     // We should use this |editor| object only to complete the ongoing
     // composition.
     InputMethodController& inputMethodController = focused->inputMethodController();
     if (!focused->editor().canEdit() && !inputMethodController.hasComposition())
         return false;
 
     // We should verify the parent node of this IME composition node are
     // editable because JavaScript may delete a parent node of the composition
     // node. In this case, WebKit crashes while deleting texts from the parent
@@ skipping 42 matching lines @@
 bool WebViewImpl::confirmComposition(const WebString& text)
 {
     return confirmComposition(text, DoNotKeepSelection);
 }
 
 bool WebViewImpl::confirmComposition(const WebString& text, ConfirmCompositionBehavior selectionBehavior)
 {
     Frame* focused = focusedWebCoreFrame();
     if (!focused || !m_imeAcceptEvents)
         return false;
+
+    WebPlugin* plugin = getFocusedPluginIfInputMethodSupported();
+    if (plugin)
+        return plugin->confirmComposition(text, selectionBehavior);
+
     return focused->inputMethodController().confirmCompositionOrInsertText(text, selectionBehavior == KeepSelection ? InputMethodController::KeepSelection : InputMethodController::DoNotKeepSelection);
 }
 
 bool WebViewImpl::compositionRange(size_t* location, size_t* length)
 {
     Frame* focused = focusedWebCoreFrame();
     if (!focused || !m_imeAcceptEvents)
         return false;
 
     RefPtr<Range> range = focused->inputMethodController().compositionRange();
@@ skipping 188 matching lines @@
     if (!focusedFrame)
         return 0;
 
     Element* target = focusedFrame->document()->focusedElement();
     if (target && target->hasInputMethodContext())
         return target->inputMethodContext();
 
     return 0;
 }
 
+WebPlugin* WebViewImpl::getFocusedPluginIfInputMethodSupported()

[tkent, 2013/12/10 07:22:57]

We usually prepend no 'get' to such function.

This doesn't support PluginDocument case. Don't you need to support
PluginDocument?

[kochi, 2013/12/10 08:20:56]

Removed 'get' prefix.

I think I need to support PluginDocument as well.
Added some code.

+{
+    Element* element = focusedElement();
+    if (element && element->isPluginElement()) {
+        WebPluginContainerImpl* container = toPluginContainerImpl(toHTMLPlugInElement(element)->pluginWidget());
+        if (container && container->supportsInputMethod())
+            return container->plugin();
+    }
+    return 0;
+}
+
 void WebViewImpl::didShowCandidateWindow()
 {
     if (InputMethodContext* context = inputMethodContext())
         context->dispatchCandidateWindowShowEvent();
 }
 
 void WebViewImpl::didUpdateCandidateWindow()
 {
     if (InputMethodContext* context = inputMethodContext())
         context->dispatchCandidateWindowUpdateEvent();
@@ skipping 1829 matching lines @@
     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefinedConstraints();
 
     if (!mainFrameImpl() || !mainFrameImpl()->frameView())
         return false;
 
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 } // namespace blink