diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java index a6188100c52e..f55eca6e4a7a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java @@ -776,22 +776,6 @@ public void runApplication() { } } - /** - * Is used by unit test to setup mIsAttachedToWindow flags, that will let this view to be properly - * attached to catalyst instance by startReactApplication call - */ - @VisibleForTesting - /* package */ void simulateAttachForTesting() { - mIsAttachedToInstance = true; - mJSTouchDispatcher = new JSTouchDispatcher(this); - if (ReactFeatureFlags.dispatchPointerEvents) { - mJSPointerDispatcher = new JSPointerDispatcher(this); - } - if (ReactNativeFeatureFlags.enableKeyEvents()) { - mJSKeyDispatcher = new JSKeyDispatcher(); - } - } - @VisibleForTesting /* package */ void simulateCheckForKeyboardForTesting() { getCustomGlobalLayoutListener().checkForKeyboardEvents(); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/ClearableSynchronizedPool.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/ClearableSynchronizedPool.kt deleted file mode 100644 index 16e79301734a..000000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/ClearableSynchronizedPool.kt +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react.common - -import androidx.core.util.Pools.Pool - -/** - * Like [androidx.core.util.Pools.SynchronizedPool] with the option to clear the pool (e.g. on - * memory pressure). - */ -internal class ClearableSynchronizedPool(maxSize: Int) : Pool { - - private val pool: Array = arrayOfNulls(maxSize) - private var size = 0 - - @Synchronized - @Suppress("UNCHECKED_CAST", "KotlinGenericsCast") - override fun acquire(): T? { - if (size == 0) { - return null - } - size-- - val lastIndex = size - val toReturn = pool[lastIndex] as T - pool[lastIndex] = null - return toReturn - } - - @Synchronized - override fun release(instance: T): Boolean { - if (size == pool.size) { - return false - } - pool[size] = instance - size++ - return true - } - - @Synchronized - fun clear(): Unit { - for (i in 0 until size) { - pool[i] = null - } - size = 0 - } -} diff --git a/packages/react-native/ReactCommon/cxxreact/Instance.cpp b/packages/react-native/ReactCommon/cxxreact/Instance.cpp index d61f049076eb..990601519cb6 100644 --- a/packages/react-native/ReactCommon/cxxreact/Instance.cpp +++ b/packages/react-native/ReactCommon/cxxreact/Instance.cpp @@ -20,7 +20,6 @@ #include "RecoverableError.h" #include "TraceSection.h" -#include #include #include @@ -175,48 +174,6 @@ void Instance::loadScriptFromString( } } -void Instance::loadRAMBundleFromString( - std::unique_ptr script, - const std::string& sourceURL) { - auto bundle = std::make_unique(std::move(script)); - auto startupScript = bundle->getStartupCode(); - auto registry = RAMBundleRegistry::singleBundleRegistry(std::move(bundle)); - loadRAMBundle(std::move(registry), std::move(startupScript), sourceURL, true); -} - -void Instance::loadRAMBundleFromFile( - const std::string& sourcePath, - const std::string& sourceURL, - bool loadSynchronously) { - auto bundle = std::make_unique(sourcePath.c_str()); - auto startupScript = bundle->getStartupCode(); - auto registry = RAMBundleRegistry::multipleBundlesRegistry( - std::move(bundle), JSIndexedRAMBundle::buildFactory()); - loadRAMBundle( - std::move(registry), - std::move(startupScript), - sourceURL, - loadSynchronously); -} - -void Instance::loadRAMBundle( - std::unique_ptr bundleRegistry, - std::unique_ptr startupScript, - std::string startupScriptSourceURL, - bool loadSynchronously) { - if (loadSynchronously) { - loadBundleSync( - std::move(bundleRegistry), - std::move(startupScript), - std::move(startupScriptSourceURL)); - } else { - loadBundle( - std::move(bundleRegistry), - std::move(startupScript), - std::move(startupScriptSourceURL)); - } -} - void Instance::setGlobalVariable( std::string propName, std::unique_ptr jsonValue) { diff --git a/packages/react-native/ReactCommon/cxxreact/Instance.h b/packages/react-native/ReactCommon/cxxreact/Instance.h index 501810e69ada..3b03ba8d9330 100644 --- a/packages/react-native/ReactCommon/cxxreact/Instance.h +++ b/packages/react-native/ReactCommon/cxxreact/Instance.h @@ -52,19 +52,9 @@ class RN_EXPORT [[deprecated("This API will be removed along with the legacy arc std::shared_ptr moduleRegistry, jsinspector_modern::HostTarget *inspectorTarget = nullptr); - void initializeRuntime(); - void setSourceURL(std::string sourceURL); void loadScriptFromString(std::unique_ptr string, std::string sourceURL, bool loadSynchronously); - void loadRAMBundleFromString(std::unique_ptr script, const std::string &sourceURL); - void loadRAMBundleFromFile(const std::string &sourcePath, const std::string &sourceURL, bool loadSynchronously); - void loadRAMBundle( - std::unique_ptr bundleRegistry, - std::unique_ptr startupScript, - std::string startupScriptSourceURL, - bool loadSynchronously); - bool supportsProfiling(); void setGlobalVariable(std::string propName, std::unique_ptr jsonValue); void *getJavaScriptContext(); bool isInspectable(); diff --git a/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp b/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp deleted file mode 100644 index c17685de39fd..000000000000 --- a/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#include "JSIndexedRAMBundle.h" - -#ifndef RCT_REMOVE_LEGACY_ARCH - -#include -#include -#include -#include -#include - -#include - -namespace facebook::react { - -namespace { -uint32_t littleEndianToHost(uint32_t value) { - if constexpr (std::endian::native == std::endian::big) { - return (value << 24) | ((value & 0x0000FF00U) << 8) | - ((value & 0x00FF0000U) >> 8) | (value >> 24); - } - return value; -} -} // namespace - -std::function(std::string)> -JSIndexedRAMBundle::buildFactory() { - return [](const std::string& bundlePath) { - return std::make_unique(bundlePath.c_str()); - }; -} - -JSIndexedRAMBundle::JSIndexedRAMBundle(const char* sourcePath) { - m_bundle = std::make_unique(sourcePath, std::ifstream::binary); - if (!m_bundle) { - throw std::ios_base::failure( - std::string("Bundle ") + sourcePath + - "cannot be opened: " + std::to_string(m_bundle->rdstate())); - } - init(); -} - -JSIndexedRAMBundle::JSIndexedRAMBundle( - std::unique_ptr script) { - // tmpStream is needed because m_bundle is std::istream type - // which has no member 'write' - std::unique_ptr tmpStream = - std::make_unique(); - tmpStream->write(script->c_str(), script->size()); - m_bundle = std::move(tmpStream); - if (!m_bundle) { - throw std::ios_base::failure( - "Bundle from string cannot be opened: " + - std::to_string(m_bundle->rdstate())); - } - init(); -} - -void JSIndexedRAMBundle::init() { - // read in magic header, number of entries, and length of the startup section - uint32_t header[3]; - static_assert( - sizeof(header) == 12, - "header size must exactly match the input file format"); - - readBundle(reinterpret_cast(header), sizeof(header)); - size_t numTableEntries = littleEndianToHost(header[1]); - std::streamsize startupCodeSize = littleEndianToHost(header[2]); - - // allocate memory for meta data and lookup table. - m_table = ModuleTable(numTableEntries); - m_baseOffset = sizeof(header) + m_table.byteLength(); - - // read the lookup table from the file - readBundle(reinterpret_cast(m_table.data.get()), m_table.byteLength()); - - // read the startup code - m_startupCode = std::make_unique(startupCodeSize - 1); - - readBundle(m_startupCode->mutableData(), startupCodeSize - 1); -} - -JSIndexedRAMBundle::Module JSIndexedRAMBundle::getModule( - uint32_t moduleId) const { - Module ret; - ret.name = std::to_string(moduleId) + ".js"; - ret.code = getModuleCode(moduleId); - return ret; -} - -std::unique_ptr JSIndexedRAMBundle::getStartupCode() { - CHECK(m_startupCode) - << "startup code for a RAM Bundle can only be retrieved once"; - return std::move(m_startupCode); -} - -std::string JSIndexedRAMBundle::getModuleCode(const uint32_t id) const { - const auto moduleData = id < m_table.numEntries ? &m_table.data[id] : nullptr; - - // entries without associated code have offset = 0 and length = 0 - const uint32_t length = - moduleData != nullptr ? littleEndianToHost(moduleData->length) : 0; - if (length == 0) { - throw std::ios_base::failure( - "Error loading module" + std::to_string(id) + "from RAM Bundle"); - } - - std::string ret(length - 1, '\0'); - readBundle( - &ret.front(), - length - 1, - m_baseOffset + littleEndianToHost(moduleData->offset)); - return ret; -} - -void JSIndexedRAMBundle::readBundle(char* buffer, std::streamsize bytes) const { - if (!m_bundle->read(buffer, bytes)) { - if ((m_bundle->rdstate() & std::ios::eofbit) != 0) { - throw std::ios_base::failure("Unexpected end of RAM Bundle file"); - } - throw std::ios_base::failure( - "Error reading RAM Bundle: " + std::to_string(m_bundle->rdstate())); - } -} - -void JSIndexedRAMBundle::readBundle( - char* buffer, - const std::streamsize bytes, - const std::ifstream::pos_type position) const { - if (!m_bundle->seekg(position)) { - throw std::ios_base::failure( - "Error reading RAM Bundle: " + std::to_string(m_bundle->rdstate())); - } - readBundle(buffer, bytes); -} - -} // namespace facebook::react - -#endif // RCT_REMOVE_LEGACY_ARCH diff --git a/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.h b/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.h deleted file mode 100644 index 715d85358849..000000000000 --- a/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#pragma once - -#ifndef RCT_REMOVE_LEGACY_ARCH - -#include -#include -#include -#include - -#include -#include - -#ifndef RN_EXPORT -#define RN_EXPORT __attribute__((visibility("default"))) -#endif - -namespace facebook::react { - -class RN_EXPORT [[deprecated("This API will be removed along with the legacy architecture.")]] JSIndexedRAMBundle - : public JSModulesUnbundle { - public: - static std::function(std::string)> buildFactory(); - - // Throws std::runtime_error on failure. - explicit JSIndexedRAMBundle(const char *sourcePath); - JSIndexedRAMBundle(std::unique_ptr script); - - // Throws std::runtime_error on failure. - std::unique_ptr getStartupCode(); - // Throws std::runtime_error on failure. - Module getModule(uint32_t moduleId) const override; - - private: - struct ModuleData { - uint32_t offset; - uint32_t length; - }; - static_assert(sizeof(ModuleData) == 8, "ModuleData must not have any padding and use sizes matching input files"); - - struct ModuleTable { - size_t numEntries; - std::unique_ptr data; - ModuleTable() : numEntries(0) {}; - ModuleTable(size_t entries) - : numEntries(entries), data(std::unique_ptr(new ModuleData[numEntries])) {}; - size_t byteLength() const - { - return numEntries * sizeof(ModuleData); - } - }; - - void init(); - std::string getModuleCode(uint32_t id) const; - void readBundle(char *buffer, std::streamsize bytes) const; - void readBundle(char *buffer, std::streamsize bytes, std::istream::pos_type position) const; - - mutable std::unique_ptr m_bundle; - ModuleTable m_table; - size_t m_baseOffset{}; - std::unique_ptr m_startupCode; -}; - -} // namespace facebook::react - -#endif // RCT_REMOVE_LEGACY_ARCH diff --git a/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.cpp b/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.cpp index 29ff28857055..b105676cc9f4 100644 --- a/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.cpp +++ b/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.cpp @@ -20,11 +20,6 @@ namespace facebook::react { constexpr uint32_t RAMBundleRegistry::MAIN_BUNDLE_ID; #pragma clang diagnostic pop -std::unique_ptr RAMBundleRegistry::singleBundleRegistry( - std::unique_ptr mainBundle) { - return std::make_unique(std::move(mainBundle)); -} - std::unique_ptr RAMBundleRegistry::multipleBundlesRegistry( std::unique_ptr mainBundle, std::function(std::string)> factory) { diff --git a/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.h b/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.h index 7951bf3dc3d8..434855471b8b 100644 --- a/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.h +++ b/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.h @@ -27,7 +27,6 @@ class RN_EXPORT [[deprecated("This API will be removed along with the legacy arc public: constexpr static uint32_t MAIN_BUNDLE_ID = 0; - static std::unique_ptr singleBundleRegistry(std::unique_ptr mainBundle); static std::unique_ptr multipleBundlesRegistry( std::unique_ptr mainBundle, std::function(std::string)> factory); diff --git a/packages/react-native/ReactCommon/cxxreact/tests/JSIndexedRAMBundleTest.cpp b/packages/react-native/ReactCommon/cxxreact/tests/JSIndexedRAMBundleTest.cpp deleted file mode 100644 index 4c4cd90a7d21..000000000000 --- a/packages/react-native/ReactCommon/cxxreact/tests/JSIndexedRAMBundleTest.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#include -#include -#include - -#include -#include -#include - -#ifndef RCT_REMOVE_LEGACY_ARCH - -using namespace facebook::react; - -namespace { -constexpr uint32_t kRAMBundleMagic = 0xFB0BD1E5; - -void appendLittleEndian32(std::string& out, uint32_t value) { - out.push_back(static_cast(value & 0xFF)); - out.push_back(static_cast((value >> 8) & 0xFF)); - out.push_back(static_cast((value >> 16) & 0xFF)); - out.push_back(static_cast((value >> 24) & 0xFF)); -} - -void appendNullTerminatedSection(std::string& out, const std::string& section) { - out += section; - out.push_back('\0'); -} -} // namespace - -TEST(JSIndexedRAMBundleTest, ReadsLittleEndianStartupAndModules) { - const std::string startup = "var startup = true;"; - const std::string moduleZero = "module zero code"; - const std::string moduleOne = "m1"; - - const auto startupCodeSize = static_cast(startup.size() + 1); - const auto lengthZero = static_cast(moduleZero.size() + 1); - const auto lengthOne = static_cast(moduleOne.size() + 1); - const uint32_t offsetZero = startupCodeSize; - const uint32_t offsetOne = offsetZero + lengthZero; - - std::string bundle; - appendLittleEndian32(bundle, kRAMBundleMagic); - appendLittleEndian32(bundle, 2); - appendLittleEndian32(bundle, startupCodeSize); - appendLittleEndian32(bundle, offsetZero); - appendLittleEndian32(bundle, lengthZero); - appendLittleEndian32(bundle, offsetOne); - appendLittleEndian32(bundle, lengthOne); - appendNullTerminatedSection(bundle, startup); - appendNullTerminatedSection(bundle, moduleZero); - appendNullTerminatedSection(bundle, moduleOne); - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - JSIndexedRAMBundle ramBundle(std::make_unique(bundle)); - - const auto startupCode = ramBundle.getStartupCode(); - EXPECT_EQ(std::string(startupCode->c_str(), startupCode->size()), startup); - - const auto firstModule = ramBundle.getModule(0); - EXPECT_EQ(firstModule.name, "0.js"); - EXPECT_EQ(firstModule.code, moduleZero); - - const auto secondModule = ramBundle.getModule(1); - EXPECT_EQ(secondModule.name, "1.js"); - EXPECT_EQ(secondModule.code, moduleOne); -#pragma GCC diagnostic pop -} - -#endif // RCT_REMOVE_LEGACY_ARCH diff --git a/packages/react-native/ReactCommon/jsinspector-modern/HostTarget.h b/packages/react-native/ReactCommon/jsinspector-modern/HostTarget.h index 55194fc98b61..7d0193d31087 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/HostTarget.h +++ b/packages/react-native/ReactCommon/jsinspector-modern/HostTarget.h @@ -252,13 +252,6 @@ class HostTargetController final { bool hasInstance() const; - /** - * [Experimental] Install a runtime binding subscribing to new Performance - * Issues, which we broadcast to the V2 Perf Monitor overlay via - * \ref HostTargetDelegate::unstable_onPerfIssueAdded. - */ - void installPerfIssuesBinding(); - /** * Increments the target's pause overlay counter. The counter represents the * exact number of Agents that have (concurrently) requested the pause diff --git a/packages/react-native/ReactCommon/react/utils/Telemetry.h b/packages/react-native/ReactCommon/react/utils/Telemetry.h index ac4c6a1eec8f..d7ebf2b0e82c 100644 --- a/packages/react-native/ReactCommon/react/utils/Telemetry.h +++ b/packages/react-native/ReactCommon/react/utils/Telemetry.h @@ -81,19 +81,6 @@ DestinationTimePointT clockCast(SourceTimePointT timePoint) timePoint - sourseClockNow + destinationClockNow); } -/* - * Returns a number of seconds that passed from the UNIX Epoch starting time - * point to a given time point. - * Also known as POSIX time or UNIX Timestamp. - */ -static inline double telemetryTimePointToSecondsSinceEpoch(TelemetryTimePoint timePoint) -{ - auto systemClockTimePoint = clockCast(timePoint); - return (double)std::chrono::duration_cast(systemClockTimePoint.time_since_epoch()) - .count() / - 1000000.0; -} - /* * Returns a number of milliseconds that represents the given duration object. */ diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api index c44d48b62522..33a4d790b770 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -2715,7 +2715,6 @@ class facebook::react::InspectorNetworkRequestListener : public jni::HybridClass class facebook::react::Instance { public bool isBatchActive(); public bool isInspectable(); - public bool supportsProfiling(); public const facebook::react::ModuleRegistry& getModuleRegistry() const; public facebook::react::ModuleRegistry& getModuleRegistry(); public facebook::react::RuntimeExecutor getRuntimeExecutor(); @@ -2725,10 +2724,6 @@ class facebook::react::Instance { public void callJSFunction(std::string&& module, std::string&& method, folly::dynamic&& params); public void handleMemoryPressure(int pressureLevel); public void initializeBridge(std::unique_ptr callback, std::shared_ptr jsef, std::shared_ptr jsQueue, std::shared_ptr moduleRegistry, facebook::react::jsinspector_modern::HostTarget* inspectorTarget = nullptr); - public void initializeRuntime(); - public void loadRAMBundle(std::unique_ptr bundleRegistry, std::unique_ptr startupScript, std::string startupScriptSourceURL, bool loadSynchronously); - public void loadRAMBundleFromFile(const std::string& sourcePath, const std::string& sourceURL, bool loadSynchronously); - public void loadRAMBundleFromString(std::unique_ptr script, const std::string& sourceURL); public void loadScriptFromString(std::unique_ptr string, std::string sourceURL, bool loadSynchronously); public void registerBundle(uint32_t bundleId, const std::string& bundlePath); public void setGlobalVariable(std::string propName, std::unique_ptr jsonValue); @@ -3004,14 +2999,6 @@ class facebook::react::JSINativeModules { public void reset(); } -class facebook::react::JSIndexedRAMBundle : public facebook::react::JSModulesUnbundle { - public JSIndexedRAMBundle(const char* sourcePath); - public JSIndexedRAMBundle(std::unique_ptr script); - public static std::function(std::string)> buildFactory(); - public std::unique_ptr getStartupCode(); - public virtual facebook::react::JSModulesUnbundle::Module getModule(uint32_t moduleId) const override; -} - class facebook::react::JSModulesUnbundle { public JSModulesUnbundle(); public virtual facebook::react::JSModulesUnbundle::Module getModule(uint32_t moduleId) const = 0; @@ -4190,7 +4177,6 @@ class facebook::react::RAMBundleRegistry { public facebook::react::RAMBundleRegistry& operator=(facebook::react::RAMBundleRegistry&&) = default; public static constexpr uint32_t MAIN_BUNDLE_ID; public static std::unique_ptr multipleBundlesRegistry(std::unique_ptr mainBundle, std::function(std::string)> factory); - public static std::unique_ptr singleBundleRegistry(std::unique_ptr mainBundle); public virtual ~RAMBundleRegistry() = default; public void registerBundle(uint32_t bundleId, std::string bundlePath); } @@ -10524,7 +10510,6 @@ class facebook::react::jsinspector_modern::HostTargetController { public facebook::react::jsinspector_modern::HostTargetDelegate& getDelegate(); public facebook::react::jsinspector_modern::tracing::HostTracingProfile stopTracing(); public void incrementPauseOverlayCounter(); - public void installPerfIssuesBinding(); } class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook::react::jsinspector_modern::LoadNetworkResourceDelegate { diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api index dd01b050910f..4de47f9fc43f 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api @@ -10162,7 +10162,6 @@ class facebook::react::jsinspector_modern::HostTargetController { public facebook::react::jsinspector_modern::HostTargetDelegate& getDelegate(); public facebook::react::jsinspector_modern::tracing::HostTracingProfile stopTracing(); public void incrementPauseOverlayCounter(); - public void installPerfIssuesBinding(); } class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook::react::jsinspector_modern::LoadNetworkResourceDelegate { diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api index c56d1e02cff1..95df33b72a15 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -2712,7 +2712,6 @@ class facebook::react::InspectorNetworkRequestListener : public jni::HybridClass class facebook::react::Instance { public bool isBatchActive(); public bool isInspectable(); - public bool supportsProfiling(); public const facebook::react::ModuleRegistry& getModuleRegistry() const; public facebook::react::ModuleRegistry& getModuleRegistry(); public facebook::react::RuntimeExecutor getRuntimeExecutor(); @@ -2722,10 +2721,6 @@ class facebook::react::Instance { public void callJSFunction(std::string&& module, std::string&& method, folly::dynamic&& params); public void handleMemoryPressure(int pressureLevel); public void initializeBridge(std::unique_ptr callback, std::shared_ptr jsef, std::shared_ptr jsQueue, std::shared_ptr moduleRegistry, facebook::react::jsinspector_modern::HostTarget* inspectorTarget = nullptr); - public void initializeRuntime(); - public void loadRAMBundle(std::unique_ptr bundleRegistry, std::unique_ptr startupScript, std::string startupScriptSourceURL, bool loadSynchronously); - public void loadRAMBundleFromFile(const std::string& sourcePath, const std::string& sourceURL, bool loadSynchronously); - public void loadRAMBundleFromString(std::unique_ptr script, const std::string& sourceURL); public void loadScriptFromString(std::unique_ptr string, std::string sourceURL, bool loadSynchronously); public void registerBundle(uint32_t bundleId, const std::string& bundlePath); public void setGlobalVariable(std::string propName, std::unique_ptr jsonValue); @@ -3001,14 +2996,6 @@ class facebook::react::JSINativeModules { public void reset(); } -class facebook::react::JSIndexedRAMBundle : public facebook::react::JSModulesUnbundle { - public JSIndexedRAMBundle(const char* sourcePath); - public JSIndexedRAMBundle(std::unique_ptr script); - public static std::function(std::string)> buildFactory(); - public std::unique_ptr getStartupCode(); - public virtual facebook::react::JSModulesUnbundle::Module getModule(uint32_t moduleId) const override; -} - class facebook::react::JSModulesUnbundle { public JSModulesUnbundle(); public virtual facebook::react::JSModulesUnbundle::Module getModule(uint32_t moduleId) const = 0; @@ -4187,7 +4174,6 @@ class facebook::react::RAMBundleRegistry { public facebook::react::RAMBundleRegistry& operator=(facebook::react::RAMBundleRegistry&&) = default; public static constexpr uint32_t MAIN_BUNDLE_ID; public static std::unique_ptr multipleBundlesRegistry(std::unique_ptr mainBundle, std::function(std::string)> factory); - public static std::unique_ptr singleBundleRegistry(std::unique_ptr mainBundle); public virtual ~RAMBundleRegistry() = default; public void registerBundle(uint32_t bundleId, std::string bundlePath); } @@ -10377,7 +10363,6 @@ class facebook::react::jsinspector_modern::HostTargetController { public facebook::react::jsinspector_modern::HostTargetDelegate& getDelegate(); public facebook::react::jsinspector_modern::tracing::HostTracingProfile stopTracing(); public void incrementPauseOverlayCounter(); - public void installPerfIssuesBinding(); } class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook::react::jsinspector_modern::LoadNetworkResourceDelegate { diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index cc1a910e081e..e65661b46002 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -5122,7 +5122,6 @@ class facebook::react::InputAccessoryState { class facebook::react::Instance { public bool isBatchActive(); public bool isInspectable(); - public bool supportsProfiling(); public const facebook::react::ModuleRegistry& getModuleRegistry() const; public facebook::react::ModuleRegistry& getModuleRegistry(); public facebook::react::RuntimeExecutor getRuntimeExecutor(); @@ -5132,10 +5131,6 @@ class facebook::react::Instance { public void callJSFunction(std::string&& module, std::string&& method, folly::dynamic&& params); public void handleMemoryPressure(int pressureLevel); public void initializeBridge(std::unique_ptr callback, std::shared_ptr jsef, std::shared_ptr jsQueue, std::shared_ptr moduleRegistry, facebook::react::jsinspector_modern::HostTarget* inspectorTarget = nullptr); - public void initializeRuntime(); - public void loadRAMBundle(std::unique_ptr bundleRegistry, std::unique_ptr startupScript, std::string startupScriptSourceURL, bool loadSynchronously); - public void loadRAMBundleFromFile(const std::string& sourcePath, const std::string& sourceURL, bool loadSynchronously); - public void loadRAMBundleFromString(std::unique_ptr script, const std::string& sourceURL); public void loadScriptFromString(std::unique_ptr string, std::string sourceURL, bool loadSynchronously); public void registerBundle(uint32_t bundleId, const std::string& bundlePath); public void setGlobalVariable(std::string propName, std::unique_ptr jsonValue); @@ -5281,14 +5276,6 @@ class facebook::react::JSIRuntimeHolder : public facebook::react::JSRuntime { public virtual facebook::jsi::Runtime& getRuntime() noexcept override; } -class facebook::react::JSIndexedRAMBundle : public facebook::react::JSModulesUnbundle { - public JSIndexedRAMBundle(const char* sourcePath); - public JSIndexedRAMBundle(std::unique_ptr script); - public static std::function(std::string)> buildFactory(); - public std::unique_ptr getStartupCode(); - public virtual facebook::react::JSModulesUnbundle::Module getModule(uint32_t moduleId) const override; -} - class facebook::react::JSModulesUnbundle { public JSModulesUnbundle(); public virtual facebook::react::JSModulesUnbundle::Module getModule(uint32_t moduleId) const = 0; @@ -6371,7 +6358,6 @@ class facebook::react::RAMBundleRegistry { public facebook::react::RAMBundleRegistry& operator=(facebook::react::RAMBundleRegistry&&) = default; public static constexpr uint32_t MAIN_BUNDLE_ID; public static std::unique_ptr multipleBundlesRegistry(std::unique_ptr mainBundle, std::function(std::string)> factory); - public static std::unique_ptr singleBundleRegistry(std::unique_ptr mainBundle); public virtual ~RAMBundleRegistry() = default; public void registerBundle(uint32_t bundleId, std::string bundlePath); } @@ -12418,7 +12404,6 @@ class facebook::react::jsinspector_modern::HostTargetController { public facebook::react::jsinspector_modern::HostTargetDelegate& getDelegate(); public facebook::react::jsinspector_modern::tracing::HostTracingProfile stopTracing(); public void incrementPauseOverlayCounter(); - public void installPerfIssuesBinding(); } class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook::react::jsinspector_modern::LoadNetworkResourceDelegate { diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index b46962198fa4..478a14b5e94d 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -12118,7 +12118,6 @@ class facebook::react::jsinspector_modern::HostTargetController { public facebook::react::jsinspector_modern::HostTargetDelegate& getDelegate(); public facebook::react::jsinspector_modern::tracing::HostTracingProfile stopTracing(); public void incrementPauseOverlayCounter(); - public void installPerfIssuesBinding(); } class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook::react::jsinspector_modern::LoadNetworkResourceDelegate { diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index 1fd3e340c7d5..edbd6daf94d9 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -5119,7 +5119,6 @@ class facebook::react::InputAccessoryState { class facebook::react::Instance { public bool isBatchActive(); public bool isInspectable(); - public bool supportsProfiling(); public const facebook::react::ModuleRegistry& getModuleRegistry() const; public facebook::react::ModuleRegistry& getModuleRegistry(); public facebook::react::RuntimeExecutor getRuntimeExecutor(); @@ -5129,10 +5128,6 @@ class facebook::react::Instance { public void callJSFunction(std::string&& module, std::string&& method, folly::dynamic&& params); public void handleMemoryPressure(int pressureLevel); public void initializeBridge(std::unique_ptr callback, std::shared_ptr jsef, std::shared_ptr jsQueue, std::shared_ptr moduleRegistry, facebook::react::jsinspector_modern::HostTarget* inspectorTarget = nullptr); - public void initializeRuntime(); - public void loadRAMBundle(std::unique_ptr bundleRegistry, std::unique_ptr startupScript, std::string startupScriptSourceURL, bool loadSynchronously); - public void loadRAMBundleFromFile(const std::string& sourcePath, const std::string& sourceURL, bool loadSynchronously); - public void loadRAMBundleFromString(std::unique_ptr script, const std::string& sourceURL); public void loadScriptFromString(std::unique_ptr string, std::string sourceURL, bool loadSynchronously); public void registerBundle(uint32_t bundleId, const std::string& bundlePath); public void setGlobalVariable(std::string propName, std::unique_ptr jsonValue); @@ -5278,14 +5273,6 @@ class facebook::react::JSIRuntimeHolder : public facebook::react::JSRuntime { public virtual facebook::jsi::Runtime& getRuntime() noexcept override; } -class facebook::react::JSIndexedRAMBundle : public facebook::react::JSModulesUnbundle { - public JSIndexedRAMBundle(const char* sourcePath); - public JSIndexedRAMBundle(std::unique_ptr script); - public static std::function(std::string)> buildFactory(); - public std::unique_ptr getStartupCode(); - public virtual facebook::react::JSModulesUnbundle::Module getModule(uint32_t moduleId) const override; -} - class facebook::react::JSModulesUnbundle { public JSModulesUnbundle(); public virtual facebook::react::JSModulesUnbundle::Module getModule(uint32_t moduleId) const = 0; @@ -6368,7 +6355,6 @@ class facebook::react::RAMBundleRegistry { public facebook::react::RAMBundleRegistry& operator=(facebook::react::RAMBundleRegistry&&) = default; public static constexpr uint32_t MAIN_BUNDLE_ID; public static std::unique_ptr multipleBundlesRegistry(std::unique_ptr mainBundle, std::function(std::string)> factory); - public static std::unique_ptr singleBundleRegistry(std::unique_ptr mainBundle); public virtual ~RAMBundleRegistry() = default; public void registerBundle(uint32_t bundleId, std::string bundlePath); } @@ -12281,7 +12267,6 @@ class facebook::react::jsinspector_modern::HostTargetController { public facebook::react::jsinspector_modern::HostTargetDelegate& getDelegate(); public facebook::react::jsinspector_modern::tracing::HostTracingProfile stopTracing(); public void incrementPauseOverlayCounter(); - public void installPerfIssuesBinding(); } class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook::react::jsinspector_modern::LoadNetworkResourceDelegate { diff --git a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api index 6f3564afb730..5900ceaebb48 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -1834,7 +1834,6 @@ class facebook::react::InputAccessoryState { class facebook::react::Instance { public bool isBatchActive(); public bool isInspectable(); - public bool supportsProfiling(); public const facebook::react::ModuleRegistry& getModuleRegistry() const; public facebook::react::ModuleRegistry& getModuleRegistry(); public facebook::react::RuntimeExecutor getRuntimeExecutor(); @@ -1844,10 +1843,6 @@ class facebook::react::Instance { public void callJSFunction(std::string&& module, std::string&& method, folly::dynamic&& params); public void handleMemoryPressure(int pressureLevel); public void initializeBridge(std::unique_ptr callback, std::shared_ptr jsef, std::shared_ptr jsQueue, std::shared_ptr moduleRegistry, facebook::react::jsinspector_modern::HostTarget* inspectorTarget = nullptr); - public void initializeRuntime(); - public void loadRAMBundle(std::unique_ptr bundleRegistry, std::unique_ptr startupScript, std::string startupScriptSourceURL, bool loadSynchronously); - public void loadRAMBundleFromFile(const std::string& sourcePath, const std::string& sourceURL, bool loadSynchronously); - public void loadRAMBundleFromString(std::unique_ptr script, const std::string& sourceURL); public void loadScriptFromString(std::unique_ptr string, std::string sourceURL, bool loadSynchronously); public void registerBundle(uint32_t bundleId, const std::string& bundlePath); public void setGlobalVariable(std::string propName, std::unique_ptr jsonValue); @@ -1988,14 +1983,6 @@ class facebook::react::JSINativeModules { public void reset(); } -class facebook::react::JSIndexedRAMBundle : public facebook::react::JSModulesUnbundle { - public JSIndexedRAMBundle(const char* sourcePath); - public JSIndexedRAMBundle(std::unique_ptr script); - public static std::function(std::string)> buildFactory(); - public std::unique_ptr getStartupCode(); - public virtual facebook::react::JSModulesUnbundle::Module getModule(uint32_t moduleId) const override; -} - class facebook::react::JSModulesUnbundle { public JSModulesUnbundle(); public virtual facebook::react::JSModulesUnbundle::Module getModule(uint32_t moduleId) const = 0; @@ -2771,7 +2758,6 @@ class facebook::react::RAMBundleRegistry { public facebook::react::RAMBundleRegistry& operator=(facebook::react::RAMBundleRegistry&&) = default; public static constexpr uint32_t MAIN_BUNDLE_ID; public static std::unique_ptr multipleBundlesRegistry(std::unique_ptr mainBundle, std::function(std::string)> factory); - public static std::unique_ptr singleBundleRegistry(std::unique_ptr mainBundle); public virtual ~RAMBundleRegistry() = default; public void registerBundle(uint32_t bundleId, std::string bundlePath); } @@ -7579,7 +7565,6 @@ class facebook::react::jsinspector_modern::HostTargetController { public facebook::react::jsinspector_modern::HostTargetDelegate& getDelegate(); public facebook::react::jsinspector_modern::tracing::HostTracingProfile stopTracing(); public void incrementPauseOverlayCounter(); - public void installPerfIssuesBinding(); } class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook::react::jsinspector_modern::LoadNetworkResourceDelegate { diff --git a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api index 8f00ecd9e8d5..1e211b6392e7 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api @@ -7419,7 +7419,6 @@ class facebook::react::jsinspector_modern::HostTargetController { public facebook::react::jsinspector_modern::HostTargetDelegate& getDelegate(); public facebook::react::jsinspector_modern::tracing::HostTracingProfile stopTracing(); public void incrementPauseOverlayCounter(); - public void installPerfIssuesBinding(); } class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook::react::jsinspector_modern::LoadNetworkResourceDelegate { diff --git a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api index ccc712d9617d..ce4cc1352d70 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -1831,7 +1831,6 @@ class facebook::react::InputAccessoryState { class facebook::react::Instance { public bool isBatchActive(); public bool isInspectable(); - public bool supportsProfiling(); public const facebook::react::ModuleRegistry& getModuleRegistry() const; public facebook::react::ModuleRegistry& getModuleRegistry(); public facebook::react::RuntimeExecutor getRuntimeExecutor(); @@ -1841,10 +1840,6 @@ class facebook::react::Instance { public void callJSFunction(std::string&& module, std::string&& method, folly::dynamic&& params); public void handleMemoryPressure(int pressureLevel); public void initializeBridge(std::unique_ptr callback, std::shared_ptr jsef, std::shared_ptr jsQueue, std::shared_ptr moduleRegistry, facebook::react::jsinspector_modern::HostTarget* inspectorTarget = nullptr); - public void initializeRuntime(); - public void loadRAMBundle(std::unique_ptr bundleRegistry, std::unique_ptr startupScript, std::string startupScriptSourceURL, bool loadSynchronously); - public void loadRAMBundleFromFile(const std::string& sourcePath, const std::string& sourceURL, bool loadSynchronously); - public void loadRAMBundleFromString(std::unique_ptr script, const std::string& sourceURL); public void loadScriptFromString(std::unique_ptr string, std::string sourceURL, bool loadSynchronously); public void registerBundle(uint32_t bundleId, const std::string& bundlePath); public void setGlobalVariable(std::string propName, std::unique_ptr jsonValue); @@ -1985,14 +1980,6 @@ class facebook::react::JSINativeModules { public void reset(); } -class facebook::react::JSIndexedRAMBundle : public facebook::react::JSModulesUnbundle { - public JSIndexedRAMBundle(const char* sourcePath); - public JSIndexedRAMBundle(std::unique_ptr script); - public static std::function(std::string)> buildFactory(); - public std::unique_ptr getStartupCode(); - public virtual facebook::react::JSModulesUnbundle::Module getModule(uint32_t moduleId) const override; -} - class facebook::react::JSModulesUnbundle { public JSModulesUnbundle(); public virtual facebook::react::JSModulesUnbundle::Module getModule(uint32_t moduleId) const = 0; @@ -2768,7 +2755,6 @@ class facebook::react::RAMBundleRegistry { public facebook::react::RAMBundleRegistry& operator=(facebook::react::RAMBundleRegistry&&) = default; public static constexpr uint32_t MAIN_BUNDLE_ID; public static std::unique_ptr multipleBundlesRegistry(std::unique_ptr mainBundle, std::function(std::string)> factory); - public static std::unique_ptr singleBundleRegistry(std::unique_ptr mainBundle); public virtual ~RAMBundleRegistry() = default; public void registerBundle(uint32_t bundleId, std::string bundlePath); } @@ -7570,7 +7556,6 @@ class facebook::react::jsinspector_modern::HostTargetController { public facebook::react::jsinspector_modern::HostTargetDelegate& getDelegate(); public facebook::react::jsinspector_modern::tracing::HostTracingProfile stopTracing(); public void incrementPauseOverlayCounter(); - public void installPerfIssuesBinding(); } class facebook::react::jsinspector_modern::HostTargetDelegate : public facebook::react::jsinspector_modern::LoadNetworkResourceDelegate {