Title: [194180] tags/Safari-602.1.13.4/Source/_javascript_Core
- Revision
- 194180
- Author
- [email protected]
- Date
- 2015-12-16 15:24:05 -0800 (Wed, 16 Dec 2015)
Log Message
Merged r193188. rdar://problem/23737525
Modified Paths
Diff
Modified: tags/Safari-602.1.13.4/Source/_javascript_Core/ChangeLog (194179 => 194180)
--- tags/Safari-602.1.13.4/Source/_javascript_Core/ChangeLog 2015-12-16 23:22:43 UTC (rev 194179)
+++ tags/Safari-602.1.13.4/Source/_javascript_Core/ChangeLog 2015-12-16 23:24:05 UTC (rev 194180)
@@ -1,5 +1,24 @@
2015-12-16 Babak Shafiei <[email protected]>
+ Merge r193188.
+
+ 2015-12-03 Joseph Pecoraro <[email protected]>
+
+ REGRESSION(r192753): Remote Web Inspector: Enabling Remote Inspection on Auto Inspect candidate Debuggable doesn't show up in debuggers
+ https://bugs.webkit.org/show_bug.cgi?id=151792
+
+ Reviewed by Brian Burg.
+
+ * inspector/remote/RemoteInspector.mm:
+ (Inspector::RemoteInspector::updateAutomaticInspectionCandidate):
+ When m_debuggablesMap was split into both m_targetMap and m_listingMap
+ this particular case was missed in updating both the target and listing
+ when the target is updated. We should match RemoteInspector::updateTarget
+ and update the listing map as the debuggable may have changed to be
+ allowed to debug.
+
+2015-12-16 Babak Shafiei <[email protected]>
+
Merge r192991.
2015-12-02 Joseph Pecoraro <[email protected]>
Modified: tags/Safari-602.1.13.4/Source/_javascript_Core/inspector/remote/RemoteInspector.mm (194179 => 194180)
--- tags/Safari-602.1.13.4/Source/_javascript_Core/inspector/remote/RemoteInspector.mm 2015-12-16 23:22:43 UTC (rev 194179)
+++ tags/Safari-602.1.13.4/Source/_javascript_Core/inspector/remote/RemoteInspector.mm 2015-12-16 23:24:05 UTC (rev 194180)
@@ -200,6 +200,10 @@
auto result = m_targetMap.set(identifier, target);
ASSERT_UNUSED(result, !result.isNewEntry);
+ // If the target has just allowed remote control, then the listing won't exist yet.
+ if (RetainPtr<NSDictionary> listing = listingForTarget(*target))
+ m_listingMap.set(identifier, listing);
+
// Don't allow automatic inspection unless it is allowed or we are stopped.
if (!m_automaticInspectionEnabled || !m_enabled) {
pushListingsSoon();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
