Title: [213356] trunk/Source/_javascript_Core
- Revision
- 213356
- Author
- commit-qu...@webkit.org
- Date
- 2017-03-02 22:49:54 -0800 (Thu, 02 Mar 2017)
Log Message
Remote Inspector: Move updateTargetListing() methods to RemoteInspector.cpp
https://bugs.webkit.org/show_bug.cgi?id=169074
Patch by Carlos Garcia Campos <cgar...@igalia.com> on 2017-03-02
Reviewed by Joseph Pecoraro.
They are not actually cocoa specific.
* inspector/remote/RemoteInspector.cpp:
(Inspector::RemoteInspector::updateTargetListing):
* inspector/remote/RemoteInspector.h:
* inspector/remote/cocoa/RemoteInspectorCocoa.mm:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (213355 => 213356)
--- trunk/Source/_javascript_Core/ChangeLog 2017-03-03 06:35:25 UTC (rev 213355)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-03-03 06:49:54 UTC (rev 213356)
@@ -1,3 +1,17 @@
+2017-03-02 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Remote Inspector: Move updateTargetListing() methods to RemoteInspector.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=169074
+
+ Reviewed by Joseph Pecoraro.
+
+ They are not actually cocoa specific.
+
+ * inspector/remote/RemoteInspector.cpp:
+ (Inspector::RemoteInspector::updateTargetListing):
+ * inspector/remote/RemoteInspector.h:
+ * inspector/remote/cocoa/RemoteInspectorCocoa.mm:
+
2017-03-02 Mark Lam <mark....@apple.com>
Add WebKit2 hooks to notify the VM that the user has requested a debugger break.
Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.cpp (213355 => 213356)
--- trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.cpp 2017-03-03 06:35:25 UTC (rev 213355)
+++ trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.cpp 2017-03-03 06:49:54 UTC (rev 213356)
@@ -207,6 +207,26 @@
return nullptr;
}
+void RemoteInspector::updateTargetListing(unsigned targetIdentifier)
+{
+ auto target = m_targetMap.get(targetIdentifier);
+ if (!target)
+ return;
+
+ updateTargetListing(*target);
+}
+
+void RemoteInspector::updateTargetListing(const RemoteControllableTarget& target)
+{
+ auto targetListing = listingForTarget(target);
+ if (!targetListing)
+ return;
+
+ m_targetListingMap.set(target.targetIdentifier(), targetListing);
+
+ pushListingsSoon();
+}
+
void RemoteInspector::updateHasActiveDebugSession()
{
bool hasActiveDebuggerSession = !m_targetConnectionMap.isEmpty();
Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.h (213355 => 213356)
--- trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.h 2017-03-03 06:35:25 UTC (rev 213355)
+++ trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.h 2017-03-03 06:49:54 UTC (rev 213356)
@@ -94,9 +94,9 @@
RetainPtr<CFDataRef> parentProcessAuditData() const { return m_parentProcessAuditData; }
void setParentProcessInformation(pid_t, RetainPtr<CFDataRef> auditData);
void setParentProcessInfomationIsDelayed();
+#endif
void updateTargetListing(unsigned targetIdentifier);
-#endif
private:
RemoteInspector();
Modified: trunk/Source/_javascript_Core/inspector/remote/cocoa/RemoteInspectorCocoa.mm (213355 => 213356)
--- trunk/Source/_javascript_Core/inspector/remote/cocoa/RemoteInspectorCocoa.mm 2017-03-03 06:35:25 UTC (rev 213355)
+++ trunk/Source/_javascript_Core/inspector/remote/cocoa/RemoteInspectorCocoa.mm 2017-03-03 06:49:54 UTC (rev 213356)
@@ -445,28 +445,6 @@
});
}
-#pragma mark - Update Listing with lock
-
-void RemoteInspector::updateTargetListing(unsigned targetIdentifier)
-{
- auto target = m_targetMap.get(targetIdentifier);
- if (!target)
- return;
-
- updateTargetListing(*target);
-}
-
-void RemoteInspector::updateTargetListing(const RemoteControllableTarget& target)
-{
- RetainPtr<NSDictionary> targetListing = listingForTarget(target);
- if (!targetListing)
- return;
-
- m_targetListingMap.set(target.targetIdentifier(), targetListing);
-
- pushListingsSoon();
-}
-
#pragma mark - Received XPC Messages
void RemoteInspector::receivedSetupMessage(NSDictionary *userInfo)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
