Skip to content

Commit 27f9a75

Browse files
smfrsmfr
committed
Migrate MotionMark 1.1 from its own directory to the common MotionMark directory.
1 parent c96e17f commit 27f9a75

File tree

190 files changed

+1743
-12522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+1743
-12522
lines changed

‎MotionMark/about.html

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
<!--
2+
Copyright (C) 2015-2018 Apple Inc. All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions
6+
are met:
7+
1. Redistributions of source code must retain the above copyright
8+
notice, this list of conditions and the following disclaimer.
9+
2. Redistributions in binary form must reproduce the above copyright
10+
notice, this list of conditions and the following disclaimer in the
11+
documentation and/or other materials provided with the distribution.
12+
13+
THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17+
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23+
THE POSSIBILITY OF SUCH DAMAGE.
24+
-->
125
<!DOCTYPE html>
226
<html>
327
<head>
@@ -6,15 +30,17 @@
630

731
<title>About MotionMark</title>
832

9-
<link rel="stylesheet" href="resources/runner/animometer.css">
33+
<link rel="stylesheet" href="resources/runner/motionmark.css">
34+
35+
<script src="resources/strings.js"></script>
1036
</head>
1137
<body class="images-loaded">
1238
<main>
1339
<section id="about" class="selected">
14-
<svg class="logo"><use xlink:href="resources/runner/logo.svg#root"></svg>
40+
<div class="logo"><svg><use xlink:href="resources/runner/logo.svg#root" /></svg></div>
1541

1642
<div class="body">
17-
<h1>About MotionMark</h1>
43+
<h1>About MotionMark <span class="version"></span></h1>
1844

1945
<p>MotionMark is a web benchmark that focuses on graphics performance. It draws multiple rendering elements, each of which uses the same set of graphics primitives. An element could be an SVG node, an HTML element with CSS style, or a series of canvas operations. Slight variations among the elements avoid trivial caching optimizations by the browser. Although fairly simple, the effects were chosen to reflect techniques commonly used on the web. Tests are visually rich, being designed to stress the graphics system rather than JavaScript.</p>
2046

@@ -48,5 +74,10 @@ <h1>About MotionMark</h1>
4874
</div>
4975
</section>
5076
</main>
77+
78+
<script>
79+
document.title = "About MotionMark " + Strings.version;
80+
document.querySelector(".version").textContent = Strings.version;
81+
</script>
5182
</body>
5283
</html>

‎MotionMark/developer.html

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,46 @@
1+
<!--
2+
Copyright (C) 2015-2018 Apple Inc. All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions
6+
are met:
7+
1. Redistributions of source code must retain the above copyright
8+
notice, this list of conditions and the following disclaimer.
9+
2. Redistributions in binary form must reproduce the above copyright
10+
notice, this list of conditions and the following disclaimer in the
11+
documentation and/or other materials provided with the distribution.
12+
13+
THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17+
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23+
THE POSSIBILITY OF SUCH DAMAGE.
24+
-->
125
<!DOCTYPE html>
226
<html>
327
<head>
428
<meta charset="utf-8">
529
<meta name="viewport" content="width=device-width, user-scalable=no">
630

7-
<title>MotionMark 1.0 - developer</title>
31+
<title>MotionMark developer</title>
832

9-
<link rel="stylesheet" href="resources/runner/animometer.css">
10-
<link rel="stylesheet" href="resources/debug-runner/animometer.css">
33+
<link rel="stylesheet" href="resources/runner/motionmark.css">
34+
<link rel="stylesheet" href="resources/debug-runner/motionmark.css">
1135

1236
<script src="resources/strings.js"></script>
1337
<script src="resources/extensions.js"></script>
1438
<script src="resources/statistics.js"></script>
1539

1640
<script src="resources/runner/tests.js" charset="utf-8"></script>
1741
<script src="resources/debug-runner/tests.js" charset="utf-8"></script>
18-
<script src="resources/runner/animometer.js"></script>
19-
<script src="resources/debug-runner/animometer.js" charset="utf-8"></script>
42+
<script src="resources/runner/motionmark.js"></script>
43+
<script src="resources/debug-runner/motionmark.js" charset="utf-8"></script>
2044

