Add --enable-accelerated-filters flag to Chrome. This is the chrome-side...

Add --enable-accelerated-filters flag to Chrome.  This is the chrome-side change corresponding to http://trac.webkit.org/changeset/102088.  Note that most of this is the result of blind devotion to cargo cult, based on code for other flags.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8822025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113388 0039d316-1c4b-4281-b951-d872f2087c98
parent 2c5c9d59
...@@ -460,6 +460,9 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs( ...@@ -460,6 +460,9 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
web_prefs.accelerated_drawing_enabled = web_prefs.accelerated_drawing_enabled =
GpuProcessHost::gpu_enabled() && GpuProcessHost::gpu_enabled() &&
command_line.HasSwitch(switches::kEnableAcceleratedDrawing); command_line.HasSwitch(switches::kEnableAcceleratedDrawing);
web_prefs.accelerated_filters_enabled =
GpuProcessHost::gpu_enabled() &&
command_line.HasSwitch(switches::kEnableAcceleratedFilters);
web_prefs.accelerated_layers_enabled = web_prefs.accelerated_layers_enabled =
!command_line.HasSwitch(switches::kDisableAcceleratedLayers); !command_line.HasSwitch(switches::kDisableAcceleratedLayers);
web_prefs.composite_to_texture_enabled = web_prefs.composite_to_texture_enabled =
......
...@@ -218,6 +218,7 @@ IPC_STRUCT_TRAITS_BEGIN(WebPreferences) ...@@ -218,6 +218,7 @@ IPC_STRUCT_TRAITS_BEGIN(WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(fixed_position_compositing_enabled) IPC_STRUCT_TRAITS_MEMBER(fixed_position_compositing_enabled)
IPC_STRUCT_TRAITS_MEMBER(accelerated_2d_canvas_enabled) IPC_STRUCT_TRAITS_MEMBER(accelerated_2d_canvas_enabled)
IPC_STRUCT_TRAITS_MEMBER(accelerated_drawing_enabled) IPC_STRUCT_TRAITS_MEMBER(accelerated_drawing_enabled)
IPC_STRUCT_TRAITS_MEMBER(accelerated_filters_enabled)
IPC_STRUCT_TRAITS_MEMBER(accelerated_plugins_enabled) IPC_STRUCT_TRAITS_MEMBER(accelerated_plugins_enabled)
IPC_STRUCT_TRAITS_MEMBER(accelerated_layers_enabled) IPC_STRUCT_TRAITS_MEMBER(accelerated_layers_enabled)
IPC_STRUCT_TRAITS_MEMBER(accelerated_video_enabled) IPC_STRUCT_TRAITS_MEMBER(accelerated_video_enabled)
......
...@@ -172,6 +172,9 @@ const char kEnableAccelerated2dCanvas[] = "enable-accelerated-2d-canvas"; ...@@ -172,6 +172,9 @@ const char kEnableAccelerated2dCanvas[] = "enable-accelerated-2d-canvas";
// in build/features_override.gypi. // in build/features_override.gypi.
const char kEnableAcceleratedDrawing[] = "enable-accelerated-drawing"; const char kEnableAcceleratedDrawing[] = "enable-accelerated-drawing";
// Enable gpu-accelerated SVG/W3C filters.
const char kEnableAcceleratedFilters[] = "enable-accelerated-filters";
// Enables WebKit accessibility within the renderer process. // Enables WebKit accessibility within the renderer process.
const char kEnableAccessibility[] = "enable-accessibility"; const char kEnableAccessibility[] = "enable-accessibility";
......
...@@ -65,6 +65,7 @@ CONTENT_EXPORT extern const char kDisableWebAudio[]; ...@@ -65,6 +65,7 @@ CONTENT_EXPORT extern const char kDisableWebAudio[];
extern const char kDisableWebSockets[]; extern const char kDisableWebSockets[];
extern const char kEnableAccelerated2dCanvas[]; extern const char kEnableAccelerated2dCanvas[];
CONTENT_EXPORT extern const char kEnableAcceleratedDrawing[]; CONTENT_EXPORT extern const char kEnableAcceleratedDrawing[];
CONTENT_EXPORT extern const char kEnableAcceleratedFilters[];
extern const char kEnableAccessibility[]; extern const char kEnableAccessibility[];
extern const char kEnableAccessibilityLogging[]; extern const char kEnableAccessibilityLogging[];
CONTENT_EXPORT extern const char kEnableCompositingForFixedPosition[]; CONTENT_EXPORT extern const char kEnableCompositingForFixedPosition[];
......
...@@ -85,6 +85,7 @@ WebPreferences::WebPreferences() ...@@ -85,6 +85,7 @@ WebPreferences::WebPreferences()
accelerated_video_enabled(false), accelerated_video_enabled(false),
accelerated_2d_canvas_enabled(false), accelerated_2d_canvas_enabled(false),
accelerated_drawing_enabled(false), accelerated_drawing_enabled(false),
accelerated_filters_enabled(false),
accelerated_plugins_enabled(false), accelerated_plugins_enabled(false),
memory_info_enabled(false), memory_info_enabled(false),
interactive_form_validation_enabled(true), interactive_form_validation_enabled(true),
...@@ -280,6 +281,9 @@ void WebPreferences::Apply(WebView* web_view) const { ...@@ -280,6 +281,9 @@ void WebPreferences::Apply(WebView* web_view) const {
// Enable gpu-accelerated drawing if requested on the command line. // Enable gpu-accelerated drawing if requested on the command line.
settings->setAcceleratedDrawingEnabled(accelerated_drawing_enabled); settings->setAcceleratedDrawingEnabled(accelerated_drawing_enabled);
// Enable gpu-accelerated filters if requested on the command line.
settings->setAcceleratedFiltersEnabled(accelerated_filters_enabled);
// Enabling accelerated layers from the command line enabled accelerated // Enabling accelerated layers from the command line enabled accelerated
// 3D CSS, Video, and Animations. // 3D CSS, Video, and Animations.
settings->setAcceleratedCompositingFor3DTransformsEnabled( settings->setAcceleratedCompositingFor3DTransformsEnabled(
......
...@@ -99,6 +99,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences { ...@@ -99,6 +99,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
bool accelerated_video_enabled; bool accelerated_video_enabled;
bool accelerated_2d_canvas_enabled; bool accelerated_2d_canvas_enabled;
bool accelerated_drawing_enabled; bool accelerated_drawing_enabled;
bool accelerated_filters_enabled;
bool accelerated_plugins_enabled; bool accelerated_plugins_enabled;
bool memory_info_enabled; bool memory_info_enabled;
bool interactive_form_validation_enabled; bool interactive_form_validation_enabled;
......
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