diff --git a/DEPS b/DEPS index a7ba98a..644d9f87 100644 --- a/DEPS +++ b/DEPS
@@ -228,7 +228,7 @@ Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067', 'src/third_party/webrtc': - Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '24348dfa49f6130b990a40b6cff4861c4a23c95e', # commit position 15817 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '3ae6916592ca41a893881bf789c20663f8eb601c', # commit position 15829 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'),
diff --git a/chromeos/CHROMEOS_LKGM b/chromeos/CHROMEOS_LKGM index d18d991b..6d858ec 100644 --- a/chromeos/CHROMEOS_LKGM +++ b/chromeos/CHROMEOS_LKGM
@@ -1 +1 @@ -9128.0.0 \ No newline at end of file +9131.0.0 \ No newline at end of file
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py index fff1fea8..0ad1c8e 100755 --- a/content/test/gpu/generate_buildbot_json.py +++ b/content/test/gpu/generate_buildbot_json.py
@@ -1123,13 +1123,6 @@ } ], }, - 'gpu_rasterization': { - 'tester_configs': [ - { - 'allow_on_android': True, - }, - ], - }, 'hardware_accelerated_feature': { 'tester_configs': [ {
diff --git a/content/test/gpu/gpu_tests/gpu_rasterization.py b/content/test/gpu/gpu_tests/gpu_rasterization.py deleted file mode 100644 index 03aea17..0000000 --- a/content/test/gpu/gpu_tests/gpu_rasterization.py +++ /dev/null
@@ -1,87 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -from gpu_tests import cloud_storage_test_base -from gpu_tests import gpu_rasterization_expectations -import page_sets - -from telemetry.page import legacy_page_test -from telemetry.util import image_util - - -test_harness_script = r""" - var domAutomationController = {}; - domAutomationController._succeeded = false; - domAutomationController._finished = false; - - domAutomationController.setAutomationId = function(id) {} - domAutomationController.send = function(msg) { - domAutomationController._finished = true; - if (msg.toLowerCase() == "success") - domAutomationController._succeeded = true; - else - domAutomationController._succeeded = false; - } - - window.domAutomationController = domAutomationController; -""" - -def _DidTestSucceed(tab): - return tab.EvaluateJavaScript('domAutomationController._succeeded') - -class GpuRasterizationValidator(cloud_storage_test_base.ValidatorBase): - def CustomizeBrowserOptions(self, options): - # --test-type=gpu is used only to suppress the "Google API Keys are missing" - # infobar, which causes flakiness in tests. - options.AppendExtraBrowserArgs(['--force-gpu-rasterization', - '--test-type=gpu']) - - def ValidateAndMeasurePage(self, page, tab, results): - if not _DidTestSucceed(tab): - raise legacy_page_test.Failure('Page indicated a failure') - - if not hasattr(page, 'expectations') or not page.expectations: - raise legacy_page_test.Failure('Expectations not specified') - - if not tab.screenshot_supported: - raise legacy_page_test.Failure( - 'Browser does not support screenshot capture') - - screenshot = tab.Screenshot() - if screenshot is None: - raise legacy_page_test.Failure('Could not capture screenshot') - - device_pixel_ratio = tab.EvaluateJavaScript('window.devicePixelRatio') - if hasattr(page, 'test_rect'): - test_rect = [int(x * device_pixel_ratio) for x in page.test_rect] - screenshot = image_util.Crop(screenshot, test_rect[0], test_rect[1], - test_rect[2], test_rect[3]) - - self._ValidateScreenshotSamples( - tab, - page.display_name, - screenshot, - page.expectations, - device_pixel_ratio) - - -class GpuRasterization(cloud_storage_test_base.CloudStorageTestBase): - """Tests that GPU rasterization produces valid content""" - test = GpuRasterizationValidator - - def __init__(self, max_failures=None): - super(GpuRasterization, self).__init__(max_failures=max_failures) - - @classmethod - def Name(cls): - return 'gpu_rasterization' - - def CreateStorySet(self, options): - story_set = page_sets.GpuRasterizationTestsStorySet(self.GetExpectations()) - for page in story_set: - page.script_to_evaluate_on_commit = test_harness_script - return story_set - - def _CreateExpectations(self): - return gpu_rasterization_expectations.GpuRasterizationExpectations()
diff --git a/content/test/gpu/gpu_tests/gpu_rasterization_expectations.py b/content/test/gpu/gpu_tests/gpu_rasterization_expectations.py deleted file mode 100644 index e99d9e8d..0000000 --- a/content/test/gpu/gpu_tests/gpu_rasterization_expectations.py +++ /dev/null
@@ -1,17 +0,0 @@ -# Copyright 2015 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -from gpu_tests.gpu_test_expectations import GpuTestExpectations - -# See the GpuTestExpectations class for documentation. - -class GpuRasterizationExpectations(GpuTestExpectations): - def SetExpectations(self): - # Sample Usage: - # self.Fail('GpuRasterization.BlueBox', - # ['mac', 'amd', ('nvidia', 0x1234)], bug=123) - - # Seems to be flaky on the new AMD R7 240 drivers. - self.Flaky('GpuRasterization.BlueBox', - ['win', ('amd', 0x6613)], bug=653538)
diff --git a/content/test/gpu/gpu_tests/memory_test_expectations.py b/content/test/gpu/gpu_tests/memory_test_expectations.py deleted file mode 100644 index fefd74e..0000000 --- a/content/test/gpu/gpu_tests/memory_test_expectations.py +++ /dev/null
@@ -1,15 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -from gpu_tests.gpu_test_expectations import GpuTestExpectations - -# See the GpuTestExpectations class for documentation. - -class MemoryTestExpectations(GpuTestExpectations): - def SetExpectations(self): - # Sample Usage: - # self.Fail('Memory.CSS3D', - # ['mac', 'amd', ('nvidia', 0x1234)], bug=123) - - self.Fail('Memory.CSS3D', bug=435899)
diff --git a/content/test/gpu/gpu_tests/pixel_expectations.py b/content/test/gpu/gpu_tests/pixel_expectations.py index 757260a..ff3fb67 100644 --- a/content/test/gpu/gpu_tests/pixel_expectations.py +++ b/content/test/gpu/gpu_tests/pixel_expectations.py
@@ -12,6 +12,10 @@ # self.Fail('Pixel_Canvas2DRedBox', # ['mac', 'amd', ('nvidia', 0x1234)], bug=123) + # Seems to be flaky on the new AMD R7 240 drivers. + self.Flaky('Pixel_GpuRasterization_BlueBox', + ['win', ('amd', 0x6613)], bug=653538) + # Software compositing is not supported on Android; so we skip these tests # that disables gpu compositing on Android platforms. self.Skip('Pixel_OffscreenCanvasUnaccelerated2D', ['android'])
diff --git a/content/test/gpu/gpu_tests/pixel_integration_test.py b/content/test/gpu/gpu_tests/pixel_integration_test.py index 17eed5a..4633c6c8 100644 --- a/content/test/gpu/gpu_tests/pixel_integration_test.py +++ b/content/test/gpu/gpu_tests/pixel_integration_test.py
@@ -114,6 +114,7 @@ cls.SetParsedCommandLineOptions(options) name = 'Pixel' pages = pixel_test_pages.DefaultPages(name) + pages += pixel_test_pages.GpuRasterizationPages(name) pages += pixel_test_pages.ExperimentalCanvasFeaturesPages(name) if sys.platform.startswith('darwin'): pages += pixel_test_pages.MacSpecificPages(name)
diff --git a/content/test/gpu/gpu_tests/pixel_test_pages.py b/content/test/gpu/gpu_tests/pixel_test_pages.py index 73d8c28..b88272b9 100644 --- a/content/test/gpu/gpu_tests/pixel_test_pages.py +++ b/content/test/gpu/gpu_tests/pixel_test_pages.py
@@ -7,33 +7,33 @@ from the old-style GPU tests. """ def __init__(self, url, name, test_rect, revision, - expected_colors=None, tolerance=2, browser_args=None): + tolerance=2, browser_args=None, expected_colors=None): super(PixelTestPage, self).__init__() self.url = url self.name = name self.test_rect = test_rect self.revision = revision + # The tolerance when comparing against the reference image. + self.tolerance = tolerance + self.browser_args = browser_args # The expected colors can be specified as a list of dictionaries, # in which case these specific pixels will be sampled instead of # comparing the entire image snapshot. The format is only defined # by contract with _CompareScreenshotSamples in # cloud_storage_integration_test_base.py. self.expected_colors = expected_colors - # The tolerance when comparing against the reference image. - self.tolerance = tolerance - self.browser_args = browser_args def CopyWithNewBrowserArgsAndSuffix(self, browser_args, suffix): return PixelTestPage( self.url, self.name + suffix, self.test_rect, self.revision, - self.expected_colors, self.tolerance, browser_args) + self.tolerance, browser_args, self.expected_colors) def CopyWithNewBrowserArgsAndPrefix(self, browser_args, prefix): # Assuming the test name is 'Pixel'. split = self.name.split('_', 1) return PixelTestPage( self.url, split[0] + '_' + prefix + split[1], self.test_rect, - self.revision, self.expected_colors, self.tolerance, browser_args) + self.revision, self.tolerance, browser_args, self.expected_colors) def CopyPagesWithNewBrowserArgsAndSuffix(pages, browser_args, suffix): @@ -133,6 +133,141 @@ ] +# Pages that should be run with GPU rasterization enabled. +def GpuRasterizationPages(base_name): + browser_args = ['--force-gpu-rasterization'] + return [ + PixelTestPage( + 'pixel_background.html', + base_name + '_GpuRasterization_BlueBox', + test_rect=[0, 0, 220, 220], + revision=0, # This is not used. + browser_args=browser_args, + expected_colors=[ + { + 'comment': 'body-t', + 'location': [5, 5], + 'size': [1, 1], + 'color': [0, 128, 0], + 'tolerance': 0 + }, + { + 'comment': 'body-r', + 'location': [215, 5], + 'size': [1, 1], + 'color': [0, 128, 0], + 'tolerance': 0 + }, + { + 'comment': 'body-b', + 'location': [215, 215], + 'size': [1, 1], + 'color': [0, 128, 0], + 'tolerance': 0 + }, + { + 'comment': 'body-l', + 'location': [5, 215], + 'size': [1, 1], + 'color': [0, 128, 0], + 'tolerance': 0 + }, + { + 'comment': 'background-t', + 'location': [30, 30], + 'size': [1, 1], + 'color': [0, 0, 0], + 'tolerance': 0 + }, + { + 'comment': 'background-r', + 'location': [170, 30], + 'size': [1, 1], + 'color': [0, 0, 0], + 'tolerance': 0 + }, + { + 'comment': 'background-b', + 'location': [170, 170], + 'size': [1, 1], + 'color': [0, 0, 0], + 'tolerance': 0 + }, + { + 'comment': 'background-l', + 'location': [30, 170], + 'size': [1, 1], + 'color': [0, 0, 0], + 'tolerance': 0 + }, + { + 'comment': 'box-t', + 'location': [70, 70], + 'size': [1, 1], + 'color': [0, 0, 255], + 'tolerance': 0 + }, + { + 'comment': 'box-r', + 'location': [140, 70], + 'size': [1, 1], + 'color': [0, 0, 255], + 'tolerance': 0 + }, + { + 'comment': 'box-b', + 'location': [140, 140], + 'size': [1, 1], + 'color': [0, 0, 255], + 'tolerance': 0 + }, + { + 'comment': 'box-l', + 'location': [70, 140], + 'size': [1, 1], + 'color': [0, 0, 255], + 'tolerance': 0 + } + ]), + PixelTestPage( + 'concave_paths.html', + base_name + '_GpuRasterization_ConcavePaths', + test_rect=[0, 0, 100, 100], + revision=0, # This is not used. + browser_args=browser_args, + expected_colors=[ + { + 'comment': 'outside', + 'location': [80, 60], + 'size': [1, 1], + 'color': [255, 255, 255], + 'tolerance': 0 + }, + { + 'comment': 'outside', + 'location': [28, 20], + 'size': [1, 1], + 'color': [255, 255, 255], + 'tolerance': 0 + }, + { + 'comment': 'inside', + 'location': [32, 25], + 'size': [1, 1], + 'color': [255, 215, 0], + 'tolerance': 0 + }, + { + 'comment': 'inside', + 'location': [80, 80], + 'size': [1, 1], + 'color': [255, 215, 0], + 'tolerance': 0 + } + ]) + ] + + # Pages that should be run with experimental canvas features. def ExperimentalCanvasFeaturesPages(base_name): browser_args = ['--enable-experimental-canvas-features']
diff --git a/content/test/gpu/page_sets/__init__.py b/content/test/gpu/page_sets/__init__.py index f994fe7..a577a9db 100644 --- a/content/test/gpu/page_sets/__init__.py +++ b/content/test/gpu/page_sets/__init__.py
@@ -8,5 +8,4 @@ from telemetry.story import story_set from page_sets.gpu_process_tests import GpuProcessTestsStorySet -from page_sets.gpu_rasterization_tests import GpuRasterizationTestsStorySet from page_sets.pixel_tests import PixelTestsStorySet
diff --git a/content/test/gpu/page_sets/gpu_rasterization_tests.py b/content/test/gpu/page_sets/gpu_rasterization_tests.py deleted file mode 100644 index 444a82d..0000000 --- a/content/test/gpu/page_sets/gpu_rasterization_tests.py +++ /dev/null
@@ -1,134 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -from telemetry.story import story_set as story_set_module - -from gpu_tests import gpu_test_base - -class GpuRasterizationBlueBoxPage(gpu_test_base.PageBase): - - def __init__(self, story_set, expectations): - super(GpuRasterizationBlueBoxPage, self).__init__( - url='file://../../data/gpu/pixel_background.html', - page_set=story_set, - name='GpuRasterization.BlueBox', - expectations=expectations) - - self.expectations = [ - {'comment': 'body-t', - 'color': [0, 128, 0], - 'tolerance': 0, - 'location': [5, 5], - 'size': [1, 1]}, - {'comment': 'body-r', - 'color': [0, 128, 0], - 'tolerance': 0, - 'location': [215, 5], - 'size': [1, 1]}, - {'comment': 'body-b', - 'color': [0, 128, 0], - 'tolerance': 0, - 'location': [215, 215], - 'size': [1, 1]}, - {'comment': 'body-l', - 'color': [0, 128, 0], - 'tolerance': 0, - 'location': [5, 215], - 'size': [1, 1]}, - {'comment': 'background-t', - 'color': [0, 0, 0], - 'tolerance': 0, - 'location': [30, 30], - 'size': [1, 1]}, - {'comment': 'background-r', - 'color': [0, 0, 0], - 'tolerance': 0, - 'location': [170, 30], - 'size': [1, 1]}, - {'comment': 'background-b', - 'color': [0, 0, 0], - 'tolerance': 0, - 'location': [170, 170], - 'size': [1, 1]}, - {'comment': 'background-l', - 'color': [0, 0, 0], - 'tolerance': 0, - 'location': [30, 170], - 'size': [1, 1]}, - {'comment': 'box-t', - 'color': [0, 0, 255], - 'tolerance': 0, - 'location': [70, 70], - 'size': [1, 1]}, - {'comment': 'box-r', - 'color': [0, 0, 255], - 'tolerance': 0, - 'location': [140, 70], - 'size': [1, 1]}, - {'comment': 'box-b', - 'color': [0, 0, 255], - 'tolerance': 0, - 'location': [140, 140], - 'size': [1, 1]}, - {'comment': 'box-l', - 'color': [0, 0, 255], - 'tolerance': 0, - 'location': [70, 140], - 'size': [1, 1]} - ] - self.test_rect = [0, 0, 220, 220] - - def RunNavigateSteps(self, action_runner): - super(GpuRasterizationBlueBoxPage, self).RunNavigateSteps(action_runner) - action_runner.WaitForJavaScriptCondition( - 'domAutomationController._finished', timeout_in_seconds=30) - - -class GpuRasterizationConcavePathsPage(gpu_test_base.PageBase): - - def __init__(self, story_set, expectations): - super(GpuRasterizationConcavePathsPage, self).__init__( - url='file://../../data/gpu/concave_paths.html', - page_set=story_set, - name='GpuRasterization.ConcavePaths', - expectations=expectations) - - self.expectations = [ - {'comment': 'outside', - 'color': [255, 255, 255], - 'tolerance': 0, - 'location': [80, 60], - 'size': [1, 1]}, - {'comment': 'outside', - 'color': [255, 255, 255], - 'tolerance': 0, - 'location': [28, 20], - 'size': [1, 1]}, - {'comment': 'inside', - 'color': [255, 215, 0], - 'tolerance': 0, - 'location': [32, 25], - 'size': [1, 1]}, - {'comment': 'inside', - 'color': [255, 215, 0], - 'tolerance': 0, - 'location': [80, 80], - 'size': [1, 1]} - ] - self.test_rect = [0, 0, 100, 100] - - def RunNavigateSteps(self, action_runner): - super(GpuRasterizationConcavePathsPage, self).RunNavigateSteps( - action_runner) - action_runner.WaitForJavaScriptCondition( - 'domAutomationController._finished', timeout_in_seconds=30) - -class GpuRasterizationTestsStorySet(story_set_module.StorySet): - - """ Basic test cases for GPU rasterization. """ - - def __init__(self, expectations): - super(GpuRasterizationTestsStorySet, self).__init__() - - self.AddStory(GpuRasterizationBlueBoxPage(self, expectations)) - self.AddStory(GpuRasterizationConcavePathsPage(self, expectations))
diff --git a/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm b/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm index 421e2cda..84adea1 100644 --- a/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm +++ b/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm
@@ -359,8 +359,10 @@ ToolsMenuButton* button = [[ToolsMenuButton alloc] initWithFrame:CGRectZero]; [button setTranslatesAutoresizingMaskIntoConstraints:NO]; - [button setImage:NativeReversableImage(imageIds[0][0], reverseForRTL) - forState:UIControlStateNormal]; + if (imageIds[0][0]) { + [button setImage:NativeReversableImage(imageIds[0][0], reverseForRTL) + forState:UIControlStateNormal]; + } [[button imageView] setContentMode:UIViewContentModeCenter]; [button setBackgroundColor:[self backgroundColor]]; [button setTag:commandID]; @@ -368,14 +370,20 @@ SetA11yLabelAndUiAutomationName(button, labelID, name); - UIImage* pressedImage = NativeReversableImage(imageIds[0][1], reverseForRTL); - if (pressedImage) { - [button setImage:pressedImage forState:UIControlStateHighlighted]; + if (imageIds[0][1]) { + UIImage* pressedImage = + NativeReversableImage(imageIds[0][1], reverseForRTL); + if (pressedImage) { + [button setImage:pressedImage forState:UIControlStateHighlighted]; + } } - UIImage* disabledImage = NativeReversableImage(imageIds[0][2], reverseForRTL); - if (disabledImage) { - [button setImage:disabledImage forState:UIControlStateDisabled]; + if (imageIds[0][2]) { + UIImage* disabledImage = + NativeReversableImage(imageIds[0][2], reverseForRTL); + if (disabledImage) { + [button setImage:disabledImage forState:UIControlStateDisabled]; + } } return button;
diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json index 6936f83..ba3891b 100644 --- a/testing/buildbot/chromium.gpu.fyi.json +++ b/testing/buildbot/chromium.gpu.fyi.json
@@ -169,29 +169,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=android-chromium", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "0000:0000", - "os": "Android" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=android-chromium", @@ -592,30 +569,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=android-chromium", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "device_os": "M", - "device_type": "bullhead", - "os": "Android" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=android-chromium", @@ -948,29 +901,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=android-chromium", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "0000:0000", - "os": "Android" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=android-chromium", @@ -1328,29 +1258,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=android-chromium", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "0000:0000", - "os": "Android" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=android-chromium", @@ -1677,29 +1584,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=android-chromium", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "0000:0000", - "os": "Android" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=android-chromium", @@ -2026,29 +1910,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=android-chromium", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "0000:0000", - "os": "Android" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=android-chromium", @@ -2398,29 +2259,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Linux" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -2775,29 +2613,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:0412", - "os": "Linux" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -3165,29 +2980,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:6779", - "os": "Linux" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -3581,29 +3373,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:6613", - "os": "Linux" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -3997,29 +3766,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:041a", - "os": "Linux" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -4413,29 +4159,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:0f02", - "os": "Linux" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -4889,29 +4612,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Linux" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -5331,29 +5031,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:0412", - "os": "Linux" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -5760,29 +5437,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:679e", - "os": "Mac-10.10" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -6114,29 +5768,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:0a2e", - "os": "Mac-10.10" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -6481,29 +6112,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:679e", - "os": "Mac-10.10" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -6877,29 +6485,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:0a2e", - "os": "Mac-10.10" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -7266,30 +6851,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:6821", - "hidpi": "1", - "os": "Mac" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -7653,30 +7214,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:6821", - "hidpi": "1", - "os": "Mac" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -8063,30 +7600,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:6821", - "hidpi": "1", - "os": "Mac" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -8517,34 +8030,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:0a2e", - "os": "Mac-10.10" - }, - { - "gpu": "1002:6821", - "hidpi": "1", - "os": "Mac" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -8946,30 +8431,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:0fe9", - "hidpi": "1", - "os": "Mac" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -9333,30 +8794,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:0fe9", - "hidpi": "1", - "os": "Mac" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -10439,29 +9876,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Windows-10" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -10899,29 +10313,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:0412", - "os": "Windows-10" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -11375,29 +10766,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Windows-10" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -11874,29 +11242,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:0412", - "os": "Windows-10" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -12360,29 +11705,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:6613", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -12797,29 +12119,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -13257,29 +12556,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:0412", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -13690,29 +12966,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:6779", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -14207,29 +13460,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:6613", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -14683,29 +13913,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:041a", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -15159,29 +14366,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:0f02", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -15753,29 +14937,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -16252,29 +15413,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:0412", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -16715,29 +15853,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug_x64", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug_x64", @@ -17226,29 +16341,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release_x64", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release_x64",
diff --git a/testing/buildbot/chromium.gpu.json b/testing/buildbot/chromium.gpu.json index 7bacd13..eea0792 100644 --- a/testing/buildbot/chromium.gpu.json +++ b/testing/buildbot/chromium.gpu.json
@@ -131,29 +131,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Linux" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -452,29 +429,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Linux" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -757,29 +711,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:0a2e", - "os": "Mac-10.10" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -1078,29 +1009,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "8086:0a2e", - "os": "Mac-10.10" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -1389,30 +1297,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:6821", - "hidpi": "1", - "os": "Mac" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -1724,30 +1608,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "1002:6821", - "hidpi": "1", - "os": "Mac" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release", @@ -2036,29 +1896,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=debug", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=debug", @@ -2357,29 +2194,6 @@ }, { "args": [ - "gpu_rasterization", - "--show-stdout", - "--browser=release", - "-v", - "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc" - ], - "isolate_name": "telemetry_gpu_test", - "name": "gpu_rasterization_tests", - "override_compile_targets": [ - "telemetry_gpu_test_run" - ], - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "gpu": "10de:104a", - "os": "Windows-2008ServerR2-SP1" - } - ] - } - }, - { - "args": [ "hardware_accelerated_feature", "--show-stdout", "--browser=release",
diff --git a/ui/login/account_picker/screen_account_picker.js b/ui/login/account_picker/screen_account_picker.js index 98234932..6a534ab 100644 --- a/ui/login/account_picker/screen_account_picker.js +++ b/ui/login/account_picker/screen_account_picker.js
@@ -118,6 +118,8 @@ this.showing_ = true; chrome.send('loginUIStateChanged', ['account-picker', true]); $('login-header-bar').signinUIState = SIGNIN_UI_STATE.ACCOUNT_PICKER; + // Header bar should be always visible on Account Picker screen. + Oobe.getInstance().headerHidden = false; chrome.send('hideCaptivePortal'); var podRow = $('pod-row'); podRow.handleBeforeShow();