| Index: tools/perf/page_sets/mac_gpu_sites.py
|
| diff --git a/tools/perf/page_sets/mac_gpu_sites.py b/tools/perf/page_sets/mac_gpu_sites.py
|
| index dc36e1404a5a01ff667140da9f5534a48d605e11..c2175af9653e1f8de87ace2cab635013bf72b7df 100644
|
| --- a/tools/perf/page_sets/mac_gpu_sites.py
|
| +++ b/tools/perf/page_sets/mac_gpu_sites.py
|
| @@ -30,110 +30,149 @@ class _NoWebGLImageChromiumSharedPageState(shared_page_state.SharedPageState):
|
| ['--disable-webgl-image-chromium'])
|
|
|
|
|
| -class TrivialScrollingPage(page_module.Page):
|
| +class _BasePage(page_module.Page):
|
| + def __init__(
|
| + self, page_set, shared_page_state_class, url, name, wait_in_seconds):
|
| + super(_BasePage, self).__init__(
|
| + url=url, page_set=page_set, name=name,
|
| + shared_page_state_class=shared_page_state_class)
|
| + self._wait_in_seconds = wait_in_seconds
|
|
|
| - def __init__(self, page_set, shared_page_state_class):
|
| + def RunPageInteractions(self, action_runner):
|
| + action_runner.Wait(self._wait_in_seconds)
|
| +
|
| +
|
| +class TrivialScrollingPage(_BasePage):
|
| +
|
| + def __init__(self, page_set, shared_page_state_class, wait_in_seconds):
|
| super(TrivialScrollingPage, self).__init__(
|
| url='file://trivial_sites/trivial_scrolling_page.html',
|
| page_set=page_set,
|
| name=self.__class__.__name__ + shared_page_state_class.__name__,
|
| - shared_page_state_class=shared_page_state_class)
|
| + shared_page_state_class=shared_page_state_class,
|
| + wait_in_seconds=wait_in_seconds)
|
|
|
|
|
| -class TrivialBlinkingCursorPage(page_module.Page):
|
| +class TrivialBlinkingCursorPage(_BasePage):
|
|
|
| - def __init__(self, page_set, shared_page_state_class):
|
| + def __init__(self, page_set, shared_page_state_class, wait_in_seconds):
|
| super(TrivialBlinkingCursorPage, self).__init__(
|
| url='file://trivial_sites/trivial_blinking_cursor.html',
|
| page_set=page_set,
|
| name=self.__class__.__name__ + shared_page_state_class.__name__,
|
| - shared_page_state_class=shared_page_state_class)
|
| + shared_page_state_class=shared_page_state_class,
|
| + wait_in_seconds=wait_in_seconds)
|
|
|
|
|
| -class TrivialCanvasPage(page_module.Page):
|
| +class TrivialCanvasPage(_BasePage):
|
|
|
| - def __init__(self, page_set, shared_page_state_class):
|
| + def __init__(self, page_set, shared_page_state_class, wait_in_seconds):
|
| super(TrivialCanvasPage, self).__init__(
|
| url='file://trivial_sites/trivial_canvas.html',
|
| page_set=page_set,
|
| name=self.__class__.__name__ + shared_page_state_class.__name__,
|
| - shared_page_state_class=shared_page_state_class)
|
| + shared_page_state_class=shared_page_state_class,
|
| + wait_in_seconds=wait_in_seconds)
|
|
|
|
|
| -class TrivialWebGLPage(page_module.Page):
|
| +class TrivialWebGLPage(_BasePage):
|
|
|
| - def __init__(self, page_set, shared_page_state_class):
|
| + def __init__(self, page_set, shared_page_state_class, wait_in_seconds):
|
| super(TrivialWebGLPage, self).__init__(
|
| url='file://trivial_sites/trivial_webgl.html',
|
| page_set=page_set,
|
| name=self.__class__.__name__ + shared_page_state_class.__name__,
|
| - shared_page_state_class=shared_page_state_class)
|
| + shared_page_state_class=shared_page_state_class,
|
| + wait_in_seconds=wait_in_seconds)
|
|
|
|
|
| -class TrivialBlurAnimationPage(page_module.Page):
|
| +class TrivialBlurAnimationPage(_BasePage):
|
|
|
| - def __init__(self, page_set, shared_page_state_class):
|
| + def __init__(self, page_set, shared_page_state_class, wait_in_seconds):
|
| super(TrivialBlurAnimationPage, self).__init__(
|
| url='file://trivial_sites/trivial_blur_animation.html',
|
| page_set=page_set,
|
| name=self.__class__.__name__ + shared_page_state_class.__name__,
|
| - shared_page_state_class=shared_page_state_class)
|
| + shared_page_state_class=shared_page_state_class,
|
| + wait_in_seconds=wait_in_seconds)
|
|
|
|
|
| -class TrivialFullscreenVideoPage(page_module.Page):
|
| +class TrivialFullscreenVideoPage(_BasePage):
|
|
|
| - def __init__(self, page_set, shared_page_state_class):
|
| + def __init__(self, page_set, shared_page_state_class, wait_in_seconds):
|
| super(TrivialFullscreenVideoPage, self).__init__(
|
| url='file://trivial_sites/trivial_fullscreen_video.html',
|
| page_set=page_set,
|
| name=self.__class__.__name__ + shared_page_state_class.__name__,
|
| - shared_page_state_class=shared_page_state_class)
|
| + shared_page_state_class=shared_page_state_class,
|
| + wait_in_seconds=wait_in_seconds)
|
|
|
| def RunPageInteractions(self, action_runner):
|
| action_runner.PressKey("Return")
|
| + super(TrivialFullscreenVideoPage, self).RunPageInteractions(action_runner)
|
|
|
|
|
| -class TrivialGifPage(page_module.Page):
|
| +class TrivialGifPage(_BasePage):
|
|
|
| - def __init__(self, page_set, shared_page_state_class):
|
| + def __init__(self, page_set, shared_page_state_class, wait_in_seconds):
|
| super(TrivialGifPage, self).__init__(
|
| url='file://trivial_sites/trivial_gif.html',
|
| page_set=page_set,
|
| name=self.__class__.__name__ + shared_page_state_class.__name__,
|
| - shared_page_state_class=shared_page_state_class)
|
| + shared_page_state_class=shared_page_state_class,
|
| + wait_in_seconds=wait_in_seconds)
|
|
|
|
|
| class MacGpuTrivialPagesStorySet(story.StorySet):
|
|
|
| - def __init__(self):
|
| + def __init__(self, wait_in_seconds=0):
|
| + # Wait is time to wait_in_seconds on page in seconds.
|
| super(MacGpuTrivialPagesStorySet, self).__init__(
|
| cloud_storage_bucket=story.PUBLIC_BUCKET)
|
| - self.AddStory(TrivialScrollingPage(self, shared_page_state.SharedPageState))
|
| + self.AddStory(TrivialScrollingPage(
|
| + self, shared_page_state.SharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialBlinkingCursorPage(
|
| + self, shared_page_state.SharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialCanvasPage(
|
| + self, shared_page_state.SharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialWebGLPage(
|
| + self, shared_page_state.SharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialBlurAnimationPage(
|
| + self, shared_page_state.SharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialFullscreenVideoPage(
|
| + self, shared_page_state.SharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialGifPage(
|
| + self, shared_page_state.SharedPageState, wait_in_seconds))
|
| +
|
| + self.AddStory(TrivialScrollingPage(
|
| + self, _NoOverlaysSharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialBlinkingCursorPage(
|
| + self, _NoOverlaysSharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialCanvasPage(
|
| + self, _NoOverlaysSharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialWebGLPage(
|
| + self, _NoOverlaysSharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialBlurAnimationPage(
|
| + self, _NoOverlaysSharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialFullscreenVideoPage(
|
| + self, _NoOverlaysSharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialGifPage(
|
| + self, _NoOverlaysSharedPageState, wait_in_seconds))
|
| +
|
| + self.AddStory(TrivialScrollingPage(
|
| + self, _NoGpuSharedPageState, wait_in_seconds))
|
| self.AddStory(TrivialBlinkingCursorPage(
|
| - self, shared_page_state.SharedPageState))
|
| - self.AddStory(TrivialCanvasPage(self, shared_page_state.SharedPageState))
|
| - self.AddStory(TrivialWebGLPage(self, shared_page_state.SharedPageState))
|
| + self, _NoGpuSharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialCanvasPage(
|
| + self, _NoGpuSharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialWebGLPage(
|
| + self, _NoWebGLImageChromiumSharedPageState, wait_in_seconds))
|
| self.AddStory(TrivialBlurAnimationPage(
|
| - self, shared_page_state.SharedPageState))
|
| + self, _NoGpuSharedPageState, wait_in_seconds))
|
| self.AddStory(TrivialFullscreenVideoPage(
|
| - self, shared_page_state.SharedPageState))
|
| - self.AddStory(TrivialGifPage(self, shared_page_state.SharedPageState))
|
| -
|
| - self.AddStory(TrivialScrollingPage(self, _NoOverlaysSharedPageState))
|
| - self.AddStory(TrivialBlinkingCursorPage(self, _NoOverlaysSharedPageState))
|
| - self.AddStory(TrivialCanvasPage(self, _NoOverlaysSharedPageState))
|
| - self.AddStory(TrivialWebGLPage(self, _NoOverlaysSharedPageState))
|
| - self.AddStory(TrivialBlurAnimationPage(self, _NoOverlaysSharedPageState))
|
| - self.AddStory(TrivialFullscreenVideoPage(self, _NoOverlaysSharedPageState))
|
| - self.AddStory(TrivialGifPage(self, _NoOverlaysSharedPageState))
|
| -
|
| - self.AddStory(TrivialScrollingPage(self, _NoGpuSharedPageState))
|
| - self.AddStory(TrivialBlinkingCursorPage(self, _NoGpuSharedPageState))
|
| - self.AddStory(TrivialCanvasPage(self, _NoGpuSharedPageState))
|
| - self.AddStory(TrivialWebGLPage(self, _NoWebGLImageChromiumSharedPageState))
|
| - self.AddStory(TrivialBlurAnimationPage(self, _NoGpuSharedPageState))
|
| - self.AddStory(TrivialFullscreenVideoPage(self, _NoGpuSharedPageState))
|
| - self.AddStory(TrivialGifPage(self, _NoGpuSharedPageState))
|
| + self, _NoGpuSharedPageState, wait_in_seconds))
|
| + self.AddStory(TrivialGifPage(
|
| + self, _NoGpuSharedPageState, wait_in_seconds))
|
|
|
| @property
|
| def allow_mixed_story_states(self):
|
|
|