| Index: content/test/gpu/page_sets/gpu_process_tests.py
|
| diff --git a/content/test/gpu/page_sets/gpu_process_tests.py b/content/test/gpu/page_sets/gpu_process_tests.py
|
| index ed9301470940b2ed682f827ddc9fafc713aa5fd1..f147cba94f403cf67e7c6baa42daf5d73e4c4548 100644
|
| --- a/content/test/gpu/page_sets/gpu_process_tests.py
|
| +++ b/content/test/gpu/page_sets/gpu_process_tests.py
|
| @@ -522,6 +522,54 @@ class EqualBugWorkaroundsInBrowserAndGpuProcessPage(gpu_test_base.PageBase):
|
| (browser_list, gpu_list, list(diff)))
|
|
|
|
|
| +class HasTransparentVisualsShared(GpuProcessSharedPageState):
|
| + def __init__(self, test, finder_options, story_set):
|
| + super(HasTransparentVisualsShared, self).__init__(
|
| + test, finder_options, story_set)
|
| + options = finder_options.browser_options
|
| + if sys.platform.startswith('linux'):
|
| + # Hit id 173 from kGpuDriverBugListJson.
|
| + options.AppendExtraBrowserArgs('--gpu-testing-gl-version=3.0 Mesa ' \
|
| + '12.1')
|
| +
|
| +class HasTransparentVisualsGpuProcessPage(DriverBugWorkaroundsTestsPage):
|
| + def __init__(self, story_set, expectations):
|
| + super(HasTransparentVisualsGpuProcessPage, self).__init__(
|
| + name='GpuProcess.has_transparent_visuals_gpu_process',
|
| + page_set=story_set,
|
| + shared_page_state_class=HasTransparentVisualsShared,
|
| + expectations=expectations,
|
| + expected_workaround=None,
|
| + unexpected_workaround='disable_transparent_visuals')
|
| +
|
| + def Validate(self, tab, results):
|
| + if sys.platform.startswith('linux'):
|
| + super(HasTransparentVisualsGpuProcessPage, self).Validate(tab, results)
|
| +
|
| +
|
| +class NoTransparentVisualsShared(GpuProcessSharedPageState):
|
| + def __init__(self, test, finder_options, story_set):
|
| + super(NoTransparentVisualsShared, self).__init__(
|
| + test, finder_options, story_set)
|
| + options = finder_options.browser_options
|
| + if sys.platform.startswith('linux'):
|
| + options.AppendExtraBrowserArgs('--disable_transparent_visuals=1')
|
| +
|
| +class NoTransparentVisualsGpuProcessPage(DriverBugWorkaroundsTestsPage):
|
| + def __init__(self, story_set, expectations):
|
| + super(NoTransparentVisualsGpuProcessPage, self).__init__(
|
| + name='GpuProcess.no_transparent_visuals_gpu_process',
|
| + page_set=story_set,
|
| + shared_page_state_class=NoTransparentVisualsShared,
|
| + expectations=expectations,
|
| + expected_workaround='disable_transparent_visuals',
|
| + unexpected_workaround=None)
|
| +
|
| + def Validate(self, tab, results):
|
| + if sys.platform.startswith('linux'):
|
| + super(NoTransparentVisualsGpuProcessPage, self).Validate(tab, results)
|
| +
|
| +
|
| class GpuProcessTestsStorySet(story_set_module.StorySet):
|
|
|
| """ Tests that accelerated content triggers the creation of a GPU process """
|
| @@ -546,8 +594,6 @@ class GpuProcessTestsStorySet(story_set_module.StorySet):
|
| self.AddStory(GpuInfoCompletePage(self, expectations))
|
| self.AddStory(NoGpuProcessPage(self, expectations))
|
| self.AddStory(SoftwareGpuProcessPage(self, expectations))
|
| - if not is_platform_android:
|
| - self.AddStory(SkipGpuProcessPage(self, expectations))
|
| self.AddStory(DriverBugWorkaroundsInGpuProcessPage(self, expectations))
|
| self.AddStory(IdentifyActiveGpuPage1(self, expectations))
|
| self.AddStory(IdentifyActiveGpuPage2(self, expectations))
|
| @@ -557,6 +603,10 @@ class GpuProcessTestsStorySet(story_set_module.StorySet):
|
| self.AddStory(DriverBugWorkaroundsUponGLRendererPage(self, expectations))
|
| self.AddStory(EqualBugWorkaroundsInBrowserAndGpuProcessPage(self,
|
| expectations))
|
| + if not is_platform_android:
|
| + self.AddStory(SkipGpuProcessPage(self, expectations))
|
| + self.AddStory(HasTransparentVisualsGpuProcessPage(self, expectations))
|
| + self.AddStory(NoTransparentVisualsGpuProcessPage(self, expectations))
|
|
|
| @property
|
| def allow_mixed_story_states(self):
|
|
|