Chromium Code Reviews| Index: content/renderer/pepper_plugin_delegate_impl.cc |
| diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc |
| index a105fbc8c250d2370d6e3c260530990453298771..3e92e0daa73a8d2fc5dcd30d98bffbdc589f108d 100644 |
| --- a/content/renderer/pepper_plugin_delegate_impl.cc |
| +++ b/content/renderer/pepper_plugin_delegate_impl.cc |
| @@ -665,7 +665,7 @@ PepperPluginDelegateImpl::PepperPluginDelegateImpl(RenderView* render_view) |
| has_saved_context_menu_action_(false), |
| saved_context_menu_action_(0), |
| id_generator_(0), |
| - is_pepper_plugin_focused_(false), |
| + focused_plugin_(0), |
|
yzshen1
2011/10/03 18:28:10
Please use NULL.
kinaba
2011/10/05 04:43:19
Done.
|
| mouse_lock_owner_(NULL), |
| mouse_locked_(false), |
| pending_lock_request_(false), |
| @@ -848,12 +848,107 @@ PepperPluginDelegateImpl::GetBitmapForOptimizedPluginPaint( |
| 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; |
|
yzshen1
2011/10/03 18:28:10
Please use NULL.
kinaba
2011/10/05 04:43:19
Done.
|
| if (render_view_) |
| render_view_->PpapiPluginFocusChanged(); |
| } |
| +void PepperPluginDelegateImpl::PluginTextInputTypeChanged( |
| + webkit::ppapi::PluginInstance* instance) { |
| + if (focused_plugin_ == instance && render_view_) |
| + render_view_->PpapiPluginTextInputTypeChanged(); |
| +} |
| + |
| +void PepperPluginDelegateImpl::PluginRequestedCancelComposition( |
| + webkit::ppapi::PluginInstance* instance) { |
| + if (focused_plugin_ == instance && render_view_) |
| + render_view_->PpapiPluginCancelComposition(); |
| +} |
| + |
| +void PepperPluginDelegateImpl::OnImeSetComposition( |
| + const string16& text, |
| + const std::vector<WebKit::WebCompositionUnderline>& underlines, |
| + int selection_start, |
| + int selection_end) { |
| + if (!IsPluginAcceptingCompositionEvents()) { |
| + 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 that support composition. |
| + // The code below mimics the behavior of WebCore::Editor::setComposition. |
| + |
| + // 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(string16()); |
| + composition_text_ = text; |
| + // Nonempty: composition is ongoing. |
| + if (!composition_text_.empty()) { |
| + focused_plugin_->HandleCompositionUpdate(text, underlines, |
|
yzshen1
2011/10/03 18:28:10
Nit: Might be better to use composition_text_ inst
kinaba
2011/10/05 04:43:19
Done.
|
| + selection_start, selection_end); |
| + } |
| + } |
| +} |
| + |
| +void PepperPluginDelegateImpl::OnImeConfirmComposition(const string16& text) { |
| + if (!text.empty()) |
| + composition_text_ = text; |
| + if (composition_text_.empty()) |
| + return; |
| + |
| + if (!IsPluginAcceptingCompositionEvents()) { |
| + 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); |
| + } |
| + } else { |
| + // Mimics the order of events sent by WebKit. |
| + // See WebCore::Editor::setComposition() for the corresponding code. |
| + focused_plugin_->HandleCompositionEnd(composition_text_); |
| + focused_plugin_->HandleTextInput(composition_text_); |
| + } |
| + composition_text_.clear(); |
| +} |
| + |
| +gfx::Rect PepperPluginDelegateImpl::GetCaretBounds() const { |
| + if (!focused_plugin_) |
| + return gfx::Rect(0,0,0,0); |
|
brettw
2011/10/03 16:46:01
Can you put spaces after the commas?
kinaba
2011/10/05 04:43:19
Done.
|
| + return focused_plugin_->GetCaretBounds(); |
| +} |
| + |
| +ui::TextInputType PepperPluginDelegateImpl::GetTextInputType() const { |
| + if (!focused_plugin_) |
| + return ui::TEXT_INPUT_TYPE_NONE; |
| + return focused_plugin_->text_input_type(); |
| +} |
| + |
| +bool PepperPluginDelegateImpl::IsPluginAcceptingCompositionEvents() const { |
| + if (!focused_plugin_) |
| + return false; |
| + return focused_plugin_->IsPluginAcceptingCompositionEvents(); |
| +} |
| + |
| +bool PepperPluginDelegateImpl::CanComposeInline() const { |
| + return IsPluginAcceptingCompositionEvents(); |
| +} |
| + |
| void PepperPluginDelegateImpl::PluginCrashed( |
| webkit::ppapi::PluginInstance* instance) { |
| subscribed_to_policy_updates_.erase(instance); |
| @@ -1050,7 +1145,7 @@ void PepperPluginDelegateImpl::OnSetFocus(bool has_focus) { |
| } |
| bool PepperPluginDelegateImpl::IsPluginFocused() const { |
| - return is_pepper_plugin_focused_; |
| + return focused_plugin_ != NULL; |
| } |
| void PepperPluginDelegateImpl::OnLockMouseACK(bool succeeded) { |