Diff
Modified: trunk/LayoutTests/ChangeLog (142337 => 142338)
--- trunk/LayoutTests/ChangeLog 2013-02-09 02:07:11 UTC (rev 142337)
+++ trunk/LayoutTests/ChangeLog 2013-02-09 02:20:48 UTC (rev 142338)
@@ -1,3 +1,20 @@
+2013-02-08 Tim Horton <timothy_hor...@apple.com>
+
+ Some tiled drawing tests use scalePageBy() incorrectly
+ https://bugs.webkit.org/show_bug.cgi?id=109336
+
+ Rubber-stamped by Simon Fraser.
+
+ scalePageBy takes (scale, x, y). Some of the tiled drawing tests are incorrectly handing them (scale, scale).
+ Adjust the tests and the expected results.
+
+ * platform/mac-wk2/tiled-drawing/fixed-background/fixed-body-background-zoomed.html:
+ * platform/mac-wk2/tiled-drawing/fixed/four-bars-zoomed-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fixed/four-bars-zoomed.html:
+ * platform/mac-wk2/tiled-drawing/tiled-drawing-zoom-expected.txt:
+ * platform/mac-wk2/tiled-drawing/tiled-drawing-zoom-scrolled.html:
+ * platform/mac-wk2/tiled-drawing/tiled-drawing-zoom.html:
+
2013-02-08 Andy Estes <aes...@apple.com>
Restore pre-r118852 behavior for EllipsisBox::nodeAtPoint()
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-zoomed-expected.txt (142337 => 142338)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-zoomed-expected.txt 2013-02-09 02:07:11 UTC (rev 142337)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-zoomed-expected.txt 2013-02-09 02:20:48 UTC (rev 142338)
@@ -2,7 +2,6 @@
(viewport rect 0 0 785 585)
(contents size 1805 5108)
(frame scale factor 2.30)
- (requested scroll position 2 0)
(children 3
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
@@ -23,7 +22,7 @@
(GraphicsLayer
(bounds 1805.00 5108.00)
- (visible rect 2.00, 0.00 785.00 x 585.00)
+ (visible rect 0.00, 0.00 785.00 x 585.00)
(children 1
(GraphicsLayer
(anchor 0.00 0.00)
@@ -32,7 +31,7 @@
(drawsContent 1)
(backgroundColor #FFFFFF)
(transform [2.30 0.00 0.00 0.00] [0.00 2.30 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
- (visible rect 0.87, 0.00 341.30 x 254.35)
+ (visible rect 0.00, 0.00 341.30 x 254.35)
(tile cache coverage 0, 0 784 x 890)
(tile size 512 x 512)
(top left tile 0, 0 tiles grid 4 x 4)
@@ -43,7 +42,7 @@
(GraphicsLayer
(bounds 778.00 74.00)
(drawsContent 1)
- (visible rect 0.87, 0.00 341.30 x 74.00)
+ (visible rect 0.00, 0.00 341.30 x 74.00)
)
(GraphicsLayer
(position 10.00 200.00)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-zoomed.html (142337 => 142338)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-zoomed.html 2013-02-09 02:07:11 UTC (rev 142337)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-zoomed.html 2013-02-09 02:20:48 UTC (rev 142338)
@@ -53,7 +53,7 @@
{
window.setTimeout(function() {
if (window.eventSender)
- eventSender.scalePageBy(2.3, 2.3);
+ eventSender.scalePageBy(2.3, 0, 0);
if (window.testRunner) {
document.getElementById('results').textContent = window.internals.scrollingStateTreeAsText(document) + '\n' +
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed-background/fixed-body-background-zoomed.html (142337 => 142338)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed-background/fixed-body-background-zoomed.html 2013-02-09 02:07:11 UTC (rev 142337)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed-background/fixed-body-background-zoomed.html 2013-02-09 02:20:48 UTC (rev 142338)
@@ -29,7 +29,7 @@
function doTest()
{
if (window.eventSender)
- eventSender.scalePageBy(2.3, 2.3);
+ eventSender.scalePageBy(2.3, 0, 0);
window.scrollTo(0, 200);
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/tiled-drawing-zoom-expected.txt (142337 => 142338)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/tiled-drawing-zoom-expected.txt 2013-02-09 02:07:11 UTC (rev 142337)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/tiled-drawing-zoom-expected.txt 2013-02-09 02:20:48 UTC (rev 142338)
@@ -1,6 +1,6 @@
(GraphicsLayer
(bounds 1805.00 1345.00)
- (visible rect 2.00, 0.00 785.00 x 585.00)
+ (visible rect 0.00, 0.00 785.00 x 585.00)
(children 1
(GraphicsLayer
(anchor 0.00 0.00)
@@ -9,7 +9,7 @@
(drawsContent 1)
(backgroundColor #FFFFFF)
(transform [2.30 0.00 0.00 0.00] [0.00 2.30 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
- (visible rect 0.87, 0.00 341.30 x 254.35)
+ (visible rect 0.00, 0.00 341.30 x 254.35)
(tile cache coverage 0, 0 784 x 584)
(tile size 512 x 512)
(top left tile 0, 0 tiles grid 4 x 3)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/tiled-drawing-zoom-scrolled.html (142337 => 142338)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/tiled-drawing-zoom-scrolled.html 2013-02-09 02:07:11 UTC (rev 142337)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/tiled-drawing-zoom-scrolled.html 2013-02-09 02:20:48 UTC (rev 142338)
@@ -15,7 +15,7 @@
function doTest()
{
if (window.eventSender)
- eventSender.scalePageBy(2.3, 2.3);
+ eventSender.scalePageBy(2.3, 0, 0);
window.scrollTo(800, 1000);
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/tiled-drawing-zoom.html (142337 => 142338)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/tiled-drawing-zoom.html 2013-02-09 02:07:11 UTC (rev 142337)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/tiled-drawing-zoom.html 2013-02-09 02:20:48 UTC (rev 142338)
@@ -9,7 +9,7 @@
function doTest()
{
if (window.eventSender)
- eventSender.scalePageBy(2.3, 2.3);
+ eventSender.scalePageBy(2.3, 0, 0);
if (window.internals) {
document.getElementById('layers').innerText = internals.layerTreeAsText(document,
