Title: [189141] trunk/Source/WebInspectorUI
- Revision
- 189141
- Author
- commit-qu...@webkit.org
- Date
- 2015-08-28 20:30:31 -0700 (Fri, 28 Aug 2015)
Log Message
Web Inspector: Resource.prototype.associateWithScript assertions firing
https://bugs.webkit.org/show_bug.cgi?id=148601
Patch by Joseph Pecoraro <pecor...@apple.com> on 2015-08-28
Reviewed by Timothy Hatcher.
* UserInterface/Models/Resource.js:
(WebInspector.Resource.prototype.associateWithScript):
Restore the code that was here before it was converted to asserts.
It looked as if it was iOS 6 only but it was not.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (189140 => 189141)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-08-29 02:31:23 UTC (rev 189140)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-08-29 03:30:31 UTC (rev 189141)
@@ -1,5 +1,17 @@
2015-08-28 Joseph Pecoraro <pecor...@apple.com>
+ Web Inspector: Resource.prototype.associateWithScript assertions firing
+ https://bugs.webkit.org/show_bug.cgi?id=148601
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/Resource.js:
+ (WebInspector.Resource.prototype.associateWithScript):
+ Restore the code that was here before it was converted to asserts.
+ It looked as if it was iOS 6 only but it was not.
+
+2015-08-28 Joseph Pecoraro <pecor...@apple.com>
+
Web Inspector: Improve ScriptSyntaxTree a bit
https://bugs.webkit.org/show_bug.cgi?id=148563
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js (189140 => 189141)
--- trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2015-08-29 02:31:23 UTC (rev 189140)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2015-08-29 03:30:31 UTC (rev 189141)
@@ -644,8 +644,11 @@
this._scripts.push(script);
- console.assert(this._type !== WebInspector.Resource.Type.Other);
- console.assert(this._type === WebInspector.Resource.Type.Script || this._type === WebInspector.Resource.Type.Document);
+ if (this._type === WebInspector.Resource.Type.Other) {
+ var oldType = this._type;
+ this._type = WebInspector.Resource.Type.Script;
+ this.dispatchEventToListeners(WebInspector.Resource.Event.TypeDidChange, {oldType});
+ }
}
saveIdentityToCookie(cookie)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
