| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from page_sets import repeatable_synthesize_scroll_gesture_shared_state | 5 from page_sets import repeatable_synthesize_scroll_gesture_shared_state |
| 6 | 6 |
| 7 from telemetry.page import page as page_module | 7 from telemetry.page import page as page_module |
| 8 from telemetry import story | 8 from telemetry import story |
| 9 | 9 |
| 10 | 10 |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 super(ToughAdCasesPageSet, self).__init__( | 172 super(ToughAdCasesPageSet, self).__init__( |
| 173 archive_data_file='data/tough_ad_cases.json', | 173 archive_data_file='data/tough_ad_cases.json', |
| 174 cloud_storage_bucket=story.INTERNAL_BUCKET) | 174 cloud_storage_bucket=story.INTERNAL_BUCKET) |
| 175 | 175 |
| 176 self.AddStory(AdPage('file://tough_ad_cases/' | 176 self.AddStory(AdPage('file://tough_ad_cases/' |
| 177 'swiffy_collection.html', self, make_javascript_deterministic=False, | 177 'swiffy_collection.html', self, make_javascript_deterministic=False, |
| 178 y_scroll_distance_multiplier=0.25, scroll=scroll)) | 178 y_scroll_distance_multiplier=0.25, scroll=scroll)) |
| 179 self.AddStory(AdPage('file://tough_ad_cases/' | 179 self.AddStory(AdPage('file://tough_ad_cases/' |
| 180 'swiffy_webgl_collection.html', | 180 'swiffy_webgl_collection.html', |
| 181 self, make_javascript_deterministic=False, scroll=scroll)) | 181 self, make_javascript_deterministic=False, scroll=scroll)) |
| 182 self.AddStory(AdPage('http://www.latimes.com', self, scroll=scroll, | 182 # crbug.com/618708 |
| 183 wait_for_interactive_or_better=True)) | 183 # self.AddStory(AdPage('http://www.latimes.com', self, scroll=scroll, |
| 184 # wait_for_interactive_or_better=True)) |
| 184 self.AddStory(ForbesAdPage('http://www.forbes.com/sites/parmyolson/' | 185 self.AddStory(ForbesAdPage('http://www.forbes.com/sites/parmyolson/' |
| 185 '2015/07/29/jana-mobile-data-facebook-internet-org/', | 186 '2015/07/29/jana-mobile-data-facebook-internet-org/', |
| 186 self, scroll=scroll)) | 187 self, scroll=scroll)) |
| 187 self.AddStory(AdPage('http://androidcentral.com', self, scroll=scroll, | 188 self.AddStory(AdPage('http://androidcentral.com', self, scroll=scroll, |
| 188 wait_for_interactive_or_better=True)) | 189 wait_for_interactive_or_better=True)) |
| 189 self.AddStory(AdPage('http://mashable.com', self, scroll=scroll, | 190 self.AddStory(AdPage('http://mashable.com', self, scroll=scroll, |
| 190 y_scroll_distance_multiplier=0.25)) | 191 y_scroll_distance_multiplier=0.25)) |
| 191 self.AddStory(AdPage('http://www.androidauthority.com/' | 192 self.AddStory(AdPage('http://www.androidauthority.com/' |
| 192 'reduce-data-use-turn-on-data-compression-in-chrome-630064/', self, | 193 'reduce-data-use-turn-on-data-compression-in-chrome-630064/', self, |
| 193 scroll=scroll)) | 194 scroll=scroll)) |
| (...skipping 10 matching lines...) Expand all Loading... |
| 204 self.AddStory(AdPage('http://androidpolice.com', self, scroll=scroll, | 205 self.AddStory(AdPage('http://androidpolice.com', self, scroll=scroll, |
| 205 wait_for_interactive_or_better=True)) | 206 wait_for_interactive_or_better=True)) |
| 206 | 207 |
| 207 | 208 |
| 208 class ScrollingToughAdCasesPageSet(ToughAdCasesPageSet): | 209 class ScrollingToughAdCasesPageSet(ToughAdCasesPageSet): |
| 209 """Pages for measuring scrolling performance with advertising content.""" | 210 """Pages for measuring scrolling performance with advertising content.""" |
| 210 | 211 |
| 211 def __init__(self): | 212 def __init__(self): |
| 212 super(ScrollingToughAdCasesPageSet, self).__init__( | 213 super(ScrollingToughAdCasesPageSet, self).__init__( |
| 213 scroll=True) | 214 scroll=True) |
| OLD | NEW |