Commit f9c55174 authored by danakj@chromium.org's avatar danakj@chromium.org

Stop setting AcceleratedCompositingForVideoEnabled in LayoutTests.

This removes the setting entirely since it's always true in production.
Once we stop setting it, we can remove it from blink.

BUG=365857

Review URL: https://codereview.chromium.org/443573004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287699 0039d316-1c4b-4281-b951-d872f2087c98
parent e179e7d1
......@@ -150,7 +150,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(accelerated_filters_enabled)
IPC_STRUCT_TRAITS_MEMBER(deferred_filters_enabled)
IPC_STRUCT_TRAITS_MEMBER(container_culling_enabled)
IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_for_video_enabled)
IPC_STRUCT_TRAITS_MEMBER(allow_displaying_insecure_content)
IPC_STRUCT_TRAITS_MEMBER(allow_running_insecure_content)
IPC_STRUCT_TRAITS_MEMBER(enable_scroll_animator)
......
......@@ -78,7 +78,6 @@ WebPreferences::WebPreferences()
layer_squashing_enabled(true),
asynchronous_spell_checking_enabled(true),
unified_textchecker_enabled(false),
accelerated_compositing_for_video_enabled(true),
accelerated_2d_canvas_enabled(false),
minimum_accelerated_2d_canvas_size(257 * 256),
antialiased_2d_canvas_disabled(false),
......
......@@ -103,7 +103,6 @@ struct CONTENT_EXPORT WebPreferences {
bool layer_squashing_enabled;
bool asynchronous_spell_checking_enabled;
bool unified_textchecker_enabled;
bool accelerated_compositing_for_video_enabled;
bool accelerated_2d_canvas_enabled;
int minimum_accelerated_2d_canvas_size;
bool antialiased_2d_canvas_disabled;
......
......@@ -1057,11 +1057,6 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
// Enable container culling if requested on the command line.
settings->setContainerCullingEnabled(prefs.container_culling_enabled);
// Enabling accelerated layers from the command line enabled accelerated
// Video.
settings->setAcceleratedCompositingForVideoEnabled(
prefs.accelerated_compositing_for_video_enabled);
// WebGL and accelerated 2D canvas are always gpu composited.
settings->setAcceleratedCompositingForCanvasEnabled(
prefs.experimental_webgl_enabled || prefs.accelerated_2d_canvas_enabled);
......
......@@ -338,7 +338,6 @@ void WebKitTestController::OverrideWebkitPrefs(WebPreferences* prefs) {
CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (!command_line.HasSwitch(switches::kDisableGpu))
prefs->accelerated_2d_canvas_enabled = true;
prefs->accelerated_compositing_for_video_enabled = true;
prefs->mock_scrollbars_enabled = true;
}
}
......
......@@ -92,7 +92,6 @@ void ApplyLayoutTestDefaultPreferences(WebPreferences* prefs) {
prefs->asynchronous_spell_checking_enabled = false;
prefs->accelerated_2d_canvas_enabled =
command_line.HasSwitch(switches::kEnableAccelerated2DCanvas);
prefs->accelerated_compositing_for_video_enabled = false;
prefs->mock_scrollbars_enabled = false;
prefs->smart_insert_delete_enabled = true;
prefs->minimum_accelerated_2d_canvas_size = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment