Commit 1845a7f4 authored by fmalita@chromium.org's avatar fmalita@chromium.org

Add an --enable-container-culling commandline flag.

Plumbing for Blink's containerCullingEnabled (experimental Skia culling
for containers).

R=jamesr@chromium.org,piman@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263074 0039d316-1c4b-4281-b951-d872f2087c98
parent 00dd7d89
...@@ -106,6 +106,7 @@ std::string DeriveCommandLine(const GURL& start_url, ...@@ -106,6 +106,7 @@ std::string DeriveCommandLine(const GURL& start_url,
::switches::kDisableGestureTapHighlight, ::switches::kDisableGestureTapHighlight,
::switches::kDisableGpuSandbox, ::switches::kDisableGpuSandbox,
::switches::kEnableDeferredFilters, ::switches::kEnableDeferredFilters,
::switches::kEnableContainerCulling,
::switches::kEnableGpuRasterization, ::switches::kEnableGpuRasterization,
::switches::kEnableImplSidePainting, ::switches::kEnableImplSidePainting,
::switches::kEnableLogging, ::switches::kEnableLogging,
......
...@@ -423,6 +423,8 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) { ...@@ -423,6 +423,8 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) {
switches::kAcceleratedCanvas2dMSAASampleCount).c_str()); switches::kAcceleratedCanvas2dMSAASampleCount).c_str());
prefs.deferred_filters_enabled = prefs.deferred_filters_enabled =
command_line.HasSwitch(switches::kEnableDeferredFilters); command_line.HasSwitch(switches::kEnableDeferredFilters);
prefs.container_culling_enabled =
command_line.HasSwitch(switches::kEnableContainerCulling);
prefs.accelerated_compositing_for_3d_transforms_enabled = prefs.accelerated_compositing_for_3d_transforms_enabled =
prefs.accelerated_compositing_for_animation_enabled = prefs.accelerated_compositing_for_animation_enabled =
!command_line.HasSwitch(switches::kDisableAcceleratedLayers); !command_line.HasSwitch(switches::kDisableAcceleratedLayers);
......
...@@ -150,6 +150,7 @@ IPC_STRUCT_TRAITS_BEGIN(WebPreferences) ...@@ -150,6 +150,7 @@ IPC_STRUCT_TRAITS_BEGIN(WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(accelerated_2d_canvas_msaa_sample_count) IPC_STRUCT_TRAITS_MEMBER(accelerated_2d_canvas_msaa_sample_count)
IPC_STRUCT_TRAITS_MEMBER(accelerated_filters_enabled) IPC_STRUCT_TRAITS_MEMBER(accelerated_filters_enabled)
IPC_STRUCT_TRAITS_MEMBER(deferred_filters_enabled) IPC_STRUCT_TRAITS_MEMBER(deferred_filters_enabled)
IPC_STRUCT_TRAITS_MEMBER(container_culling_enabled)
IPC_STRUCT_TRAITS_MEMBER(gesture_tap_highlight_enabled) IPC_STRUCT_TRAITS_MEMBER(gesture_tap_highlight_enabled)
IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_for_plugins_enabled) IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_for_plugins_enabled)
IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_for_3d_transforms_enabled) IPC_STRUCT_TRAITS_MEMBER(accelerated_compositing_for_3d_transforms_enabled)
......
...@@ -364,6 +364,9 @@ const char kEnableLCDText[] = "enable-lcd-text"; ...@@ -364,6 +364,9 @@ const char kEnableLCDText[] = "enable-lcd-text";
const char kEnableLayerSquashing[] = const char kEnableLayerSquashing[] =
"enable-layer-squashing"; "enable-layer-squashing";
// Enable experimental container node culling.
const char kEnableContainerCulling[] = "enable-container-culling";
// Turns on extremely verbose logging of accessibility events. // Turns on extremely verbose logging of accessibility events.
const char kEnableAccessibilityLogging[] = "enable-accessibility-logging"; const char kEnableAccessibilityLogging[] = "enable-accessibility-logging";
......
...@@ -112,6 +112,7 @@ CONTENT_EXPORT extern const char kEnableDeferredFilters[]; ...@@ -112,6 +112,7 @@ CONTENT_EXPORT extern const char kEnableDeferredFilters[];
CONTENT_EXPORT extern const char kEnableAcceleratedFixedRootBackground[]; CONTENT_EXPORT extern const char kEnableAcceleratedFixedRootBackground[];
CONTENT_EXPORT extern const char kEnableAcceleratedOverflowScroll[]; CONTENT_EXPORT extern const char kEnableAcceleratedOverflowScroll[];
CONTENT_EXPORT extern const char kEnableLayerSquashing[]; CONTENT_EXPORT extern const char kEnableLayerSquashing[];
CONTENT_EXPORT extern const char kEnableContainerCulling[];
extern const char kEnableAccessibilityLogging[]; extern const char kEnableAccessibilityLogging[];
CONTENT_EXPORT extern const char kEnableBeginFrameScheduling[]; CONTENT_EXPORT extern const char kEnableBeginFrameScheduling[];
CONTENT_EXPORT extern const char kEnableBrowserPluginForAllViewTypes[]; CONTENT_EXPORT extern const char kEnableBrowserPluginForAllViewTypes[];
......
...@@ -231,6 +231,9 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) { ...@@ -231,6 +231,9 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
// Enable deferred filter rendering if requested on the command line. // Enable deferred filter rendering if requested on the command line.
settings->setDeferredFiltersEnabled(prefs.deferred_filters_enabled); settings->setDeferredFiltersEnabled(prefs.deferred_filters_enabled);
// Enable container culling if requested on the command line.
settings->setContainerCullingEnabled(prefs.container_culling_enabled);
// Enable gesture tap highlight if requested on the command line. // Enable gesture tap highlight if requested on the command line.
settings->setGestureTapHighlightEnabled(prefs.gesture_tap_highlight_enabled); settings->setGestureTapHighlightEnabled(prefs.gesture_tap_highlight_enabled);
......
...@@ -72,6 +72,7 @@ WebPreferences::WebPreferences() ...@@ -72,6 +72,7 @@ WebPreferences::WebPreferences()
accelerated_2d_canvas_msaa_sample_count(0), accelerated_2d_canvas_msaa_sample_count(0),
accelerated_filters_enabled(false), accelerated_filters_enabled(false),
deferred_filters_enabled(false), deferred_filters_enabled(false),
container_culling_enabled(false),
gesture_tap_highlight_enabled(false), gesture_tap_highlight_enabled(false),
accelerated_compositing_for_plugins_enabled(false), accelerated_compositing_for_plugins_enabled(false),
allow_displaying_insecure_content(true), allow_displaying_insecure_content(true),
......
...@@ -120,6 +120,7 @@ struct WEBKIT_COMMON_EXPORT WebPreferences { ...@@ -120,6 +120,7 @@ struct WEBKIT_COMMON_EXPORT WebPreferences {
int accelerated_2d_canvas_msaa_sample_count; int accelerated_2d_canvas_msaa_sample_count;
bool accelerated_filters_enabled; bool accelerated_filters_enabled;
bool deferred_filters_enabled; bool deferred_filters_enabled;
bool container_culling_enabled;
bool gesture_tap_highlight_enabled; bool gesture_tap_highlight_enabled;
bool accelerated_compositing_for_plugins_enabled; bool accelerated_compositing_for_plugins_enabled;
bool allow_displaying_insecure_content; bool allow_displaying_insecure_content;
......
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