Commit 8655039d authored by ccameron's avatar ccameron Committed by Commit bot

Revert of Enable compositor-thread property trees (patchset #1 id:1 of...

Revert of Enable compositor-thread property trees (patchset #1 id:1 of https://codereview.chromium.org/1449143004/ )

Reason for revert:
This is causing overscroll on Mac to fail. Just using the flag --disable-compositor-property-trees fails to make this go away -- I had to do a manual revert
BUG=559550

Original issue's description:
> Enable compositor-thread property trees
>
> This enables compositor-thread property trees for all clients of cc.
> It also replaces the existing --enable-compositor-property-trees flag
> with a --disable-compositor-property-trees flag.
>
> BUG=481585
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/f626d0b9d0fb2bfde430cf63c5111df7da1fba6f
> Cr-Commit-Position: refs/heads/master@{#360635}

TBR=enne@chromium.org,jaydasika@chromium.org,piman@chromium.org,ajuma@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=481585
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

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

Cr-Commit-Position: refs/heads/master@{#361246}
parent 9de47c51
...@@ -56,10 +56,10 @@ const char kEnableBeginFrameScheduling[] = "enable-begin-frame-scheduling"; ...@@ -56,10 +56,10 @@ const char kEnableBeginFrameScheduling[] = "enable-begin-frame-scheduling";
// Enables the GPU benchmarking extension // Enables the GPU benchmarking extension
const char kEnableGpuBenchmarking[] = "enable-gpu-benchmarking"; const char kEnableGpuBenchmarking[] = "enable-gpu-benchmarking";
// Disables the use of property trees rather than CalcDrawProps for computing // Enables the use of property trees rather than CalcDrawProps for computing
// draw properties. // draw properties.
const char kDisableCompositorPropertyTrees[] = const char kEnableCompositorPropertyTrees[] =
"disable-compositor-property-trees"; "enable-compositor-property-trees";
// Renders a border around compositor layers to help debug and study // Renders a border around compositor layers to help debug and study
// layer compositing. // layer compositing.
......
...@@ -30,7 +30,7 @@ CC_EXPORT extern const char kEnablePropertyTreeVerification[]; ...@@ -30,7 +30,7 @@ CC_EXPORT extern const char kEnablePropertyTreeVerification[];
// Switches for both the renderer and ui compositors. // Switches for both the renderer and ui compositors.
CC_EXPORT extern const char kEnableBeginFrameScheduling[]; CC_EXPORT extern const char kEnableBeginFrameScheduling[];
CC_EXPORT extern const char kEnableGpuBenchmarking[]; CC_EXPORT extern const char kEnableGpuBenchmarking[];
CC_EXPORT extern const char kDisableCompositorPropertyTrees[]; CC_EXPORT extern const char kEnableCompositorPropertyTrees[];
// Debug visualizations. // Debug visualizations.
CC_EXPORT extern const char kShowCompositedLayerBorders[]; CC_EXPORT extern const char kShowCompositedLayerBorders[];
......
...@@ -127,7 +127,7 @@ LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting:: ...@@ -127,7 +127,7 @@ LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting::
true, true,
false, false,
true, true,
true, false,
render_surface_layer_list, render_surface_layer_list,
0, 0,
GetPropertyTrees(root_layer)) { GetPropertyTrees(root_layer)) {
......
...@@ -60,7 +60,7 @@ LayerTreeSettings::LayerTreeSettings() ...@@ -60,7 +60,7 @@ LayerTreeSettings::LayerTreeSettings()
use_occlusion_for_tile_prioritization(false), use_occlusion_for_tile_prioritization(false),
record_full_layer(false), record_full_layer(false),
verify_property_trees(false), verify_property_trees(false),
use_property_trees(true), use_property_trees(false),
image_decode_tasks_enabled(false), image_decode_tasks_enabled(false),
use_compositor_animation_timelines(false), use_compositor_animation_timelines(false),
wait_for_beginframe_interval(true), wait_for_beginframe_interval(true),
......
...@@ -189,10 +189,10 @@ void DeriveCommandLine(const GURL& start_url, ...@@ -189,10 +189,10 @@ void DeriveCommandLine(const GURL& start_url,
// content/browser/renderer_host/render_process_host_impl.cc. // content/browser/renderer_host/render_process_host_impl.cc.
cc::switches::kDisableCachedPictureRaster, cc::switches::kDisableCachedPictureRaster,
cc::switches::kDisableCompositedAntialiasing, cc::switches::kDisableCompositedAntialiasing,
cc::switches::kDisableCompositorPropertyTrees,
cc::switches::kDisableMainFrameBeforeActivation, cc::switches::kDisableMainFrameBeforeActivation,
cc::switches::kDisableThreadedAnimation, cc::switches::kDisableThreadedAnimation,
cc::switches::kEnableBeginFrameScheduling, cc::switches::kEnableBeginFrameScheduling,
cc::switches::kEnableCompositorPropertyTrees,
cc::switches::kEnableGpuBenchmarking, cc::switches::kEnableGpuBenchmarking,
cc::switches::kEnablePropertyTreeVerification, cc::switches::kEnablePropertyTreeVerification,
cc::switches::kEnableMainFrameBeforeActivation, cc::switches::kEnableMainFrameBeforeActivation,
......
...@@ -445,8 +445,8 @@ void CompositorImpl::CreateLayerTreeHost() { ...@@ -445,8 +445,8 @@ void CompositorImpl::CreateLayerTreeHost() {
command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking)); command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking));
settings.initial_debug_state.show_fps_counter = settings.initial_debug_state.show_fps_counter =
command_line->HasSwitch(cc::switches::kUIShowFPSCounter); command_line->HasSwitch(cc::switches::kUIShowFPSCounter);
if (command_line->HasSwitch(cc::switches::kDisableCompositorPropertyTrees)) settings.use_property_trees =
settings.use_property_trees = false; command_line->HasSwitch(cc::switches::kEnableCompositorPropertyTrees);
// TODO(enne): Update this this compositor to use the scheduler. // TODO(enne): Update this this compositor to use the scheduler.
settings.single_thread_proxy_scheduler = false; settings.single_thread_proxy_scheduler = false;
......
...@@ -1421,10 +1421,10 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( ...@@ -1421,10 +1421,10 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// also be added to chrome/browser/chromeos/login/chrome_restart_request.cc. // also be added to chrome/browser/chromeos/login/chrome_restart_request.cc.
cc::switches::kDisableCachedPictureRaster, cc::switches::kDisableCachedPictureRaster,
cc::switches::kDisableCompositedAntialiasing, cc::switches::kDisableCompositedAntialiasing,
cc::switches::kDisableCompositorPropertyTrees,
cc::switches::kDisableMainFrameBeforeActivation, cc::switches::kDisableMainFrameBeforeActivation,
cc::switches::kDisableThreadedAnimation, cc::switches::kDisableThreadedAnimation,
cc::switches::kEnableBeginFrameScheduling, cc::switches::kEnableBeginFrameScheduling,
cc::switches::kEnableCompositorPropertyTrees,
cc::switches::kEnableGpuBenchmarking, cc::switches::kEnableGpuBenchmarking,
cc::switches::kEnableMainFrameBeforeActivation, cc::switches::kEnableMainFrameBeforeActivation,
cc::switches::kShowCompositedLayerBorders, cc::switches::kShowCompositedLayerBorders,
......
...@@ -331,8 +331,8 @@ void RenderWidgetCompositor::Initialize() { ...@@ -331,8 +331,8 @@ void RenderWidgetCompositor::Initialize() {
settings.verify_property_trees = settings.verify_property_trees =
cmd->HasSwitch(cc::switches::kEnablePropertyTreeVerification); cmd->HasSwitch(cc::switches::kEnablePropertyTreeVerification);
if (cmd->HasSwitch(cc::switches::kDisableCompositorPropertyTrees)) settings.use_property_trees =
settings.use_property_trees = false; cmd->HasSwitch(cc::switches::kEnableCompositorPropertyTrees);
settings.renderer_settings.allow_antialiasing &= settings.renderer_settings.allow_antialiasing &=
!cmd->HasSwitch(cc::switches::kDisableCompositedAntialiasing); !cmd->HasSwitch(cc::switches::kDisableCompositedAntialiasing);
// The means the renderer compositor has 2 possible modes: // The means the renderer compositor has 2 possible modes:
......
...@@ -449,6 +449,27 @@ crbug.com/505364 imported/web-platform-tests/shadow-dom/untriaged/styles/test-00 ...@@ -449,6 +449,27 @@ crbug.com/505364 imported/web-platform-tests/shadow-dom/untriaged/styles/test-00
crbug.com/505364 imported/web-platform-tests/shadow-dom/untriaged/styles/test-010.html [ Failure Crash ] crbug.com/505364 imported/web-platform-tests/shadow-dom/untriaged/styles/test-010.html [ Failure Crash ]
crbug.com/505364 imported/web-platform-tests/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html [ Failure Crash ] crbug.com/505364 imported/web-platform-tests/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html [ Failure Crash ]
crbug.com/481585 compositing/backface-visibility-transformed.html [ NeedsRebaseline ]
crbug.com/481585 compositing/geometry/layer-due-to-layer-children-deep.html [ NeedsRebaseline ]
crbug.com/481585 compositing/geometry/layer-due-to-layer-children.html [ NeedsRebaseline ]
crbug.com/481585 compositing/geometry/vertical-scroll-composited.html [ NeedsRebaseline ]
crbug.com/481585 compositing/overflow/nested-render-surfaces-with-rotation.html [ NeedsRebaseline ]
crbug.com/481585 compositing/perpendicular-layer-sorting.html [ NeedsRebaseline ]
crbug.com/481585 compositing/reflections/nested-reflection-anchor-point.html [ NeedsRebaseline ]
crbug.com/481585 compositing/reflections/nested-reflection-animated.html [ NeedsRebaseline ]
crbug.com/481585 compositing/reflections/transform-inside-reflection.html [ NeedsRebaseline ]
crbug.com/481585 css3/blending/background-blend-mode-overlapping-accelerated-elements.html [ NeedsRebaseline ]
crbug.com/481585 fast/sub-pixel/transformed-iframe-copy-on-scroll.html [ NeedsRebaseline ]
crbug.com/481585 media/video-layer-crash.html [ NeedsRebaseline ]
crbug.com/481585 media/video-transformed.html [ NeedsRebaseline ]
crbug.com/481585 transforms/3d/general/perspective-units.html [ NeedsRebaseline ]
crbug.com/481585 transforms/3d/general/transform-origin-z-change.html [ NeedsRebaseline ]
crbug.com/481585 transforms/3d/point-mapping/3d-point-mapping-coplanar.html [ NeedsRebaseline ]
crbug.com/481585 transforms/3d/point-mapping/3d-point-mapping-deep.html [ NeedsRebaseline ]
crbug.com/481585 transforms/3d/point-mapping/3d-point-mapping-origins.html [ NeedsRebaseline ]
crbug.com/481585 transforms/3d/point-mapping/3d-point-mapping.html [ NeedsRebaseline ]
crbug.com/481585 virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-render-surfaces-with-rotation.html [ NeedsRebaseline ]
crbug.com/552532 [ Win10 ] fast/replaced/no-focus-ring-embed.html [ Pass Crash ] crbug.com/552532 [ Win10 ] fast/replaced/no-focus-ring-embed.html [ Pass Crash ]
crbug.com/552532 [ Win10 ] fast/replaced/no-focus-ring-object.html [ Pass Crash ] crbug.com/552532 [ Win10 ] fast/replaced/no-focus-ring-object.html [ Pass Crash ]
crbug.com/552532 [ Win10 ] plugins/focus.html [ Pass Crash ] crbug.com/552532 [ Win10 ] plugins/focus.html [ Pass Crash ]
...@@ -765,6 +786,8 @@ crbug.com/467635 fast/dom/HTMLImageElement/image-sizes-meta-viewport.html [ Skip ...@@ -765,6 +786,8 @@ crbug.com/467635 fast/dom/HTMLImageElement/image-sizes-meta-viewport.html [ Skip
crbug.com/484370 [ Win Debug ] svg/custom/gradient-userSpaceOnUse-with-percentage.svg [ Failure ] crbug.com/484370 [ Win Debug ] svg/custom/gradient-userSpaceOnUse-with-percentage.svg [ Failure ]
crbug.com/116710 [ Win Debug ] transforms/3d/point-mapping/3d-point-mapping-preserve-3d.html [ Failure ]
# Printing Layout broken in these tests. # Printing Layout broken in these tests.
crbug.com/377696 printing/setPrinting.html [ Skip ] crbug.com/377696 printing/setPrinting.html [ Skip ]
crbug.com/377696 printing/width-overflow.html [ Skip ] crbug.com/377696 printing/width-overflow.html [ Skip ]
......
...@@ -137,8 +137,8 @@ Compositor::Compositor(ui::ContextFactory* context_factory, ...@@ -137,8 +137,8 @@ Compositor::Compositor(ui::ContextFactory* context_factory,
settings.initial_debug_state.SetRecordRenderingStats( settings.initial_debug_state.SetRecordRenderingStats(
command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking)); command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking));
if (command_line->HasSwitch(cc::switches::kDisableCompositorPropertyTrees)) settings.use_property_trees =
settings.use_property_trees = false; command_line->HasSwitch(cc::switches::kEnableCompositorPropertyTrees);
settings.use_zero_copy = IsUIZeroCopyEnabled(); settings.use_zero_copy = IsUIZeroCopyEnabled();
settings.renderer_settings.use_rgba_4444_textures = settings.renderer_settings.use_rgba_4444_textures =
......
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