Skip to content

GitLab

T
tangled
Commit 9edc3c40 authored by Philip Rogers's avatar Philip Rogers Committed by Commit Bot
Browse files
Options

Update non-fast scrollable region tests to force noncomposited scrolling 

These tests were relying on scrollers not being composited and did not
pass with --enable-prefer-compositing-to-lcd-text. This patch updates
the tests to explicitly disable composited scrolling.

Bug: 1085035
Change-Id: I5f2be2c7c57ce535801c9498a87ba42635906faf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2209993
Commit-Queue: Philip Rogers <pdr@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: default avatarXianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771102}
parent 12a95f24
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 6 deletions
third_party/blink/web_tests/scrollingcoordinator/donot-compute-non-fast-scrollable-region-for-hidden-frames.html
View file @ 9edc3c40
...@@ -12,6 +12,13 @@ ...@@ -12,6 +12,13 @@
} }
</style> </style>
<script>
// Prefer non-composited scrolling because this is a test of non-composited
// scrollers.
if (window.internals)
internals.settings.setPreferCompositingToLCDTextEnabled(false);
</script>
<iframe id='iframe' src='resources/iframe-containing-non-fast-scrollables.html'></iframe> <iframe id='iframe' src='resources/iframe-containing-non-fast-scrollables.html'></iframe>
<script src="resources/non-fast-scrollable-region-testing.js"></script> <script src="resources/non-fast-scrollable-region-testing.js"></script>
......
third_party/blink/web_tests/scrollingcoordinator/non-fast-scrollable-region-nested.html
View file @ 9edc3c40
...@@ -12,6 +12,13 @@ ...@@ -12,6 +12,13 @@
} }
</style> </style>
<script>
// Prefer non-composited scrolling because this is a test of non-composited
// scrollers.
if (window.internals)
internals.settings.setPreferCompositingToLCDTextEnabled(false);
</script>
<iframe id='iframe' src='resources/iframe-containing-non-fast-scrollables.html'></iframe> <iframe id='iframe' src='resources/iframe-containing-non-fast-scrollables.html'></iframe>
<div id="console"></div> <div id="console"></div>
......
third_party/blink/web_tests/scrollingcoordinator/non-fast-scrollable-region-scaled-iframe.html
View file @ 9edc3c40
...@@ -14,6 +14,13 @@ ...@@ -14,6 +14,13 @@
} }
</style> </style>
<script>
// Prefer non-composited scrolling because this is a test of non-composited
// scrollers.
if (window.internals)
internals.settings.setPreferCompositingToLCDTextEnabled(false);
</script>
<iframe src="data:text/html;charset=utf-8,<html><body style='width:1000px;height:1000px;'>Should be covered by a green overlay.</body></html>"></iframe> <iframe src="data:text/html;charset=utf-8,<html><body style='width:1000px;height:1000px;'>Should be covered by a green overlay.</body></html>"></iframe>
<div id="console"></div> <div id="console"></div>
<div class="spacer"></div> <div class="spacer"></div>
......
third_party/blink/web_tests/scrollingcoordinator/non-fast-scrollable-region-transformed-iframe.html
View file @ 9edc3c40
...@@ -15,6 +15,13 @@ ...@@ -15,6 +15,13 @@
} }
</style> </style>
<script>
// Prefer non-composited scrolling because this is a test of non-composited
// scrollers.
if (window.internals)
internals.settings.setPreferCompositingToLCDTextEnabled(false);
</script>
<iframe srcdoc=" <iframe srcdoc="
<!DOCTYPE html> <!DOCTYPE html>
<style> <style>
......
third_party/blink/web_tests/scrollingcoordinator/non-fast-scrollable-transform-changed.html
View file @ 9edc3c40
...@@ -23,7 +23,12 @@ ...@@ -23,7 +23,12 @@
height: 2000px; height: 2000px;
} }
</style> </style>
<script>
// Prefer non-composited scrolling because this is a test of non-composited
// scrollers.
if (window.internals)
internals.settings.setPreferCompositingToLCDTextEnabled(false);
</script>
<div id='nonFastRegion'><div>This should be covered by a green overlay.</div></div> <div id='nonFastRegion'><div>This should be covered by a green overlay.</div></div>
<p>A single square should be visible covered by a green overlay.</p> <p>A single square should be visible covered by a green overlay.</p>
......
third_party/blink/web_tests/scrollingcoordinator/non-fast-scrollable-visibility-change.html
View file @ 9edc3c40
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
margin: 0; margin: 0;
} }
.container { .container {
height: 250px; height: 250px;
width: 250px; width: 250px;
margin-top: 50px; margin-top: 50px;
display: block; display: block;
} }
.container > div { .container > div {
height: 200px; height: 200px;
...@@ -26,7 +26,12 @@ ...@@ -26,7 +26,12 @@
border: none; border: none;
} }
</style> </style>
<script>
// Prefer non-composited scrolling because this is a test of non-composited
// scrollers.
if (window.internals)
internals.settings.setPreferCompositingToLCDTextEnabled(false);
</script>
<section id='div' style="display:none;"> <section id='div' style="display:none;">
<div class="to-show container"> <div class="to-show container">
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment