Title: [194181] tags/Safari-602.1.13.4/Source/_javascript_Core
- Revision
- 194181
- Author
- [email protected]
- Date
- 2015-12-16 15:26:18 -0800 (Wed, 16 Dec 2015)
Log Message
Merged r193354. rdar://problem/23736842
Modified Paths
Diff
Modified: tags/Safari-602.1.13.4/Source/_javascript_Core/ChangeLog (194180 => 194181)
--- tags/Safari-602.1.13.4/Source/_javascript_Core/ChangeLog 2015-12-16 23:24:05 UTC (rev 194180)
+++ tags/Safari-602.1.13.4/Source/_javascript_Core/ChangeLog 2015-12-16 23:26:18 UTC (rev 194181)
@@ -1,5 +1,22 @@
2015-12-16 Babak Shafiei <[email protected]>
+ Merge r193354.
+
+ 2015-12-03 Joseph Pecoraro <[email protected]>
+
+ REGRESSION:(r192753): Remote Web Inspector: Window immediately closes after opening
+ https://bugs.webkit.org/show_bug.cgi?id=151788
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/remote/RemoteInspector.mm:
+ (Inspector::RemoteInspector::pushListingsNow):
+ The key at the outer level was not a string. Ensure it is a
+ string for backwards compatibility. One day we may use
+ non-numeric page identifiers as listing keys.
+
+2015-12-16 Babak Shafiei <[email protected]>
+
Merge r193188.
2015-12-03 Joseph Pecoraro <[email protected]>
Modified: tags/Safari-602.1.13.4/Source/_javascript_Core/inspector/remote/RemoteInspector.mm (194180 => 194181)
--- tags/Safari-602.1.13.4/Source/_javascript_Core/inspector/remote/RemoteInspector.mm 2015-12-16 23:24:05 UTC (rev 194180)
+++ tags/Safari-602.1.13.4/Source/_javascript_Core/inspector/remote/RemoteInspector.mm 2015-12-16 23:26:18 UTC (rev 194181)
@@ -545,7 +545,7 @@
RetainPtr<NSMutableDictionary> listings = adoptNS([[NSMutableDictionary alloc] init]);
for (RetainPtr<NSDictionary> listing : m_listingMap.values()) {
- NSString *identifier = [listing.get() objectForKey:WIRPageIdentifierKey];
+ NSString *identifier = [[listing.get() objectForKey:WIRPageIdentifierKey] stringValue];
[listings setObject:listing.get() forKey:identifier];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
