diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 00:16:05 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 00:16:05 +0000 |
| commit | f5ee2f7f98f966a8d24b7f7dfd2ac12ecbebfe58 (patch) | |
| tree | 52ad30610c15a30da85f343620454551a16e6828 /content | |
| parent | 33b1550fe0b9c46bb2894c5e560775ebf6353d01 (diff) | |
| download | chromium_src-f5ee2f7f98f966a8d24b7f7dfd2ac12ecbebfe58.zip chromium_src-f5ee2f7f98f966a8d24b7f7dfd2ac12ecbebfe58.tar.gz chromium_src-f5ee2f7f98f966a8d24b7f7dfd2ac12ecbebfe58.tar.bz2 | |
Revert 99688 - Allow gpu features for about:blank (unlike other about: schemes)
TEST=run with --force-compositing-mode and --show-fps-counter, verify
that the counter shows up on about:blank and not on other about: pages
BUG=95107
Review URL: http://codereview.chromium.org/7779022
TBR=jamesr@chromium.org
Review URL: http://codereview.chromium.org/7782021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 12e2039..30eaa24 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -1802,8 +1802,7 @@ WebPreferences TabContents::GetWebkitPrefs() { // chrome-devtools: pages (unless it's specifically allowed). if ((GetURL().SchemeIs(chrome::kChromeDevToolsScheme) || GetURL().SchemeIs(chrome::kChromeUIScheme) || - (GetURL().SchemeIs(chrome::kAboutScheme) && - GetURL().spec() != chrome::kAboutBlankURL)) && + GetURL().SchemeIs(chrome::kAboutScheme)) && !web_prefs.allow_webui_compositing) { web_prefs.accelerated_compositing_enabled = false; web_prefs.accelerated_2d_canvas_enabled = false; |