- Revision
- 107698
- Author
- [email protected]
- Date
- 2012-02-14 02:54:15 -0800 (Tue, 14 Feb 2012)
Log Message
svg/hixie/perf has different repaint region in debug vs release
https://bugs.webkit.org/show_bug.cgi?id=78516
Reviewed by Hajime Morita.
Based on patch by Tony Chang <[email protected]>.
The problem is the progress text in the lower right. It says,
"Test in progress... X of 10". Depending on how fast the test runs,
this text is never painted and the repaint region changes. Disable
painting of the intermediate text and only include the final text.
Extended Tonys original patch to cover all svg/hixie/perf tests that
suffered from this issue - also avoid using setTimeout between the
individual steps, as we're only interessted in the final repaint
region, not the intermediate ones.
* platform/mac/svg/hixie/perf/001-expected.png:
* platform/mac/svg/hixie/perf/002-expected.png:
* platform/mac/svg/hixie/perf/003-expected.png:
* svg/hixie/perf/001.xml:
* svg/hixie/perf/002.xml:
* svg/hixie/perf/003.xml:
* svg/hixie/perf/004.xml:
* svg/hixie/perf/005.xml:
* svg/hixie/perf/006.xml:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (107697 => 107698)
--- trunk/LayoutTests/ChangeLog 2012-02-14 10:41:03 UTC (rev 107697)
+++ trunk/LayoutTests/ChangeLog 2012-02-14 10:54:15 UTC (rev 107698)
@@ -1,5 +1,34 @@
2012-02-14 Nikolas Zimmermann <[email protected]>
+ svg/hixie/perf has different repaint region in debug vs release
+ https://bugs.webkit.org/show_bug.cgi?id=78516
+
+ Reviewed by Hajime Morita.
+
+ Based on patch by Tony Chang <[email protected]>.
+
+ The problem is the progress text in the lower right. It says,
+ "Test in progress... X of 10". Depending on how fast the test runs,
+ this text is never painted and the repaint region changes. Disable
+ painting of the intermediate text and only include the final text.
+
+ Extended Tonys original patch to cover all svg/hixie/perf tests that
+ suffered from this issue - also avoid using setTimeout between the
+ individual steps, as we're only interessted in the final repaint
+ region, not the intermediate ones.
+
+ * platform/mac/svg/hixie/perf/001-expected.png:
+ * platform/mac/svg/hixie/perf/002-expected.png:
+ * platform/mac/svg/hixie/perf/003-expected.png:
+ * svg/hixie/perf/001.xml:
+ * svg/hixie/perf/002.xml:
+ * svg/hixie/perf/003.xml:
+ * svg/hixie/perf/004.xml:
+ * svg/hixie/perf/005.xml:
+ * svg/hixie/perf/006.xml:
+
+2012-02-14 Nikolas Zimmermann <[email protected]>
+
Not reviewed. Add mixing Lion pixel test result for a svg/carto.net test.
* platform/mac/svg/carto.net/scrollbar-expected.png: Added.
Modified: trunk/LayoutTests/platform/mac/svg/hixie/perf/001-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/svg/hixie/perf/002-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/svg/hixie/perf/003-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/svg/hixie/perf/001.xml (107697 => 107698)
--- trunk/LayoutTests/svg/hixie/perf/001.xml 2012-02-14 10:41:03 UTC (rev 107697)
+++ trunk/LayoutTests/svg/hixie/perf/001.xml 2012-02-14 10:54:15 UTC (rev 107698)
@@ -264,8 +264,6 @@
var dx = 5;
var dy = -5;
var count = 0;
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
function repaintTest() {
if ((cx + r + dx > 390) || (cx - r + dx < -190))
dx =- dx;
@@ -277,13 +275,16 @@
c.setAttribute('cy', cy);
++count;
if (count < max) {
- window.setTimeout(repaintTest, 0);
- t.firstChild.data = '' + count + ' of ' + max;
+ if (window.layoutTestController)
+ repaintTest();
+ else {
+ window.setTimeout(repaintTest, 0);
+ t.firstChild.data = '' + count + ' of ' + max;
+ }
} else {
- if (window.layoutTestController) {
+ if (window.layoutTestController)
t.firstChild.data = '';
- layoutTestController.notifyDone();
- } else {
+ else {
var end = new Date();
var elapsed = (end - start) / 1000;
t.firstChild.data = '' + elapsed.toFixed(2) + 's.';
Modified: trunk/LayoutTests/svg/hixie/perf/002.xml (107697 => 107698)
--- trunk/LayoutTests/svg/hixie/perf/002.xml 2012-02-14 10:41:03 UTC (rev 107697)
+++ trunk/LayoutTests/svg/hixie/perf/002.xml 2012-02-14 10:54:15 UTC (rev 107698)
@@ -264,8 +264,6 @@
var dx = 5;
var dy = -5;
var count = 0;
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
function repaintTest() {
if ((cx + r + dx > 390) || (cx - r + dx < -190))
dx =- dx;
@@ -277,13 +275,16 @@
c.setAttribute('cy', cy);
++count;
if (count < max) {
- window.setTimeout(repaintTest, 0);
- t.firstChild.data = '' + count + ' of ' + max;
+ if (window.layoutTestController)
+ repaintTest();
+ else {
+ window.setTimeout(repaintTest, 0);
+ t.firstChild.data = '' + count + ' of ' + max;
+ }
} else {
- if (window.layoutTestController) {
+ if (window.layoutTestController)
t.firstChild.data = '';
- layoutTestController.notifyDone();
- } else {
+ else {
var end = new Date();
var elapsed = (end - start) / 1000;
t.firstChild.data = '' + elapsed.toFixed(2) + 's.';
Modified: trunk/LayoutTests/svg/hixie/perf/003.xml (107697 => 107698)
--- trunk/LayoutTests/svg/hixie/perf/003.xml 2012-02-14 10:41:03 UTC (rev 107697)
+++ trunk/LayoutTests/svg/hixie/perf/003.xml 2012-02-14 10:54:15 UTC (rev 107698)
@@ -46,8 +46,6 @@
var maxPerBlock = Xs.length / (idealTime / delay);
var maxBlocks = Xs.length / maxPerBlock;
var count = 0;
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
function repaintTest() {
for (var subcount = 0; subcount < maxPerBlock; subcount += 1) {
var index = count * maxPerBlock + subcount;
@@ -62,13 +60,16 @@
}
++count;
if (count < maxBlocks) {
- window.setTimeout(repaintTest, delay);
- t.firstChild.data = '' + count + ' of ' + maxBlocks;
+ if (window.layoutTestController)
+ repaintTest();
+ else {
+ window.setTimeout(repaintTest, delay);
+ t.firstChild.data = '' + count + ' of ' + maxBlocks;
+ }
} else {
- if (window.layoutTestController) {
+ if (window.layoutTestController)
t.firstChild.data = '';
- layoutTestController.notifyDone();
- } else {
+ else {
var end = new Date();
var elapsed = (end - start) / 1000;
t.firstChild.data = '' + elapsed.toFixed(2) + 's.';
Modified: trunk/LayoutTests/svg/hixie/perf/004.xml (107697 => 107698)
--- trunk/LayoutTests/svg/hixie/perf/004.xml 2012-02-14 10:41:03 UTC (rev 107697)
+++ trunk/LayoutTests/svg/hixie/perf/004.xml 2012-02-14 10:54:15 UTC (rev 107698)
@@ -46,8 +46,6 @@
var maxPerBlock = Xs.length / (idealTime / delay);
var maxBlocks = Xs.length / maxPerBlock;
var count = 0;
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
function repaintTest() {
for (var subcount = 0; subcount < maxPerBlock; subcount += 1) {
var index = count * maxPerBlock + subcount;
@@ -63,13 +61,16 @@
}
++count;
if (count < maxBlocks) {
- window.setTimeout(repaintTest, delay);
- t.firstChild.data = '' + count + ' of ' + maxBlocks;
+ if (window.layoutTestController)
+ repaintTest();
+ else {
+ window.setTimeout(repaintTest, delay);
+ t.firstChild.data = '' + count + ' of ' + maxBlocks;
+ }
} else {
- if (window.layoutTestController) {
+ if (window.layoutTestController)
t.firstChild.data = '';
- layoutTestController.notifyDone();
- } else {
+ else {
var end = new Date();
var elapsed = (end - start) / 1000;
t.firstChild.data = '' + elapsed.toFixed(2) + 's.';
Modified: trunk/LayoutTests/svg/hixie/perf/005.xml (107697 => 107698)
--- trunk/LayoutTests/svg/hixie/perf/005.xml 2012-02-14 10:41:03 UTC (rev 107697)
+++ trunk/LayoutTests/svg/hixie/perf/005.xml 2012-02-14 10:54:15 UTC (rev 107698)
@@ -52,8 +52,6 @@
var maxPerBlock = Xs.length / (idealTime / delay);
var maxBlocks = Xs.length / maxPerBlock;
var count = 0;
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
function repaintTest() {
for (var subcount = 0; subcount < maxPerBlock; subcount += 1) {
var index = count * maxPerBlock + subcount;
@@ -69,13 +67,16 @@
}
++count;
if (count < maxBlocks) {
- window.setTimeout(repaintTest, delay);
- t.firstChild.data = '' + count + ' of ' + maxBlocks;
+ if (window.layoutTestController)
+ repaintTest();
+ else {
+ window.setTimeout(repaintTest, delay);
+ t.firstChild.data = '' + count + ' of ' + maxBlocks;
+ }
} else {
- if (window.layoutTestController) {
+ if (window.layoutTestController)
t.firstChild.data = '';
- layoutTestController.notifyDone();
- } else {
+ else {
var end = new Date();
var elapsed = (end - start) / 1000;
t.firstChild.data = '' + elapsed.toFixed(2) + 's.';
Modified: trunk/LayoutTests/svg/hixie/perf/006.xml (107697 => 107698)
--- trunk/LayoutTests/svg/hixie/perf/006.xml 2012-02-14 10:41:03 UTC (rev 107697)
+++ trunk/LayoutTests/svg/hixie/perf/006.xml 2012-02-14 10:54:15 UTC (rev 107698)
@@ -52,8 +52,6 @@
var maxPerBlock = Xs.length / (idealTime / delay);
var maxBlocks = Xs.length / maxPerBlock;
var count = 0;
- if (window.layoutTestController)
- layoutTestController.waitUntilDone();
function repaintTest() {
for (var subcount = 0; subcount < maxPerBlock; subcount += 1) {
var index = count * maxPerBlock + subcount;
@@ -69,13 +67,16 @@
}
++count;
if (count < maxBlocks) {
- window.setTimeout(repaintTest, delay);
- t.firstChild.data = '' + count + ' of ' + maxBlocks;
+ if (window.layoutTestController)
+ repaintTest();
+ else {
+ window.setTimeout(repaintTest, delay);
+ t.firstChild.data = '' + count + ' of ' + maxBlocks;
+ }
} else {
- if (window.layoutTestController) {
+ if (window.layoutTestController)
t.firstChild.data = '';
- layoutTestController.notifyDone();
- } else {
+ else {
var end = new Date();
var elapsed = (end - start) / 1000;
t.firstChild.data = '' + elapsed.toFixed(2) + 's.';
