diff options
| author | vangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 21:29:08 +0000 |
|---|---|---|
| committer | vangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 21:29:08 +0000 |
| commit | 447021cb995e1ec7799eeb893f4c2b7acb30533e (patch) | |
| tree | 660dde553b3777736e560e05609778bc15ea0b47 /chrome/browser/tab_contents | |
| parent | d6bf667b962bbd99222392e74206cc22590478a7 (diff) | |
| download | chromium_src-447021cb995e1ec7799eeb893f4c2b7acb30533e.zip chromium_src-447021cb995e1ec7799eeb893f4c2b7acb30533e.tar.gz chromium_src-447021cb995e1ec7799eeb893f4c2b7acb30533e.tar.bz2 | |
Moving the code that disables accelerated compositing for chrome: and chrome-extensions:
URLs into TabContents::GetWebkitPrefs() so that it gets called both when the RenderView is
created and on subsequent preference updates. Also removed checking for kChromeInternalScheme as it is not used (per Darin).
BUG=54869
Review URL: http://codereview.chromium.org/3364015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 7332ee6..28c8f79 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -2828,7 +2828,17 @@ GURL TabContents::GetAlternateErrorPageURL() const { WebPreferences TabContents::GetWebkitPrefs() { Profile* profile = render_view_host()->process()->profile(); bool is_dom_ui = false; - return RenderViewHostDelegateHelper::GetWebkitPrefs(profile, is_dom_ui); + WebPreferences web_prefs = + RenderViewHostDelegateHelper::GetWebkitPrefs(profile, is_dom_ui); + + // Force accelerated compositing off for chrome: and chrome-extension: + // pages. + if (GetURL().SchemeIs(chrome::kChromeUIScheme) || + GetURL().SchemeIs(chrome::kExtensionScheme)) { + web_prefs.accelerated_compositing_enabled = false; + } + + return web_prefs; } void TabContents::OnIgnoredUIEvent() { |