Changeset 146200 in webkit


Ignore:
Timestamp:
Mar 19, 2013 5:54:56 AM (11 years ago)
Author:
loislo@chromium.org
Message:

Web Inspector: rename TimelineOverviewWindow to OverviewGrid.Window and fix names for constants.
​https://bugs.webkit.org/show_bug.cgi?id=112685

Reviewed by Yury Semikhatsky.

It is the second patch which extracts OverviewGrid from TimelineOverviewPane.
It renames internal components of OverviewGrid.
WebInspector.TimelineOverviewWindow -> WebInspector.OverviewGrid.Window
WebInspector.TimelineOverviewWindow.WindowSelector -> WebInspector.OverviewGrid.WindowSelector

and moves constants from WebInspector.TimelineOverviewWindow namespace to WebInspector.OverviewGrid namespace

  • inspector/front-end/TimelineOverviewPane.js:

(WebInspector.TimelineOverviewPane):
(WebInspector.OverviewGrid):
(WebInspector.OverviewGrid.Window):
(WebInspector.OverviewGrid.Window.prototype._startWindowSelectorDragging):
(WebInspector.OverviewGrid.Window.prototype._endWindowSelectorDragging):
(WebInspector.OverviewGrid.Window.prototype._startWindowDragging):
(WebInspector.OverviewGrid.Window.prototype._windowDragging):
(WebInspector.OverviewGrid.Window.prototype._moveWindow):
(WebInspector.OverviewGrid.Window.prototype._resizeWindowRight):
(WebInspector.OverviewGrid.Window.prototype._setWindowPosition):
(WebInspector.OverviewGrid.Window.prototype._onMouseWheel):
(WebInspector.OverviewGrid.Window.prototype._zoom):
(WebInspector.OverviewGrid.WindowSelector):
(WebInspector.OverviewGrid.WindowSelector.prototype._createSelectorElement):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r146199 r146200  
     12013-03-19  Ilya Tikhonovsky  <loislo@chromium.org>
     2
     3        Web Inspector: rename TimelineOverviewWindow to OverviewGrid.Window and fix names for constants.
     4        https://bugs.webkit.org/show_bug.cgi?id=112685
     5
     6        Reviewed by Yury Semikhatsky.
     7
     8        It is the second patch which extracts OverviewGrid from TimelineOverviewPane.
     9        It renames internal components of OverviewGrid.
     10        WebInspector.TimelineOverviewWindow -> WebInspector.OverviewGrid.Window
     11        WebInspector.TimelineOverviewWindow.WindowSelector -> WebInspector.OverviewGrid.WindowSelector
     12
     13        and moves constants from WebInspector.TimelineOverviewWindow namespace to WebInspector.OverviewGrid namespace
     14
     15        * inspector/front-end/TimelineOverviewPane.js:
     16        (WebInspector.TimelineOverviewPane):
     17        (WebInspector.OverviewGrid):
     18        (WebInspector.OverviewGrid.Window):
     19        (WebInspector.OverviewGrid.Window.prototype._startWindowSelectorDragging):
     20        (WebInspector.OverviewGrid.Window.prototype._endWindowSelectorDragging):
     21        (WebInspector.OverviewGrid.Window.prototype._startWindowDragging):
     22        (WebInspector.OverviewGrid.Window.prototype._windowDragging):
     23        (WebInspector.OverviewGrid.Window.prototype._moveWindow):
     24        (WebInspector.OverviewGrid.Window.prototype._resizeWindowRight):
     25        (WebInspector.OverviewGrid.Window.prototype._setWindowPosition):
     26        (WebInspector.OverviewGrid.Window.prototype._onMouseWheel):
     27        (WebInspector.OverviewGrid.Window.prototype._zoom):
     28        (WebInspector.OverviewGrid.WindowSelector):
     29        (WebInspector.OverviewGrid.WindowSelector.prototype._createSelectorElement):
     30
    1312013-03-19  Ilya Tikhonovsky  <loislo@chromium.org>
    232

  • trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js

    r146199 r146200  
    9797    model.addEventListener(WebInspector.TimelineModel.Events.RecordAdded, this._onRecordAdded, this);
    9898    model.addEventListener(WebInspector.TimelineModel.Events.RecordsCleared, this._reset, this);
    99     this._overviewGrid.addEventListener(WebInspector.TimelineOverviewWindow.Events.WindowChanged, this._onWindowChanged, this);
     99    this._overviewGrid.addEventListener(WebInspector.OverviewGrid.Events.WindowChanged, this._onWindowChanged, this);
    100100}
    101101
    102102/**
    103103 * @constructor
     104 * @param {string} prefix
    104105 */
    105106WebInspector.OverviewGrid = function(prefix)
    … …  
    116117    this.element.appendChild(this._grid.element);
    117118
    118     this._window = new WebInspector.TimelineOverviewWindow(this.element, this._grid.dividersLabelBarElement);
     119    this._window = new WebInspector.OverviewGrid.Window(this.element, this._grid.dividersLabelBarElement, prefix);
    119120}
    120121
    … …  
    223224
    224225
    225 WebInspector.TimelineOverviewPane.MinSelectableSize = 12;
    226 
    227 WebInspector.TimelineOverviewPane.WindowScrollSpeedFactor = .3;
    228 
    229 WebInspector.TimelineOverviewPane.ResizerOffset = 3.5; // half pixel because offset values are not rounded but ceiled
     226WebInspector.OverviewGrid.MinSelectableSize = 12;
     227
     228WebInspector.OverviewGrid.WindowScrollSpeedFactor = .3;
     229
     230WebInspector.OverviewGrid.ResizerOffset = 3.5; // half pixel because offset values are not rounded but ceiled
    230231
    231232WebInspector.TimelineOverviewPane.Mode = {
    … …  
    472473 * @param {Element} parentElement
    473474 * @param {Element} dividersLabelBarElement
     475 * @param {string} prefix
    474476 */
    475 WebInspector.TimelineOverviewWindow = function(parentElement, dividersLabelBarElement)
     477WebInspector.OverviewGrid.Window = function(parentElement, dividersLabelBarElement, prefix)
    476478{
    477479    this._parentElement = parentElement;
    478480    this._dividersLabelBarElement = dividersLabelBarElement;
     481    this._prefix = prefix;
    479482
    480483    WebInspector.installDragHandle(this._parentElement, this._startWindowSelectorDragging.bind(this), this._windowSelectorDragging.bind(this), this._endWindowSelectorDragging.bind(this), "ew-resize");
    … …  
    488491
    489492    this._overviewWindowElement = document.createElement("div");
    490     this._overviewWindowElement.className = "timeline-overview-window";
     493    this._overviewWindowElement.className = prefix + "-overview-window";
    491494    parentElement.appendChild(this._overviewWindowElement);
    492495
    493496    this._overviewWindowBordersElement = document.createElement("div");
    494     this._overviewWindowBordersElement.className = "timeline-overview-window-rulers";
     497    this._overviewWindowBordersElement.className = prefix + "-overview-window-rulers";
    495498    parentElement.appendChild(this._overviewWindowBordersElement);
    496499
    497500    var overviewDividersBackground = document.createElement("div");
    498     overviewDividersBackground.className = "timeline-overview-dividers-background";
     501    overviewDividersBackground.className = prefix + "-overview-dividers-background";
    499502    parentElement.appendChild(overviewDividersBackground);
    500503
    501504    this._leftResizeElement = document.createElement("div");
    502     this._leftResizeElement.className = "timeline-window-resizer";
     505    this._leftResizeElement.className = prefix + "-window-resizer";
    503506    this._leftResizeElement.style.left = 0;
    504507    parentElement.appendChild(this._leftResizeElement);
    … …  
    506509
    507510    this._rightResizeElement = document.createElement("div");
    508     this._rightResizeElement.className = "timeline-window-resizer timeline-window-resizer-right";
     511    this._rightResizeElement.className = prefix + "-window-resizer " + prefix + "-window-resizer-right";
    509512    this._rightResizeElement.style.right = 0;
    510513    parentElement.appendChild(this._rightResizeElement);
    … …  
    512515}
    513516
    514 WebInspector.TimelineOverviewWindow.Events = {
     517WebInspector.OverviewGrid.Events = {
    515518    WindowChanged: "WindowChanged"
    516519}
    517520
    518 WebInspector.TimelineOverviewWindow.prototype = {
     521WebInspector.OverviewGrid.Window.prototype = {
    519522    reset: function()
    520523    {
    … …  
    555558    {
    556559        var position = event.pageX - this._parentElement.offsetLeft;
    557         this._overviewWindowSelector = new WebInspector.TimelineOverviewPane.WindowSelector(this._parentElement, position);
     560        this._overviewWindowSelector = new WebInspector.OverviewGrid.WindowSelector(this._parentElement, position, this._prefix);
    558561        return true;
    559562    },
    … …  
    577580        if (window.end === window.start) { // Click, not drag.
    578581            var middle = window.end;
    579             window.start = Math.max(0, middle - WebInspector.TimelineOverviewPane.MinSelectableSize / 2);
    580             window.end = Math.min(this._parentElement.clientWidth, middle + WebInspector.TimelineOverviewPane.MinSelectableSize / 2);
    581         } else if (window.end - window.start < WebInspector.TimelineOverviewPane.MinSelectableSize) {
    582             if (this._parentElement.clientWidth - window.end > WebInspector.TimelineOverviewPane.MinSelectableSize)
    583                 window.end = window.start + WebInspector.TimelineOverviewPane.MinSelectableSize;
     582            window.start = Math.max(0, middle - WebInspector.OverviewGrid.MinSelectableSize / 2);
     583            window.end = Math.min(this._parentElement.clientWidth, middle + WebInspector.OverviewGrid.MinSelectableSize / 2);
     584        } else if (window.end - window.start < WebInspector.OverviewGrid.MinSelectableSize) {
     585            if (this._parentElement.clientWidth - window.end > WebInspector.OverviewGrid.MinSelectableSize)
     586                window.end = window.start + WebInspector.OverviewGrid.MinSelectableSize;
    584587            else
    585                 window.start = window.end - WebInspector.TimelineOverviewPane.MinSelectableSize;
     588                window.start = window.end - WebInspector.OverviewGrid.MinSelectableSize;
    586589        }
    587590        this._setWindowPosition(window.start, window.end);
    … …  
    594597    _startWindowDragging: function(event)
    595598    {
    596         var windowLeft = this._leftResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset;
     599        var windowLeft = this._leftResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
    597600        this._dragOffset = windowLeft - event.pageX;
    598601        return true;
    … …  
    604607    _windowDragging: function(event)
    605608    {
    606         var windowLeft = this._leftResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset;
     609        var windowLeft = this._leftResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
    607610        var start = this._dragOffset + event.pageX;
    608611        this._moveWindow(start);
    … …  
    623626    _moveWindow: function(start)
    624627    {
    625         var windowLeft = this._leftResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset;
    626         var windowRight = this._rightResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset;
     628        var windowLeft = this._leftResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
     629        var windowRight = this._rightResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
    627630        var windowSize = windowRight - windowLeft;
    628631        var end = start + windowSize;
    … …  
    661664        if (end > this._parentElement.clientWidth - 10)
    662665            end = this._parentElement.clientWidth;
    663         else if (end < this._leftResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.MinSelectableSize)
    664             end = this._leftResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.MinSelectableSize;
     666        else if (end < this._leftResizeElement.offsetLeft + WebInspector.OverviewGrid.MinSelectableSize)
     667            end = this._leftResizeElement.offsetLeft + WebInspector.OverviewGrid.MinSelectableSize;
    665668        this._setWindowPosition(null, end);
    666669    },
    … …  
    701704        this._overviewWindowElement.style.width = (this.windowRight - this.windowLeft) * 100 + "%";
    702705        this._overviewWindowBordersElement.style.right = (1 - this.windowRight + 2 * rulerAdjustment) * 100 + "%";
    703         this.dispatchEventToListeners(WebInspector.TimelineOverviewWindow.Events.WindowChanged);
     706        this.dispatchEventToListeners(WebInspector.OverviewGrid.Events.WindowChanged);
    704707    },
    705708
    … …  
    717720        }
    718721        if (typeof event.wheelDeltaX === "number" && event.wheelDeltaX) {
    719             var windowLeft = this._leftResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset;
    720             var start = windowLeft - Math.round(event.wheelDeltaX * WebInspector.TimelineOverviewPane.WindowScrollSpeedFactor);
     722            var windowLeft = this._leftResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
     723            var start = windowLeft - Math.round(event.wheelDeltaX * WebInspector.OverviewGrid.WindowScrollSpeedFactor);
    721724            this._moveWindow(start);
    722725            event.preventDefault();
    … …  
    730733    _zoom: function(factor, referencePoint)
    731734    {
    732         var left = this._leftResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset;
    733         var right = this._rightResizeElement.offsetLeft + WebInspector.TimelineOverviewPane.ResizerOffset;
     735        var left = this._leftResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
     736        var right = this._rightResizeElement.offsetLeft + WebInspector.OverviewGrid.ResizerOffset;
    734737
    735738        var delta = factor * (right - left);
    736         if (factor < 1 && delta < WebInspector.TimelineOverviewPane.MinSelectableSize)
     739        if (factor < 1 && delta < WebInspector.OverviewGrid.MinSelectableSize)
    737740            return;
    738741        var max = this._parentElement.clientWidth;
    … …  
    816819/**
    817820 * @constructor
     821 * @param {string} prefix
    818822 */
    819 WebInspector.TimelineOverviewPane.WindowSelector = function(parent, position)
     823WebInspector.OverviewGrid.WindowSelector = function(parent, position, prefix)
    820824{
     825    this._prefix = prefix;
    821826    this._startPosition = position;
    822827    this._width = parent.offsetWidth;
    823828    this._windowSelector = document.createElement("div");
    824     this._windowSelector.className = "timeline-window-selector";
     829    this._windowSelector.className = prefix + "-window-selector";
    825830    this._windowSelector.style.left = this._startPosition + "px";
    826831    this._windowSelector.style.right = this._width - this._startPosition +  + "px";
    … …  
    828833}
    829834
    830 WebInspector.TimelineOverviewPane.WindowSelector.prototype = {
     835WebInspector.OverviewGrid.WindowSelector.prototype = {
    831836    _createSelectorElement: function(parent, left, width, height)
    832837    {
    833838        var selectorElement = document.createElement("div");
    834         selectorElement.className = "timeline-window-selector";
     839        selectorElement.className = this._prefix + "-window-selector";
    835840        selectorElement.style.left = left + "px";
    836841        selectorElement.style.width = width + "px";
Note: See TracChangeset for help on using the changeset viewer.