WebKit Bugzilla
Attachment 357893 Details for
Bug 192959
: Web Inspector: Charles Proxy errors opening har files exported from Safari (invalid startedDateTime)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
[PATCH] Proposed Fix
har-1.patch (text/plain), 3.90 KB, created by
Joseph Pecoraro
on 2018-12-20 16:11:42 PST
(
hide
)
Description:
[PATCH] Proposed Fix
Filename:
MIME Type:
Creator:
Joseph Pecoraro
Created:
2018-12-20 16:11:42 PST
Size:
3.90 KB
patch
obsolete
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog >index b8b0a84a819..16a16351c45 100644 >--- a/Source/WebInspectorUI/ChangeLog >+++ b/Source/WebInspectorUI/ChangeLog >@@ -1,3 +1,21 @@ >+2018-12-20 Joseph Pecoraro <pecoraro@apple.com> >+ >+ Web Inspector: Charles Proxy errors opening har files exported from Safari (invalid startedDateTime) >+ https://bugs.webkit.org/show_bug.cgi?id=192959 >+ <rdar://problem/46863411> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * UserInterface/Views/NetworkTableContentView.js: >+ (WI.NetworkTableContentView.prototype.tableCellContextMenuClicked): >+ (WI.NetworkTableContentView.prototype._updateExportButton): >+ (WI.NetworkTableContentView.prototype._canExportHAR): >+ Disallow HAR export if we don't have load data, such as the requestSentDate for >+ the main resource or sub-resources. >+ >+ (WI.NetworkTableContentView.prototype._HARResources): >+ Only export resources that have load data. >+ > 2018-12-20 Joseph Pecoraro <pecoraro@apple.com> > > Web Inspector: Autoformat doesn't work on icloud.com (javascript-packed.js) >diff --git a/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js b/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js >index 6af19bf7ddf..57ec8af3f10 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js >+++ b/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js >@@ -147,7 +147,7 @@ WI.NetworkTableContentView = class NetworkTableContentView extends WI.ContentVie > // triggers a MainResource change and then a MainFrame change. Page Transition > // triggers a MainFrame change then a MainResource change. > this._transitioningPageTarget = false; >- >+ > WI.notifications.addEventListener(WI.Notification.TransitionPageTarget, this._transitionPageTarget, this); > } > >@@ -363,7 +363,7 @@ WI.NetworkTableContentView = class NetworkTableContentView extends WI.ContentVie > WI.appendContextMenuItemsForSourceCode(contextMenu, entry.resource); > > contextMenu.appendSeparator(); >- contextMenu.appendItem(WI.UIString("Export HAR"), () => { this._exportHAR(); }); >+ contextMenu.appendItem(WI.UIString("Export HAR"), () => { this._exportHAR(); }, !this._canExportHAR()); > } > > tableShouldSelectRow(table, cell, column, rowIndex) >@@ -1158,10 +1158,28 @@ WI.NetworkTableContentView = class NetworkTableContentView extends WI.ContentVie > } > } > >+ _canExportHAR() >+ { >+ let mainFrame = WI.networkManager.mainFrame; >+ if (!mainFrame) >+ return false; >+ >+ let mainResource = mainFrame.mainResource; >+ if (!mainResource) >+ return false; >+ >+ if (!mainResource.requestSentDate) >+ return false; >+ >+ if (!this._HARResources().length) >+ return false; >+ >+ return true; >+ } >+ > _updateExportButton() > { >- let enabled = this._filteredEntries.length > 0; >- this._harExportNavigationItem.enabled = enabled; >+ this._harExportNavigationItem.enabled = this._canExportHAR(); > } > > _processPendingEntries() >@@ -1871,7 +1889,15 @@ WI.NetworkTableContentView = class NetworkTableContentView extends WI.ContentVie > { > let resources = this._filteredEntries.map((x) => x.resource); > const supportedHARSchemes = new Set(["http", "https", "ws", "wss"]); >- return resources.filter((resource) => resource.finished && supportedHARSchemes.has(resource.urlComponents.scheme)); >+ return resources.filter((resource) => { >+ if (!resource.finished) >+ return false; >+ if (!resource.requestSentDate) >+ return false; >+ if (!supportedHARSchemes.has(resource.urlComponents.scheme)) >+ return false; >+ return true; >+ }); > } > > _exportHAR()
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 192959
: 357893