Enable GPU rasterization for more telemetry tests.

tools/perf/benchmarks/smoothness.py

 # Copyright 2013 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 core import perf_benchmark
 
 from benchmarks import silk_flags
 from measurements import smoothness
 import page_sets
 import page_sets.key_silk_cases
@@ skipping 135 matching lines @@
   def CreateStorySet(self, options):
     stories = super(SmoothnessKeySilkCases, self).CreateStorySet(options)
     # Page26 (befamous) is too noisy to be useful; crbug.com/461127
     to_remove = [story for story in stories
                  if isinstance(story, page_sets.key_silk_cases.Page26)]
     for story in to_remove:
       stories.RemoveStory(story)
     return stories
 
 
-@benchmark.Enabled('android')
+@benchmark.Enabled('android', "mac")
 class SmoothnessGpuRasterizationTop25(_Smoothness):
   """Measures rendering statistics for the top 25 with GPU rasterization.
   """
   tag = 'gpu_rasterization'
   page_set = page_sets.Top25SmoothPageSet
 
   def SetExtraBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
   @classmethod
@@ skipping 86 matching lines @@
     # orthogonal to fling performance, and its activation is only more noise.
     options.AppendExtraBrowserArgs('--disable-overscroll-edge-effect')
 
   @classmethod
   def Name(cls):
     return 'smoothness.fling.simple_mobile_sites'
 
 
 @benchmark.Enabled('android', 'chromeos', 'mac')
 class SmoothnessToughPinchZoomCases(_Smoothness):
-  """Measures rendering statistics for pinch-zooming into the tough pinch zoom
+  """Measures rendering statistics for pinch-zooming in the tough pinch zoom
   cases.
   """
   page_set = page_sets.ToughPinchZoomCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.tough_pinch_zoom_cases'
 
 
+@benchmark.Enabled('android', 'chromeos', 'mac')
+class SmoothnessGpuRasterizationToughPinchZoomCases(_Smoothness):
+  """Measures rendering statistics for pinch-zooming in the tough pinch zoom
+  cases with GPU rasterization.
+  """
+  tag = 'gpu_rasterization'
+  test = smoothness.Smoothness
+  page_set = page_sets.ToughPinchZoomCasesPageSet
+
+  def SetExtraBrowserOptions(self, options):
+    silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
+
+  @classmethod
+  def Name(cls):
+    return 'smoothness.gpu_rasterization.tough_pinch_zoom_cases'
+
+
 @benchmark.Enabled('android', 'chromeos')
 class SmoothnessToughScrollingWhileZoomedInCases(_Smoothness):
   """Measures rendering statistics for pinch-zooming then diagonal scrolling"""
   page_set = page_sets.ToughScrollingWhileZoomedInCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.tough_scrolling_while_zoomed_in_cases'
 
 
@@ skipping 23 matching lines @@
     return 'smoothness.gpu_rasterization.polymer'
 
 
 class SmoothnessToughScrollingCases(_Smoothness):
   page_set = page_sets.ToughScrollingCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.tough_scrolling_cases'
 
+
+@benchmark.Enabled('android', "mac")
+class SmoothnessGpuRasterizationToughScrollingCases(_Smoothness):
+  tag = 'gpu_rasterization'
+  test = smoothness.Smoothness
+  page_set = page_sets.ToughScrollingCasesPageSet
+
+  def SetExtraBrowserOptions(self, options):
+    silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
+
+  @classmethod
+  def Name(cls):
+    return 'smoothness.gpu_rasterization.tough_scrolling_cases'
+
 @benchmark.Disabled('android')  # http://crbug.com/531593
 class SmoothnessToughImageDecodeCases(_Smoothness):
   page_set = page_sets.ToughImageDecodeCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.tough_image_decode_cases'
 
 @benchmark.Disabled('android')  # http://crbug.com/513699
 class SmoothnessImageDecodingCases(_Smoothness):
@@ skipping 94 matching lines @@
 
 
 @benchmark.Disabled('reference')  # http://crbug.com/496684
 class SmoothnessToughWebGLAdCases(_Smoothness):
   """Measures rendering statistics while scrolling advertisements."""
   page_set = page_sets.ToughWebglAdCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.tough_webgl_ad_cases'