<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[146085] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/146085">146085</a></dd>
<dt>Author</dt> <dd>kbr@google.com</dd>
<dt>Date</dt> <dd>2013-03-18 10:53:52 -0700 (Mon, 18 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/146079">r146079</a>.
http://trac.webkit.org/changeset/146079
https://bugs.webkit.org/show_bug.cgi?id=112594

many timeline tests failed. (Requested by loislo on #webkit).

Patch by Sheriff Bot &lt;webkit.review.bot@gmail.com&gt; on 2013-03-18

* inspector/front-end/TimelineOverviewPane.js:
(WebInspector.TimelineOverviewPane):
(WebInspector.TimelineOverviewPane.prototype.setMode):
(WebInspector.TimelineOverviewPane.prototype._setFrameMode):
(WebInspector.TimelineOverviewPane.prototype._update):
(WebInspector.TimelineOverviewPane.prototype.sidebarResized):
(WebInspector.TimelineOverviewPane.prototype.zoomToFrame):
(WebInspector.TimelineOverviewPane.prototype._reset):
(WebInspector.TimelineOverviewPane.prototype.windowLeft):
(WebInspector.TimelineOverviewPane.prototype.windowRight):
(WebInspector.TimelineOverviewPane.prototype._updateWindow):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorfrontendTimelineOverviewPanejs">trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (146084 => 146085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-03-18 17:49:52 UTC (rev 146084)
+++ trunk/Source/WebCore/ChangeLog        2013-03-18 17:53:52 UTC (rev 146085)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-03-18  Sheriff Bot  &lt;webkit.review.bot@gmail.com&gt;
+
+        Unreviewed, rolling out r146079.
+        http://trac.webkit.org/changeset/146079
+        https://bugs.webkit.org/show_bug.cgi?id=112594
+
+        many timeline tests failed. (Requested by loislo on #webkit).
+
+        * inspector/front-end/TimelineOverviewPane.js:
+        (WebInspector.TimelineOverviewPane):
+        (WebInspector.TimelineOverviewPane.prototype.setMode):
+        (WebInspector.TimelineOverviewPane.prototype._setFrameMode):
+        (WebInspector.TimelineOverviewPane.prototype._update):
+        (WebInspector.TimelineOverviewPane.prototype.sidebarResized):
+        (WebInspector.TimelineOverviewPane.prototype.zoomToFrame):
+        (WebInspector.TimelineOverviewPane.prototype._reset):
+        (WebInspector.TimelineOverviewPane.prototype.windowLeft):
+        (WebInspector.TimelineOverviewPane.prototype.windowRight):
+        (WebInspector.TimelineOverviewPane.prototype._updateWindow):
+
</ins><span class="cx"> 2013-03-18  Peter Beverloo  &lt;peter@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         [Chromium] The &lt;select&gt; element on Android should also switch to new-flexbox
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorfrontendTimelineOverviewPanejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js (146084 => 146085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js        2013-03-18 17:49:52 UTC (rev 146084)
+++ trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js        2013-03-18 17:53:52 UTC (rev 146085)
</span><span class="lines">@@ -74,152 +74,40 @@
</span><span class="cx">     
</span><span class="cx">     this._overviewItems[this._currentMode].revealAndSelect(false);
</span><span class="cx"> 
</span><del>-    this._overviewGrid = new WebInspector.OverviewGrid(&quot;timeline&quot;);
</del><ins>+    this._overviewContainer = this.element.createChild(&quot;div&quot;, &quot;fill&quot;);
+    this._overviewContainer.id = &quot;timeline-overview-container&quot;;
</ins><span class="cx"> 
</span><ins>+    this._overviewGrid = new WebInspector.TimelineGrid();
+    this._overviewGrid.element.id = &quot;timeline-overview-grid&quot;;
+    this._overviewGrid.itemsGraphsElement.id = &quot;timeline-overview-timelines&quot;;
+
+    this._overviewContainer.appendChild(this._overviewGrid.element);
+
</ins><span class="cx">     this._heapGraph = new WebInspector.HeapGraph(this._model);
</span><span class="cx">     this._heapGraph.element.id = &quot;timeline-overview-memory&quot;;
</span><del>-    this._overviewGrid.insertBeforeItemsGraphsElement(this._heapGraph.element);
</del><ins>+    this._overviewGrid.element.insertBefore(this._heapGraph.element, this._overviewGrid.itemsGraphsElement);
</ins><span class="cx"> 
</span><ins>+    this._overviewWindow = new WebInspector.TimelineOverviewWindow(this._overviewContainer, this._overviewGrid.dividersLabelBarElement);
+    this._overviewWindow.addEventListener(WebInspector.TimelineOverviewWindow.Events.WindowChanged, this._onWindowChanged, this);
+
</ins><span class="cx">     var separatorElement = document.createElement(&quot;div&quot;);
</span><span class="cx">     separatorElement.id = &quot;timeline-overview-separator&quot;;
</span><span class="cx">     this.element.appendChild(separatorElement);
</span><span class="cx"> 
</span><span class="cx">     this._categoryStrips = new WebInspector.TimelineCategoryStrips(this._model);
</span><del>-    this._overviewGrid.itemsGraphsElement().appendChild(this._categoryStrips.element);
</del><ins>+    this._overviewGrid.itemsGraphsElement.appendChild(this._categoryStrips.element);
</ins><span class="cx">  
</span><span class="cx">     var categories = WebInspector.TimelinePresentationModel.categories();
</span><span class="cx">     for (var category in categories)
</span><span class="cx">         categories[category].addEventListener(WebInspector.TimelineCategory.Events.VisibilityChanged, this._onCategoryVisibilityChanged, this);
</span><span class="cx"> 
</span><ins>+    this._overviewGrid.setScrollAndDividerTop(0, 0);
</ins><span class="cx">     this._overviewCalculator = new WebInspector.TimelineOverviewCalculator();
</span><span class="cx"> 
</span><span class="cx">     model.addEventListener(WebInspector.TimelineModel.Events.RecordAdded, this._onRecordAdded, this);
</span><span class="cx">     model.addEventListener(WebInspector.TimelineModel.Events.RecordsCleared, this._reset, this);
</span><del>-    this._overviewGrid.addEventListener(WebInspector.OverviewGrid.Events.WindowChanged, this._onWindowChanged, this);
</del><span class="cx"> }
</span><span class="cx"> 
</span><del>-/**
- * @constructor
- */
-WebInspector.OverviewGrid = function(prefix)
-{
-    this.element = this.element.createChild(&quot;div&quot;, &quot;fill&quot;);
-    this.element.id = prefix + &quot;-overview-container&quot;;
-
-    this._grid = new WebInspector.TimelineGrid();
-    this._grid.element.id = prefix + &quot;-overview-grid&quot;;
-    this._grid.itemsGraphsElement.id = prefix + &quot;-overview-timelines&quot;;
-    this._grid.setScrollAndDividerTop(0, 0);
-
-    this.element.appendChild(this._grid.element);
-
-    this._window = new WebInspector.TimelineOverviewWindow(this.element, this._grid.dividersLabelBarElement);
-}
-
-WebInspector.OverviewGrid.prototype = {
-    itemsGraphsElement: function()
-    {
-        return this._grid.itemsGraphsElement;
-    },
-
-    /**
-     * @param {!Node} child
-     */
-    insertBeforeItemsGraphsElement: function(child)
-    {
-        this._grid.element.insertBefore(child, this._grid.itemsGraphsElement);
-    },
-
-    /**
-     * @return {number}
-     */
-    clientWidth: function()
-    {
-        return this.element.clientWidth;
-    },
-
-    showItemsGraphsElement: function()
-    {
-        this._grid.itemsGraphsElement.removeStyleClass(&quot;hidden&quot;);
-    },
-
-    hideItemsGraphsElement: function()
-    {
-        this._grid.itemsGraphsElement.addStyleClass(&quot;hidden&quot;);
-    },
-
-    /**
-     * @param {!WebInspector.TimelineOverviewCalculator} calculator
-     */
-    updateDividers: function(calculator)
-    {
-        this._grid.updateDividers(calculator);
-    },
-
-    /**
-     * @param {!Array.&lt;Element&gt;} dividers
-     */
-    addEventDividers: function(dividers)
-    {
-        this._grid.addEventDividers(dividers);
-    },
-
-    removeEventDividers: function()
-    {
-        this._grid.removeEventDividers();
-    },
-    
-    /**
-     * @param {?number} start
-     * @param {?number} end
-     */
-    setWindowPosition: function(start, end)
-    {
-        this._window._setWindowPosition(start, end);
-    },
-
-    reset: function()
-    {
-        this._window.reset();
-    },
-
-    /**
-     * @return {number}
-     */
-    windowLeft: function()
-    {
-        return this._window.windowLeft;
-    },
-
-    /**
-     * @return {number}
-     */
-    windowRight: function()
-    {
-        return this._window.windowRight;
-    },
-
-    /**
-     * @param {number} left
-     * @param {number} right
-     */
-    setWindow: function(left, right)
-    {
-        this._window._setWindow(left, right);
-    },
-    
-    /**
-     * @param {string} eventType
-     * @param {function(WebInspector.Event)} listener
-     * @param {Object=} thisObject
-     */
-    addEventListener: function(eventType, listener, thisObject)
-    {
-        this._window.addEventListener(eventType, listener, thisObject);
-    }
-}
-
-
</del><span class="cx"> WebInspector.TimelineOverviewPane.MinSelectableSize = 12;
</span><span class="cx"> 
</span><span class="cx"> WebInspector.TimelineOverviewPane.WindowScrollSpeedFactor = .3;
</span><span class="lines">@@ -259,10 +147,10 @@
</span><span class="cx">             case WebInspector.TimelineOverviewPane.Mode.Events:
</span><span class="cx">             case WebInspector.TimelineOverviewPane.Mode.Frames:
</span><span class="cx">                 this._heapGraph.hide();
</span><del>-                this._overviewGrid.showItemsGraphsElement();
</del><ins>+                this._overviewGrid.itemsGraphsElement.removeStyleClass(&quot;hidden&quot;);
</ins><span class="cx">                 break;
</span><span class="cx">             case WebInspector.TimelineOverviewPane.Mode.Memory:
</span><del>-                this._overviewGrid.hideItemsGraphsElement();
</del><ins>+                this._overviewGrid.itemsGraphsElement.addStyleClass(&quot;hidden&quot;);
</ins><span class="cx">                 this._heapGraph.show();
</span><span class="cx">         }
</span><span class="cx">         this._overviewItems[this._currentMode].revealAndSelect(false);
</span><span class="lines">@@ -276,11 +164,11 @@
</span><span class="cx">             return;
</span><span class="cx">         if (enabled) {
</span><span class="cx">             this._frameOverview = new WebInspector.TimelineFrameOverview(this._model);
</span><del>-            this._frameOverview.show(this._overviewGrid.element);
</del><ins>+            this._frameOverview.show(this._overviewContainer);
</ins><span class="cx">         } else {
</span><span class="cx">             this._frameOverview.detach();
</span><span class="cx">             this._frameOverview = null;
</span><del>-            this._overviewGrid.showItemsGraphsElement();
</del><ins>+            this._overviewGrid.itemsGraphsElement.removeStyleClass(&quot;hidden&quot;);
</ins><span class="cx">             this._categoryStrips.update();
</span><span class="cx">         }
</span><span class="cx">     },
</span><span class="lines">@@ -297,7 +185,7 @@
</span><span class="cx"> 
</span><span class="cx">         this._updateWindow();
</span><span class="cx">         this._overviewCalculator.setWindow(this._model.minimumRecordTime(), this._model.maximumRecordTime());
</span><del>-        this._overviewCalculator.setDisplayWindow(0, this._overviewGrid.clientWidth());
</del><ins>+        this._overviewCalculator.setDisplayWindow(0, this._overviewContainer.clientWidth);
</ins><span class="cx"> 
</span><span class="cx">         if (this._heapGraph.visible)
</span><span class="cx">             this._heapGraph.update();
</span><span class="lines">@@ -333,7 +221,7 @@
</span><span class="cx">      */
</span><span class="cx">     sidebarResized: function(width)
</span><span class="cx">     {
</span><del>-        this._overviewGrid.element.style.left = width + &quot;px&quot;;
</del><ins>+        this._overviewContainer.style.left = width + &quot;px&quot;;
</ins><span class="cx">         this._topPaneSidebarElement.style.width = width + &quot;px&quot;;
</span><span class="cx">         this._update();
</span><span class="cx">     },
</span><span class="lines">@@ -356,7 +244,7 @@
</span><span class="cx">         if (!window)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        this._overviewGrid.setWindowPosition(window.start, window.end);
</del><ins>+        this._overviewWindow._setWindowPosition(window.start, window.end);
</ins><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     _onRecordAdded: function(event)
</span><span class="lines">@@ -376,8 +264,8 @@
</span><span class="cx">     {
</span><span class="cx">         this._windowStartTime = 0;
</span><span class="cx">         this._windowEndTime = Infinity;
</span><ins>+        this._overviewWindow.reset();
</ins><span class="cx">         this._overviewCalculator.reset();
</span><del>-        this._overviewGrid.reset();
</del><span class="cx">         this._eventDividers = [];
</span><span class="cx">         this._overviewGrid.updateDividers(this._overviewCalculator);
</span><span class="cx">         if (this._frameOverview)
</span><span class="lines">@@ -397,12 +285,12 @@
</span><span class="cx"> 
</span><span class="cx">     windowLeft: function()
</span><span class="cx">     {
</span><del>-        return this._overviewGrid.windowLeft();
</del><ins>+        return this._overviewWindow.windowLeft;
</ins><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     windowRight: function()
</span><span class="cx">     {
</span><del>-        return this._overviewGrid.windowRight();
</del><ins>+        return this._overviewWindow.windowRight;
</ins><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     _onWindowChanged: function()
</span><span class="lines">@@ -440,7 +328,7 @@
</span><span class="cx">         var left = this._windowStartTime ? (this._windowStartTime - offset) / timeSpan : 0;
</span><span class="cx">         var right = this._windowEndTime &lt; Infinity ? (this._windowEndTime - offset) / timeSpan : 1;
</span><span class="cx">         this._ignoreWindowChangedEvent = true;
</span><del>-        this._overviewGrid.setWindow(left, right);
</del><ins>+        this._overviewWindow._setWindow(left, right);
</ins><span class="cx">         this._ignoreWindowChangedEvent = false;
</span><span class="cx">     },
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>