Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/fast/scrolling/set-root-scroller.html

Issue 2128553002: Make rootScroller the layout viewport. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@viewportScrollCallbackInterface
Patch Set: Rebase + comment fix in test Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/Document.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/fast/scrolling/set-root-scroller.html
diff --git a/third_party/WebKit/LayoutTests/fast/scrolling/set-root-scroller.html b/third_party/WebKit/LayoutTests/fast/scrolling/set-root-scroller.html
index ca9cdd4e8a6ceef29d12ef09d334aad0dee2b805..177d339ff96f51d05bf392a483669a28963a1180 100644
--- a/third_party/WebKit/LayoutTests/fast/scrolling/set-root-scroller.html
+++ b/third_party/WebKit/LayoutTests/fast/scrolling/set-root-scroller.html
@@ -20,7 +20,13 @@
overflow: auto;
}
- #spacer {
+ #parent {
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+ }
+
+ .spacer {
width: 2000px;
height: 2000px;
}
@@ -35,10 +41,13 @@
}
</style>
-<div id="container">
- <div id="spacer">
- <span id="spanner">TEST</span>
+<div id="parent">
+ <div id="container">
+ <div class="spacer">
+ <span id="spanner">TEST</span>
+ </div>
</div>
+ <div class="spacer"></div>
</div>
<div id="rootspacer"></div>
@@ -46,77 +55,112 @@
<script src="../../resources/testharnessreport.js"></script>
<script>
+ var parentScroller = document.querySelector('#parent');
+ var container = document.querySelector('#container');
+ var spanner = document.querySelector('#spanner');
+
test(function() {
assert_false(typeof document.rootScroller === 'undefined');
}, 'setRootScroller API enabled');
- // TODO(bokan): Break this test up, failing asserts are hard to find.
test(function() {
- // Setting the container object should succeed.
- assert_equals(document.rootScroller, null);
- var container = document.querySelector('#container');
- document.rootScroller = container;
- assert_equals(document.rootScroller, container);
-
- // Trying to set the <span> should succeed even though it's not a valid
- // scroller.
- var spanner = document.querySelector('#spanner');
- document.rootScroller = spanner;
- assert_equals(document.rootScroller, spanner);
-
- // Scroll the container <div> past the end. The scrolls should not chain
- // past the rootScroller to the scrollingElement.
- document.rootScroller = container;
- if (typeof eventSender !== 'undefined') {
- eventSender.gestureScrollBegin(500, 500);
- eventSender.gestureScrollUpdate(-300, -300);
- eventSender.gestureScrollEnd(0, 0);
- eventSender.gestureScrollBegin(500, 500);
- eventSender.gestureScrollUpdate(-300, -300);
- eventSender.gestureScrollEnd(0, 0);
- eventSender.gestureScrollBegin(500, 500);
- eventSender.gestureScrollUpdate(-300, -300);
- eventSender.gestureScrollEnd(0, 0);
- eventSender.gestureScrollBegin(500, 500);
- eventSender.gestureScrollUpdate(-300, -300);
- eventSender.gestureScrollUpdate(-300, -300);
- eventSender.gestureScrollUpdate(-300, -300);
- eventSender.gestureScrollEnd(0, 0);
-
- assert_equals(container.scrollTop, 2000 - 600);
- assert_equals(container.scrollLeft, 2000 - 800);
- assert_equals(document.scrollingElement.scrollTop, 0);
- assert_equals(document.scrollingElement.scrollLeft, 0);
- }
-
- // Making the current rootScroller an invalid scroller should fallback to
- // the default element, the documentElement, but the rootScroller property
- // should remain the same.
- container.style.width = "95%";
- assert_equals(document.rootScroller, container);
-
- // Now scrolling over the <div> should scroll the scrollingElement since the
- // rootElement is invalid (doesn't fill the viewport).
- if (typeof eventSender !== 'undefined') {
- eventSender.gestureScrollBegin(500, 500);
- eventSender.gestureScrollUpdate(-300, -300);
- eventSender.gestureScrollEnd(0, 0);
- eventSender.gestureScrollBegin(500, 500);
- eventSender.gestureScrollUpdate(-300, -300);
- eventSender.gestureScrollEnd(0, 0);
- eventSender.gestureScrollBegin(500, 500);
- eventSender.gestureScrollUpdate(-300, -300);
- eventSender.gestureScrollEnd(0, 0);
- eventSender.gestureScrollBegin(500, 500);
- eventSender.gestureScrollUpdate(-300, -300);
- eventSender.gestureScrollEnd(0, 0);
-
- assert_equals(document.scrollingElement.scrollTop, 400);
- assert_equals(document.scrollingElement.scrollLeft, 200);
- }
-
- // Don't output the text in spanner.
- document.querySelector('#spanner').style.display = 'none';
-
- }, 'Test the setRootScroller API basic functionality');
+ // Setting the container object should succeed.
+ assert_equals(document.rootScroller, null);
+ document.rootScroller = container;
+ assert_equals(document.rootScroller, container);
+ document.rootScroller = null;
+ assert_equals(document.rootScroller, null);
+ }, 'Setter and getter on a valid element works');
+
+ test(function() {
+ // Trying to set the <span> should succeed even though it's not a valid
+ // scroller.
+ document.rootScroller = spanner;
+ assert_equals(document.rootScroller, spanner);
+ }, 'Can set a non-scrolling element as the rootScroller');
+
+ test(function() {
+ // Scroll the container <div> past the end. The scrolls should not chain
+ // past the rootScroller to the parentScroller element.
+ document.rootScroller = container;
+ if (typeof eventSender !== 'undefined') {
+ eventSender.gestureScrollBegin(500, 500);
+ eventSender.gestureScrollUpdate(-300, -300);
+ eventSender.gestureScrollEnd(0, 0);
+ eventSender.gestureScrollBegin(500, 500);
+ eventSender.gestureScrollUpdate(-300, -300);
+ eventSender.gestureScrollEnd(0, 0);
+ eventSender.gestureScrollBegin(500, 500);
+ eventSender.gestureScrollUpdate(-300, -300);
+ eventSender.gestureScrollEnd(0, 0);
+ eventSender.gestureScrollBegin(500, 500);
+ eventSender.gestureScrollUpdate(-300, -300);
+ eventSender.gestureScrollUpdate(-300, -300);
+
+ assert_equals(container.scrollTop, 2000 - 600);
+ assert_equals(container.scrollLeft, 2000 - 800);
+
+ // The container is now fully scrolled. Normally, further scroll
+ // events would chain up to the parent element but, because the
+ // container is the root scroller, we shouldn't chain up past it.
+ eventSender.gestureScrollUpdate(-300, -300);
+ eventSender.gestureScrollEnd(0, 0);
+ eventSender.gestureScrollBegin(500, 500);
+ eventSender.gestureScrollUpdate(-300, -300);
+ eventSender.gestureScrollEnd(0, 0);
+
+ assert_equals(container.scrollTop, 2000 - 600);
+ assert_equals(container.scrollLeft, 2000 - 800);
+ assert_equals(parentScroller.scrollTop, 0);
+ assert_equals(parentScroller.scrollLeft, 0);
+ }
+ }, "Scrolls don't chain past root scroller element");
+
+ test(function() {
+ document.rootScroller = container;
+ container.scrollTop = 999;
+ container.scrollLeft = 998;
+
+ // Window.scrollX and scrollY should reflect the scroll offset of the
+ // rootScroller
+ assert_equals(container.scrollTop, 999);
+ assert_equals(container.scrollLeft, 998);
+ assert_equals(window.scrollY, container.scrollTop);
+ assert_equals(window.scrollX, container.scrollLeft);
+ assert_equals(document.scrollingElement.scrollTop, container.scrollTop);
+ assert_equals(document.scrollingElement.scrollLeft, container.scrollLeft);
+
+ }, "document.scrollingElement and window scroll API reflect rootScroller offsets");
+
+ test(function() {
+ // Making the current rootScroller an invalid scroller (by making it not
+ // fill the viewport) should fallback to the default element, the
+ // documentElement, but the rootScroller property should remain the same.
+ document.rootScroller = container;
+ container.style.width = "95%";
+ assert_equals(document.rootScroller, container);
+
+ // Reset parentScroller's offsets, make container fully scrolled.
+ parentScroller.scrollTop = 0;
+ parentScroller.scrollLeft = 0;
+ container.scrollTop = 10000;
+ container.scrollLeft = 10000;
+
+ // Now scrolling over the container should scroll the scrollingElement
+ // since the rootElement is invalid (doesn't fill the viewport).
+ if (typeof eventSender !== 'undefined') {
+ eventSender.gestureScrollBegin(500, 500);
+ eventSender.gestureScrollUpdate(-300, -300);
+ eventSender.gestureScrollEnd(0, 0);
+ eventSender.gestureScrollBegin(500, 500);
+ eventSender.gestureScrollUpdate(-300, -300);
+ eventSender.gestureScrollEnd(0, 0);
+ eventSender.gestureScrollBegin(500, 500);
+ eventSender.gestureScrollUpdate(-300, -300);
+ eventSender.gestureScrollEnd(0, 0);
+
+ assert_equals(parentScroller.scrollTop, 900);
+ assert_equals(parentScroller.scrollLeft, 900);
+ }
+ }, "Setting an invalid rootScroller should reset to using the documentElement.");
</script>
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698