| Index: content/renderer/render_widget.h
|
| diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
|
| index 8883dd44c6e6630453ad0e62e0f65fb4296f9c26..9cc831c3f692ccc5c4704ef3afb303c7598cb383 100644
|
| --- a/content/renderer/render_widget.h
|
| +++ b/content/renderer/render_widget.h
|
| @@ -83,6 +83,7 @@ class CompositorDependencies;
|
| class ExternalPopupMenu;
|
| class FrameSwapMessageQueue;
|
| class ImeEventGuard;
|
| +class PepperPluginInstanceImpl;
|
| class RenderFrameImpl;
|
| class RenderFrameProxy;
|
| class RenderWidgetCompositor;
|
| @@ -362,9 +363,24 @@ class CONTENT_EXPORT RenderWidget
|
| void SetDeviceColorProfileForTesting(const std::vector<char>& color_profile);
|
| void ResetDeviceColorProfileForTesting();
|
|
|
| + // RenderWidget IME-related Methods.
|
| + void HandleImeSetComposition(
|
| + const base::string16& text,
|
| + const std::vector<blink::WebCompositionUnderline>& underlines,
|
| + const gfx::Range& replacement_range,
|
| + int selection_start,
|
| + int selection_end);
|
| + void HandleImeConfirmComposition(const base::string16& text,
|
| + const gfx::Range& replacement_range,
|
| + bool keep_selection);
|
| +
|
| // Indicates whether this widget has focus.
|
| bool has_focus() const { return has_focus_; }
|
|
|
| + void set_focused_pepper_plugin(PepperPluginInstanceImpl* plugin) {
|
| + focused_pepper_plugin_ = plugin;
|
| + }
|
| +
|
| protected:
|
| // Friend RefCounted so that the dtor can be non-public. Using this class
|
| // without ref-counting is an error.
|
| @@ -458,6 +474,7 @@ class CONTENT_EXPORT RenderWidget
|
| virtual void OnImeConfirmComposition(const base::string16& text,
|
| const gfx::Range& replacement_range,
|
| bool keep_selection);
|
| +
|
| // Called when the device scale factor is changed, or the layer tree is
|
| // initialized.
|
| virtual void OnDeviceScaleFactorChanged();
|
| @@ -766,6 +783,10 @@ class CONTENT_EXPORT RenderWidget
|
| // Indicates whether this widget has focus.
|
| bool has_focus_;
|
|
|
| + // This reference is set by the RenderFrame and is used to query the IME-
|
| + // related state from the plugin to later send to the browser.
|
| + PepperPluginInstanceImpl* focused_pepper_plugin_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidget);
|
| };
|
|
|
|
|