Title: [187300] branches/safari-601.1-branch/Source/WebInspectorUI
- Revision
- 187300
- Author
- [email protected]
- Date
- 2015-07-23 23:31:07 -0700 (Thu, 23 Jul 2015)
Log Message
Merged r187123. rdar://problem/21925581
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog (187299 => 187300)
--- branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog 2015-07-24 06:29:28 UTC (rev 187299)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog 2015-07-24 06:31:07 UTC (rev 187300)
@@ -1,3 +1,23 @@
+2015-07-23 Lucas Forschler <[email protected]>
+
+ Merge r187123
+
+ 2015-07-21 Joseph Pecoraro <[email protected]>
+
+ 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 <[email protected]>
Merge r186926. rdar://problem/21868062
Modified: branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js (187299 => 187300)
--- branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js 2015-07-24 06:29:28 UTC (rev 187299)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js 2015-07-24 06:31:07 UTC (rev 187300)
@@ -135,15 +135,10 @@
if (!event.target.isMainFrame())
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.
if (this._waitingForFirstMainResourceToStartTrackingSize) {
this._waitingForFirstMainResourceToStartTrackingSize = false;
@@ -170,6 +165,11 @@
++this.resourcesCount;
}
+ _resourceSizeDidChange(event)
+ {
+ this.resourcesSize += event.target.size - event.data.previousSize;
+ }
+
_startUpdatingTime()
{
this._stopUpdatingTime();
@@ -223,11 +223,6 @@
this._stopUpdatingTime();
}
- _resourceSizeDidChange(event)
- {
- this.resourcesSize += event.target.size - event.data.previousSize;
- }
-
_consoleMessageAdded(event)
{
var message = event.data.message;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
