Diff
Modified: trunk/LayoutTests/ChangeLog (136884 => 136885)
--- trunk/LayoutTests/ChangeLog 2012-12-06 21:58:01 UTC (rev 136884)
+++ trunk/LayoutTests/ChangeLog 2012-12-06 22:00:46 UTC (rev 136885)
@@ -1,3 +1,23 @@
+2012-12-06 Xianzhu Wang <[email protected]>
+
+ internals.settings.setEnableCompositingForFixedPosition() should be called before onload
+ https://bugs.webkit.org/show_bug.cgi?id=104277
+
+ Fixed some tests that set enableCompositingForFixedPosition in onload handler which may not take effect because it is too late.
+ Leave the image mismatches to bug 96839.
+
+ Reviewed by Simon Fraser.
+
+ * compositing/geometry/fixed-position-composited-page-scale-down.html:
+ * compositing/geometry/fixed-position-composited-page-scale-scroll.html:
+ * compositing/geometry/fixed-position-composited-page-scale.html:
+ * compositing/geometry/fixed-position-iframe-composited-page-scale-down.html:
+ * compositing/geometry/fixed-position-iframe-composited-page-scale.html:
+ * compositing/geometry/fixed-position-transform-composited-page-scale-down.html:
+ * compositing/geometry/fixed-position-transform-composited-page-scale.html:
+ * compositing/layer-creation/fixed-position-out-of-view.html:
+ * platform/chromium/TestExpectations: Mark the original flaky image mismatch as constantly failure. Add one image mismatch caused by this change but because of incorrect baseline.
+
2012-12-06 Stephen White <[email protected]>
[Chromium] Unreviewed gardening.
Modified: trunk/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-down.html (136884 => 136885)
--- trunk/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-down.html 2012-12-06 21:58:01 UTC (rev 136884)
+++ trunk/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-down.html 2012-12-06 22:00:46 UTC (rev 136885)
@@ -13,17 +13,15 @@
}
</style>
<script>
- function scale() {
- if (window.internals) {
- window.internals.settings.setEnableCompositingForFixedPosition(true);
- window.internals.setPageScaleFactor(0.5, 0, 0);
- }
- if (window.testRunner)
- testRunner.dumpAsText(true);
+ if (window.internals) {
+ window.internals.settings.setEnableCompositingForFixedPosition(true);
+ window.internals.setPageScaleFactor(0.5, 0, 0);
}
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
</script>
</head>
-<body _onload_="scale();" style="width:2000px;height:2000px;">
+<body style="width:2000px;height:2000px;">
<div class="fixed-no-z-index">TEST</div><br>
<div class="fixed-with-z-index">TEST</div>
</body>
Modified: trunk/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-scroll.html (136884 => 136885)
--- trunk/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-scroll.html 2012-12-06 21:58:01 UTC (rev 136884)
+++ trunk/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-scroll.html 2012-12-06 22:00:46 UTC (rev 136885)
@@ -14,18 +14,18 @@
}
</style>
<script>
- function scale() {
- if (window.internals) {
- window.internals.settings.setEnableCompositingForFixedPosition(true);
- window.internals.setPageScaleFactor(2, 0, 0);
- }
+ if (window.internals) {
+ window.internals.settings.setEnableCompositingForFixedPosition(true);
+ window.internals.setPageScaleFactor(2, 0, 0);
+ }
+ function test() {
window.scrollTo(100,100);
if (window.testRunner)
testRunner.dumpAsText();
}
</script>
</head>
-<body _onload_="scale();" style="width:2000px;height:2000px;">
+<body _onload_="test();" style="width:2000px;height:2000px;">
<div class="fixed-no-z-index">This test should not hit an assertion in RenderGeometryMap in debug builds</div><br>
<div class="fixed-with-z-index">This test should not hit an assertion in RenderGeometryMap in debug builds</div>
</body>
Modified: trunk/LayoutTests/compositing/geometry/fixed-position-composited-page-scale.html (136884 => 136885)
--- trunk/LayoutTests/compositing/geometry/fixed-position-composited-page-scale.html 2012-12-06 21:58:01 UTC (rev 136884)
+++ trunk/LayoutTests/compositing/geometry/fixed-position-composited-page-scale.html 2012-12-06 22:00:46 UTC (rev 136885)
@@ -13,17 +13,15 @@
}
</style>
<script>
- function scale() {
- if (window.internals) {
- window.internals.settings.setEnableCompositingForFixedPosition(true);
- window.internals.setPageScaleFactor(2, 0, 0);
- }
- if (window.testRunner)
- testRunner.dumpAsText(true);
+ if (window.internals) {
+ window.internals.settings.setEnableCompositingForFixedPosition(true);
+ window.internals.setPageScaleFactor(2, 0, 0);
}
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
</script>
</head>
-<body _onload_="scale();" style="width:2000px;height:2000px;">
+<body style="width:2000px;height:2000px;">
<div class="fixed-no-z-index">TEST</div><br>
<div class="fixed-with-z-index">TEST</div>
</body>
Modified: trunk/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale-down.html (136884 => 136885)
--- trunk/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale-down.html 2012-12-06 21:58:01 UTC (rev 136884)
+++ trunk/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale-down.html 2012-12-06 22:00:46 UTC (rev 136885)
@@ -13,11 +13,11 @@
}
</style>
<script>
+ if (window.internals) {
+ window.internals.settings.setEnableCompositingForFixedPosition(true);
+ window.internals.setPageScaleFactor(0.5, 0, 0);
+ }
function test() {
- if (window.internals) {
- window.internals.settings.setEnableCompositingForFixedPosition(true);
- window.internals.setPageScaleFactor(0.5, 0, 0);
- }
if (window.testRunner)
testRunner.dumpAsText(true);
Modified: trunk/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale.html (136884 => 136885)
--- trunk/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale.html 2012-12-06 21:58:01 UTC (rev 136884)
+++ trunk/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale.html 2012-12-06 22:00:46 UTC (rev 136885)
@@ -13,11 +13,11 @@
}
</style>
<script>
+ if (window.internals) {
+ window.internals.settings.setEnableCompositingForFixedPosition(true);
+ window.internals.setPageScaleFactor(2, 0, 0);
+ }
function test() {
- if (window.internals) {
- window.internals.settings.setEnableCompositingForFixedPosition(true);
- window.internals.setPageScaleFactor(2, 0, 0);
- }
if (window.testRunner)
testRunner.dumpAsText(true);
Modified: trunk/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale-down.html (136884 => 136885)
--- trunk/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale-down.html 2012-12-06 21:58:01 UTC (rev 136884)
+++ trunk/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale-down.html 2012-12-06 22:00:46 UTC (rev 136885)
@@ -15,17 +15,15 @@
}
</style>
<script>
- function scale() {
- if (window.internals) {
- window.internals.settings.setEnableCompositingForFixedPosition(true);
- window.internals.setPageScaleFactor(0.5, 0, 0);
- }
- if (window.testRunner)
- testRunner.dumpAsText(true);
+ if (window.internals) {
+ window.internals.settings.setEnableCompositingForFixedPosition(true);
+ window.internals.setPageScaleFactor(0.5, 0, 0);
}
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
</script>
</head>
-<body _onload_="scale();" style="width:2000px;height:2000px;">
+<body style="width:2000px;height:2000px;">
<div class="fixed-no-z-index">TEST</div><br>
<div class="fixed-with-z-index">TEST</div>
</body>
Modified: trunk/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale.html (136884 => 136885)
--- trunk/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale.html 2012-12-06 21:58:01 UTC (rev 136884)
+++ trunk/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale.html 2012-12-06 22:00:46 UTC (rev 136885)
@@ -15,17 +15,15 @@
}
</style>
<script>
- function scale() {
- if (window.internals) {
- window.internals.settings.setEnableCompositingForFixedPosition(true);
- window.internals.setPageScaleFactor(2, 0, 0);
- }
- if (window.testRunner)
- testRunner.dumpAsText(true);
+ if (window.internals) {
+ window.internals.settings.setEnableCompositingForFixedPosition(true);
+ window.internals.setPageScaleFactor(2, 0, 0);
}
+ if (window.testRunner)
+ testRunner.dumpAsText(true);
</script>
</head>
-<body _onload_="scale();" style="width:2000px;height:2000px;">
+<body style="width:2000px;height:2000px;">
<div class="fixed-no-z-index">TEST</div><br>
<div class="fixed-with-z-index">TEST</div>
</body>
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (136884 => 136885)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-12-06 21:58:01 UTC (rev 136884)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-12-06 22:00:46 UTC (rev 136885)
@@ -3572,8 +3572,10 @@
# Timing out on some Windows bots
webkit.org/b/89510 [ Win ] gamepad/gamepad-polling-access.html [ Pass Timeout ]
-webkit.org/b/96839 compositing/geometry/fixed-position-transform-composited-page-scale.html [ ImageOnlyFailure Pass ]
-webkit.org/b/96839 platform/chromium/virtual/softwarecompositing/geometry/fixed-position-transform-composited-page-scale.html [ ImageOnlyFailure Pass ]
+webkit.org/b/96839 compositing/geometry/fixed-position-transform-composited-page-scale.html [ ImageOnlyFailure ]
+webkit.org/b/96839 platform/chromium/virtual/softwarecompositing/geometry/fixed-position-transform-composited-page-scale.html [ ImageOnlyFailure ]
+webkit.org/b/96839 compositing/geometry/fixed-position-transform-composited-page-scale-down.html [ ImageOnlyFailure ]
+webkit.org/b/96839 platform/chromium/virtual/softwarecompositing/geometry/fixed-position-transform-composited-page-scale-down.html [ ImageOnlyFailure ]
webkit.org/b/89702 compositing/scaling/tiled-layer-recursion.html [ ImageOnlyFailure Pass ]
webkit.org/b/89702 platform/chromium/virtual/softwarecompositing/scaling/tiled-layer-recursion.html [ ImageOnlyFailure Pass ]
