Never submit: tentative Pepper IME.

content/renderer/pepper_plugin_delegate_impl.cc

 // Copyright (c) 2011 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/pepper_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <queue>
 
 #include "base/bind.h"
@@ skipping 645 matching lines @@
   // saved pipe handle.
   // Temporarily, just call back.
   client->BrokerConnected(PlatformFileToInt(plugin_handle), result);
 }
 
 PepperPluginDelegateImpl::PepperPluginDelegateImpl(RenderView* render_view)
     : render_view_(render_view),
       has_saved_context_menu_action_(false),
       saved_context_menu_action_(0),
       id_generator_(0),
-      is_pepper_plugin_focused_(false) {
+      focused_plugin_(0) {
 }
 
 PepperPluginDelegateImpl::~PepperPluginDelegateImpl() {
 }
 
 scoped_refptr<webkit::ppapi::PluginModule>
 PepperPluginDelegateImpl::CreatePepperPluginModule(
     const webkit::WebPluginInfo& webplugin_info,
     bool* pepper_plugin_was_registered) {
   *pepper_plugin_was_registered = true;
@@ skipping 157 matching lines @@
            active_instances_.begin();
        i != active_instances_.end(); ++i) {
     webkit::ppapi::PluginInstance* instance = *i;
     if (instance->GetBitmapForOptimizedPluginPaint(
             paint_bounds, dib, location, clip))
       return *i;
   }
   return NULL;
 }
 
-void PepperPluginDelegateImpl::PluginFocusChanged(bool focused) {
-  is_pepper_plugin_focused_ = focused;
+void PepperPluginDelegateImpl::PluginFocusChanged(
+    webkit::ppapi::PluginInstance* instance,
+    bool focused) {
+  if (focused) {
+    focused_plugin_ = instance;
+  } else if (focused_plugin_ == instance) {
+    focused_plugin_ = 0;
+  }

[James Su, 2011/09/23 01:46:48]

nit: no { }

   if (render_view_)
     render_view_->PpapiPluginFocusChanged();
 }
 
+void PepperPluginDelegateImpl::PluginTextInputTypeChanged(
+    webkit::ppapi::PluginInstance* instance) {
+  if (focused_plugin_ == instance && render_view_)
+    render_view_->PpapiPluginFocusChanged();

[James Su, 2011/09/23 01:46:48]

Is it correct? Shouldn't we have a specific method for text input type change?

+}
+
+void PepperPluginDelegateImpl::OnImeSetComposition(
+    const string16& text,
+    const std::vector<WebKit::WebCompositionUnderline>& underlines,
+    int selection_start,
+    int selection_end) {
+  if (!CanComposeInline()) {
+    composition_text_ = text;
+  } else {
+    // TODO(kinaba) currently all composition events are sent directly to
+    // plugins. Use DOM event mechanism after WebKit is made aware about
+    // plugins supporting composition.
+
+    // Empty -> nonempty: composition started.
+    if (composition_text_.empty() && !text.empty())
+      focused_plugin_->HandleCompositionStart(string16());
+    // Nonempty -> empty: composition canceled.
+    if (!composition_text_.empty() && text.empty())
+       focused_plugin_->HandleCompositionEnd(text);

[James Su, 2011/09/23 01:46:48]

should send composition_text_ along with composition end event? compositionend
event defined in HTML DOM Event Level3 has such behavior.

+    composition_text_ = text;
+    // Nonempty: composition is ongoing.
+    if (!composition_text_.empty())
+      focused_plugin_->HandleCompositionUpdate(text, underlines,
+                                               selection_start, selection_end);

[James Su, 2011/09/23 01:46:48]

nit: use {} for multi-line if statement.

+  }
+}
+
+void PepperPluginDelegateImpl::OnImeConfirmComposition(const string16& text) {
+  if (!text.empty())
+    composition_text_ = text;
+  if (composition_text_.empty())
+    return;
+
+  if (!CanComposeInline()) {

[James Su, 2011/09/23 01:46:48]

Is it possible that a plugin cannot handle inline composition but can handle
text input event? Or do we plan to support it?

+    for (size_t i = 0; i < text.size(); ++i) {
+      WebKit::WebKeyboardEvent char_event;
+      char_event.type = WebKit::WebInputEvent::Char;
+      char_event.timeStampSeconds = base::Time::Now().ToDoubleT();
+      char_event.modifiers = 0;
+      char_event.windowsKeyCode = composition_text_[i];
+      char_event.nativeKeyCode = composition_text_[i];
+      char_event.text[0] = composition_text_[i];
+      char_event.unmodifiedText[0] = composition_text_[i];
+      if (render_view_->webwidget())
+        render_view_->webwidget()->handleInputEvent(char_event);
+    }
+  }

[James Su, 2011/09/23 01:46:48]

nit: no line break.

+  else {
+    focused_plugin_->HandleTextInput(composition_text_);
+    focused_plugin_->HandleCompositionEnd(composition_text_);

[James Su, 2011/09/23 01:46:48]

Should we send composition end first? Like what webkit does?

+  }
+  composition_text_.clear();
+}
+
+WebKit::WebRect PepperPluginDelegateImpl::GetCaretBounds() const {
+  if (!focused_plugin_)
+    return WebKit::WebRect();
+  return focused_plugin_->GetCaretBounds();
+}
+
+WebKit::WebTextInputType PepperPluginDelegateImpl::GetTextInputType() const {
+  if (!focused_plugin_)
+    return WebKit::WebTextInputTypeNone;
+  return focused_plugin_->text_input_type();
+}
+
+bool PepperPluginDelegateImpl::CanComposeInline() const {
+  if (!focused_plugin_)
+    return false;
+  return focused_plugin_->CanComposeInline();
+}
+
 void PepperPluginDelegateImpl::PluginCrashed(
     webkit::ppapi::PluginInstance* instance) {
   subscribed_to_policy_updates_.erase(instance);
   render_view_->PluginCrashed(instance->module()->path());
 }
 
 void PepperPluginDelegateImpl::InstanceCreated(
     webkit::ppapi::PluginInstance* instance) {
   active_instances_.insert(instance);
 
@@ skipping 166 matching lines @@
 }
 
 void PepperPluginDelegateImpl::OnSetFocus(bool has_focus) {
   for (std::set<webkit::ppapi::PluginInstance*>::iterator i =
          active_instances_.begin();
        i != active_instances_.end(); ++i)
     (*i)->SetContentAreaFocus(has_focus);
 }
 
 bool PepperPluginDelegateImpl::IsPluginFocused() const {
-  return is_pepper_plugin_focused_;
+  return focused_plugin_ != 0;

[James Su, 2011/09/23 01:46:48]

!= NULL?

 }
 
 bool PepperPluginDelegateImpl::OpenFileSystem(
     const GURL& url,
     fileapi::FileSystemType type,
     long long size,
     fileapi::FileSystemCallbackDispatcher* dispatcher) {
   FileSystemDispatcher* file_system_dispatcher =
       ChildThread::current()->file_system_dispatcher();
   return file_system_dispatcher->OpenFileSystem(
@@ skipping 445 matching lines @@
 
 int PepperPluginDelegateImpl::GetRoutingId() const {
   return render_view_->routing_id();
 }
 
 void PepperPluginDelegateImpl::PublishInitialPolicy(
     scoped_refptr<webkit::ppapi::PluginInstance> instance,
     const std::string& policy) {
   instance->HandlePolicyUpdate(policy);
 }