Title: [207201] branches/safari-602-branch/Source/WebInspectorUI
- Revision
- 207201
- Author
- matthew_han...@apple.com
- Date
- 2016-10-12 01:41:15 -0700 (Wed, 12 Oct 2016)
Log Message
Merge r204428. rdar://problem/28476954
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebInspectorUI/ChangeLog (207200 => 207201)
--- branches/safari-602-branch/Source/WebInspectorUI/ChangeLog 2016-10-12 08:41:13 UTC (rev 207200)
+++ branches/safari-602-branch/Source/WebInspectorUI/ChangeLog 2016-10-12 08:41:15 UTC (rev 207201)
@@ -1,3 +1,18 @@
+2016-10-12 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r204428. rdar://problem/28476954
+
+ 2016-08-12 Nikita Vasilyev <nvasil...@apple.com>
+
+ Web Inspector: Command-Shift-O causes infinite loop if web page has frames
+ https://bugs.webkit.org/show_bug.cgi?id=160810
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/OpenResourceDialog.js:
+ (WebInspector.OpenResourceDialog.prototype._addResourcesForFrame):
+ "frame" doesn't change inside the loop.
+
2016-09-09 Babak Shafiei <bshaf...@apple.com>
Merge r205192. rdar://problem/28097740
Modified: branches/safari-602-branch/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js (207200 => 207201)
--- branches/safari-602-branch/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2016-10-12 08:41:13 UTC (rev 207200)
+++ branches/safari-602-branch/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2016-10-12 08:41:15 UTC (rev 207201)
@@ -267,7 +267,7 @@
for (let resource of resources)
this._addResource(resource, suppressFilterUpdate);
- frames = frames.concat(frame.childFrames);
+ frames = frames.concat(currentFrame.childFrames);
}
this._updateFilter();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
