Added second Google search expansion case to key_silk_pages

tools/perf/page_sets/key_silk_cases.py

 # 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.page import page as page_module
 from telemetry.page import page_set as page_set_module
 
 
 class KeySilkCasesPage(page_module.Page):
 
   def __init__(self, url, page_set):
@@ skipping 388 matching lines @@
       page_set=page_set)
 
   def RunSmoothness(self, action_runner):
     interaction = action_runner.BeginGestureInteraction(
         'ScrollAction', is_smooth=True)
     action_runner.ScrollElement(
         selector='#container', speed_in_pixels_per_second=5000)
     interaction.End()
 
 
-class Page21(KeySilkCasesPage):
+class GwsExpansionPage(KeySilkCasesPage):
+  """Abstract base class for pages that expand Google knowledge panels."""
 
-  def __init__(self, page_set):
-    super(Page21, self).__init__(
-      url='http://www.google.com/#q=google',
-      page_set=page_set)
-
-  def ScrollKnowledgeCardToTop(self, action_runner):
-    # scroll until the knowledge card is at the top
-    action_runner.ScrollPage(
-      distance_expr='''
-          (function() {
-            var el = document.getElementById('kno-result');
-            var bound = el.getBoundingClientRect();
-            return bound.top - document.body.scrollTop;
-          })()''')
+  def NavigateWait(self, action_runner):

[Sami, 2014/08/12 11:38:52]

µ-nit: NavigateAndWait?

+    action_runner.NavigateToPage(self)
+    action_runner.Wait(3)
 
   def ExpandKnowledgeCard(self, action_runner):
     # expand card
     interaction = action_runner.BeginInteraction(
         'Action_TapAction', is_smooth=True)
     action_runner.TapElement(
         element_function='document.getElementsByClassName("vk_arc")[0]')
     action_runner.Wait(2)
     interaction.End()
 
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(3)
-    self.ScrollKnowledgeCardToTop(action_runner)
+  def ScrollKnowledgeCardToTop(self, action_runner, card_id):
+    # scroll until the knowledge card is at the top
+    action_runner.ExecuteJavaScript(
+        "document.getElementById('%s').scrollIntoView()" % card_id)

[Sami, 2014/08/12 11:38:52]

Do we need to pass in true here to make sure the element is scrolled all the way
to the top?

 
   def RunSmoothness(self, action_runner):
     self.ExpandKnowledgeCard(action_runner)
 
 
+class GwsGoogleExpansion(GwsExpansionPage):
+
+  """ Why: Animating height of a complex content card is common. """
+
+  def __init__(self, page_set):
+    super(GwsGoogleExpansion, self).__init__(
+      url='http://www.google.com/#q=google',
+      page_set=page_set)
+
+  def RunNavigateSteps(self, action_runner):
+    self.NavigateWait(action_runner)
+    self.ScrollKnowledgeCardToTop(action_runner, 'kno-result')
+
+
+class GwsBoogieExpansion(GwsExpansionPage):
+
+  """ Why: Same case as Google expansion but text-heavy rather than image. """
+
+  def __init__(self, page_set):
+    super(GwsBoogieExpansion, self).__init__(
+      url='https://www.google.com/search?hl=en&q=define%3Aboogie',
+      page_set=page_set)
+
+  def RunNavigateSteps(self, action_runner):
+    self.NavigateWait(action_runner)
+    self.ScrollKnowledgeCardToTop(action_runner, 'rso')
+
+
 class Page22(KeySilkCasesPage):
 
   def __init__(self, page_set):
     super(Page22, self).__init__(
       url='http://plus.google.com/app/basic/stream',
       page_set=page_set)
 
     self.disabled = 'Times out on Windows; crbug.com/338838'
     self.credentials = 'google'
 
@@ skipping 185 matching lines @@
     self.AddPage(Page11(self))
     self.AddPage(Page12(self))
     self.AddPage(Page13(self))
     self.AddPage(Page14(self))
     self.AddPage(Page15(self))
     self.AddPage(Page16(self))
     self.AddPage(Page17(self))
     self.AddPage(Page18(self))
     self.AddPage(Page19(self))
     self.AddPage(Page20(self))
-    self.AddPage(Page21(self))
+    self.AddPage(GwsGoogleExpansion(self))
+    self.AddPage(GwsBoogieExpansion(self))
     self.AddPage(Page22(self))
     self.AddPage(Page23(self))
     self.AddPage(Page24(self))
     self.AddPage(Page25(self))
     self.AddPage(Page26(self))
     self.AddPage(SVGIconRaster(self))
     self.AddPage(UpdateHistoryState(self))