diff options
| author | rbyers@chromium.org <rbyers@chromium.org> | 2015-08-13 02:09:42 +0000 |
|---|---|---|
| committer | rbyers@chromium.org <rbyers@chromium.org> | 2015-08-13 02:09:42 +0000 |
| commit | a51a0a8e38e9e49b95c41043daf56503c95e981e (patch) | |
| tree | 916b420a0c64167e39d026e029173560dc56f1bf /third_party/WebKit/LayoutTests/compositing/layer-creation | |
| parent | 419dc3cd8905bb58c576ea868827ce196c25a053 (diff) | |
| download | chromium_src-a51a0a8e38e9e49b95c41043daf56503c95e981e.zip chromium_src-a51a0a8e38e9e49b95c41043daf56503c95e981e.tar.gz chromium_src-a51a0a8e38e9e49b95c41043daf56503c95e981e.tar.bz2 | |
Delete blink code for scroll-blocks-on
We've decided that controlling scroll blocking behavior is something
that really needs to be tied to event listeners via a JS API, not
a CSS property. The platform needs to mediate the composition here
(eg. for two unrelated libraries both adding touch handlers to the
document), and there's no good way to mediate that composition using
CSS. It's really a property of the event handler and so should be
specified at addEventListener time.
http://crbug.com/489802 tracks the first step of that design
(EventListenerOptions). So it's time to remove the scroll-blocks-on
CSS support from blink. I expect the utlimate compositor integration
for EventListenerOptions mayCancel to be similar, and so for now
I'm leaving the hooks in place in GraphicsLayer.
This change also fixes a regression where iframes could occasionally
not get displayed. I don't understand how the scroll-blocks-on code
(even when not enabled) was triggering that problem, but since it's
going away I'm not going to investigate further.
BUG=347272, 490358
Review URL: https://codereview.chromium.org/1287623002
git-svn-id: svn://svn.chromium.org/blink/trunk@200448 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/compositing/layer-creation')
12 files changed, 0 insertions, 374 deletions
diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-default-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-default-expected.txt deleted file mode 100644 index 8181a63..0000000 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-default-expected.txt +++ /dev/null @@ -1,23 +0,0 @@ -Verify we get the default scroll-blocks-on mode applied to the viewport, no additional layers created (even with an iframe), and no scroll-blocks-on mode applied to any other layer. - -{ - "bounds": [800, 600], - "children": [ - { - "bounds": [800, 600], - "scrollBlocksOn": [ - "StartTouch", - "WheelEvent" - ], - "contentsOpaque": true, - "drawsContent": true, - "children": [ - { - "position": [8, 8], - "bounds": [20, 20] - } - ] - } - ] -} - diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-default.html b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-default.html deleted file mode 100644 index 408a857..0000000 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-default.html +++ /dev/null @@ -1,20 +0,0 @@ -<!DOCTYPE html> -<style> -#layer { - transform: translateZ(0); - width: 20px; - height: 20px; -} -</style> -<div id="layer"></div> -<iframe srcdoc="<div style='width: 15px;'></div>"></iframe> -<script> - onload = function() { - if (window.testRunner) { - testRunner.dumpAsText(); - var output = "Verify we get the default scroll-blocks-on mode applied to the viewport, no additional layers created (even with an iframe), and no scroll-blocks-on mode applied to any other layer.\n\n"; - output += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_SCROLL_BLOCKS_ON); - testRunner.setCustomTextOutput(output); - } - }; -</script> diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-document-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-document-expected.txt deleted file mode 100644 index b18bd99..0000000 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-document-expected.txt +++ /dev/null @@ -1,17 +0,0 @@ -Verify that scroll-blocks-on on the documentElement is propagated to the viewport without creating any additional layers. - -{ - "bounds": [800, 600], - "children": [ - { - "bounds": [800, 600], - "scrollBlocksOn": [ - "StartTouch", - "ScrollEvent" - ], - "contentsOpaque": true, - "drawsContent": true - } - ] -} - diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-document.html b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-document.html deleted file mode 100644 index 56c69c9..0000000 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-document.html +++ /dev/null @@ -1,14 +0,0 @@ -<!DOCTYPE html> -<style> -html { - scroll-blocks-on: start-touch scroll-event; -} -</style> -<script> - if (window.testRunner) { - testRunner.dumpAsText(); - var output = "Verify that scroll-blocks-on on the documentElement is propagated to the viewport without creating any additional layers.\n\n"; - output += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_SCROLL_BLOCKS_ON); - testRunner.setCustomTextOutput(output); - } -</script> diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-explicit-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-explicit-expected.txt deleted file mode 100644 index 1dd959f..0000000 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-explicit-expected.txt +++ /dev/null @@ -1,34 +0,0 @@ -Verifies that setting the scroll-blocks-on property in a stylesheet creates layers with the correct modes only when it's greater than the defaults on the root. In this case, only 'addScroll' should get a layer. - -{ - "bounds": [800, 600], - "children": [ - { - "bounds": [800, 600], - "scrollBlocksOn": [ - "StartTouch", - "WheelEvent" - ], - "contentsOpaque": true, - "drawsContent": true, - "children": [ - { - "position": [8, 8], - "bounds": [784, 1], - "scrollBlocksOn": [ - "WheelEvent" - ] - }, - { - "position": [8, 9], - "bounds": [784, 2], - "scrollBlocksOn": [ - "StartTouch", - "ScrollEvent" - ] - } - ] - } - ] -} - diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-explicit.html b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-explicit.html deleted file mode 100644 index 0a3998b..0000000 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-explicit.html +++ /dev/null @@ -1,26 +0,0 @@ -<!DOCTYPE html> -<style> -#redundant { - height: 1px; - scroll-blocks-on: wheel-event; -} -#addScroll { - height: 2px; - scroll-blocks-on: start-touch scroll-event; -} -#none { - height: 3px; - scroll-blocks-on: none; -} -</style> -<div id=redundant></div> -<div id=addScroll></div> -<div id=none></div> -<script> - if (window.testRunner) { - testRunner.dumpAsText(); - var output = "Verifies that setting the scroll-blocks-on property in a stylesheet creates layers with the correct modes only when it's greater than the defaults on the root. In this case, only 'addScroll' should get a layer.\n\n"; - output += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_SCROLL_BLOCKS_ON); - testRunner.setCustomTextOutput(output); - } -</script> diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-iframe-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-iframe-expected.txt deleted file mode 100644 index 63cfa4e..0000000 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-iframe-expected.txt +++ /dev/null @@ -1,122 +0,0 @@ -Verify that an iframe will be promoted to a composited layer only when it has additional scroll-blocks-on bits. - -{ - "bounds": [800, 600], - "children": [ - { - "bounds": [800, 600], - "scrollBlocksOn": [ - "StartTouch" - ], - "contentsOpaque": true, - "drawsContent": true, - "children": [ - { - "position": [8, 60], - "bounds": [100, 15], - "drawsContent": true, - "children": [ - { - "bounds": [100, 15], - "children": [ - { - "bounds": [100, 15], - "children": [ - { - "children": [ - { - "bounds": [100, 15], - "children": [ - { - "bounds": [100, 15], - "scrollBlocksOn": [ - "StartTouch", - "WheelEvent" - ], - "drawsContent": true - } - ] - } - ] - } - ] - } - ] - } - ] - }, - { - "position": [8, 80], - "bounds": [100, 15], - "drawsContent": true, - "children": [ - { - "bounds": [100, 15], - "children": [ - { - "bounds": [100, 15], - "children": [ - { - "children": [ - { - "bounds": [100, 15], - "children": [ - { - "bounds": [100, 15], - "scrollBlocksOn": [ - "StartTouch", - "ScrollEvent" - ], - "drawsContent": true - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} - - --------- -Frame: '<!--framePath //<!--frame2-->-->' --------- -{ - "bounds": [100, 15], - "children": [ - { - "bounds": [100, 15], - "scrollBlocksOn": [ - "StartTouch", - "WheelEvent" - ], - "drawsContent": true - } - ] -} - - --------- -Frame: '<!--framePath //<!--frame3-->-->' --------- -{ - "bounds": [100, 15], - "children": [ - { - "bounds": [100, 15], - "scrollBlocksOn": [ - "StartTouch", - "ScrollEvent" - ], - "drawsContent": true - } - ] -} - diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-iframe.html b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-iframe.html deleted file mode 100644 index a988333..0000000 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-iframe.html +++ /dev/null @@ -1,38 +0,0 @@ -<!DOCTYPE html> -<style> -html { - scroll-blocks-on: start-touch; -} -iframe { - position: absolute; - height: 15px; /* large enough to prevent scrollbars */ - width: 100px; - border: 0; -} -#f1 { - top: 20px; -} -#f2 { - top: 40px; -} -#f3 { - top: 60px; -} -#f4 { - top: 80px; -} -</style> -<iframe id=f1 srcdoc="<style>html { scroll-blocks-on: none; }</style>"></iframe> -<iframe id=f2 srcdoc="<style>html { scroll-blocks-on: start-touch; }</style>"></iframe> -<iframe id=f3 srcdoc="<style></style>"></iframe> -<iframe id=f4 srcdoc="<style>html { scroll-blocks-on: start-touch scroll-event; }</style>"></iframe> -<script> - onload = function() { - if (window.testRunner) { - testRunner.dumpAsText(); - var output = "Verify that an iframe will be promoted to a composited layer only when it has additional scroll-blocks-on bits.\n\n"; - output += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_SCROLL_BLOCKS_ON); - testRunner.setCustomTextOutput(output); - } - }; -</script> diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-script-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-script-expected.txt deleted file mode 100644 index db1cd4b..0000000 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-script-expected.txt +++ /dev/null @@ -1,26 +0,0 @@ -Verify that setting scroll-blocks-on from script immediately creates the necessary layer. - -{ - "bounds": [800, 600], - "children": [ - { - "bounds": [800, 600], - "scrollBlocksOn": [ - "StartTouch", - "WheelEvent" - ], - "contentsOpaque": true, - "drawsContent": true, - "children": [ - { - "position": [8, 8], - "bounds": [20, 20], - "scrollBlocksOn": [ - "ScrollEvent" - ] - } - ] - } - ] -} - diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-script.html b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-script.html deleted file mode 100644 index 41fab4a..0000000 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-script.html +++ /dev/null @@ -1,19 +0,0 @@ -<!DOCTYPE html> -<style> -#target { - width: 20px; - height: 20px; -} -</style> -<div id="target"></div> -<script> - onload = function() { - target.style.scrollBlocksOn = 'scroll-event'; - if (window.testRunner) { - testRunner.dumpAsText(); - var output = "Verify that setting scroll-blocks-on from script immediately creates the necessary layer.\n\n"; - output += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_SCROLL_BLOCKS_ON); - testRunner.setCustomTextOutput(output); - } - }; -</script> diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-svg-expected.txt b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-svg-expected.txt deleted file mode 100644 index d0ce1b2..0000000 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-svg-expected.txt +++ /dev/null @@ -1,17 +0,0 @@ -This test verifies that SVG documents have the default scroll-blocks-on mode applied to them, and that foreignObject html documents inside them don't create a new composited layer unnecessarily. - -{ - "bounds": [800, 600], - "children": [ - { - "bounds": [800, 600], - "scrollBlocksOn": [ - "StartTouch", - "WheelEvent" - ], - "contentsOpaque": true, - "drawsContent": true - } - ] -} - diff --git a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-svg.svg b/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-svg.svg deleted file mode 100644 index a51d2f7..0000000 --- a/third_party/WebKit/LayoutTests/compositing/layer-creation/scroll-blocks-on-svg.svg +++ /dev/null @@ -1,18 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"> - <foreignObject x="20" y="20" width="200" height="100"> - <html xmlns="http://www.w3.org/1999/xhtml"> - <body> - <div style="height:10px;"></div> - </body> - </html> - </foreignObject> - - <script> - if (window.testRunner) { - testRunner.dumpAsText(); - var output = "This test verifies that SVG documents have the default scroll-blocks-on mode applied to them, and that foreignObject html documents inside them don't create a new composited layer unnecessarily.\n\n"; - output += internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_SCROLL_BLOCKS_ON); - testRunner.setCustomTextOutput(output); - } - </script> -</svg> |
