Index: LayoutTests/compositing/overflow/automatically-opt-into-composited-scrolling.html |
diff --git a/LayoutTests/compositing/overflow/automatically-opt-into-composited-scrolling.html b/LayoutTests/compositing/overflow/automatically-opt-into-composited-scrolling.html |
index 8c5a37e8ad2b0a77a0bd9bec18a6110aeac8a369..acfff54652ce350dfb5553e8104f975124f0268a 100644 |
--- a/LayoutTests/compositing/overflow/automatically-opt-into-composited-scrolling.html |
+++ b/LayoutTests/compositing/overflow/automatically-opt-into-composited-scrolling.html |
@@ -53,12 +53,16 @@ |
</style> |
<script src="resources/automatically-opt-into-composited-scrolling.js"></script> |
<script> |
+ if (window.internals) |
+ window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true); |
+ |
function testPermutation(count, ordering, hasPositionedAncestor, containerIsPositioned) |
{ |
if (!window.internals) |
return; |
var container = document.getElementById('container'); |
+ var containerOptedIn = didOptIn(container); |
// Below, when we set webkitTransform to '', we want that to force an |
// immediate, synchronous style recalculation. Querying the |
@@ -79,17 +83,21 @@ |
// composited. To ensure that we perform the full style recalc, we need to |
// change a style property so the style is dirty, and force the style to |
// be cleaned with document.body.offsetTop (inside getStackingOrder()). |
- window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(false); |
+ window.internals.setNeedsCompositedScrolling(container, |
+ window.internals.FORCE_COMPOSITED_SCROLLING_OFF); |
container.style.webkitTransform = ''; |
var oldStackingOrder = getStackingOrder(container); |
- // force to promote. |
- window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true); |
+ window.internals.setNeedsCompositedScrolling(container, |
+ window.internals.FORCE_COMPOSITED_SCROLLING_ON); |
hartmanng
2013/05/02 14:04:01
This doesn't match the .idl file, shouldn't it be
|
container.style.webkitTransform = 'translateZ(0px)'; |
var newStackingOrder = getStackingOrder(container); |
+ window.internals.setNeedsCompositedScrolling(container, |
+ window.internals.settings.DO_NOT_FORCE_COMPOSITED_SCROLLING); |
hartmanng
2013/05/02 14:04:01
same as above
|
+ |
var shouldOptIn = oldStackingOrder.length === newStackingOrder.length; |
for (var i = 0; i < oldStackingOrder.length; ++i) { |
if (oldStackingOrder[i] !== newStackingOrder[i]) { |
@@ -99,7 +107,7 @@ |
} |
container.style.webkitTransform = ''; |
- if (shouldOptIn !== didOptIn(container)) { |
+ if (shouldOptIn !== containerOptedIn) { |
if (shouldOptIn) |
write("FAIL - should've automatically opted in but didn't " + count); |
else |