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

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/ui/ViewportControl.js

Issue 2179123004: DevTools: fix stick to bottom in console viewport (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Best attempt at tests Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 this._provider = provider; 52 this._provider = provider;
53 this.element.addEventListener("scroll", this._onScroll.bind(this), false); 53 this.element.addEventListener("scroll", this._onScroll.bind(this), false);
54 this.element.addEventListener("copy", this._onCopy.bind(this), false); 54 this.element.addEventListener("copy", this._onCopy.bind(this), false);
55 this.element.addEventListener("dragstart", this._onDragStart.bind(this), fal se); 55 this.element.addEventListener("dragstart", this._onDragStart.bind(this), fal se);
56 56
57 this._firstVisibleIndex = 0; 57 this._firstVisibleIndex = 0;
58 this._lastVisibleIndex = -1; 58 this._lastVisibleIndex = -1;
59 this._renderedItems = []; 59 this._renderedItems = [];
60 this._anchorSelection = null; 60 this._anchorSelection = null;
61 this._headSelection = null; 61 this._headSelection = null;
62 this._stickToBottom = false;
63 this._scrolledToBottom = true;
64 this._itemCount = 0; 62 this._itemCount = 0;
63 this._observer = new MutationObserver(this.refresh.bind(this));
lushnikov 2016/07/30 01:31:12 what do you use mutation observer for? Could you p
luoe 2016/08/01 21:44:37 MutationObserver ensures that a refresh will be fi
64 this._observerConfig = { childList: true, subtree: true };
65
66 this.setStickToBottom(true);
dgozman 2016/07/30 16:15:54 It was false by default before.
luoe 2016/08/01 21:44:37 Right, I'll remove this.
65 } 67 }
66 68
67 /** 69 /**
68 * @interface 70 * @interface
69 */ 71 */
70 WebInspector.ViewportControl.Provider = function() 72 WebInspector.ViewportControl.Provider = function()
71 { 73 {
72 } 74 }
73 75
74 WebInspector.ViewportControl.Provider.prototype = { 76 WebInspector.ViewportControl.Provider.prototype = {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 element: function() 140 element: function()
139 { 141 {
140 return this._element; 142 return this._element;
141 }, 143 },
142 } 144 }
143 145
144 WebInspector.ViewportControl.prototype = { 146 WebInspector.ViewportControl.prototype = {
145 /** 147 /**
146 * @return {boolean} 148 * @return {boolean}
147 */ 149 */
148 scrolledToBottom: function() 150 stickToBottom: function()
149 { 151 {
150 return this._scrolledToBottom; 152 return this._stickToBottom;
151 }, 153 },
152 154
153 /** 155 /**
154 * @param {boolean} value 156 * @param {boolean} value
155 */ 157 */
156 setStickToBottom: function(value) 158 setStickToBottom: function(value)
157 { 159 {
158 this._stickToBottom = value; 160 this._stickToBottom = value;
161 if (this._stickToBottom)
162 this._observer.observe(this._contentElement, this._observerConfig);
163 else
164 this._observer.disconnect();
159 }, 165 },
160 166
161 /** 167 /**
162 * @param {!Event} event 168 * @param {!Event} event
163 */ 169 */
164 _onCopy: function(event) 170 _onCopy: function(event)
165 { 171 {
166 var text = this._selectedText(); 172 var text = this._selectedText();
167 if (!text) 173 if (!text)
168 return; 174 return;
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 else if (this._headSelection.item > this._lastVisibleIndex) 375 else if (this._headSelection.item > this._lastVisibleIndex)
370 headElement = this._bottomGapElement; 376 headElement = this._bottomGapElement;
371 headOffset = this._selectionIsBackward ? 0 : 1; 377 headOffset = this._selectionIsBackward ? 0 : 1;
372 } 378 }
373 379
374 selection.setBaseAndExtent(anchorElement, anchorOffset, headElement, hea dOffset); 380 selection.setBaseAndExtent(anchorElement, anchorOffset, headElement, hea dOffset);
375 }, 381 },
376 382
377 refresh: function() 383 refresh: function()
378 { 384 {
385 this._observer.disconnect();
386 this._innerRefresh();
387 if (this._stickToBottom)
388 this._observer.observe(this._contentElement, this._observerConfig);
389 },
390
391 _innerRefresh: function()
392 {
379 if (!this._visibleHeight()) 393 if (!this._visibleHeight())
380 return; // Do nothing for invisible controls. 394 return; // Do nothing for invisible controls.
381 395
382 if (!this._itemCount) { 396 if (!this._itemCount) {
383 for (var i = 0; i < this._renderedItems.length; ++i) 397 for (var i = 0; i < this._renderedItems.length; ++i)
384 this._renderedItems[i].willHide(); 398 this._renderedItems[i].willHide();
385 this._renderedItems = []; 399 this._renderedItems = [];
386 this._contentElement.removeChildren(); 400 this._contentElement.removeChildren();
387 this._topGapElement.style.height = "0px"; 401 this._topGapElement.style.height = "0px";
388 this._bottomGapElement.style.height = "0px"; 402 this._bottomGapElement.style.height = "0px";
389 this._firstVisibleIndex = -1; 403 this._firstVisibleIndex = -1;
390 this._lastVisibleIndex = -1; 404 this._lastVisibleIndex = -1;
391 return; 405 return;
392 } 406 }
393 407
394 var selection = this.element.getComponentSelection(); 408 var selection = this.element.getComponentSelection();
395 var shouldRestoreSelection = this._updateSelectionModel(selection); 409 var shouldRestoreSelection = this._updateSelectionModel(selection);
396 410
397 var visibleFrom = this.element.scrollTop; 411 var visibleFrom = this.element.scrollTop;
398 var visibleHeight = this._visibleHeight(); 412 var visibleHeight = this._visibleHeight();
399 this._scrolledToBottom = this.element.isScrolledToBottom();
400 var isInvalidating = !this._cumulativeHeights; 413 var isInvalidating = !this._cumulativeHeights;
401 414
402 for (var i = 0; i < this._renderedItems.length; ++i) { 415 for (var i = 0; i < this._renderedItems.length; ++i) {
403 // Tolerate 1-pixel error due to double-to-integer rounding errors. 416 // Tolerate 1-pixel error due to double-to-integer rounding errors.
404 if (this._cumulativeHeights && Math.abs(this._cachedItemHeight(this. _firstVisibleIndex + i) - this._renderedItems[i].element().offsetHeight) > 1) 417 if (this._cumulativeHeights && Math.abs(this._cachedItemHeight(this. _firstVisibleIndex + i) - this._renderedItems[i].element().offsetHeight) > 1)
405 delete this._cumulativeHeights; 418 delete this._cumulativeHeights;
406 } 419 }
407 this._rebuildCumulativeHeightsIfNeeded(); 420 this._rebuildCumulativeHeightsIfNeeded();
408 var oldFirstVisibleIndex = this._firstVisibleIndex; 421 var oldFirstVisibleIndex = this._firstVisibleIndex;
409 var oldLastVisibleIndex = this._lastVisibleIndex; 422 var oldLastVisibleIndex = this._lastVisibleIndex;
410 423
411 var shouldStickToBottom = this._stickToBottom && this._scrolledToBottom; 424 // When the viewport is scrolled to the bottom and the last visible mess age sits above the
412 425 // text prompt, we may overestimate the number of next visible indices w hen new messages are
413 if (shouldStickToBottom) { 426 // added. This stickToBottom check avoids extra calls to refresh() in th ose cases.
427 if (this._stickToBottom) {
428 this._firstVisibleIndex = Math.max(this._itemCount - Math.ceil(visib leHeight / this._provider.minimumRowHeight()), 0);
414 this._lastVisibleIndex = this._itemCount - 1; 429 this._lastVisibleIndex = this._itemCount - 1;
415 this._firstVisibleIndex = Math.max(this._itemCount - Math.ceil(visib leHeight / this._provider.minimumRowHeight()), 0);
416 } else { 430 } else {
417 this._firstVisibleIndex = Math.max(Array.prototype.lowerBound.call(t his._cumulativeHeights, visibleFrom + 1), 0); 431 this._firstVisibleIndex = Math.max(Array.prototype.lowerBound.call(t his._cumulativeHeights, visibleFrom + 1), 0);
418 // Proactively render more rows in case some of them will be collaps ed without triggering refresh. @see crbug.com/390169 432 // Proactively render more rows in case some of them will be collaps ed without triggering refresh. @see crbug.com/390169
419 this._lastVisibleIndex = this._firstVisibleIndex + Math.ceil(visible Height / this._provider.minimumRowHeight()) - 1; 433 this._lastVisibleIndex = this._firstVisibleIndex + Math.ceil(visible Height / this._provider.minimumRowHeight()) - 1;
420 this._lastVisibleIndex = Math.min(this._lastVisibleIndex, this._item Count - 1); 434 this._lastVisibleIndex = Math.min(this._lastVisibleIndex, this._item Count - 1);
421 } 435 }
436
422 var topGapHeight = this._cumulativeHeights[this._firstVisibleIndex - 1] || 0; 437 var topGapHeight = this._cumulativeHeights[this._firstVisibleIndex - 1] || 0;
423 var bottomGapHeight = this._cumulativeHeights[this._cumulativeHeights.le ngth - 1] - this._cumulativeHeights[this._lastVisibleIndex]; 438 var bottomGapHeight = this._cumulativeHeights[this._cumulativeHeights.le ngth - 1] - this._cumulativeHeights[this._lastVisibleIndex];
424 439
425 /** 440 /**
426 * @this {WebInspector.ViewportControl} 441 * @this {WebInspector.ViewportControl}
427 */ 442 */
428 function prepare() 443 function prepare()
429 { 444 {
430 this._topGapElement.style.height = topGapHeight + "px"; 445 this._topGapElement.style.height = topGapHeight + "px";
431 this._bottomGapElement.style.height = bottomGapHeight + "px"; 446 this._bottomGapElement.style.height = bottomGapHeight + "px";
432 this._topGapElement._active = !!topGapHeight; 447 this._topGapElement._active = !!topGapHeight;
433 this._bottomGapElement._active = !!bottomGapHeight; 448 this._bottomGapElement._active = !!bottomGapHeight;
434 this._contentElement.style.setProperty("height", "10000000px"); 449 this._contentElement.style.setProperty("height", "10000000px");
435 } 450 }
436 451
437 if (isInvalidating) 452 if (isInvalidating)
438 this._fullViewportUpdate(prepare.bind(this)); 453 this._fullViewportUpdate(prepare.bind(this));
439 else 454 else
440 this._partialViewportUpdate(oldFirstVisibleIndex, oldLastVisibleInde x, prepare.bind(this)); 455 this._partialViewportUpdate(oldFirstVisibleIndex, oldLastVisibleInde x, prepare.bind(this));
441 this._contentElement.style.removeProperty("height"); 456 this._contentElement.style.removeProperty("height");
442 // Should be the last call in the method as it might force layout. 457 // Should be the last call in the method as it might force layout.
443 if (shouldRestoreSelection) 458 if (shouldRestoreSelection)
444 this._restoreSelection(selection); 459 this._restoreSelection(selection);
445 if (shouldStickToBottom) 460 if (this._stickToBottom)
446 this.element.scrollTop = 10000000; 461 this.element.scrollTop = 10000000;
447 }, 462 },
448 463
449 /** 464 /**
450 * @param {function()} prepare 465 * @param {function()} prepare
451 */ 466 */
452 _fullViewportUpdate: function(prepare) 467 _fullViewportUpdate: function(prepare)
453 { 468 {
454 for (var i = 0; i < this._renderedItems.length; ++i) 469 for (var i = 0; i < this._renderedItems.length; ++i)
455 this._renderedItems[i].willHide(); 470 this._renderedItems[i].willHide();
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 this.forceScrollItemToBeFirst(index); 620 this.forceScrollItemToBeFirst(index);
606 else if (index >= this._lastVisibleIndex) 621 else if (index >= this._lastVisibleIndex)
607 this.forceScrollItemToBeLast(index); 622 this.forceScrollItemToBeLast(index);
608 }, 623 },
609 624
610 /** 625 /**
611 * @param {number} index 626 * @param {number} index
612 */ 627 */
613 forceScrollItemToBeFirst: function(index) 628 forceScrollItemToBeFirst: function(index)
614 { 629 {
630 this.setStickToBottom(false);
615 this._rebuildCumulativeHeightsIfNeeded(); 631 this._rebuildCumulativeHeightsIfNeeded();
616 this.element.scrollTop = index > 0 ? this._cumulativeHeights[index - 1] : 0; 632 this.element.scrollTop = index > 0 ? this._cumulativeHeights[index - 1] : 0;
633 if (this.element.isScrolledToBottom())
634 this.setStickToBottom(true);
617 this.refresh(); 635 this.refresh();
618 }, 636 },
619 637
620 /** 638 /**
621 * @param {number} index 639 * @param {number} index
622 */ 640 */
623 forceScrollItemToBeLast: function(index) 641 forceScrollItemToBeLast: function(index)
624 { 642 {
643 this.setStickToBottom(false);
625 this._rebuildCumulativeHeightsIfNeeded(); 644 this._rebuildCumulativeHeightsIfNeeded();
626 this.element.scrollTop = this._cumulativeHeights[index] - this._visibleH eight(); 645 this.element.scrollTop = this._cumulativeHeights[index] - this._visibleH eight();
646 if (this.element.isScrolledToBottom())
647 this.setStickToBottom(true);
627 this.refresh(); 648 this.refresh();
628 }, 649 },
629 650
630 /** 651 /**
631 * @return {number} 652 * @return {number}
632 */ 653 */
633 _visibleHeight: function() 654 _visibleHeight: function()
634 { 655 {
635 // Use offsetHeight instead of clientHeight to avoid being affected by h orizontal scroll. 656 // Use offsetHeight instead of clientHeight to avoid being affected by h orizontal scroll.
636 return this.element.offsetHeight; 657 return this.element.offsetHeight;
637 } 658 }
638 } 659 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698