Index: tools/perf/page_sets/polymer.py |
diff --git a/tools/perf/page_sets/polymer.py b/tools/perf/page_sets/polymer.py |
index 45802c302c30982e89f0011856c12b69bda097f6..2ec270a9af99c7fc1b9b92bd4519246e579350d2 100644 |
--- a/tools/perf/page_sets/polymer.py |
+++ b/tools/perf/page_sets/polymer.py |
@@ -80,7 +80,9 @@ class PolymerShadowPage(PolymerPage): |
"document.getElementById('fab').scrollIntoView()") |
action_runner.Wait(5) |
self.AnimateShadow(action_runner, 'card') |
- self.AnimateShadow(action_runner, 'fab') |
+ #FIXME(wiltzius) disabling until this issue is fixed: |
+ # https://github.com/Polymer/paper-shadow/issues/12 |
+ #self.AnimateShadow(action_runner, 'fab') |
def AnimateShadow(self, action_runner, eid): |
for i in range(1, 6): |
@@ -102,15 +104,12 @@ 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' |
def RunNavigateSteps(self, action_runner): |
- #FIXME(wiltzius) workaround for crbug.com/391672 |
- action_runner.ExecuteJavaScript('window.location.href="about:blank";') |
super(PolymerSampler, self).RunNavigateSteps(action_runner) |
waitForLoadJS = """ |
window.Polymer.whenPolymerReady(function() { |
@@ -131,7 +130,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, |
@@ -168,7 +167,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)): |
@@ -215,7 +214,9 @@ class PolymerPageSet(page_set_module.PageSet): |
'paper-icon-button', |
# crbug.com/394756 |
# 'paper-radio-button', |
- 'paper-shadow', |
+ #FIXME(wiltzius) Disabling x-shadow until this issue is fixed: |
+ # https://github.com/Polymer/paper-shadow/issues/12 |
+ #'paper-shadow', |
'paper-tabs', |
'paper-toggle-button', |
] |
@@ -224,8 +225,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)) |