Commit 56914490 authored by kylechar's avatar kylechar Committed by Commit Bot

Turn on surface sync with --enable-viz.

Always turn on surface synchronization when the --enable-viz flag is
present. Disable a few extra tests which now fail in the new
configuration.

The --enable-surface-synchronization flag was added to an FYI trybot to
check for failures. No failures were observed over the weekend. Remove
the now unneeded flag from the FYI trybot.

Bug: 793302
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: I6bc0aff21d968ba5ee38f7453fbd7b5779efb34a
Reviewed-on: https://chromium-review.googlesource.com/812409
Commit-Queue: kylechar <kylechar@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Reviewed-by: default avatarFady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523685}
parent 6de6b4fd
...@@ -14,9 +14,10 @@ const base::Feature kEnableSurfaceSynchronization{ ...@@ -14,9 +14,10 @@ const base::Feature kEnableSurfaceSynchronization{
"SurfaceSynchronization", base::FEATURE_DISABLED_BY_DEFAULT}; "SurfaceSynchronization", base::FEATURE_DISABLED_BY_DEFAULT};
bool IsSurfaceSynchronizationEnabled() { bool IsSurfaceSynchronizationEnabled() {
auto* command_line = base::CommandLine::ForCurrentProcess();
return base::FeatureList::IsEnabled(kEnableSurfaceSynchronization) || return base::FeatureList::IsEnabled(kEnableSurfaceSynchronization) ||
base::CommandLine::ForCurrentProcess()->HasSwitch( command_line->HasSwitch(switches::kEnableSurfaceSynchronization) ||
switches::kEnableSurfaceSynchronization); command_line->HasSwitch(switches::kEnableViz);
} }
} // namespace features } // namespace features
...@@ -4304,7 +4304,6 @@ ...@@ -4304,7 +4304,6 @@
}, },
{ {
"args": [ "args": [
"--enable-surface-synchronization",
"--enable-viz", "--enable-viz",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.viz.content_browsertests.filter" "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.viz.content_browsertests.filter"
], ],
......
...@@ -101,7 +101,10 @@ ...@@ -101,7 +101,10 @@
-ScreenOrientationOOPIFBrowserTest.ScreenOrientation -ScreenOrientationOOPIFBrowserTest.ScreenOrientation
-ScreenOrientationOOPIFBrowserTest.ScreenOrientationInPendingMainFrame -ScreenOrientationOOPIFBrowserTest.ScreenOrientationInPendingMainFrame
-SitePerProcessBrowserTest.CommunicateWithProxyAfterCancelPending -SitePerProcessBrowserTest.CommunicateWithProxyAfterCancelPending
-SitePerProcessBrowserTest.CrossProcessInertSubframe
-SitePerProcessBrowserTest.CrossSiteIframeDisplayNone -SitePerProcessBrowserTest.CrossSiteIframeDisplayNone
-SitePerProcessBrowserTest.FileChooserInSubframe
-SitePerProcessBrowserTest.MainframeTouchEventRouting
-SitePerProcessBrowserTest.RecreateMainFrameAfterCancelPending -SitePerProcessBrowserTest.RecreateMainFrameAfterCancelPending
-SitePerProcessBrowserTest.ReuseNonLiveRenderViewHostAfterCancelPending -SitePerProcessBrowserTest.ReuseNonLiveRenderViewHostAfterCancelPending
-WheelScrollLatchingBrowserTest.WheelEventTarget -WheelScrollLatchingBrowserTest.WheelEventTarget
......
...@@ -91,3 +91,21 @@ ...@@ -91,3 +91,21 @@
# TODO: investigate flaky failure http://crbug.com/792740 # TODO: investigate flaky failure http://crbug.com/792740
-IsolatedOriginTest.ProcessLimit -IsolatedOriginTest.ProcessLimit
# Tests failures related to surface sync. http://crbug.com/793302
-RenderWidgetHostViewBrowserTestBase.CompositorWorksWhenReusingRenderer
-RenderWidgetInitialSizeTest.InitialSize
-RenderWidgetTest.OnResize
-ScreenOrientationBrowserTest.ScreenOrientationChange
-ScreenOrientationBrowserTest.WindowOrientationChange
-ScreenOrientationOOPIFBrowserTest.ScreenOrientation
-ScreenOrientationOOPIFBrowserTest.ScreenOrientationInPendingMainFrame
-SitePerProcessBrowserTest.CommunicateWithProxyAfterCancelPending
-SitePerProcessBrowserTest.CrossProcessInertSubframe
-SitePerProcessBrowserTest.CrossSiteIframeDisplayNone
-SitePerProcessBrowserTest.FileChooserInSubframe
-SitePerProcessBrowserTest.MainframeTouchEventRouting
-SitePerProcessBrowserTest.RecreateMainFrameAfterCancelPending
-SitePerProcessBrowserTest.ReuseNonLiveRenderViewHostAfterCancelPending
-WheelScrollLatchingBrowserTest.WheelEventTarget
-WheelScrollLatchingDisabledBrowserTest.WheelEventTarget
...@@ -1254,7 +1254,6 @@ ...@@ -1254,7 +1254,6 @@
'mojo_chromiumos_specific_gtests': { 'mojo_chromiumos_specific_gtests': {
'viz_content_browsertests': { 'viz_content_browsertests': {
'args': [ 'args': [
'--enable-surface-synchronization',
'--enable-viz', '--enable-viz',
'--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.viz.content_browsertests.filter', '--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.viz.content_browsertests.filter',
], ],
......
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