summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-13 18:36:43 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-13 18:36:43 +0000
commit126a15b2c87a68854fa97f87ea1d949ccb0c8ce7 (patch)
tree2be4bc321bf8b3efb12864d5511b35e0e490a124 /content/browser
parent8bf6c17915c9c9c8d707c809efb7e8f76050ed27 (diff)
downloadchromium_src-126a15b2c87a68854fa97f87ea1d949ccb0c8ce7.zip
chromium_src-126a15b2c87a68854fa97f87ea1d949ccb0c8ce7.tar.gz
chromium_src-126a15b2c87a68854fa97f87ea1d949ccb0c8ce7.tar.bz2
Reverting this change as it does not disable H/W video decode. It disables H/W rendering.
Revert 150947 - Temporarily disable H/W Video decode on Windows to see if it is the cause of the spike in the gpu process crashes. BUG=none R=apatrick Review URL: https://chromiumcodereview.appspot.com/10837196 TBR=ananta@chromium.org Review URL: https://chromiumcodereview.appspot.com/10854125 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/web_contents/web_contents_impl.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index c70cbd0..ecd1f40 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -514,14 +514,8 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
!command_line.HasSwitch(switches::kDisableAcceleratedLayers);
prefs.accelerated_plugins_enabled =
!command_line.HasSwitch(switches::kDisableAcceleratedPlugins);
- // Temporarily disabling H/W accelerated video on windows to see if it is the
- // cause of the spike in the gpu process crashes.
-#if defined(OS_WIN)
- prefs.accelerated_video_enabled = false;
-#else // OS_WIN
prefs.accelerated_video_enabled =
!command_line.HasSwitch(switches::kDisableAcceleratedVideo);
-#endif // OS_WIN
prefs.fullscreen_enabled =
!command_line.HasSwitch(switches::kDisableFullScreen);
prefs.css_regions_enabled =