Chromium Code Reviews| Index: tools/perf/page_sets/polymer.py |
| diff --git a/tools/perf/page_sets/polymer.py b/tools/perf/page_sets/polymer.py |
| index 9a7ff97f43fd5a620c130bfd4d440ba64565f44e..7cb36147b89c7a106289d01bf3777c84c2aea7ab 100644 |
| --- a/tools/perf/page_sets/polymer.py |
| +++ b/tools/perf/page_sets/polymer.py |
| @@ -102,15 +102,14 @@ class PolymerSampler(PolymerPage): |
| content page or not. |
| """ |
| super(PolymerSampler, self).__init__( |
| - url=('http://www.polymer-project.org/components/paper-elements/demo.html#' |
| - + anchor), |
| + url=('http://www.polymer-project.org/components/%s/demo.html' % anchor), |
| page_set=page_set) |
| self.scrolling_page = scrolling_page |
| - self.iframe_js = 'document.querySelector("sampler-scaffold").$.frame' |
| + self.iframe_js = 'document' |
|
Sami
2014/08/07 14:51:06
Are you planning to use this same code for the int
|
| def RunNavigateSteps(self, action_runner): |
| #FIXME(wiltzius) workaround for crbug.com/391672 |
| - action_runner.ExecuteJavaScript('window.location.href="about:blank";') |
| + #action_runner.ExecuteJavaScript('window.location.href="about:blank";') |
|
tonyg
2014/08/09 18:17:32
Don't we want to completely remove the above two l
|
| super(PolymerSampler, self).RunNavigateSteps(action_runner) |
| #FIXME(wiltzius) this should wait for iframe to load and all load |
| # animations to end |
| @@ -124,7 +123,7 @@ class PolymerSampler(PolymerPage): |
| self.TouchEverything(action_runner) |
| def ScrollContentPane(self, action_runner): |
| - element_function = (self.iframe_js + '.contentDocument.querySelector(' |
| + element_function = (self.iframe_js + '.querySelector(' |
| '"core-scroll-header-panel").$.mainContainer') |
| interaction = action_runner.BeginInteraction('Scroll_Page', is_smooth=True) |
| action_runner.ScrollElement(use_touch=True, |
| @@ -161,7 +160,7 @@ class PolymerSampler(PolymerPage): |
| # Find all widgets of this type, but skip any that are disabled or are |
| # currently active as they typically don't produce animation frames. |
| element_list_query = (self.iframe_js + |
| - ('.contentDocument.querySelectorAll("body %s:not([disabled]):' |
| + ('.querySelectorAll("body %s:not([disabled]):' |
| 'not([active])")' % widget_type)) |
| roles_count_query = element_list_query + '.length' |
| for i in range(action_runner.EvaluateJavaScript(roles_count_query)): |
| @@ -217,8 +216,7 @@ class PolymerPageSet(page_set_module.PageSet): |
| # Polymer Sampler subpages that are interesting to scroll |
| SCROLLABLE_PAGES = [ |
| - # crbug.com/394756 |
| - # 'core-scroll-header-panel', |
| + 'core-scroll-header-panel', |
| ] |
| for p in SCROLLABLE_PAGES: |
| self.AddPage(PolymerSampler(self, p, scrolling_page=True)) |