Changeset 187300 in webkit

Timestamp:

Jul 23, 2015, 11:31:07 PM (11 years ago)

Author:

Lucas Forschler

Message:

Merged r187123. rdar://problem/21925581

Location:

branches/safari-601.1-branch/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/DefaultDashboard.js (modified) (3 diffs)

branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-07-23  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r187123
+
+    2015-07-21  Joseph Pecoraro  <pecoraro@apple.com>
+
+            Web Inspector: Total download size doesn't update soon after loading
+            https://bugs.webkit.org/show_bug.cgi?id=147161
+
+            Reviewed by Timothy Hatcher.
+
+            * UserInterface/Models/DefaultDashboard.js:
+            (WebInspector.DefaultDashboard.prototype._mainResourceDidChange):
+            Previously autorecording would always have made us start capturing,
+            however we only autorecord if users are on the Timeline tab. Just
+            reset the time always, a navigation happened and start the timer.
+
+            (WebInspector.DefaultDashboard.prototype._resourceSizeDidChange):
+            Move to a better location within the file.
+
 2015-07-16  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js

@@ -136 +136 @@
             return;
 
+        this._time = 0;
         this._resourcesCount = 1;
         this._resourcesSize = WebInspector.frameResourceManager.mainFrame.mainResource.size || 0;
-
-        // Only update the time if we are recording the timeline.
-        if (!WebInspector.timelineManager.isCapturing()) {
-            this._time = 0;
-            return;
-        }
 
         // We should only track resource sizes on fresh loads.
@@ -169 +164 @@
     {
         ++this.resourcesCount;
+    }
+
+    _resourceSizeDidChange(event)
+    {
+        this.resourcesSize += event.target.size - event.data.previousSize;
     }
 
@@ -222 +222 @@
 
         this._stopUpdatingTime();
-    }
-
-    _resourceSizeDidChange(event)
-    {
-        this.resourcesSize += event.target.size - event.data.previousSize;
     }