summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorlazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-28 02:17:44 +0000
committerlazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-28 02:17:44 +0000
commit18dae161efa3398f21f79f876a3a3bb82c61c35e (patch)
tree8ef297238c2fcc8e3956f018fc048e547b48b23c /content
parent5bac53ababd2aeeea1c7fbbc0a89248b48ac7592 (diff)
downloadchromium_src-18dae161efa3398f21f79f876a3a3bb82c61c35e.zip
chromium_src-18dae161efa3398f21f79f876a3a3bb82c61c35e.tar.gz
chromium_src-18dae161efa3398f21f79f876a3a3bb82c61c35e.tar.bz2
[gtk/aura]: This fixes selection color, caret blinking for guests.
BUG=146582 Tested=GTK+Aura; Sanity check on OSX (no change). Review URL: https://chromiumcodereview.appspot.com/10908099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/browser_plugin/browser_plugin_embedder.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.cc b/content/browser/browser_plugin/browser_plugin_embedder.cc
index d8a7856..00b85a8 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.cc
+++ b/content/browser/browser_plugin/browser_plugin_embedder.cc
@@ -95,8 +95,17 @@ void BrowserPluginEmbedder::NavigateGuest(RenderViewHost* render_view_host,
guest->set_embedder_render_process_host(
render_view_host->GetProcess());
- guest_web_contents->GetMutableRendererPrefs()->
- throttle_input_events = false;
+ RendererPreferences* guest_renderer_prefs =
+ guest_web_contents->GetMutableRendererPrefs();
+ // Copy renderer preferences (and nothing else) from the embedder's
+ // TabContents to the guest.
+ //
+ // For GTK and Aura this is necessary to get proper renderer configuration
+ // values for caret blinking interval, colors related to selection and
+ // focus.
+ *guest_renderer_prefs = *web_contents()->GetMutableRendererPrefs();
+
+ guest_renderer_prefs->throttle_input_events = false;
AddGuest(instance_id, guest_web_contents);
guest_web_contents->SetDelegate(guest);
} else {