Index: third_party/WebKit/LayoutTests/http/tests/inspector-unit/viewport-control.js |
diff --git a/third_party/WebKit/LayoutTests/http/tests/inspector-unit/viewport-control.js b/third_party/WebKit/LayoutTests/http/tests/inspector-unit/viewport-control.js |
index 1a0b1fac00aec5da0b8a2276c38a2d65a6ffd945..778d9c5cab55f110b646ace9cfc812f7accab87c 100644 |
--- a/third_party/WebKit/LayoutTests/http/tests/inspector-unit/viewport-control.js |
+++ b/third_party/WebKit/LayoutTests/http/tests/inspector-unit/viewport-control.js |
@@ -1,24 +1,19 @@ |
-TestRunner.addResult("This tests if the ViewportControl works properly."); |
- |
-var items = []; |
-var heights = []; |
-for (var i = 0; i < 100; i++){ |
- items[i] = document.createElement("div"); |
- items[i].style.height = (heights[i] = (i % 4) ? 50 : 28) + "px"; |
- items[i].textContent = i; |
+TestRunner.addResult("This tests if the SimpleViewport works properly."); |
+ |
+var height; |
+function createItem(index) { |
+ var item = document.createElement("div"); |
+ item.style.height = height + "px"; |
+ item.textContent = index; |
+ return item; |
} |
-var viewport = new UI.ViewportControl({ |
- fastItemHeight: i => heights[i], |
- itemCount: _ => items.length, |
- itemElement: i => items[i] |
-}); |
+ |
+var viewport = new UI.SimpleViewport(createItem); |
viewport.element.style.height = "300px"; |
UI.inspectorView.element.appendChild(viewport.element); |
-viewport.refresh(); |
-dumpViewport(); |
- |
-viewport.forceScrollItemToBeFirst(26); |
+height = 28; |
+viewport.refresh(100); |
dumpViewport(); |
viewport.scrollItemIntoView(33); |
@@ -27,24 +22,31 @@ dumpViewport(); |
viewport.scrollItemIntoView(30); |
dumpViewport(); |
-viewport.forceScrollItemToBeFirst(30); |
+viewport.scrollItemIntoView(7); |
+dumpViewport(); |
+ |
+viewport.scrollItemIntoView(99); |
+dumpViewport(); |
+ |
+viewport.scrollItemIntoView(98); |
dumpViewport(); |
-viewport.forceScrollItemToBeLast(88); |
+viewport.scrollItemIntoView(0); |
dumpViewport(); |
-for (var i = 0; i < 100; i++) |
- items[i].style.height = (heights[i] = (i % 2) ? 55 : 63) + "px"; |
-viewport.refresh(); |
-viewport.forceScrollItemToBeLast(88); |
+height = 55; |
+viewport.resetElementHeight(); |
+viewport.refresh(100); |
+ |
+viewport.scrollItemIntoView(88); |
dumpViewport(); |
TestRunner.completeTest(); |
function dumpViewport() |
{ |
- TestRunner.addResult("First:" + viewport.firstVisibleIndex()); |
- TestRunner.addResult("Last:" + viewport.lastVisibleIndex()); |
- TestRunner.addResult("Active Items:" + viewport._innerElement.children.length); |
- TestRunner.addResult(""); |
+ TestRunner.addResult("First:" + viewport._viewport._firstIndex); |
+ TestRunner.addResult("Last:" + viewport._viewport._lastIndex); |
+ TestRunner.addResult("ScrollTop:" + viewport.element.scrollTop); |
+ TestRunner.addResult(""); |
} |