Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1354)

Unified Diff: content/renderer/render_view.h

Issue 6990072: The first step for enabling off-the-spot IME on Pepper on ChromeOS/Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved most changes into renderer, and several fixes on style. Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view.h
diff --git a/content/renderer/render_view.h b/content/renderer/render_view.h
index ac79586615d1eb80b608dc9532984fce6326c315..a4e96c0ffc8e7e8161d6bee5eaf40a096dd93f97 100644
--- a/content/renderer/render_view.h
+++ b/content/renderer/render_view.h
@@ -305,6 +305,9 @@ class RenderView : public RenderWidget,
WebKit::WebPlugin* CreatePluginNoCheck(WebKit::WebFrame* frame,
const WebKit::WebPluginParams& params);
+ // Informs the render view that the given plugin has gained or lost focus.
+ void PpapiPluginFocusChanged(bool focused);
+
#if defined(OS_MACOSX)
// Informs the render view that the given plugin has gained or lost focus.
void PluginFocusChanged(bool focused, int plugin_id);
@@ -609,6 +612,14 @@ class RenderView : public RenderWidget,
virtual void OnWasHidden();
virtual void OnWasRestored(bool needs_repainting);
virtual bool SupportsAsynchronousSwapBuffers() OVERRIDE;
+ virtual void OnImeSetComposition(
+ const string16& text,
+ const std::vector<WebKit::WebCompositionUnderline>& underlines,
+ int selection_start,
+ int selection_end) OVERRIDE;
+ virtual void OnImeConfirmComposition(const string16& text) OVERRIDE;
+ virtual void GetTextInputType(WebKit::WebTextInputType* type,
+ WebKit::WebRect* caret_bounds) OVERRIDE;
private:
// For unit tests.
@@ -1050,6 +1061,9 @@ class RenderView : public RenderWidget,
// or tab focus and visibily. These are non-owning references.
std::set<WebPluginDelegateProxy*> plugin_delegates_;
+ // Whether or not the focus is on a PPAPI plugin
+ bool is_ppapi_plugin_focused_;
brettw 2011/05/26 02:57:26 Can this state be tracked on the PepperPluginDeleg
kinaba 2011/05/30 03:07:11 Done. (The variable is moved to PepperPluginDelega
+
// Helper objects ------------------------------------------------------------
ScopedRunnableMethodFactory<RenderView> accessibility_method_factory_;

Powered by Google App Engine
This is Rietveld 408576698