Skip to content

Commit 6f38f7a

Browse files
committed
Expand the grid size of the Multiply test automatically when needed
WebKit#52 Enlarge the grid size and reduce the tile size when a larger complexity is needed to lower the frame rate. Refactor the spiral iterator into a separate class. Keep calling its next() method to move to the next cell. When its isDon() returns true enlarge the iterator grid size and resize the already created tiles to fit in the new grid size. Add a new class for the roundedRect tile called "Tile". This class can handle the location, size and animation of the Tile. Add a unit test for the spiral iterator.
1 parent f1c7edb commit 6f38f7a

File tree

6 files changed

+1308
-92
lines changed

6 files changed

+1308
-92
lines changed

MotionMark/resources/extensions.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,18 +265,41 @@ Point = Utilities.createClass(
265265
return this.x;
266266
},
267267

268+
// Used when the point object is used as a size object.
269+
set width(w)
270+
{
271+
this.x = w;
272+
},
273+
268274
// Used when the point object is used as a size object.
269275
get height()
270276
{
271277
return this.y;
272278
},
273279

280+
// Used when the point object is used as a size object.
281+
set height(h)
282+
{
283+
this.y = h;
284+
},
285+
274286
// Used when the point object is used as a size object.
275287
get center()
276288
{
277289
return new Point(this.x / 2, this.y / 2);
278290
},
279291

292+
// Used when the point object is used as a size object.
293+
area: function() {
294+
return this.x * this.y;
295+
},
296+
297+
// Used when the point object is used as a size object.
298+
expand(width, height) {
299+
this.x += width;
300+
this.y += height;
301+
},
302+
280303
str: function()
281304
{
282305
return "x = " + this.x + ", y = " + this.y;
@@ -320,6 +343,9 @@ Point = Utilities.createClass(
320343
}
321344
});
322345

346+
// FIXME: Add a seprate class for Size.
347+
let Size = Point;
348+
323349
Utilities.extendObject(Point, {
324350
zero: new Point(0, 0),
325351

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
/*
2+
* Copyright (C) 2015-2024 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+
*/
25+
26+
class SpiralIterator {
27+
gridSize;
28+
current;
29+
direction;
30+
size;
31+
count;
32+
33+
directions = {
34+
top: 0,
35+
left: 1,
36+
bottom: 2,
37+
right: 3
38+
};
39+
40+
moves = [
41+
new Size(0, -1), // top
42+
new Size(-1, 0), // left
43+
new Size(0, +1), // bottom
44+
new Size(+1, 0) // right
45+
];
46+
47+
constructor(gridSize) {
48+
this.gridSize = gridSize;
49+
this.current = Point.zero;
50+
this.direction = this.directions.right;
51+
this.size = new Size(1, 1);
52+
this.count = 0;
53+
54+
}
55+
56+
isDone() {
57+
return this.count >= this.gridSize.area();
58+
}
59+
60+
next() {
61+
++this.count;
62+
63+
if (this.isDone())
64+
return;
65+
66+
let direction = this.direction;
67+
let move = this.moves[direction];
68+
69+
if (Math.abs(this.current.x) == Math.abs(this.current.y)) {
70+
// Turn left.
71+
direction = (direction + 1) % 4;
72+
73+
if (this.current.x >= 0 && this.current.y >= 0) {
74+
if (this.size.width < Math.min(this.gridSize.width, this.gridSize.height))
75+
this.size.expand(2, 2);
76+
else if (this.size.width < this.gridSize.width)
77+
++this.size.width;
78+
79+
move = this.moves[this.directions.right];
80+
} else
81+
move = this.moves[direction];
82+
}
83+
84+
if (this.count < this.size.area()) {
85+
this.current = this.current.add(move);
86+
this.direction = direction;
87+
return;
88+
}
89+
90+
// Make a U-turn.
91+
this.direction = (this.direction + 1) % 4;
92+
93+
if (this.direction == this.directions.left || this.direction == this.directions.right)
94+
this.current = this.current.add(this.moves[this.direction].multiply(this.size.width++));
95+
else
96+
this.current = this.current.add(this.moves[this.direction].multiply(this.size.height++));
97+
98+
this.direction = (this.direction + 1) % 4;
99+
}
100+
}

MotionMark/tests/core/multiply.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
</div>
7070
<script src="../../resources/strings.js"></script>
7171
<script src="../../resources/extensions.js"></script>
72+
<script src="../../resources/spiral-iterator.js"></script>
7273
<script src="../../resources/statistics.js"></script>
7374
<script src="../resources/math.js"></script>
7475
<script src="../resources/main.js"></script>

0 commit comments

Comments
 (0)