[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

pfeldman at chromium.org pfeldman at chromium.org
Wed Apr 7 23:20:42 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 805a8b702675872f4297f15680bf7727af4f4176
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 3 21:30:51 2009 +0000

    2009-11-03  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: clear overview on Clear action and panel reset.
    
            https://bugs.webkit.org/show_bug.cgi?id=31078
    
            * inspector/front-end/TimelinePanel.js:
            (WebInspector.TimelinePanel.prototype._getRecordDetails):
            (WebInspector.TimelinePanel.prototype.reset):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50481 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c7ad44b..3d3fa3b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-03  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: clear overview on Clear action and panel reset.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31078
+
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelinePanel.prototype._getRecordDetails):
+        (WebInspector.TimelinePanel.prototype.reset):
+
 2009-11-03  Yaar Schnitman  <yaar at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/inspector/front-end/TimelinePanel.js b/WebCore/inspector/front-end/TimelinePanel.js
index 14f9b72..95eadac 100644
--- a/WebCore/inspector/front-end/TimelinePanel.js
+++ b/WebCore/inspector/front-end/TimelinePanel.js
@@ -176,7 +176,7 @@ WebInspector.TimelinePanel.prototype = {
     {
         switch (record.type) {
         case WebInspector.TimelineAgent.RecordType.EventDispatch:
-            return record.data.type;
+            return record.data ? record.data.type : "";
         case WebInspector.TimelineAgent.RecordType.TimerInstall:
         case WebInspector.TimelineAgent.RecordType.TimerRemove:
         case WebInspector.TimelineAgent.RecordType.TimerFire:
@@ -195,6 +195,9 @@ WebInspector.TimelinePanel.prototype = {
         WebInspector.AbstractTimelinePanel.prototype.reset.call(this);
         this._lastRecord = null;
         this._overviewCalculator.reset();
+        for (var category in this.categories)
+            this._categoryGraphs[category].clearChunks();
+        this._setWindowPosition(0, this._overviewGridElement.clientWidth);
     },
 
     _createOverview: function()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list