summaryrefslogtreecommitdiffstats
path: root/chrome/common/plugin_messages.h
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 19:07:30 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 19:07:30 +0000
commit4923229ec942699c100556ead557576a816a285c (patch)
tree438c07b04fbc19affdc194e8d88f580039774c09 /chrome/common/plugin_messages.h
parent9715b85f74e95db5345fd33ef43ff48eb0ce983f (diff)
downloadchromium_src-4923229ec942699c100556ead557576a816a285c.zip
chromium_src-4923229ec942699c100556ead557576a816a285c.tar.gz
chromium_src-4923229ec942699c100556ead557576a816a285c.tar.bz2
Fix initial plugin Mac plugin focus and visibily
Also simplifies the way initial window state is set, by sending the same message that's used for later changes just after initialization instead of adding parameters to the init message. While this means we send one more async message if the plugin's renderer is visible, we remove an unnecessary synchronous call to the browser procces for plugins in background tabs, and we defer that synchronous call until after plugin initialization has started in the visible case. BUG=51391 TEST=Plugins loaded in a foreground page should react to keystrokes without having to switch tabs. Mouseovers should continue to work as before. Review URL: http://codereview.chromium.org/3356006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/plugin_messages.h')
-rw-r--r--chrome/common/plugin_messages.h27
1 files changed, 1 insertions, 26 deletions
diff --git a/chrome/common/plugin_messages.h b/chrome/common/plugin_messages.h
index 190fdba..56eaf50 100644
--- a/chrome/common/plugin_messages.h
+++ b/chrome/common/plugin_messages.h
@@ -42,11 +42,6 @@ struct PluginMsg_Init_Params {
std::vector<std::string> arg_values;
bool load_manually;
int host_render_view_routing_id;
-#if defined(OS_MACOSX)
- gfx::Rect containing_window_frame;
- gfx::Rect containing_content_frame;
- bool containing_window_has_focus;
-#endif
};
struct PluginHostMsg_URLRequest_Params {
@@ -128,11 +123,6 @@ struct ParamTraits<PluginMsg_Init_Params> {
WriteParam(m, p.arg_values);
WriteParam(m, p.load_manually);
WriteParam(m, p.host_render_view_routing_id);
-#if defined(OS_MACOSX)
- WriteParam(m, p.containing_window_frame);
- WriteParam(m, p.containing_content_frame);
- WriteParam(m, p.containing_window_has_focus);
-#endif
}
static bool Read(const Message* m, void** iter, param_type* p) {
return ReadParam(m, iter, &p->containing_window) &&
@@ -141,14 +131,7 @@ struct ParamTraits<PluginMsg_Init_Params> {
ReadParam(m, iter, &p->arg_names) &&
ReadParam(m, iter, &p->arg_values) &&
ReadParam(m, iter, &p->load_manually) &&
- ReadParam(m, iter, &p->host_render_view_routing_id)
-#if defined(OS_MACOSX)
- &&
- ReadParam(m, iter, &p->containing_window_frame) &&
- ReadParam(m, iter, &p->containing_content_frame) &&
- ReadParam(m, iter, &p->containing_window_has_focus)
-#endif
- ;
+ ReadParam(m, iter, &p->host_render_view_routing_id);
}
static void Log(const param_type& p, std::string* l) {
l->append("(");
@@ -165,14 +148,6 @@ struct ParamTraits<PluginMsg_Init_Params> {
LogParam(p.load_manually, l);
l->append(", ");
LogParam(p.host_render_view_routing_id, l);
-#if defined(OS_MACOSX)
- l->append(", ");
- LogParam(p.containing_window_frame, l);
- l->append(", ");
- LogParam(p.containing_content_frame, l);
- l->append(", ");
- LogParam(p.containing_window_has_focus, l);
-#endif
l->append(")");
}
};