2145
<script src="resources/runner/benchmark-runner.js"></script>
2246
<script src="resources/debug-runner/d3.min.js"></script>
@@ -25,7 +49,10 @@
2549
<body class="showing-intro">
2650
<main>
2751
<section id="intro" class="selected">
28-
<h1>MotionMark</h1>
52+
<header>
53+
<h1>MotionMark</h1>
54+
<h2>version <span class="version"></span></h2>
55+
</header>
2956
<div class="body">
3057
<div>
3158
<div id="suites">
@@ -57,11 +84,9 @@ <h3>Tiles:</h3>
5784
<li>
5885
<h3>Adjusting the test complexity:</h3>
5986
<ul>
87+
<li><label><input name="controller" type="radio" value="ramp" checked> Ramp</label></li>
6088
<li><label><input name="controller" type="radio" value="fixed"> Keep at a fixed complexity</label></li>
61-
<li><label><input name="controller" type="radio" value="step"> Keep at a fixed complexity, then make a big step</label></li>
6289
<li><label><input name="controller" type="radio" value="adaptive"> Maintain target FPS</label></li>
63-
<li><label><input name="controller" type="radio" value="ramp" checked> Ramp</label></li>
64-
<li><label><input name="controller" type="radio" value="ramp30"> Ramp @ 30fps</label></li>
6590
</ul>
6691
</li>
6792
<li>
@@ -109,6 +134,7 @@ <h1>MotionMark score</h1>
109134
<span class="medium">on a medium screen (laptop, tablet)</span>
110135
<span class="large">on a large screen (desktop)</span>
111136
</div>
137+
<div>version <span class="version"></span></div>
112138
<p class="score" onclick="benchmarkController.showDebugInfo()"></p>
113139
<p class="confidence"></p>
114140
<div id="results-tables" class="table-container">
@@ -157,13 +183,11 @@ <h1>Graph:</h1>
157183
<form name="complexity-graph-options">
158184
<ul class="series">
159185
<li><label><input type="checkbox" name="series-raw" checked> Series raw</label></li>
160-
<li><label><input type="checkbox" name="series-average"> Series average</label></li>
161186
</ul>
162187
<ul>
163188
<li><label><input type="checkbox" name="regression-time-score"> Controller score</label></li>
164189
<li><label><input type="checkbox" name="bootstrap-score" checked> Bootstrap score and histogram</label></li>
165190
<li><label><input type="checkbox" name="complexity-regression-aggregate-raw" checked> Regression, series raw</label><span id="complexity-regression-aggregate-raw"></span></li>
166-
<li><label><input type="checkbox" name="complexity-regression-aggregate-average"> Regression, series average</label><span id="complexity-regression-aggregate-average"></span></li>
167191
</ul>
168192
</form>
169193
</nav>

‎MotionMark/index.html

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,43 @@
1+
<!--
2+
Copyright (C) 2015-2018 Apple Inc. All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions
6+
are met:
7+
1. Redistributions of source code must retain the above copyright
8+
notice, this list of conditions and the following disclaimer.
9+
2. Redistributions in binary form must reproduce the above copyright
10+
notice, this list of conditions and the following disclaimer in the
11+
documentation and/or other materials provided with the distribution.
12+
13+
THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17+
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23+
THE POSSIBILITY OF SUCH DAMAGE.
24+
-->
125
<!DOCTYPE html>
226
<html>
327
<head>
428
<meta charset="utf-8">
529
<meta name="viewport" content="width=device-width, user-scalable=no">
630

7-
<title>MotionMark 1.0</title>
31+
<title>MotionMark</title>
832

9-
<link rel="stylesheet" href="resources/runner/animometer.css">
33+
<link rel="stylesheet" href="resources/runner/motionmark.css">
1034

1135
<script src="resources/strings.js" defer></script>
1236
<script src="resources/extensions.js" defer></script>
1337
<script src="resources/statistics.js" defer></script>
1438

1539
<script src="resources/runner/tests.js" charset="utf-8" defer></script>
16-
<script src="resources/runner/animometer.js" defer></script>
40+
<script src="resources/runner/motionmark.js" defer></script>
1741

1842
<script src="resources/runner/benchmark-runner.js" defer></script>
1943

@@ -27,7 +51,10 @@
2751
<body class="showing-intro">
2852
<main>
2953
<section id="intro" class="selected">
30-
<svg class="logo"><use xlink:href="resources/runner/logo.svg#root"></svg>
54+
<div class="logo">
55+
<svg><use xlink:href="resources/runner/logo.svg#root" /></svg>
56+
<div>version <span class="version"></span></div>
57+
</div>
3158
<div class="body">
3259
<p>MotionMark is a graphics benchmark that measures a browser’s capability to animate complex scenes at a target frame rate.</p>
3360

@@ -41,7 +68,10 @@
4168
<section id="test-container" class="frame-container"></section>
4269

4370
<section id="results">
44-
<svg class="logo"><use xlink:href="resources/runner/logo.svg#root"></svg>
71+
<div class="logo">
72+
<svg><use xlink:href="resources/runner/logo.svg#root" /></svg>
73+
<div>version <span class="version"></span></div>
74+
</div>
4575
<div class="body">
4676
<div class="score-container">
4777
<div class="score"></div>

0 commit comments

Comments
 (0)