Skip to content

GitLab

T
tangled
Commit c836bb35 authored by epenner's avatar epenner Committed by Commit bot
Browse files
Options

Revert of Clean up perftesthelper.js style (patchset #2 id:20001 of... 

Revert of Clean up perftesthelper.js style (patchset #2 id:20001 of https://codereview.chromium.org/927583005/)

Reason for revert:
Tough animation cases are failing due to a few missed files in the refactor.

Original issue's description:
> Clean up perftesthelper.js style
>
> This change makes tools/perf/page_sets/tough_animation_cases/resources/perftesthelper.js
> consistent with the Chromium Javascript style guide:
>  - Fixed indentation
>  - Added missing semicolon
>  - Renamed file to be underscore separated
>
> Committed: https://crrev.com/30a1e4bc96550502e8607ac0f0a246eb42a61852
> Cr-Commit-Position: refs/heads/master@{#316965}

TBR=qyearsley@chromium.org,alancutter@google.com,alancutter@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/941773002

Cr-Commit-Position: refs/heads/master@{#317092}
parent c00e53cb
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 43 deletions
tools/perf/page_sets/tough_animation_cases/balls_css_keyframe_animations.html
View file @ c836bb35
......@@ -55,7 +55,7 @@ span {
border-radius: 6px;
}
</style>
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script>
var measurementReady = false;
var stageWidth = 600;
......
tools/perf/page_sets/tough_animation_cases/balls_css_keyframe_animations_composited_transform.html
View file @ c836bb35
......@@ -55,7 +55,7 @@ span {
border-radius: 6px;
}
</style>
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script>
var measurementReady = false;
var stageWidth = 600;
......
tools/perf/page_sets/tough_animation_cases/balls_css_transition_2_properties.html
View file @ c836bb35
......@@ -55,7 +55,7 @@ span {
border-radius: 6px;
}
</style>
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script>
var measurementReady = false;
var stageWidth = 600;
......
tools/perf/page_sets/tough_animation_cases/balls_css_transition_40_properties.html
View file @ c836bb35
......@@ -55,7 +55,7 @@ span {
border-radius: 6px;
}
</style>
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script>
var measurementReady = false;
var stageWidth = 600;
......
tools/perf/page_sets/tough_animation_cases/balls_css_transition_all_properties.html
View file @ c836bb35
......@@ -55,7 +55,7 @@ span {
border-radius: 6px;
}
</style>
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script>
var measurementReady = false;
var stageWidth = 600;
......
tools/perf/page_sets/tough_animation_cases/balls_javascript_canvas.html
View file @ c836bb35
......@@ -55,7 +55,7 @@ span {
border-radius: 6px;
}
</style>
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script>
var measurementReady = false;
var stageWidth = 600;
......
tools/perf/page_sets/tough_animation_cases/balls_javascript_css.html
View file @ c836bb35
......@@ -55,7 +55,7 @@ span {
border-radius: 6px;
}
</style>
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script>
var measurementReady = false;
var stageWidth = 600;
......
tools/perf/page_sets/tough_animation_cases/balls_svg_animations.html
View file @ c836bb35
......@@ -55,7 +55,7 @@ span {
border-radius: 6px;
}
</style>
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script>
var measurementReady = false;
var stageWidth = 600;
......
tools/perf/page_sets/tough_animation_cases/css_animations_many_keyframes.html
View file @ c836bb35
<!DOCTYPE html>
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<style>
target {
position: absolute;
......
tools/perf/page_sets/tough_animation_cases/css_animations_simultaneous_by_inserting_new_element.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/animation.css">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_animations_simultaneous_by_inserting_style_element.html
View file @ c836bb35
<!DOCTYPE html>
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_animations_simultaneous_by_updating_class.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/animation.css">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_animations_simultaneous_by_updating_inline_style.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/animation.css">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_animations_staggered_chaining_by_inserting_new_element.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/animation.css">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_animations_staggered_chaining_by_inserting_style_element.html
View file @ c836bb35
<!DOCTYPE html>
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_animations_staggered_chaining_by_updating_class.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/animation.css">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_animations_staggered_chaining_by_updating_inline_style.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/animation.css">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_animations_staggered_infinite_iterations.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/animation.css">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<style>
target {
-webkit-animation-iteration-count: infinite;
......
tools/perf/page_sets/tough_animation_cases/css_animations_staggered_triggering_by_inserting_new_element.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/animation.css">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_animations_staggered_triggering_by_inserting_style_element.html
View file @ c836bb35
<!DOCTYPE html>
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<style>
target {
-webkit-animation: 1000ms linear;
......
tools/perf/page_sets/tough_animation_cases/css_animations_staggered_triggering_by_updating_class.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/animation.css">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_animations_staggered_triggering_by_updating_inline_style.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/animation.css">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_transitions_simultaneous_by_inserting_new_element.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<link rel="stylesheet" type="text/css" href="resources/transition.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<style>
target {
opacity: 0;
......
tools/perf/page_sets/tough_animation_cases/css_transitions_simultaneous_by_inserting_style_element.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<link rel="stylesheet" type="text/css" href="resources/transition.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_transitions_simultaneous_by_updating_class.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<link rel="stylesheet" type="text/css" href="resources/transition.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<style>
.keyframe0 {
opacity: 0;
......
tools/perf/page_sets/tough_animation_cases/css_transitions_simultaneous_by_updating_inline_style.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<link rel="stylesheet" type="text/css" href="resources/transition.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_transitions_staggered_chaining_by_inserting_new_element.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<link rel="stylesheet" type="text/css" href="resources/transition.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<style>
keyframe0 + target {
opacity: 0;
......
tools/perf/page_sets/tough_animation_cases/css_transitions_staggered_chaining_by_inserting_style_element.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<link rel="stylesheet" type="text/css" href="resources/transition.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<style>
target {
opacity: 0;
......
tools/perf/page_sets/tough_animation_cases/css_transitions_staggered_chaining_by_updating_class.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<link rel="stylesheet" type="text/css" href="resources/transition.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<style>
target {
opacity: 0;
......
tools/perf/page_sets/tough_animation_cases/css_transitions_staggered_chaining_by_updating_inline_style.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<link rel="stylesheet" type="text/css" href="resources/transition.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<style>
target {
opacity: 0;
......
tools/perf/page_sets/tough_animation_cases/css_transitions_staggered_triggering_by_inserting_new_element.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<link rel="stylesheet" type="text/css" href="resources/transition.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<style>
show + target {
opacity: 1;
......
tools/perf/page_sets/tough_animation_cases/css_transitions_staggered_triggering_by_inserting_style_element.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<link rel="stylesheet" type="text/css" href="resources/transition.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_transitions_staggered_triggering_by_updating_class.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<link rel="stylesheet" type="text/css" href="resources/transition.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<style>
.keyframe0 {
opacity: 0;
......
tools/perf/page_sets/tough_animation_cases/css_transitions_staggered_triggering_by_updating_inline_style.html
View file @ c836bb35
......@@ -2,7 +2,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<link rel="stylesheet" type="text/css" href="resources/transition.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_value_type_color.html
View file @ c836bb35
<!DOCTYPE html>
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script src="resources/css_value_type.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_value_type_filter.html
View file @ c836bb35
<!DOCTYPE html>
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script src="resources/css_value_type.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_value_type_length_3d.html
View file @ c836bb35
......@@ -6,7 +6,7 @@ target {
transform: rotate3d(3, 2, 1, 45deg);
}
</style>
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script src="resources/css_value_type.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_value_type_length_complex.html
View file @ c836bb35
......@@ -6,7 +6,7 @@ target {
position: relative;
}
</style>
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script src="resources/css_value_type.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_value_type_length_simple.html
View file @ c836bb35
......@@ -6,7 +6,7 @@ target {
position: relative;
}
</style>
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script src="resources/css_value_type.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_value_type_shadow.html
View file @ c836bb35
<!DOCTYPE html>
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script src="resources/css_value_type.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_value_type_transform_complex.html
View file @ c836bb35
<!DOCTYPE html>
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script src="resources/css_value_type.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/css_value_type_transform_simple.html
View file @ c836bb35
<!DOCTYPE html>
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" type="text/css" href="resources/tablet.css">
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script src="resources/css_value_type.js"></script>
<container id="container"></container>
......
tools/perf/page_sets/tough_animation_cases/overlay_background_color_css_transitions.html
View file @ c836bb35
......@@ -57,7 +57,7 @@ body {
-webkit-transition: background-color 1s linear;
}
</style>
<script src="resources/perf_test_helper.js"></script>
<script src="resources/perftesthelper.js"></script>
<script>
window.measurementReady = false;
var maxOverlays = 500;
......
tools/perf/page_sets/tough_animation_cases/resources/perf_test_helper.js → tools/perf/page_sets/tough_animation_cases/resources/perftesthelper.js
View file @ c836bb35
// 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.
(function() {
(function(){
'use strict';
if (window.PerfTestHelper) {
......@@ -10,52 +10,51 @@ if (window.PerfTestHelper) {
window.PerfTestHelper = {};
var randomSeed = 3384413;
var mask = 0xffffffff;
window.PerfTestHelper.random = function() {
var temp = randomSeed;
// Robert Jenkins' 32 bit integer hash function.
temp = ((temp + 0x7ed55d16) + (temp << 12)) & mask;
temp = ((temp ^ 0xc761c23c) ^ (temp >>> 19)) & mask;
temp = ((temp + 0x165667b1) + (temp << 5)) & mask;
temp = ((temp + 0xd3a2646c) ^ (temp << 9)) & mask;
temp = ((temp + 0xfd7046c5) + (temp << 3)) & mask;
temp = ((temp ^ 0xb55a4f09) ^ (temp >>> 16)) & mask;
randomSeed = temp;
return (randomSeed & 0xfffffff) / 0x10000000;
var temp = randomSeed;
// Robert Jenkins' 32 bit integer hash function.
temp = ((temp + 0x7ed55d16) + (temp << 12)) & 0xffffffff;
temp = ((temp ^ 0xc761c23c) ^ (temp >>> 19)) & 0xffffffff;
temp = ((temp + 0x165667b1) + (temp << 5)) & 0xffffffff;
temp = ((temp + 0xd3a2646c) ^ (temp << 9)) & 0xffffffff;
temp = ((temp + 0xfd7046c5) + (temp << 3)) & 0xffffffff;
temp = ((temp ^ 0xb55a4f09) ^ (temp >>> 16)) & 0xffffffff;
randomSeed = temp;
return (randomSeed & 0xfffffff) / 0x10000000;
};
window.PerfTestHelper.getParameter = function(parameter) {
var match = new RegExp(parameter + '=([^&]*)').exec(window.location.search);
if (match) {
return match[1];
}
return null;
};
var match = new RegExp(parameter + '=([^&]*)').exec(window.location.search);
if (match) {
return match[1];
}
return null;
}
window.PerfTestHelper.getN = function(defaultN) {
var match = PerfTestHelper.getParameter('N');
if (match) {
var n = Number(match);
if (isNaN(n)) {
throw 'Invalid N value: ' + match;
var match = PerfTestHelper.getParameter('N');
if (match) {
var n = Number(match);
if (isNaN(n)) {
throw 'Invalid N value: ' + match;
}
return n;
}
if (typeof defaultN === 'undefined') {
throw 'Default N value required';
}
return n;
}
if (typeof defaultN === 'undefined') {
throw 'Default N value required';
}
return defaultN;
return defaultN;
};
window.PerfTestHelper.signalReady = function() {
requestAnimationFrame(function() {
// FIXME: We must wait at least two frames before
// measuring to allow the GC to clean up the
// previous test.
requestAnimationFrame(function() {
window.measurementReady = true;
// FIXME: We must wait at least two frames before
// measuring to allow the GC to clean up the
// previous test.
requestAnimationFrame(function() {
window.measurementReady = true;
});
});
});
};
})();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment