react-native 0.74.0-nightly-20240220-e9351f0f8 → 0.74.0-rc.0

package/Libraries/Core/ReactNativeVersion.js

@@ -17,7 +17,7 @@ const version: $ReadOnly<{
   major: 0,
   minor: 74,
   patch: 0,
-  prerelease: 'nightly-20240220-e9351f0f8',
+  prerelease: 'rc.0',
 };
 
 module.exports = {version};

package/React/Base/RCTBridge+Private.h

@@ -74,11 +74,11 @@ RCT_EXTERN void RCTRegisterModule(Class);
 @property (nonatomic, strong, readonly) RCTModuleRegistry *moduleRegistry;
 
 /**
- * The HostTarget for this bridge, if one has been created. Exposed for RCTCxxBridge only.
+ * The page target for this bridge, if one has been created. Exposed for RCTCxxBridge only.
  */
 @property (nonatomic, assign, readonly)
 #ifdef __cplusplus
-    facebook::react::jsinspector_modern::HostTarget *
+    facebook::react::jsinspector_modern::PageTarget *
 #else
     // The inspector infrastructure cannot be used in C code.
     void *

package/React/Base/RCTBridge.mm

@@ -188,9 +188,9 @@ void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled)
   kDispatchAccessibilityManagerInitOntoMain = enabled;
 }
 
-class RCTBridgeHostTargetDelegate : public facebook::react::jsinspector_modern::HostTargetDelegate {
+class RCTBridgePageTargetDelegate : public facebook::react::jsinspector_modern::PageTargetDelegate {
  public:
-  RCTBridgeHostTargetDelegate(RCTBridge *bridge) : bridge_(bridge) {}
+  RCTBridgePageTargetDelegate(RCTBridge *bridge) : bridge_(bridge) {}
 
   void onReload(const PageReloadRequest &request) override
   {
@@ -208,8 +208,8 @@ class RCTBridgeHostTargetDelegate : public facebook::react::jsinspector_modern::
 @implementation RCTBridge {
   NSURL *_delegateBundleURL;
 
-  std::unique_ptr<RCTBridgeHostTargetDelegate> _inspectorHostDelegate;
-  std::shared_ptr<facebook::react::jsinspector_modern::HostTarget> _inspectorTarget;
+  std::unique_ptr<RCTBridgePageTargetDelegate> _inspectorPageDelegate;
+  std::shared_ptr<facebook::react::jsinspector_modern::PageTarget> _inspectorTarget;
   std::optional<int> _inspectorPageId;
 }
 
@@ -259,7 +259,7 @@ static RCTBridge *RCTCurrentBridgeInstance = nil;
     _bundleURL = bundleURL;
     _moduleProvider = block;
     _launchOptions = [launchOptions copy];
-    _inspectorHostDelegate = std::make_unique<RCTBridgeHostTargetDelegate>(self);
+    _inspectorPageDelegate = std::make_unique<RCTBridgePageTargetDelegate>(self);
 
     [self setUp];
   }
@@ -413,7 +413,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance();
   if (inspectorFlags.getEnableModernCDPRegistry() && !_inspectorPageId.has_value()) {
     _inspectorTarget =
-        facebook::react::jsinspector_modern::HostTarget::create(*_inspectorHostDelegate, [](auto callback) {
+        facebook::react::jsinspector_modern::PageTarget::create(*_inspectorPageDelegate, [](auto callback) {
           RCTExecuteOnMainQueue(^{
             callback();
           });
@@ -526,7 +526,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   [self.batchedBridge registerSegmentWithId:segmentId path:path];
 }
 
-- (facebook::react::jsinspector_modern::HostTarget *)inspectorTarget
+- (facebook::react::jsinspector_modern::PageTarget *)inspectorTarget
 {
   return _inspectorTarget.get();
 }

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(74),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"nightly-20240220-e9351f0f8",
+                  RCTVersionPrerelease: @"rc.0",
                   };
   });
   return __rnVersion;

package/React/CxxBridge/RCTCxxBridge.mm

@@ -437,7 +437,7 @@ struct RCTInstanceCallback : public InstanceCallback {
   // pointer into a member of RCTBridge! But we only use it while _reactInstance exists, meaning we
   // haven't been invalidated, and therefore RCTBridge hasn't been deallocated yet.
   RCTAssertMainQueue();
-  facebook::react::jsinspector_modern::HostTarget *parentInspectorTarget = _parentBridge.inspectorTarget;
+  facebook::react::jsinspector_modern::PageTarget *parentInspectorTarget = _parentBridge.inspectorTarget;
 
   // Dispatch the instance initialization as soon as the initial module metadata has
   // been collected (see initModules)
@@ -658,7 +658,7 @@ struct RCTInstanceCallback : public InstanceCallback {
 }
 
 - (void)_initializeBridge:(std::shared_ptr<JSExecutorFactory>)executorFactory
-    parentInspectorTarget:(facebook::react::jsinspector_modern::HostTarget *)parentInspectorTarget
+    parentInspectorTarget:(facebook::react::jsinspector_modern::PageTarget *)parentInspectorTarget
 {
   if (!self.valid) {
     return;
@@ -691,7 +691,7 @@ struct RCTInstanceCallback : public InstanceCallback {
 }
 
 - (void)_initializeBridgeLocked:(std::shared_ptr<JSExecutorFactory>)executorFactory
-          parentInspectorTarget:(facebook::react::jsinspector_modern::HostTarget *)parentInspectorTarget
+          parentInspectorTarget:(facebook::react::jsinspector_modern::PageTarget *)parentInspectorTarget
 {
   std::lock_guard<std::mutex> guard(_moduleRegistryLock);
 

package/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm

@@ -179,8 +179,8 @@ static NSString *const kRCTLegacyInteropChildIndexKey = @"index";
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
-  if (_adapter && index < _adapter.paperView.reactSubviews.count) {
-    [_adapter.paperView removeReactSubview:_adapter.paperView.reactSubviews[index]];
+  if (_adapter) {
+    [_adapter.paperView removeReactSubview:childComponentView];
   } else {
     [_viewsToBeUnmounted addObject:childComponentView];
   }

package/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp

@@ -62,16 +62,8 @@ void registerComponents(
 std::shared_ptr<TurboModule> cxxModuleProvider(
     const std::string& name,
     const std::shared_ptr<CallInvoker>& jsInvoker) {
-  // Here you can provide your CXX Turbo Modules coming from
-  // either your application or from external libraries. The approach to follow
-  // is similar to the following (for a module called `NativeCxxModuleExample`):
-  //
-  // if (name == NativeCxxModuleExample::kModuleName) {
-  //   return std::make_shared<NativeCxxModuleExample>(jsInvoker);
-  // }
-
-  // And we fallback to the CXX module providers autolinked by RN CLI
-  return rncli_cxxModuleProvider(name, jsInvoker);
+  // Not implemented yet: provide pure-C++ NativeModules here.
+  return nullptr;
 }
 
 std::shared_ptr<TurboModule> javaModuleProvider(

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.74.0-nightly-20240220-e9351f0f8
+VERSION_NAME=0.74.0-rc.0
 react.internal.publishingGroup=com.facebook.react
 
 android.useAndroidX=true

package/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

@@ -1231,10 +1231,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener {
                   public void run() {
                     mMountNotificationScheduled.set(false);
 
-                    if (mDestroyed) {
-                      return;
-                    }
-
                     final @Nullable Binding binding = mBinding;
                     if (mountItems == null || binding == null) {
                       return;

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 74,
       "patch", 0,
-      "prerelease", "nightly-20240220-e9351f0f8");
+      "prerelease", "rc.0");
 }

package/ReactCommon/cxxreact/Instance.cpp

@@ -54,7 +54,7 @@ void Instance::initializeBridge(
     std::shared_ptr<JSExecutorFactory> jsef,
     std::shared_ptr<MessageQueueThread> jsQueue,
     std::shared_ptr<ModuleRegistry> moduleRegistry,
-    jsinspector_modern::HostTarget* parentInspectorTarget) {
+    jsinspector_modern::PageTarget* parentInspectorTarget) {
   callback_ = std::move(callback);
   moduleRegistry_ = std::move(moduleRegistry);
   parentInspectorTarget_ = parentInspectorTarget;

package/ReactCommon/cxxreact/Instance.h

@@ -47,7 +47,7 @@ class RN_EXPORT Instance : private jsinspector_modern::InstanceTargetDelegate {
       std::shared_ptr<JSExecutorFactory> jsef,
       std::shared_ptr<MessageQueueThread> jsQueue,
       std::shared_ptr<ModuleRegistry> moduleRegistry,
-      jsinspector_modern::HostTarget* inspectorTarget = nullptr);
+      jsinspector_modern::PageTarget* inspectorTarget = nullptr);
 
   void initializeRuntime();
 
@@ -178,7 +178,7 @@ class RN_EXPORT Instance : private jsinspector_modern::InstanceTargetDelegate {
   std::shared_ptr<JSCallInvoker> jsCallInvoker_ =
       std::make_shared<JSCallInvoker>();
 
-  jsinspector_modern::HostTarget* parentInspectorTarget_{nullptr};
+  jsinspector_modern::PageTarget* parentInspectorTarget_{nullptr};
   jsinspector_modern::InstanceTarget* inspectorTarget_{nullptr};
   jsinspector_modern::RuntimeTarget* runtimeInspectorTarget_{nullptr};
 };

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 74;
   int32_t Patch = 0;
-  std::string_view Prerelease = "nightly-20240220-e9351f0f8";
+  std::string_view Prerelease = "rc.0";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeAgentDelegate.cpp

@@ -102,7 +102,7 @@ class HermesRuntimeAgentDelegate::Impl final : public RuntimeAgentDelegate {
    * \param executionContextDescription A description of the execution context
    * represented by this runtime. This is used for disambiguating the
    * source/destination of CDP messages when there are multiple runtimes
-   * (concurrently or over the life of a Host).
+   * (concurrently or over the life of a Page).
    * \param runtime The HermesRuntime that this agent is attached to.
    * \param runtimeExecutor A callback for scheduling work on the JS thread.
    * \c runtimeExecutor may drop scheduled work if the runtime is destroyed
@@ -155,7 +155,7 @@ class HermesRuntimeAgentDelegate::Impl final : public RuntimeAgentDelegate {
     // TODO: Change to string::starts_with when we're on C++20.
     if (req.method.rfind("Log.", 0) == 0) {
       // Since we know Hermes doesn't do anything useful with Log messages, but
-      // our containing HostAgent will, just bail out early.
+      // our containing PageAgent will, just bail out early.
       // TODO: We need a way to negotiate this more dynamically with Hermes
       // through the API.
       return false;

package/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeAgentDelegate.h

@@ -33,7 +33,7 @@ class HermesRuntimeAgentDelegate : public RuntimeAgentDelegate {
    * \param executionContextDescription A description of the execution context
    * represented by this runtime. This is used for disambiguating the
    * source/destination of CDP messages when there are multiple runtimes
-   * (concurrently or over the life of a Host).
+   * (concurrently or over the life of a Page).
    * \param runtime The HermesRuntime that this agent is attached to.
    * \param runtimeExecutor A callback for scheduling work on the JS thread.
    * \c runtimeExecutor may drop scheduled work if the runtime is destroyed

package/ReactCommon/jsinspector-modern/CONCEPTS.md

@@ -8,11 +8,11 @@ A debuggable entity that a debugger frontend can connect to.
 
 ### Target Delegate
 
-An interface between a Target class and the underlying debuggable entity. For example, HostTargetDelegate is used by HostTarget to send host-related events to the native platform implementation.
+An interface between a Target class and the underlying debuggable entity. For example, PageTargetDelegate is used by PageTarget to send page-related events to the native platform implementation.
 
 ### Target Controller
 
-A private interface exposed by a Target class to its Sessions/Agents. For example, HostTargetController is used by HostAgent to safely access the host's HostTargetDelegate, without exposing HostTarget's other private state.
+A private interface exposed by a Target class to its Sessions/Agents. For example, PageTargetController is used by PageAgent to safely access the page's PageTargetDelegate, without exposing PageTarget's other private state.
 
 ### Session
 

package/ReactCommon/jsinspector-modern/InstanceAgent.h

@@ -47,7 +47,7 @@ class InstanceAgent final {
   bool handleRequest(const cdp::PreparsedRequest& req);
 
   /**
-   * Replace the current RuntimeAgent hostAgent_ with a new one
+   * Replace the current RuntimeAgent pageAgent_ with a new one
    * connected to the new RuntimeTarget.
    * \param runtime The new runtime target. May be nullptr to indicate
    * there's no current debuggable runtime.

package/ReactCommon/jsinspector-modern/InstanceTarget.cpp

@@ -47,7 +47,7 @@ InstanceTarget::~InstanceTarget() {
   // they hold an InstanceTarget& that we must guarantee is valid.
   assert(
       agents_.empty() &&
-      "InstanceAgent objects must be destroyed before their InstanceTarget. Did you call HostTarget::unregisterInstance()?");
+      "InstanceAgent objects must be destroyed before their InstanceTarget. Did you call PageTarget::unregisterInstance()?");
 }
 
 RuntimeTarget& InstanceTarget::registerRuntime(

package/ReactCommon/jsinspector-modern/{HostAgent.cpp → PageAgent.cpp}

@@ -7,9 +7,9 @@
 
 #include <folly/dynamic.h>
 #include <folly/json.h>
-#include <jsinspector-modern/HostAgent.h>
-#include <jsinspector-modern/HostTarget.h>
 #include <jsinspector-modern/InstanceAgent.h>
+#include <jsinspector-modern/PageAgent.h>
+#include <jsinspector-modern/PageTarget.h>
 
 #include <chrono>
 
@@ -27,19 +27,19 @@ namespace facebook::react::jsinspector_modern {
 static constexpr auto kModernCDPBackendNotice =
     ANSI_COLOR_BG_YELLOW ANSI_WEIGHT_BOLD
     "NOTE:" ANSI_WEIGHT_RESET " You are using the " ANSI_STYLE_ITALIC
-    "modern" ANSI_STYLE_RESET " CDP backend for React Native (HostTarget)."sv;
+    "modern" ANSI_STYLE_RESET " CDP backend for React Native (PageTarget)."sv;
 
-HostAgent::HostAgent(
+PageAgent::PageAgent(
     FrontendChannel frontendChannel,
-    HostTargetController& targetController,
-    HostTarget::SessionMetadata sessionMetadata,
+    PageTargetController& targetController,
+    PageTarget::SessionMetadata sessionMetadata,
     SessionState& sessionState)
     : frontendChannel_(frontendChannel),
       targetController_(targetController),
       sessionMetadata_(std::move(sessionMetadata)),
       sessionState_(sessionState) {}
 
-void HostAgent::handleRequest(const cdp::PreparsedRequest& req) {
+void PageAgent::handleRequest(const cdp::PreparsedRequest& req) {
   bool shouldSendOKResponse = false;
   bool isFinishedHandlingRequest = false;
 
@@ -113,7 +113,7 @@ void HostAgent::handleRequest(const cdp::PreparsedRequest& req) {
   frontendChannel_(json);
 }
 
-void HostAgent::sendInfoLogEntry(std::string_view text) {
+void PageAgent::sendInfoLogEntry(std::string_view text) {
   frontendChannel_(
       folly::toJson(folly::dynamic::object("method", "Log.entryAdded")(
           "params",
@@ -127,7 +127,7 @@ void HostAgent::sendInfoLogEntry(std::string_view text) {
                   "level", "info")("text", text)))));
 }
 
-void HostAgent::setCurrentInstanceAgent(
+void PageAgent::setCurrentInstanceAgent(
     std::shared_ptr<InstanceAgent> instanceAgent) {
   auto previousInstanceAgent = std::move(instanceAgent_);
   instanceAgent_ = std::move(instanceAgent);

package/ReactCommon/jsinspector-modern/{HostAgent.h → PageAgent.h}

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "HostTarget.h"
+#include "PageTarget.h"
 #include "SessionState.h"
 
 #include <jsinspector-modern/InspectorInterfaces.h>
@@ -19,32 +19,32 @@
 
 namespace facebook::react::jsinspector_modern {
 
-class HostTarget;
+class PageTarget;
 class InstanceAgent;
 class InstanceTarget;
 
 /**
  * An Agent that handles requests from the Chrome DevTools Protocol for the
- * given Host.
+ * given page.
  * The constructor, destructor and all public methods must be called on the
- * same thread, which is also the thread where the associated HostTarget is
+ * same thread, which is also the thread where the associated PageTarget is
  * constructed and managed.
  */
-class HostAgent final {
+class PageAgent final {
  public:
   /**
    * \param frontendChannel A channel used to send responses and events to the
    * frontend.
-   * \param targetController An interface to the HostTarget that this agent is
+   * \param targetController An interface to the PageTarget that this agent is
    * attached to. The caller is responsible for ensuring that the
-   * HostTargetDelegate and underlying HostTarget both outlive the agent.
+   * PageTargetDelegate and underlying PageTarget both outlive the agent.
    * \param sessionMetadata Metadata about the session that created this agent.
    * \param sessionState The state of the session that created this agent.
    */
-  HostAgent(
+  PageAgent(
       FrontendChannel frontendChannel,
-      HostTargetController& targetController,
-      HostTarget::SessionMetadata sessionMetadata,
+      PageTargetController& targetController,
+      PageTarget::SessionMetadata sessionMetadata,
       SessionState& sessionState);
 
   /**
@@ -70,13 +70,13 @@ class HostAgent final {
    * DevTools, the message will appear in the Console tab along with regular
    * console messages. The difference between Log.entryAdded and
    * Runtime.consoleAPICalled is that the latter requires an execution context
-   * ID, which does not exist at the Host level.
+   * ID, which does not exist at the Page level.
    */
   void sendInfoLogEntry(std::string_view text);
 
   FrontendChannel frontendChannel_;
-  HostTargetController& targetController_;
-  const HostTarget::SessionMetadata sessionMetadata_;
+  PageTargetController& targetController_;
+  const PageTarget::SessionMetadata sessionMetadata_;
   std::shared_ptr<InstanceAgent> instanceAgent_;
 
   /**

package/ReactCommon/jsinspector-modern/{HostTarget.cpp → PageTarget.cpp}

@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "HostTarget.h"
-#include "HostAgent.h"
+#include "PageTarget.h"
 #include "InspectorInterfaces.h"
 #include "InspectorUtilities.h"
 #include "InstanceTarget.h"
+#include "PageAgent.h"
 #include "Parsing.h"
 #include "SessionState.h"
 
@@ -21,15 +21,15 @@
 namespace facebook::react::jsinspector_modern {
 
 /**
- * A Session connected to a HostTarget, passing CDP messages to and from a
- * HostAgent which it owns.
+ * A Session connected to a PageTarget, passing CDP messages to and from a
+ * PageAgent which it owns.
  */
-class HostTargetSession {
+class PageTargetSession {
  public:
-  explicit HostTargetSession(
+  explicit PageTargetSession(
       std::unique_ptr<IRemoteConnection> remote,
-      HostTargetController& targetController,
-      HostTarget::SessionMetadata sessionMetadata)
+      PageTargetController& targetController,
+      PageTarget::SessionMetadata sessionMetadata)
       : remote_(std::make_shared<RAIIRemoteConnection>(std::move(remote))),
         frontendChannel_(
             [remoteWeak = std::weak_ptr(remote_)](std::string_view message) {
@@ -37,7 +37,7 @@ class HostTargetSession {
                 remote->onMessage(std::string(message));
               }
             }),
-        hostAgent_(
+        pageAgent_(
             frontendChannel_,
             targetController,
             std::move(sessionMetadata),
@@ -67,7 +67,7 @@ class HostTargetSession {
     // Catch exceptions that may arise from accessing dynamic params during
     // request handling.
     try {
-      hostAgent_.handleRequest(request);
+      pageAgent_.handleRequest(request);
     } catch (const cdp::TypeError& e) {
       frontendChannel_(folly::toJson(folly::dynamic::object("id", request.id)(
           "error",
@@ -77,17 +77,17 @@ class HostTargetSession {
   }
 
   /**
-   * Replace the current instance agent inside hostAgent_ with a new one
+   * Replace the current instance agent inside pageAgent_ with a new one
    * connected to the new InstanceTarget.
    * \param instance The new instance target. May be nullptr to indicate
    * there's no current instance.
    */
   void setCurrentInstance(InstanceTarget* instance) {
     if (instance) {
-      hostAgent_.setCurrentInstanceAgent(
+      pageAgent_.setCurrentInstanceAgent(
           instance->createAgent(frontendChannel_, state_));
     } else {
-      hostAgent_.setCurrentInstanceAgent(nullptr);
+      pageAgent_.setCurrentInstanceAgent(nullptr);
     }
   }
 
@@ -95,26 +95,26 @@ class HostTargetSession {
   // Owned by this instance, but shared (weakly) with the frontend channel
   std::shared_ptr<RAIIRemoteConnection> remote_;
   FrontendChannel frontendChannel_;
-  HostAgent hostAgent_;
+  PageAgent pageAgent_;
   SessionState state_;
 };
 
-std::shared_ptr<HostTarget> HostTarget::create(
-    HostTargetDelegate& delegate,
+std::shared_ptr<PageTarget> PageTarget::create(
+    PageTargetDelegate& delegate,
     VoidExecutor executor) {
-  std::shared_ptr<HostTarget> hostTarget{new HostTarget(delegate)};
-  hostTarget->setExecutor(executor);
-  return hostTarget;
+  std::shared_ptr<PageTarget> pageTarget{new PageTarget(delegate)};
+  pageTarget->setExecutor(executor);
+  return pageTarget;
 }
 
-HostTarget::HostTarget(HostTargetDelegate& delegate)
+PageTarget::PageTarget(PageTargetDelegate& delegate)
     : delegate_(delegate),
       executionContextManager_{std::make_shared<ExecutionContextManager>()} {}
 
-std::unique_ptr<ILocalConnection> HostTarget::connect(
+std::unique_ptr<ILocalConnection> PageTarget::connect(
     std::unique_ptr<IRemoteConnection> connectionToFrontend,
     SessionMetadata sessionMetadata) {
-  auto session = std::make_shared<HostTargetSession>(
+  auto session = std::make_shared<PageTargetSession>(
       std::move(connectionToFrontend), controller_, std::move(sessionMetadata));
   session->setCurrentInstance(currentInstance_.get());
   sessions_.insert(std::weak_ptr(session));
@@ -122,44 +122,44 @@ std::unique_ptr<ILocalConnection> HostTarget::connect(
       [session](std::string message) { (*session)(message); });
 }
 
-HostTarget::~HostTarget() {
-  // Sessions are owned by InspectorPackagerConnection, not by HostTarget, but
-  // they hold a HostTarget& that we must guarantee is valid.
+PageTarget::~PageTarget() {
+  // Sessions are owned by InspectorPackagerConnection, not by PageTarget, but
+  // they hold a PageTarget& that we must guarantee is valid.
   assert(
       sessions_.empty() &&
-      "HostTargetSession objects must be destroyed before their HostTarget. Did you call getInspectorInstance().removePage()?");
+      "PageTargetSession objects must be destroyed before their PageTarget. Did you call getInspectorInstance().removePage()?");
 }
 
-HostTargetDelegate::~HostTargetDelegate() {}
+PageTargetDelegate::~PageTargetDelegate() {}
 
-InstanceTarget& HostTarget::registerInstance(InstanceTargetDelegate& delegate) {
+InstanceTarget& PageTarget::registerInstance(InstanceTargetDelegate& delegate) {
   assert(!currentInstance_ && "Only one instance allowed");
   currentInstance_ = InstanceTarget::create(
       executionContextManager_, delegate, makeVoidExecutor(executorFromThis()));
   sessions_.forEach(
-      [currentInstance = &*currentInstance_](HostTargetSession& session) {
+      [currentInstance = &*currentInstance_](PageTargetSession& session) {
         session.setCurrentInstance(currentInstance);
       });
   return *currentInstance_;
 }
 
-void HostTarget::unregisterInstance(InstanceTarget& instance) {
+void PageTarget::unregisterInstance(InstanceTarget& instance) {
   assert(
       currentInstance_ && currentInstance_.get() == &instance &&
       "Invalid unregistration");
   sessions_.forEach(
-      [](HostTargetSession& session) { session.setCurrentInstance(nullptr); });
+      [](PageTargetSession& session) { session.setCurrentInstance(nullptr); });
   currentInstance_.reset();
 }
 
-HostTargetController::HostTargetController(HostTarget& target)
+PageTargetController::PageTargetController(PageTarget& target)
     : target_(target) {}
 
-HostTargetDelegate& HostTargetController::getDelegate() {
+PageTargetDelegate& PageTargetController::getDelegate() {
   return target_.getDelegate();
 }
 
-bool HostTargetController::hasInstance() const {
+bool PageTargetController::hasInstance() const {
   return target_.hasInstance();
 }