| Index: third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius.html
|
| diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius.html b/third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius.html
|
| index 5729ca0893d89d70569c11ef67ee3c06fdc89bd5..f8e95f93f24fde4869be61467f8e2c88468a6bd5 100644
|
| --- a/third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius.html
|
| +++ b/third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius.html
|
| @@ -1,65 +1,65 @@
|
| -<!DOCTYPE HTML>
|
| +1 <!DOCTYPE HTML>
|
| <script src="resources/composited-scroll.js"></script>
|
| <style>
|
| #scroller {
|
| - overflow: scroll;
|
| - height: 300px;
|
| - width: 300px;
|
| - background-color: red;
|
| + overflow: scroll;
|
| + height: 300px;
|
| + width: 300px;
|
| + background-color: red;
|
| }
|
|
|
| #scrolled {
|
| - height: 1000px;
|
| - width: 250px;
|
| - background-color: green;
|
| + height: 1000px;
|
| + width: 250px;
|
| + background-color: green;
|
| }
|
|
|
| #fixed {
|
| - position: fixed;
|
| - height: 100px;
|
| - width: 100px;
|
| - background-color: green;
|
| - top: 400px;
|
| - left: 100px;
|
| + position: fixed;
|
| + height: 100px;
|
| + width: 100px;
|
| + background-color: green;
|
| + top: 400px;
|
| + left: 100px;
|
| }
|
| </style>
|
| <div id="scroller">
|
| - <div id="scrolled"></div>
|
| - <div id="fixed"></div>
|
| + <div id="scrolled"></div>
|
| + <div id="fixed"></div>
|
| </div>
|
| <script>
|
| if (window.internals)
|
| - window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
|
| + window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
|
|
|
| -if (window.testRunner) {
|
| + if (window.testRunner) {
|
| window.testRunner.dumpAsText();
|
| window.testRunner.waitUntilDone();
|
| -}
|
| + }
|
|
|
| var result = "";
|
|
|
| onload = function() {
|
| + if (window.internals) {
|
| + result += "No border radius (should be using composited scrolling): ";
|
| + if (isUsingCompositedScrolling(JSON.parse(window.internals.layerTreeAsText(document))))
|
| + result += "Pass.\n";
|
| + else
|
| + result += "Fail.\n"
|
| + }
|
| + document.getElementById("scroller").style.borderRadius = '5px';
|
| + requestAnimationFrame(function() {
|
| if (window.internals) {
|
| - result += "No border radius (should be using composited scrolling): ";
|
| - if (isUsingCompositedScrolling(JSON.parse(window.internals.layerTreeAsText(document))))
|
| - result += "Pass.\n";
|
| - else
|
| - result += "Fail.\n"
|
| + result += "Has border radius (should not be using composited scrolling): ";
|
| + if (isUsingCompositedScrolling(JSON.parse(window.internals.layerTreeAsText(document))))
|
| + result += "Pass.\n";
|
| + else
|
| + result += "Fail.\n"
|
| }
|
| - document.getElementById("scroller").style.borderRadius = '5px';
|
| - requestAnimationFrame(function() {
|
| - if (window.internals) {
|
| - result += "Has border radius (should not be using composited scrolling): ";
|
| - if (!isUsingCompositedScrolling(JSON.parse(window.internals.layerTreeAsText(document))))
|
| - result += "Pass.\n";
|
| - else
|
| - result += "Fail.\n"
|
| - }
|
|
|
| - if (window.testRunner) {
|
| - window.testRunner.setCustomTextOutput(result);
|
| - window.testRunner.notifyDone();
|
| - }
|
| - });
|
| + if (window.testRunner) {
|
| + window.testRunner.setCustomTextOutput(result);
|
| + window.testRunner.notifyDone();
|
| + }
|
| + });
|
| };
|
| </script>
|
|
|