Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (266071 => 266072)
--- trunk/Source/_javascript_Core/ChangeLog 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-08-24 17:31:56 UTC (rev 266072)
@@ -1,3 +1,43 @@
+2020-08-24 Devin Rousso <drou...@apple.com>
+
+ Web Inspector: remove "extra domains" concept now that domains can be added based on the debuggable type
+ https://bugs.webkit.org/show_bug.cgi?id=201150
+ <rdar://problem/56545911>
+
+ Reviewed by Brian Burg.
+
+ * inspector/scripts/codegen/objc_generator_templates.py:
+ * inspector/augmentable/AugmentableInspectorController.h:
+
+ * inspector/JSGlobalObjectInspectorController.h:
+ * inspector/JSGlobalObjectInspectorController.cpp:
+ (Inspector::JSGlobalObjectInspectorController::connectFrontend):
+ (Inspector::JSGlobalObjectInspectorController::registerAlternateAgent): Added.
+ (Inspector::JSGlobalObjectInspectorController::appendExtraAgent): Deleted.
+
+ * inspector/InspectorAgentRegistry.h:
+ * inspector/InspectorAgentRegistry.cpp:
+ (Inspector::AgentRegistry::appendExtraAgent): Deleted.
+
+ * inspector/protocol/Inspector.json:
+ * inspector/agents/InspectorAgent.h:
+ * inspector/agents/InspectorAgent.cpp:
+ (Inspector::InspectorAgent::activateExtraDomain): Deleted.
+ (Inspector::InspectorAgent::activateExtraDomains): Deleted.
+
+ * inspector/scripts/tests/expected/command-targetType-matching-domain-debuggableType.json-result:
+ * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
+ * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
+ * inspector/scripts/tests/expected/definitions-with-mac-platform.json-result:
+ * inspector/scripts/tests/expected/domain-debuggableTypes.json-result:
+ * inspector/scripts/tests/expected/domain-targetType-matching-domain-debuggableType.json-result:
+ * inspector/scripts/tests/expected/domain-targetTypes.json-result:
+ * inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
+ * inspector/scripts/tests/expected/enum-values.json-result:
+ * inspector/scripts/tests/expected/event-targetType-matching-domain-debuggableType.json-result:
+ * inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
+ Rebase protocol tests.
+
2020-08-23 Yusuke Suzuki <ysuz...@apple.com>
Unreviewed, wrong merge resolution between r266031 and r263837
Modified: trunk/Source/_javascript_Core/inspector/InspectorAgentRegistry.cpp (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/InspectorAgentRegistry.cpp 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/InspectorAgentRegistry.cpp 2020-08-24 17:31:56 UTC (rev 266072)
@@ -48,15 +48,6 @@
m_agents.append(WTFMove(agent));
}
-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-void AgentRegistry::appendExtraAgent(std::unique_ptr<InspectorAgentBase> agent)
-{
- m_extraDomains.append(agent->domainName());
-
- append(WTFMove(agent));
-}
-#endif
-
void AgentRegistry::didCreateFrontendAndBackend(FrontendRouter* frontendRouter, BackendDispatcher* backendDispatcher)
{
for (auto& agent : m_agents)
Modified: trunk/Source/_javascript_Core/inspector/InspectorAgentRegistry.h (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/InspectorAgentRegistry.h 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/InspectorAgentRegistry.h 2020-08-24 17:31:56 UTC (rev 266072)
@@ -48,11 +48,6 @@
void willDestroyFrontendAndBackend(DisconnectReason);
void discardValues();
-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- void appendExtraAgent(std::unique_ptr<InspectorAgentBase>);
- Vector<String> extraDomains() const { return m_extraDomains; }
-#endif
-
private:
// These are declared here to avoid MSVC from trying to create default iplementations which would
// involve generating a copy constructor and copy assignment operator for the Vector of std::unique_ptrs.
@@ -60,9 +55,6 @@
AgentRegistry& operator=(const AgentRegistry&) = delete;
Vector<std::unique_ptr<InspectorAgentBase>> m_agents;
-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- Vector<String> m_extraDomains;
-#endif
};
} // namespace Inspector
Modified: trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.cpp (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.cpp 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.cpp 2020-08-24 17:31:56 UTC (rev 266072)
@@ -115,9 +115,6 @@
m_agents.didCreateFrontendAndBackend(nullptr, nullptr);
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- if (m_globalObject.inspectorDebuggable().type() == Inspector::RemoteControllableTarget::Type::_javascript_)
- ensureInspectorAgent().activateExtraDomains(m_agents.extraDomains());
-
if (m_augmentingClient)
m_augmentingClient->inspectorConnected();
#endif
@@ -261,17 +258,12 @@
}
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-void JSGlobalObjectInspectorController::appendExtraAgent(std::unique_ptr<InspectorAgentBase> agent)
+void JSGlobalObjectInspectorController::registerAlternateAgent(std::unique_ptr<InspectorAgentBase> agent)
{
- String domainName = agent->domainName();
-
// FIXME: change this to notify agents which frontend has connected (by id).
agent->didCreateFrontendAndBackend(nullptr, nullptr);
- m_agents.appendExtraAgent(WTFMove(agent));
-
- if (m_globalObject.inspectorDebuggable().type() == Inspector::RemoteControllableTarget::Type::_javascript_)
- ensureInspectorAgent().activateExtraDomain(domainName);
+ m_agents.append(WTFMove(agent));
}
#endif
Modified: trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.h (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.h 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.h 2020-08-24 17:31:56 UTC (rev 266072)
@@ -98,7 +98,7 @@
const FrontendRouter& frontendRouter() const final { return m_frontendRouter.get(); }
BackendDispatcher& backendDispatcher() final { return m_backendDispatcher.get(); }
- void appendExtraAgent(std::unique_ptr<InspectorAgentBase>) final;
+ void registerAlternateAgent(std::unique_ptr<InspectorAgentBase>) final;
#endif
private:
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorAgent.cpp (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorAgent.cpp 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorAgent.cpp 2020-08-24 17:31:56 UTC (rev 266072)
@@ -102,28 +102,4 @@
m_pendingEvaluateTestCommands.append(script);
}
-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-void InspectorAgent::activateExtraDomain(const String& domainName)
-{
- if (!m_enabled)
- return;
-
- auto domainNames = JSON::ArrayOf<String>::create();
- domainNames->addItem(domainName);
- m_frontendDispatcher->activateExtraDomains(WTFMove(domainNames));
-}
-
-void InspectorAgent::activateExtraDomains(const Vector<String>& extraDomains)
-{
- if (extraDomains.isEmpty())
- return;
-
- auto domainNames = JSON::ArrayOf<String>::create();
- for (const auto& domainName : extraDomains)
- domainNames->addItem(domainName);
-
- m_frontendDispatcher->activateExtraDomains(WTFMove(domainNames));
-}
-#endif
-
} // namespace Inspector
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorAgent.h (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorAgent.h 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorAgent.h 2020-08-24 17:31:56 UTC (rev 266072)
@@ -63,11 +63,6 @@
void evaluateForTestInFrontend(const String& script);
-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- void activateExtraDomain(const String&);
- void activateExtraDomains(const Vector<String>&);
-#endif
-
private:
InspectorEnvironment& m_environment;
std::unique_ptr<InspectorFrontendDispatcher> m_frontendDispatcher;
Modified: trunk/Source/_javascript_Core/inspector/augmentable/AugmentableInspectorController.h (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/augmentable/AugmentableInspectorController.h 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/augmentable/AugmentableInspectorController.h 2020-08-24 17:31:56 UTC (rev 266072)
@@ -44,7 +44,7 @@
virtual const FrontendRouter& frontendRouter() const = 0;
virtual BackendDispatcher& backendDispatcher() = 0;
- virtual void appendExtraAgent(std::unique_ptr<InspectorAgentBase>) = 0;
+ virtual void registerAlternateAgent(std::unique_ptr<InspectorAgentBase>) = 0;
bool connected() const { return frontendRouter().hasFrontends(); }
};
Modified: trunk/Source/_javascript_Core/inspector/protocol/Inspector.json (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/protocol/Inspector.json 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/protocol/Inspector.json 2020-08-24 17:31:56 UTC (rev 266072)
@@ -29,14 +29,6 @@
{ "name": "object", "$ref": "Runtime.RemoteObject" },
{ "name": "hints", "type": "object" }
]
- },
- {
- "name": "activateExtraDomains",
- "description": "Fired when the backend has alternate domains that need to be activated.",
- "condition": "defined(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS) && ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS",
- "parameters": [
- { "name": "domains", "type": "array", "items": { "type": "string" }, "description": "Domain names that need activation" }
- ]
}
]
}
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator_templates.py (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator_templates.py 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator_templates.py 2020-08-24 17:31:56 UTC (rev 266072)
@@ -146,7 +146,7 @@
auto alternateDispatcher = makeUnique<ObjCInspector${domainName}BackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<${domainName}BackendDispatcher, Alternate${domainName}BackendDispatcher>>("${domainName}"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<${objcPrefix}${domainName}DomainHandler>)${variableNamePrefix}Handler
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/command-targetType-matching-domain-debuggableType.json-result (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/command-targetType-matching-domain-debuggableType.json-result 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/command-targetType-matching-domain-debuggableType.json-result 2020-08-24 17:31:56 UTC (rev 266072)
@@ -697,7 +697,7 @@
auto alternateDispatcher = makeUnique<ObjCInspectorDomainBackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<DomainBackendDispatcher, AlternateDomainBackendDispatcher>>("Domain"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<TestProtocolDomainDomainHandler>)domainHandler
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2020-08-24 17:31:56 UTC (rev 266072)
@@ -1211,7 +1211,7 @@
auto alternateDispatcher = makeUnique<ObjCInspectorDatabaseBackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<DatabaseBackendDispatcher, AlternateDatabaseBackendDispatcher>>("Database"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<TestProtocolDatabaseDomainHandler>)databaseHandler
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2020-08-24 17:31:56 UTC (rev 266072)
@@ -1074,7 +1074,7 @@
auto alternateDispatcher = makeUnique<ObjCInspectorDatabaseBackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<DatabaseBackendDispatcher, AlternateDatabaseBackendDispatcher>>("Database"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<TestProtocolDatabaseDomainHandler>)databaseHandler
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/definitions-with-mac-platform.json-result (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/definitions-with-mac-platform.json-result 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/definitions-with-mac-platform.json-result 2020-08-24 17:31:56 UTC (rev 266072)
@@ -832,7 +832,7 @@
auto alternateDispatcher = makeUnique<ObjCInspectorNetworkBackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<NetworkBackendDispatcher, AlternateNetworkBackendDispatcher>>("Network"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<TestProtocolNetworkDomainHandler>)networkHandler
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domain-debuggableTypes.json-result (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domain-debuggableTypes.json-result 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domain-debuggableTypes.json-result 2020-08-24 17:31:56 UTC (rev 266072)
@@ -697,7 +697,7 @@
auto alternateDispatcher = makeUnique<ObjCInspectorDomainBackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<DomainBackendDispatcher, AlternateDomainBackendDispatcher>>("Domain"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<TestProtocolDomainDomainHandler>)domainHandler
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domain-targetType-matching-domain-debuggableType.json-result (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domain-targetType-matching-domain-debuggableType.json-result 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domain-targetType-matching-domain-debuggableType.json-result 2020-08-24 17:31:56 UTC (rev 266072)
@@ -697,7 +697,7 @@
auto alternateDispatcher = makeUnique<ObjCInspectorDomainBackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<DomainBackendDispatcher, AlternateDomainBackendDispatcher>>("Domain"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<TestProtocolDomainDomainHandler>)domainHandler
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domain-targetTypes.json-result (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domain-targetTypes.json-result 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domain-targetTypes.json-result 2020-08-24 17:31:56 UTC (rev 266072)
@@ -697,7 +697,7 @@
auto alternateDispatcher = makeUnique<ObjCInspectorDomainBackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<DomainBackendDispatcher, AlternateDomainBackendDispatcher>>("Domain"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<TestProtocolDomainDomainHandler>)domainHandler
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2020-08-24 17:31:56 UTC (rev 266072)
@@ -1082,7 +1082,7 @@
auto alternateDispatcher = makeUnique<ObjCInspectorNetwork1BackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<Network1BackendDispatcher, AlternateNetwork1BackendDispatcher>>("Network1"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<TestProtocolNetwork1DomainHandler>)network1Handler
@@ -1100,7 +1100,7 @@
auto alternateDispatcher = makeUnique<ObjCInspectorNetwork3BackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<Network3BackendDispatcher, AlternateNetwork3BackendDispatcher>>("Network3"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<TestProtocolNetwork3DomainHandler>)network3Handler
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result 2020-08-24 17:31:56 UTC (rev 266072)
@@ -815,7 +815,7 @@
auto alternateDispatcher = makeUnique<ObjCInspectorCommandDomainBackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<CommandDomainBackendDispatcher, AlternateCommandDomainBackendDispatcher>>("CommandDomain"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<TestProtocolCommandDomainDomainHandler>)commandDomainHandler
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/event-targetType-matching-domain-debuggableType.json-result (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/event-targetType-matching-domain-debuggableType.json-result 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/event-targetType-matching-domain-debuggableType.json-result 2020-08-24 17:31:56 UTC (rev 266072)
@@ -697,7 +697,7 @@
auto alternateDispatcher = makeUnique<ObjCInspectorDomainBackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<DomainBackendDispatcher, AlternateDomainBackendDispatcher>>("Domain"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<TestProtocolDomainDomainHandler>)domainHandler
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result (266071 => 266072)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2020-08-24 17:31:56 UTC (rev 266072)
@@ -775,7 +775,7 @@
auto alternateDispatcher = makeUnique<ObjCInspectorNetwork1BackendDispatcher>(handler);
auto alternateAgent = makeUnique<AlternateDispatchableAgent<Network1BackendDispatcher, AlternateNetwork1BackendDispatcher>>("Network1"_s, *_controller, WTFMove(alternateDispatcher));
- _controller->appendExtraAgent(WTFMove(alternateAgent));
+ _controller->registerAlternateAgent(WTFMove(alternateAgent));
}
- (id<TestProtocolNetwork1DomainHandler>)network1Handler
Modified: trunk/Source/WebInspectorUI/ChangeLog (266071 => 266072)
--- trunk/Source/WebInspectorUI/ChangeLog 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/ChangeLog 2020-08-24 17:31:56 UTC (rev 266072)
@@ -1,5 +1,52 @@
2020-08-24 Devin Rousso <drou...@apple.com>
+ Web Inspector: remove "extra domains" concept now that domains can be added based on the debuggable type
+ https://bugs.webkit.org/show_bug.cgi?id=201150
+ <rdar://problem/56545911>
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Base/Object.js:
+ * UserInterface/Protocol/InspectorObserver.js:
+ (WI.InspectorObserver.prototype.activateExtraDomains):
+ * UserInterface/Protocol/Target.js:
+ (WI.Target.prototype.activateExtraDomain):
+ * UserInterface/Controllers/AppController.js:
+ (WI.AppController.prototype.activateExtraDomains):
+ * UserInterface/Controllers/AnimationManager.js:
+ (WI.AnimationManager.prototype.activateExtraDomain):
+ * UserInterface/Controllers/ApplicationCacheManager.js:
+ (WI.ApplicationCacheManager.prototype.activateExtraDomain):
+ * UserInterface/Controllers/CanvasManager.js:
+ (WI.CanvasManager.prototype.activateExtraDomain):
+ * UserInterface/Controllers/DOMStorageManager.js:
+ (WI.DOMStorageManager.prototype.activateExtraDomain):
+ * UserInterface/Controllers/DatabaseManager.js:
+ (WI.DatabaseManager.prototype.activateExtraDomain):
+ * UserInterface/Controllers/HeapManager.js:
+ (WI.HeapManager.prototype.activateExtraDomain):
+ * UserInterface/Controllers/IndexedDBManager.js:
+ (WI.IndexedDBManager.prototype.activateExtraDomain):
+ * UserInterface/Controllers/MemoryManager.js:
+ (WI.MemoryManager.prototype.activateExtraDomain):
+ * UserInterface/Controllers/NetworkManager.js:
+ (WI.NetworkManager.prototype._extraDomainsActivated):
+ * UserInterface/Controllers/TimelineManager.js:
+ (WI.TimelineManager.prototype.activateExtraDomain):
+ * UserInterface/Base/Main.js:
+ (WI.activateExtraDomains):
+ * UserInterface/Views/SourcesNavigationSidebarPanel.js:
+ (WI.SourcesNavigationSidebarPanel):
+ (WI.SourcesNavigationSidebarPanel.prototype._handleExtraDomainsActivated):
+ Add compatibility comments.
+
+ * UserInterface/Protocol/InspectorBackend.js:
+ (InspectorBackendClass):
+ (InspectorBackend.Domain):
+ Add FIXMEs.
+
+2020-08-24 Devin Rousso <drou...@apple.com>
+
Web Inspector: remove legacy code for replacing the Canvas Tab with the Graphics Tab
https://bugs.webkit.org/show_bug.cgi?id=205827
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -789,6 +789,7 @@
WI.tabBrowser.showTabForContentView(tabContentView, options);
};
+// COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
WI.activateExtraDomains = function(domains)
{
WI.notifications.dispatchEventToListeners(WI.Notification.ExtraDomainsActivated, {domains});
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Object.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Object.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Object.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -217,7 +217,7 @@
GlobalModifierKeysDidChange: "global-modifiers-did-change",
PageArchiveStarted: "page-archive-started",
PageArchiveEnded: "page-archive-ended",
- ExtraDomainsActivated: "extra-domains-activated",
+ ExtraDomainsActivated: "extra-domains-activated", // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
VisibilityStateDidChange: "visibility-state-did-change",
TransitionPageTarget: "transition-page-target",
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/AnimationManager.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/AnimationManager.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/AnimationManager.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -42,6 +42,8 @@
activateExtraDomain(domain)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
console.assert(domain === "Animation");
for (let target of WI.targets)
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/AppController.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/AppController.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/AppController.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -43,6 +43,8 @@
activateExtraDomains(domains)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
console.assert(this._debuggableType === WI.DebuggableType._javascript_);
console.assert(WI.targets.length === 1);
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/ApplicationCacheManager.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/ApplicationCacheManager.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/ApplicationCacheManager.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -41,6 +41,8 @@
activateExtraDomain(domain)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
console.assert(domain === "ApplicationCache");
for (let target of WI.targets)
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CanvasManager.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CanvasManager.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CanvasManager.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -46,6 +46,8 @@
activateExtraDomain(domain)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
console.assert(domain === "Canvas");
for (let target of WI.targets)
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMStorageManager.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMStorageManager.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMStorageManager.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -42,6 +42,8 @@
activateExtraDomain(domain)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
console.assert(domain === "DOMStorage");
for (let target of WI.targets)
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DatabaseManager.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DatabaseManager.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DatabaseManager.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -42,6 +42,8 @@
activateExtraDomain(domain)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
console.assert(domain === "Database");
for (let target of WI.targets)
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/HeapManager.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/HeapManager.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/HeapManager.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -40,6 +40,8 @@
activateExtraDomain(domain)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
console.assert(domain === "Heap");
for (let target of WI.targets)
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/IndexedDBManager.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/IndexedDBManager.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/IndexedDBManager.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -44,6 +44,8 @@
activateExtraDomain(domain)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
console.assert(domain === "IndexedDB");
for (let target of WI.targets)
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/MemoryManager.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/MemoryManager.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/MemoryManager.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -38,6 +38,8 @@
activateExtraDomain(domain)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
console.assert(domain === "Memory");
for (let target of WI.targets)
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/NetworkManager.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/NetworkManager.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/NetworkManager.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -52,7 +52,9 @@
// FIXME: Provide dedicated UI to toggle Network Interception globally?
this._interceptionEnabled = true;
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
WI.notifications.addEventListener(WI.Notification.ExtraDomainsActivated, this._extraDomainsActivated, this);
+
WI.Frame.addEventListener(WI.Frame.Event.MainResourceDidChange, this._handleFrameMainResourceDidChange, this);
if (NetworkManager.supportsLocalResourceOverrides()) {
@@ -1447,6 +1449,8 @@
_extraDomainsActivated(event)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
let target = WI.assumingMainTarget();
if (target.hasDomain("Page") && event.data.domains.includes("Page"))
target.PageAgent.getResourceTree(this._processMainFrameResourceTreePayload.bind(this));
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -69,6 +69,8 @@
activateExtraDomain(domain)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
console.assert(domain === "Timeline");
for (let target of WI.targets)
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -41,6 +41,7 @@
this._defaultTracer = new WI.LoggingProtocolTracer;
this._activeTracers = [this._defaultTracer];
+ // FIXME: <https://webkit.org/b/213632> Web Inspector: release unused backend domains/events/commands once the debuggable type is known
this._supportedDomainsForTargetType = new Multimap;
this._supportedCommandParameters = new Map;
this._supportedEventParameters = new Map;
@@ -326,6 +327,7 @@
this._dispatcher = null;
+ // FIXME: <https://webkit.org/b/213632> Web Inspector: release unused backend domains/events/commands once the debuggable type is known
this._supportedCommandsForTargetType = new Multimap;
this._supportedEventsForTargetType = new Multimap;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -68,6 +68,8 @@
activateExtraDomains(domains)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
WI.sharedApp.activateExtraDomains(domains);
}
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/Target.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/Target.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/Target.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -121,6 +121,8 @@
activateExtraDomain(domainName)
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
this._agents[domainName] = InspectorBackend._makeAgent(domainName, this);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js (266071 => 266072)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js 2020-08-24 17:30:29 UTC (rev 266071)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js 2020-08-24 17:31:56 UTC (rev 266072)
@@ -345,6 +345,7 @@
WI.targetManager.addEventListener(WI.TargetManager.Event.TargetAdded, this._handleTargetAdded, this);
WI.targetManager.addEventListener(WI.TargetManager.Event.TargetRemoved, this._handleTargetRemoved, this);
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
WI.notifications.addEventListener(WI.Notification.ExtraDomainsActivated, this._handleExtraDomainsActivated, this);
if (WI.SourcesNavigationSidebarPanel.shouldPlaceResourcesAtTopLevel()) {
@@ -2621,6 +2622,8 @@
_handleExtraDomainsActivated()
{
+ // COMPATIBILITY (iOS 14.0): Inspector.activateExtraDomains was removed in favor of a declared debuggable type
+
if (WI.SourcesNavigationSidebarPanel.shouldPlaceResourcesAtTopLevel())
this._resourcesTreeOutline.disclosureButtons = true;
}
