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..658a2b3f5f9ea8f624dbe176bfa3a139b1ff8257 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,50 +1,55 @@ |
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; |
+function createItem(height, item) { |
+ var element = document.createElement("div"); |
+ element.style.height = height + "px"; |
+ element.textContent = item.title; |
+ return element; |
} |
-var viewport = new UI.ViewportControl({ |
- fastItemHeight: i => heights[i], |
- itemCount: _ => items.length, |
- itemElement: i => items[i] |
-}); |
+ |
+var viewport = new UI.ViewportControl(); |
viewport.element.style.height = "300px"; |
UI.inspectorView.element.appendChild(viewport.element); |
-viewport.refresh(); |
+var items = []; |
+for (var i = 0; i < 100; i++) |
+ items.push({title: i}); |
+ |
+viewport.setFixedHeight(28); |
+viewport.setRenderer(createItem.bind(null, 28)); |
+viewport.replaceAllItems(items); |
dumpViewport(); |
-viewport.forceScrollItemToBeFirst(26); |
+viewport.scrollItemAtIndexIntoView(33); |
dumpViewport(); |
-viewport.scrollItemIntoView(33); |
+viewport.scrollItemAtIndexIntoView(30); |
dumpViewport(); |
-viewport.scrollItemIntoView(30); |
+viewport.scrollItemAtIndexIntoView(7); |
dumpViewport(); |
-viewport.forceScrollItemToBeFirst(30); |
+viewport.scrollItemAtIndexIntoView(99); |
dumpViewport(); |
-viewport.forceScrollItemToBeLast(88); |
+viewport.scrollItemAtIndexIntoView(98); |
dumpViewport(); |
-for (var i = 0; i < 100; i++) |
- items[i].style.height = (heights[i] = (i % 2) ? 55 : 63) + "px"; |
-viewport.refresh(); |
-viewport.forceScrollItemToBeLast(88); |
+viewport.scrollItemAtIndexIntoView(0); |
+dumpViewport(); |
+ |
+viewport.setFixedHeight(55); |
+viewport.setRenderer(createItem.bind(null, 55)); |
+ |
+viewport.scrollItemAtIndexIntoView(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._firstIndex); |
+ TestRunner.addResult("Last:" + viewport._lastIndex); |
+ TestRunner.addResult("ScrollTop:" + viewport.element.scrollTop); |
+ TestRunner.addResult(""); |
} |