diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 935a0548a5e..8ad8ceb0445 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -36,15 +36,15 @@ CMakeLists.txt @medns # dom related /dom/ @churchill-zhang @ilikethese @medns -# js core related -/driver/js/core/ @churchill-zhang @ilikethese -/driver/js/core/js/ @zoomchan-cxj +# driver related +/driver/js/ @churchill-zhang @ilikethese +/driver/js/lib/ @zoomchan-cxj # examples related -/driver/js/examples/android-demo/ @siguangli -/driver/js/examples/android-demo/res/ @zoomchan-cxj -/driver/js/examples/ios-demo/ @ozonelmy -/driver/js/examples/ios-demo/res/ @zoomchan-cxj +/framework/examples/android-demo/ @siguangli +/framework/examples/ios-demo/ @ozonelmy +/framework/examples/android-demo/res/ @zoomchan-cxj +/framework/examples/ios-demo/res/ @zoomchan-cxj /driver/js/examples/hippy-react-demo/ @zoomchan-cxj /driver/js/examples/hippy-vue-demo/ @zoomchan-cxj @@ -64,7 +64,7 @@ CMakeLists.txt @medns /layout/ @ilikethese @churchill-zhang # android related -/driver/js/android/ @siguangli +/framework/android/ @siguangli /renderer/native/android/ @siguangli /gradle/ @siguangli /gradle.properties @siguangli @@ -74,7 +74,7 @@ CMakeLists.txt @medns /setting.gradle @siguangli # ios related -/driver/js/ios/ @ozonelmy +/framework/ios/ @ozonelmy /renderer/native/ios/ @ozonelmy /hippy.podspec @ozonelmy diff --git a/.github/license-check.json b/.github/license-check.json index 95f4163532c..d6c6aec1171 100644 --- a/.github/license-check.json +++ b/.github/license-check.json @@ -34,8 +34,9 @@ ".github/**", ".husky/**", "docs/**", - "driver/js/examples/android-demo/res/**", - "driver/js/examples/ios-demo/res/**", + "static/**", + "framework/examples/android-demo/res/**", + "framework/examples/ios-demo/res/**", "driver/js/examples/hippy-**-demo/**", "driver/js/flutter/example/**" ] diff --git a/.github/workflows/android_build_tests.yml b/.github/workflows/android_build_tests.yml index 99c4c3249d1..82cd5790c12 100644 --- a/.github/workflows/android_build_tests.yml +++ b/.github/workflows/android_build_tests.yml @@ -8,8 +8,11 @@ on: - v3.0-dev - v3.0 paths: - - 'driver/js/android/**' - - 'driver/js/core/**' + - 'framework/android/**' + - 'driver/js/lib/**' + - 'driver/js/src/**' + - 'driver/js/include/**' + - 'driver/js/CMakeLists.txt' - 'dom/**' - 'layout/engine/**' - 'modules/android/**' diff --git a/.github/workflows/android_build_tests_bypass.yml b/.github/workflows/android_build_tests_bypass.yml index 96a224112f8..e676dc8abfd 100644 --- a/.github/workflows/android_build_tests_bypass.yml +++ b/.github/workflows/android_build_tests_bypass.yml @@ -8,8 +8,11 @@ on: - v3.0-dev - v3.0 paths-ignore: - - 'driver/js/android/**' - - 'driver/js/core/**' + - 'framework/android/**' + - 'driver/js/lib/**' + - 'driver/js/src/**' + - 'driver/js/include/**' + - 'driver/js/CMakeLists.txt' - 'dom/**' - 'layout/engine/**' - 'modules/android/**' diff --git a/.github/workflows/frontend_build_tests.yml b/.github/workflows/frontend_build_tests.yml index 785bd652028..9fd0992c08c 100644 --- a/.github/workflows/frontend_build_tests.yml +++ b/.github/workflows/frontend_build_tests.yml @@ -10,10 +10,9 @@ on: paths: - 'driver/js/packages/**' - 'driver/js/examples/hippy-*-demo/**' - - 'driver/js/core/js/**/*.js' + - 'driver/js/lib/**/*.js' - 'driver/js/scripts/**/*.js' - 'package*.json' - - 'scripts/**/*.js' defaults: run: working-directory: driver/js diff --git a/.github/workflows/frontend_build_tests_bypass.yml b/.github/workflows/frontend_build_tests_bypass.yml index c2e518ae859..527da005aec 100644 --- a/.github/workflows/frontend_build_tests_bypass.yml +++ b/.github/workflows/frontend_build_tests_bypass.yml @@ -10,10 +10,9 @@ on: paths-ignore: - 'driver/js/packages/**' - 'driver/js/examples/hippy-*-demo/**' - - 'driver/js/core/js/**/*.js' + - 'driver/js/lib/**/*.js' - 'driver/js/scripts/**/*.js' - 'package*.json' - - 'scripts/**/*.js' jobs: frontend_build_tests: runs-on: ubuntu-latest diff --git a/.github/workflows/ios_build_tests.yml b/.github/workflows/ios_build_tests.yml index 1d6ff873f3c..1ec0f9223f8 100644 --- a/.github/workflows/ios_build_tests.yml +++ b/.github/workflows/ios_build_tests.yml @@ -8,8 +8,11 @@ on: - v3.0-dev - v3.0 paths: - - 'driver/js/ios/**' - - 'driver/js/core/**' + - 'framework/ios/**' + - 'driver/js/lib/**' + - 'driver/js/src/**' + - 'driver/js/include/**' + - 'driver/js/CMakeLists.txt' - 'dom/**' - 'layout/engine/**' - 'modules/ios/**' @@ -28,4 +31,4 @@ jobs: lfs: true - name: Build run: | - pushd driver/js/examples/ios-demo && pod install && xcodebuild build -destination 'name=iPhone 11' -scheme 'HippyDemo' -workspace 'HippyDemo.xcworkspace' && popd + pushd framework/examples/ios-demo && pod install && xcodebuild build -destination 'name=iPhone 11' -scheme 'HippyDemo' -workspace 'HippyDemo.xcworkspace' && popd diff --git a/.github/workflows/ios_build_tests_bypass.yml b/.github/workflows/ios_build_tests_bypass.yml index 7d8223da747..6001128d9b4 100644 --- a/.github/workflows/ios_build_tests_bypass.yml +++ b/.github/workflows/ios_build_tests_bypass.yml @@ -8,8 +8,11 @@ on: - v3.0-dev - v3.0 paths-ignore: - - 'driver/js/ios/**' - - 'driver/js/core/**' + - 'framework/ios/**' + - 'driver/js/lib/**' + - 'driver/js/src/**' + - 'driver/js/include/**' + - 'driver/js/CMakeLists.txt' - 'dom/**' - 'layout/engine/**' - 'modules/ios/**' diff --git a/.github/workflows/security_codeql_analyses.yml b/.github/workflows/security_codeql_analyses.yml index 3e57cdfdfa9..8e5a17e0fa8 100644 --- a/.github/workflows/security_codeql_analyses.yml +++ b/.github/workflows/security_codeql_analyses.yml @@ -96,7 +96,7 @@ jobs: - name: Build C++ if: steps.detect_languages.outputs.language == 'cpp' run: | - ./gradlew hippy-driver::buildCMakeRelease + ./gradlew hippy-framework::buildCMakeRelease - name: Perform CodeQL Analysis if: steps.detect_languages.outputs.language uses: github/codeql-action/analyze@v2 diff --git a/.gitignore b/.gitignore index a030696e9e1..7d1e6e0af50 100644 --- a/.gitignore +++ b/.gitignore @@ -22,28 +22,29 @@ layout/cproject layout/.project layout/.settings -driver/js/android/maven-auth.properties -driver/js/android/local.properties -driver/js/android/.cxx/* -driver/js/android/libs/armeabi-v7a/libhippybridge.so -driver/js/android/libs/arm64-v8a/libhippybridge.so -driver/js/android/libs/x86/libhippybridge.so -driver/js/android/libs/x86_64/libhippybridge.so -driver/js/android/cmake-build-debug/* -driver/js/android/src/main/jni/.vs -driver/js/android/src/main/jni/cmake-build-debug/* +framework/android/maven-auth.properties +framework/android/local.properties +framework/android/.cxx/* +framework/android/libs/armeabi-v7a/libhippybridge.so +framework/android/libs/arm64-v8a/libhippybridge.so +framework/android/libs/x86/libhippybridge.so +framework/android/libs/x86_64/libhippybridge.so +framework/android/cmake-build-debug/* +framework/android/src/main/jni/.vs +framework/android/src/main/jni/cmake-build-debug/* -driver/js/examples/*/res/vendor-manifest.json -driver/js/examples/android-demo/src/main/assets/ -driver/js/examples/android-demo/libs/* -driver/js/examples/android-demo/maven-auth.properties -driver/js/examples/android-demo/.cxx/ -driver/js/examples/ios-demo/HippyDemo.xcodeproj/project.xcworkspace/xcuserdata/* -driver/js/examples/ios-demo/HippyDemo.xcodeproj/xcuserdata/* -driver/js/examples/ios-demo/HippyDemo.xcworkspace/* -driver/js/examples/ios-demo/Pods/* -driver/js/examples/ios-demo/Podfile.lock -driver/js/examples/ios-demo/devtools_backend/* +framework/examples/*/res/vendor-manifest.json +framework/examples/android-demo/src/main/assets/ +framework/examples/android-demo/libs/* +framework/examples/android-demo/maven-auth.properties +framework/examples/android-demo/.cxx/ +framework/examples/ios-demo/HippyDemo.xcodeproj/project.xcworkspace/ +framework/examples/ios-demo/HippyDemo.xcodeproj/xcuserdata/* +framework/examples/ios-demo/HippyDemo.xcodeproj/xcshareddata/* +framework/examples/ios-demo/HippyDemo.xcworkspace/* +framework/examples/ios-demo/Pods/* +framework/examples/ios-demo/Podfile.lock +framework/examples/ios-demo/devtools_backend/* driver/js/packages/hippy-vue-loader/remote-debug-profile/* diff --git a/README.md b/README.md index ae0e0d57025..c687e609f77 100644 --- a/README.md +++ b/README.md @@ -62,9 +62,9 @@ For iOS, we recommend to use iOS simulator when first try. However, you can chan 3. Choose a demo to build with `npm run buildexample [hippy-react-demo|hippy-vue-demo]`. -4. Install CocoaPods with `brew install cocoapods`, install cmake with `brew install cmake`, and then configure CocoaPods dependencies with `pod install` at `driver/js/examples/ios-demo` directory. +4. Install CocoaPods with `brew install cocoapods`, install cmake with `brew install cmake`, and then configure CocoaPods dependencies with `pod install` at `framework/examples/ios-demo` directory. -5. Start the Xcode and build the iOS app with `open driver/js/examples/ios-demo/HippyDemo.xcworkspace`. +5. Start the Xcode and build the iOS app with `open framework/examples/ios-demo/HippyDemo.xcworkspace`. > If `Step 2` throw error, you can `cd` to `driver/js/examples` hippy-react-demo or hippy-vue-demo, and run `npm install --legacy-peer-deps` to install demo dependencies first. > diff --git a/build.gradle b/build.gradle index 0322e1c1074..3f93708d1b7 100644 --- a/build.gradle +++ b/build.gradle @@ -32,9 +32,9 @@ task clean(type: Delete) { } project.afterEvaluate { - delete 'driver/js/examples/android-demo/src/main/assets' + delete 'framework/examples/android-demo/src/main/assets' copy{ - from "driver/js/examples/android-demo/res" - into "driver/js/examples/android-demo/src/main/assets" + from "framework/examples/android-demo/res" + into "framework/examples/android-demo/src/main/assets" } } diff --git a/commitlint.config.js b/commitlint.config.js index c1c7fc840a9..a4b6a3b86ca 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -1,3 +1,23 @@ +/* + * Tencent is pleased to support the open source community by making + * Hippy available. + * + * Copyright (C) 2017-2022 THL A29 Limited, a Tencent company. + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /* eslint-disable no-control-regex */ function asciiAndEmojiCheck(message) { const asciiAndEmojiReg = /^((\ud83c[\udf00-\udfff])|(\ud83d[\udc00-\ude4f\ude80-\udeff])|[\u2600-\u2B55]|[\x00-\xff])*$/i; diff --git a/dom/CMakeLists.txt b/dom/CMakeLists.txt index 3c129a777dc..e3a242d763d 100644 --- a/dom/CMakeLists.txt +++ b/dom/CMakeLists.txt @@ -40,11 +40,6 @@ GlobalPackages_Add(footstone) target_link_libraries(${PROJECT_NAME} PRIVATE footstone) # endregion -# region core base -# TODO: will be removed when the JNI library is complete -target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_ROOT_DIR}/driver/js/core/include) -# endregion - # region layout engine if (NOT DEFINED LAYOUT_ENGINE) set(LAYOUT_ENGINE "Taitank") diff --git a/driver/js/android/src/main/jni/.clang-format b/driver/js/.clang-format similarity index 100% rename from driver/js/android/src/main/jni/.clang-format rename to driver/js/.clang-format diff --git a/driver/js/.eslintignore b/driver/js/.eslintignore index 1b029049e8b..b4b197914c3 100644 --- a/driver/js/.eslintignore +++ b/driver/js/.eslintignore @@ -1,5 +1,4 @@ node_modules* -docs/ dist/ coverage packages/hippy-vue/types diff --git a/driver/js/.eslintrc.js b/driver/js/.eslintrc.js index 30e56a01df9..743a4708d3b 100644 --- a/driver/js/.eslintrc.js +++ b/driver/js/.eslintrc.js @@ -1,3 +1,23 @@ +/* + * Tencent is pleased to support the open source community by making + * Hippy available. + * + * Copyright (C) 2017-2022 THL A29 Limited, a Tencent company. + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + const path = require('path'); function resolveVue(p) { diff --git a/driver/js/core/CMakeLists.txt b/driver/js/CMakeLists.txt similarity index 86% rename from driver/js/core/CMakeLists.txt rename to driver/js/CMakeLists.txt index 0a1b4ff6fff..55aad901f13 100644 --- a/driver/js/core/CMakeLists.txt +++ b/driver/js/CMakeLists.txt @@ -20,9 +20,9 @@ cmake_minimum_required(VERSION 3.14) -project("core") +project("js_driver") -get_filename_component(PROJECT_ROOT_DIR "${PROJECT_SOURCE_DIR}/../../.." REALPATH) +get_filename_component(PROJECT_ROOT_DIR "${PROJECT_SOURCE_DIR}/../.." REALPATH) include("${PROJECT_ROOT_DIR}/buildconfig/cmake/GlobalPackagesModule.cmake") include("${PROJECT_ROOT_DIR}/buildconfig/cmake/compiler_toolchain.cmake") @@ -61,16 +61,6 @@ GlobalPackages_Add(footstone) target_link_libraries(${PROJECT_NAME} PRIVATE footstone) # endregion -# region jni -GlobalPackages_Add(jni) -target_link_libraries(${PROJECT_NAME} PRIVATE jni) -# endregion - -# region jni common -# TODO: will be removed when the JNI library is complete -target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_ROOT_DIR}/driver/js/android/src/main/jni/include) -# endregion - # region devtools if (ENABLE_INSPECTOR) add_subdirectory(${PROJECT_ROOT_DIR}/devtools/devtools-backend ${CMAKE_CURRENT_BINARY_DIR}/devtools/devtools-backend) @@ -79,13 +69,8 @@ endif () # endregion # region dom -add_subdirectory(${PROJECT_ROOT_DIR}/dom ${CMAKE_CURRENT_BINARY_DIR}/dom) -target_link_libraries(${PROJECT_NAME} PUBLIC dom) -# endregion - -# region native renderer -add_subdirectory(${PROJECT_ROOT_DIR}/renderer/native/android/src/main/jni ${CMAKE_CURRENT_BINARY_DIR}/renderer/native) -target_link_libraries(${PROJECT_NAME} PUBLIC native_renderer) +GlobalPackages_Add(dom) +target_link_libraries(${PROJECT_NAME} PRIVATE dom) # endregion # region source set diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/IHippyNativeLogHandler.java b/driver/js/android/src/main/java/com/tencent/mtt/hippy/IHippyNativeLogHandler.java deleted file mode 100644 index cc36ba890f8..00000000000 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/IHippyNativeLogHandler.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.tencent.mtt.hippy; - -@SuppressWarnings({"unused"}) -public interface IHippyNativeLogHandler { - - void onReceiveNativeLogMessage(String msg); -} diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/NativeAccess.java b/driver/js/android/src/main/java/com/tencent/mtt/hippy/NativeAccess.java deleted file mode 100644 index 67add697860..00000000000 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/NativeAccess.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.tencent.mtt.hippy; - -import com.tencent.mtt.hippy.runtime.builtins.JSSharedArrayBuffer; -import com.tencent.mtt.hippy.runtime.builtins.wasm.WasmModule; - -@SuppressWarnings("JavaJniMissingFunction") -public class NativeAccess { - - private NativeAccess() { - - } - - // region bridge.serialization.delegate - public static native JSSharedArrayBuffer getSharedArrayBufferFromId(int clone_id); - - public static native WasmModule getWasmModuleFromId(int transfer_id); - // endregion -} diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/thirdparty/HippyThirdPartyAdapter.java b/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/thirdparty/HippyThirdPartyAdapter.java deleted file mode 100644 index f09586d7391..00000000000 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/thirdparty/HippyThirdPartyAdapter.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.tencent.mtt.hippy.adapter.thirdparty; - -import org.json.JSONObject; - -@SuppressWarnings({"unused"}) -public abstract class HippyThirdPartyAdapter { - - public abstract void onRuntimeInit(long runtimeId); - - public abstract void onRuntimeDestroy(); - - public abstract String getPackageName(); - - public abstract String getAppVersion(); - - public abstract void setPageUrl(String url); - - public abstract String getPageUrl(); - - public abstract void setExtraData(JSONObject extraData); - - public abstract JSONObject getExtraData(); -} diff --git a/driver/js/android/src/main/jni/CPPLINT.cfg b/driver/js/android/src/main/jni/CPPLINT.cfg deleted file mode 100644 index 461484956c8..00000000000 --- a/driver/js/android/src/main/jni/CPPLINT.cfg +++ /dev/null @@ -1,2 +0,0 @@ -root=. -exclude_files=(third_party/*) diff --git a/driver/js/android/src/main/jni/include/bridge/bridge.h b/driver/js/android/src/main/jni/include/bridge/bridge.h deleted file mode 100644 index c61412b44bd..00000000000 --- a/driver/js/android/src/main/jni/include/bridge/bridge.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "core/runtime/v8/bridge.h" - -#include - -#include "jni/scoped_java_ref.h" - -namespace hippy { - class ADRBridge: public Bridge { - public: - ADRBridge(JNIEnv* j_env, jobject j_obj): ref_(std::make_shared(j_env, j_obj)){} - virtual ~ADRBridge() = default; -#if defined(ENABLE_INSPECTOR) && !defined(V8_WITHOUT_INSPECTOR) - virtual void SendResponse(std::unique_ptr message) override; - virtual void SendNotification(std::unique_ptr message) override; -#endif - inline jobject GetObj() { - return ref_->GetObj(); - } - inline std::shared_ptr GetRef() { - return ref_; - } - private: - std::shared_ptr ref_; - }; -} diff --git a/driver/js/android/src/main/jni/src/bridge/bridge.cc b/driver/js/android/src/main/jni/src/bridge/bridge.cc deleted file mode 100644 index 56f17a3adf2..00000000000 --- a/driver/js/android/src/main/jni/src/bridge/bridge.cc +++ /dev/null @@ -1,61 +0,0 @@ -#include "bridge/bridge.h" - -#include "footstone/check.h" -#include "core/base/common.h" -#include "jni/jni_env.h" - -namespace hippy { - -#if defined(ENABLE_INSPECTOR) && !defined(V8_WITHOUT_INSPECTOR) -void ADRBridge::SendResponse(std::unique_ptr message) { - if (message->string().is8Bit()) { - return; - } - - const uint16_t* source = message->string().characters16(); - auto len = footstone::check::checked_numeric_cast( - message->string().length() * sizeof(*source)); - std::shared_ptr instance = JNIEnvironment::GetInstance(); - JNIEnv* j_env = instance->AttachCurrentThread(); - jbyteArray msg = j_env->NewByteArray(len); - j_env->SetByteArrayRegion( - msg, 0, len, - reinterpret_cast(reinterpret_cast(source))); - - if (instance->GetMethods().j_inspector_channel_method_id && ref_) { - j_env->CallVoidMethod(ref_->GetObj(), - instance->GetMethods().j_inspector_channel_method_id, - msg); - JNIEnvironment::ClearJEnvException(j_env); - } - - j_env->DeleteLocalRef(msg); -} - -void ADRBridge::SendNotification(std::unique_ptr message) { - if (message->string().is8Bit()) { - return; - } - - const uint16_t* source = message->string().characters16(); - auto len = footstone::check::checked_numeric_cast( - message->string().length() * sizeof(*source)); - std::shared_ptr instance = JNIEnvironment::GetInstance(); - JNIEnv* j_env = instance->AttachCurrentThread(); - jbyteArray msg = j_env->NewByteArray(len); - j_env->SetByteArrayRegion( - msg, 0, len, - reinterpret_cast(reinterpret_cast(source))); - - if (instance->GetMethods().j_inspector_channel_method_id && ref_) { - j_env->CallVoidMethod(ref_->GetObj(), - instance->GetMethods().j_inspector_channel_method_id, - msg); - JNIEnvironment::ClearJEnvException(j_env); - } - - j_env->DeleteLocalRef(msg); -} -#endif - -} diff --git a/driver/js/ava.config.js b/driver/js/ava.config.js index dd62be9547a..a69e637a85c 100644 --- a/driver/js/ava.config.js +++ b/driver/js/ava.config.js @@ -1,3 +1,23 @@ +/* + * Tencent is pleased to support the open source community by making + * Hippy available. + * + * Copyright (C) 2017-2022 THL A29 Limited, a Tencent company. + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import os from 'os'; const numCPUs = os.cpus().length; diff --git a/driver/js/core/.clang-format b/driver/js/core/.clang-format deleted file mode 100644 index b15d2f186df..00000000000 --- a/driver/js/core/.clang-format +++ /dev/null @@ -1,10 +0,0 @@ -# Suggested by V8/.clang-format -BasedOnStyle: Google -MaxEmptyLinesToKeep: 1 - -# Hippy override -AllowAllParametersOfDeclarationOnNextLine: false -BinPackParameters: false -AllowShortFunctionsOnASingleLine: Inline -AllowShortIfStatementsOnASingleLine: false -AllowShortLoopsOnASingleLine: false diff --git a/driver/js/core/include/core/core.h b/driver/js/core/include/core/core.h deleted file mode 100644 index 7a36386bde0..00000000000 --- a/driver/js/core/include/core/core.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * - * Tencent is pleased to support the open source community by making - * Hippy available. - * - * Copyright (C) 2019 THL A29 Limited, a Tencent company. - * All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#pragma once - -#include "core/base/common.h" -#include "core/base/file.h" -#include "core/base/macros.h" -#include "core/base/uri_loader.h" -#include "core/engine.h" -#include "core/modules/console_module.h" -#include "core/modules/contextify_module.h" -#include "core/modules/module_base.h" -#include "core/modules/module_register.h" -#include "core/modules/timer_module.h" -#include "core/napi/callback_info.h" -#include "core/napi/js_native_api.h" -#include "core/napi/js_native_api_types.h" -#include "core/napi/native_source_code.h" -#include "core/scope.h" - -#ifdef JS_V8 -#include "core/napi/v8/js_native_api_v8.h" -#include "core/napi/v8/js_native_turbo_v8.h" -#include "core/runtime/v8/bridge.h" -#if defined(ENABLE_INSPECTOR) && !defined(V8_WITHOUT_INSPECTOR) -#include "core/runtime/v8/inspector/v8_inspector_client_impl.h" -#endif -#else -#include "core/napi/jsc/js_native_api_jsc.h" -#include "core/napi/jsc/js_native_jsc_helper.h" -#include "core/napi/jsc/js_native_turbo_jsc.h" -#endif diff --git a/driver/js/core/include/core/modules/event_module.h b/driver/js/core/include/core/modules/event_module.h deleted file mode 100644 index e8c281bc7d6..00000000000 --- a/driver/js/core/include/core/modules/event_module.h +++ /dev/null @@ -1,10 +0,0 @@ -#include "core/napi/js_native_api_types.h" -#include "core/scope.h" -#include "dom/dom_event.h" - -namespace hippy { - -std::shared_ptr> MakeEventInstanceDefine( - const std::weak_ptr& weak_scope, std::shared_ptr& dom_event); - -} // namespace hippy diff --git a/driver/js/core/include/core/modules/scene_builder.h b/driver/js/core/include/core/modules/scene_builder.h deleted file mode 100644 index a4b00ebdc3b..00000000000 --- a/driver/js/core/include/core/modules/scene_builder.h +++ /dev/null @@ -1,10 +0,0 @@ -#include "core/scope.h" -#include "core/napi/js_native_api_types.h" - -namespace hippy { - -std::shared_ptr> -RegisterSceneBuilder(const std::weak_ptr& weak_scope); - -} - diff --git a/driver/js/core/include/core/runtime/v8/bridge.h b/driver/js/core/include/core/runtime/v8/bridge.h deleted file mode 100644 index 052e05ca064..00000000000 --- a/driver/js/core/include/core/runtime/v8/bridge.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include -#if defined(ENABLE_INSPECTOR) && !defined(V8_WITHOUT_INSPECTOR) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wconversion" -#pragma clang diagnostic ignored "-Wshadow" -#include "v8/v8-inspector.h" -#pragma clang diagnostic pop -#endif - -namespace hippy { - -class Bridge { - public: - Bridge() = default; - virtual ~Bridge() = default; - -#if defined(ENABLE_INSPECTOR) && !defined(V8_WITHOUT_INSPECTOR) - virtual void SendResponse(std::unique_ptr message) = 0; - virtual void SendNotification(std::unique_ptr message) = 0; -#endif -}; - -} diff --git a/driver/js/examples/ios-demo/HippyDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/driver/js/examples/ios-demo/HippyDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 25ff250e752..00000000000 --- a/driver/js/examples/ios-demo/HippyDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/driver/js/examples/ios-demo/HippyDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/driver/js/examples/ios-demo/HippyDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003d6..00000000000 --- a/driver/js/examples/ios-demo/HippyDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/driver/js/examples/ios-demo/HippyDemo.xcodeproj/xcshareddata/xcschemes/HippyDemo.xcscheme b/driver/js/examples/ios-demo/HippyDemo.xcodeproj/xcshareddata/xcschemes/HippyDemo.xcscheme deleted file mode 100644 index 576f3ab8c33..00000000000 --- a/driver/js/examples/ios-demo/HippyDemo.xcodeproj/xcshareddata/xcschemes/HippyDemo.xcscheme +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/driver/js/examples/ios-demo/HippyDemo.xcodeproj/xcuserdata/ozonelmy.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/driver/js/examples/ios-demo/HippyDemo.xcodeproj/xcuserdata/ozonelmy.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist deleted file mode 100644 index 2c512e4fa30..00000000000 --- a/driver/js/examples/ios-demo/HippyDemo.xcodeproj/xcuserdata/ozonelmy.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/driver/js/examples/ios-demo/HippyDemo.xcodeproj/xcuserdata/ozonelmy.xcuserdatad/xcschemes/xcschememanagement.plist b/driver/js/examples/ios-demo/HippyDemo.xcodeproj/xcuserdata/ozonelmy.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 2ed42a89706..00000000000 --- a/driver/js/examples/ios-demo/HippyDemo.xcodeproj/xcuserdata/ozonelmy.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,14 +0,0 @@ - - - - - SchemeUserState - - HippyDemo.xcscheme_^#shared#^_ - - orderHint - 0 - - - - diff --git a/driver/js/examples/ios-demo/Podfile.lock b/driver/js/examples/ios-demo/Podfile.lock deleted file mode 100644 index 54114d2b7e3..00000000000 --- a/driver/js/examples/ios-demo/Podfile.lock +++ /dev/null @@ -1,3 +0,0 @@ -PODFILE CHECKSUM: a2bd6084b3cfc40f18bd77eb7177f24efd7e6483 - -COCOAPODS: 1.11.3 diff --git a/driver/js/flutter/core/src/bridge/android/bridge_impl.cc b/driver/js/flutter/core/src/bridge/android/bridge_impl.cc index 908fc8b35cb..cf9182186e9 100644 --- a/driver/js/flutter/core/src/bridge/android/bridge_impl.cc +++ b/driver/js/flutter/core/src/bridge/android/bridge_impl.cc @@ -25,8 +25,8 @@ #include #include -#include "core/runtime/v8/runtime.h" -#include "core/runtime/v8/v8_bridge_utils.h" +#include "driver/runtime/v8/runtime.h" +#include "driver/runtime/v8/v8_bridge_utils.h" #include "bridge_impl.h" #include "dart2js.h" #include "voltron_bridge.h" diff --git a/driver/js/flutter/core/src/bridge/android/dart2js.h b/driver/js/flutter/core/src/bridge/android/dart2js.h index cc13024febb..2dc5614f61e 100644 --- a/driver/js/flutter/core/src/bridge/android/dart2js.h +++ b/driver/js/flutter/core/src/bridge/android/dart2js.h @@ -23,7 +23,7 @@ #pragma once #include "core/core.h" -#include "core/runtime/v8/v8_bridge_utils.h" +#include "driver/runtime/v8/v8_bridge_utils.h" namespace voltron { namespace bridge { diff --git a/driver/js/flutter/core/src/bridge/android/exception_handler.cc b/driver/js/flutter/core/src/bridge/android/exception_handler.cc index cf4080063ca..6176ffa3c39 100644 --- a/driver/js/flutter/core/src/bridge/android/exception_handler.cc +++ b/driver/js/flutter/core/src/bridge/android/exception_handler.cc @@ -27,10 +27,9 @@ namespace voltron { void ExceptionHandler::ReportJsException(const std::shared_ptr& runtime, const unicode_string_view& desc, const unicode_string_view& stack) { FOOTSTONE_DLOG(INFO) << "ReportJsException begin"; - - auto bridge = std::static_pointer_cast(runtime->GetBridge()); - - if (bridge) { + if (runtime->HasData(kBridgeSlot)) { + auto slot = runtime->GetData(kBridgeSlot); + auto bridge = std::any_cast(slot); auto platform_runtime = bridge->GetPlatformRuntime(); if (platform_runtime) { std::u16string exception = StringViewUtils::CovertToUtf16(desc, desc.encoding()).utf16_value(); diff --git a/driver/js/flutter/core/src/bridge/android/exception_handler.h b/driver/js/flutter/core/src/bridge/android/exception_handler.h index 78212a42e20..3f5e8e72cd3 100644 --- a/driver/js/flutter/core/src/bridge/android/exception_handler.h +++ b/driver/js/flutter/core/src/bridge/android/exception_handler.h @@ -26,7 +26,7 @@ #include #include "core/napi/v8/js_native_api_v8.h" -#include "core/runtime/v8/runtime.h" +#include "driver/runtime/v8/runtime.h" #include "voltron_bridge.h" namespace voltron { diff --git a/driver/js/flutter/core/src/bridge/android/js2dart.cc b/driver/js/flutter/core/src/bridge/android/js2dart.cc index 440fe8864a5..26b1fe48c5d 100644 --- a/driver/js/flutter/core/src/bridge/android/js2dart.cc +++ b/driver/js/flutter/core/src/bridge/android/js2dart.cc @@ -20,8 +20,8 @@ * */ -#include "core/runtime/v8/runtime.h" -#include "core/runtime/v8/v8_bridge_utils.h" +#include "driver/runtime/v8/runtime.h" +#include "driver/runtime/v8/v8_bridge_utils.h" #include "js2dart.h" #include "voltron_bridge.h" @@ -42,8 +42,8 @@ void CallDart(hippy::napi::CBDataTuple *data) { std::u16string module_name = StringViewUtils::CovertToUtf16(module, module.encoding()).utf16_value(); std::u16string module_func = StringViewUtils::CovertToUtf16(func, func.encoding()).utf16_value(); std::u16string call_id = StringViewUtils::CovertToUtf16(cb_id, cb_id.encoding()).utf16_value(); - auto bridge = std::static_pointer_cast(runtime->GetBridge()); - + FOOTSTONE_DCHECK(runtime->HasData(kBridgeSlot)); + auto bridge = std::any_cast(runtime->GetData(kBridgeSlot)); if (bridge) { bridge->GetPlatformRuntime()->CallDart(module_name, module_func, diff --git a/driver/js/flutter/core/src/bridge/android/voltron_bridge.h b/driver/js/flutter/core/src/bridge/android/voltron_bridge.h index 3e2f226dcd4..de3767c409a 100644 --- a/driver/js/flutter/core/src/bridge/android/voltron_bridge.h +++ b/driver/js/flutter/core/src/bridge/android/voltron_bridge.h @@ -23,7 +23,7 @@ #pragma once #include "bridge/bridge_runtime.h" -#include "core/runtime/v8/bridge.h" +#include "driver/runtime/v8/bridge.h" namespace voltron { using hippy::Bridge; diff --git a/driver/js/core/include/devtools/adapter/hippy_dom_tree_adapter.h b/driver/js/include/devtools/adapter/hippy_dom_tree_adapter.h similarity index 100% rename from driver/js/core/include/devtools/adapter/hippy_dom_tree_adapter.h rename to driver/js/include/devtools/adapter/hippy_dom_tree_adapter.h diff --git a/driver/js/core/include/devtools/adapter/hippy_runtime_adapter.h b/driver/js/include/devtools/adapter/hippy_runtime_adapter.h similarity index 100% rename from driver/js/core/include/devtools/adapter/hippy_runtime_adapter.h rename to driver/js/include/devtools/adapter/hippy_runtime_adapter.h diff --git a/driver/js/core/include/devtools/adapter/hippy_screen_adapter.h b/driver/js/include/devtools/adapter/hippy_screen_adapter.h similarity index 100% rename from driver/js/core/include/devtools/adapter/hippy_screen_adapter.h rename to driver/js/include/devtools/adapter/hippy_screen_adapter.h diff --git a/driver/js/core/include/devtools/adapter/hippy_tracing_adapter.h b/driver/js/include/devtools/adapter/hippy_tracing_adapter.h similarity index 100% rename from driver/js/core/include/devtools/adapter/hippy_tracing_adapter.h rename to driver/js/include/devtools/adapter/hippy_tracing_adapter.h diff --git a/driver/js/core/include/devtools/adapter/hippy_vm_request_adapter.h b/driver/js/include/devtools/adapter/hippy_vm_request_adapter.h similarity index 100% rename from driver/js/core/include/devtools/adapter/hippy_vm_request_adapter.h rename to driver/js/include/devtools/adapter/hippy_vm_request_adapter.h diff --git a/driver/js/core/include/devtools/devtools_data_source.h b/driver/js/include/devtools/devtools_data_source.h similarity index 100% rename from driver/js/core/include/devtools/devtools_data_source.h rename to driver/js/include/devtools/devtools_data_source.h diff --git a/driver/js/core/include/devtools/devtools_macro.h b/driver/js/include/devtools/devtools_macro.h similarity index 100% rename from driver/js/core/include/devtools/devtools_macro.h rename to driver/js/include/devtools/devtools_macro.h diff --git a/driver/js/core/include/devtools/devtools_utils.h b/driver/js/include/devtools/devtools_utils.h similarity index 100% rename from driver/js/core/include/devtools/devtools_utils.h rename to driver/js/include/devtools/devtools_utils.h diff --git a/driver/js/core/include/devtools/hippy_dom_data.h b/driver/js/include/devtools/hippy_dom_data.h similarity index 100% rename from driver/js/core/include/devtools/hippy_dom_data.h rename to driver/js/include/devtools/hippy_dom_data.h diff --git a/driver/js/core/include/devtools/trace_control.h b/driver/js/include/devtools/trace_control.h similarity index 100% rename from driver/js/core/include/devtools/trace_control.h rename to driver/js/include/devtools/trace_control.h diff --git a/driver/js/core/include/core/base/common.h b/driver/js/include/driver/base/common.h similarity index 100% rename from driver/js/core/include/core/base/common.h rename to driver/js/include/driver/base/common.h diff --git a/driver/js/core/include/core/base/file.h b/driver/js/include/driver/base/file.h similarity index 99% rename from driver/js/core/include/core/base/file.h rename to driver/js/include/driver/base/file.h index 6ae9e940c5e..d5f700fbb22 100644 --- a/driver/js/core/include/core/base/file.h +++ b/driver/js/include/driver/base/file.h @@ -30,10 +30,10 @@ #include #include +#include "driver/base/common.h" #include "footstone/logging.h" #include "footstone/unicode_string_view.h" #include "footstone/check.h" -#include "core/base/common.h" #include "footstone/string_view_utils.h" namespace hippy { diff --git a/driver/js/core/include/core/base/js_value_wrapper.h b/driver/js/include/driver/base/js_value_wrapper.h similarity index 100% rename from driver/js/core/include/core/base/js_value_wrapper.h rename to driver/js/include/driver/base/js_value_wrapper.h diff --git a/driver/js/core/include/core/base/macros.h b/driver/js/include/driver/base/macros.h similarity index 100% rename from driver/js/core/include/core/base/macros.h rename to driver/js/include/driver/base/macros.h diff --git a/driver/js/core/include/core/base/uri_loader.h b/driver/js/include/driver/base/uri_loader.h similarity index 100% rename from driver/js/core/include/core/base/uri_loader.h rename to driver/js/include/driver/base/uri_loader.h diff --git a/driver/js/core/include/core/engine.h b/driver/js/include/driver/engine.h similarity index 94% rename from driver/js/core/include/core/engine.h rename to driver/js/include/driver/engine.h index dec52f29be5..04bc71f4763 100644 --- a/driver/js/core/include/core/engine.h +++ b/driver/js/include/driver/engine.h @@ -26,13 +26,13 @@ #include #include +#include "driver/base/common.h" +#include "driver/napi/js_native_api_types.h" #include "footstone/logging.h" #include "footstone/task_runner.h" -#include "core/base/common.h" -#include "core/napi/js_native_api_types.h" #if defined(ENABLE_INSPECTOR) && !defined(V8_WITHOUT_INSPECTOR) -#include "core/runtime/v8/inspector/v8_inspector_client_impl.h" +#include "driver/runtime/v8/inspector/v8_inspector_client_impl.h" #endif class Scope; diff --git a/driver/js/core/include/core/modules/animation_module.h b/driver/js/include/driver/modules/animation_module.h similarity index 96% rename from driver/js/core/include/core/modules/animation_module.h rename to driver/js/include/driver/modules/animation_module.h index aed8c76cd9d..ff8cb971220 100644 --- a/driver/js/core/include/core/modules/animation_module.h +++ b/driver/js/include/driver/modules/animation_module.h @@ -22,9 +22,9 @@ #pragma once -#include "core/napi/js_native_api_types.h" #include "dom/animation/cubic_bezier_animation.h" #include "dom/animation/animation_set.h" +#include "driver/napi/js_native_api_types.h" namespace hippy { diff --git a/driver/js/core/include/core/modules/console_module.h b/driver/js/include/driver/modules/console_module.h similarity index 91% rename from driver/js/core/include/core/modules/console_module.h rename to driver/js/include/driver/modules/console_module.h index e2e64aa2d20..f287078c61d 100644 --- a/driver/js/core/include/core/modules/console_module.h +++ b/driver/js/include/driver/modules/console_module.h @@ -22,8 +22,8 @@ #pragma once -#include "core/modules/module_base.h" -#include "core/napi/callback_info.h" +#include "driver/modules/module_base.h" +#include "driver/napi/callback_info.h" class Scope; diff --git a/driver/js/core/include/core/modules/contextify_module.h b/driver/js/include/driver/modules/contextify_module.h similarity index 91% rename from driver/js/core/include/core/modules/contextify_module.h rename to driver/js/include/driver/modules/contextify_module.h index 7751f523ab1..96744e295bb 100644 --- a/driver/js/core/include/core/modules/contextify_module.h +++ b/driver/js/include/driver/modules/contextify_module.h @@ -22,10 +22,10 @@ #pragma once +#include "driver/modules/module_base.h" +#include "driver/napi/callback_info.h" +#include "driver/napi/js_native_api_types.h" #include "footstone/string_view_utils.h" -#include "core/modules/module_base.h" -#include "core/napi/callback_info.h" -#include "core/napi/js_native_api_types.h" class Scope; diff --git a/driver/js/include/driver/modules/event_module.h b/driver/js/include/driver/modules/event_module.h new file mode 100644 index 00000000000..dc5d310291e --- /dev/null +++ b/driver/js/include/driver/modules/event_module.h @@ -0,0 +1,33 @@ +/* + * + * Tencent is pleased to support the open source community by making + * Hippy available. + * + * Copyright (C) 2022 THL A29 Limited, a Tencent company. + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#pragma once + +#include "dom/dom_event.h" +#include "driver/scope.h" + +namespace hippy { + +std::shared_ptr> MakeEventInstanceDefine( + const std::weak_ptr& weak_scope, std::shared_ptr& dom_event); + +} // namespace hippy diff --git a/driver/js/core/include/core/modules/module_base.h b/driver/js/include/driver/modules/module_base.h similarity index 100% rename from driver/js/core/include/core/modules/module_base.h rename to driver/js/include/driver/modules/module_base.h diff --git a/driver/js/core/include/core/modules/module_register.h b/driver/js/include/driver/modules/module_register.h similarity index 95% rename from driver/js/core/include/core/modules/module_register.h rename to driver/js/include/driver/modules/module_register.h index 28479e8f496..e93e65d29a0 100644 --- a/driver/js/core/include/core/modules/module_register.h +++ b/driver/js/include/driver/modules/module_register.h @@ -27,12 +27,12 @@ #include #include +#include "driver/base/macros.h" +#include "driver/modules/module_base.h" +#include "driver/napi/callback_info.h" +#include "driver/napi/js_native_api_types.h" +#include "driver/scope.h" #include "footstone/unicode_string_view.h" -#include "core/base/macros.h" -#include "core/modules/module_base.h" -#include "core/napi/callback_info.h" -#include "core/napi/js_native_api_types.h" -#include "core/scope.h" #define REGISTER_MODULE(Module, Function) \ auto __##Module##Function##__ = [] { \ diff --git a/driver/js/include/driver/modules/scene_builder.h b/driver/js/include/driver/modules/scene_builder.h new file mode 100644 index 00000000000..74a64d43317 --- /dev/null +++ b/driver/js/include/driver/modules/scene_builder.h @@ -0,0 +1,34 @@ +/* + * + * Tencent is pleased to support the open source community by making + * Hippy available. + * + * Copyright (C) 2022 THL A29 Limited, a Tencent company. + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#pragma once + +#include "driver/scope.h" +#include "driver/napi/js_native_api_types.h" + +namespace hippy { + +std::shared_ptr> +RegisterSceneBuilder(const std::weak_ptr& weak_scope); + +} + diff --git a/driver/js/core/include/core/modules/timer_module.h b/driver/js/include/driver/modules/timer_module.h similarity index 92% rename from driver/js/core/include/core/modules/timer_module.h rename to driver/js/include/driver/modules/timer_module.h index 9420235be8f..4656e0f6121 100644 --- a/driver/js/core/include/core/modules/timer_module.h +++ b/driver/js/include/driver/modules/timer_module.h @@ -26,12 +26,12 @@ #include #include +#include "driver/modules/module_base.h" +#include "driver/napi/callback_info.h" +#include "driver/napi/js_native_api.h" +#include "driver/napi/js_native_api_types.h" #include "footstone/task.h" #include "footstone/base_timer.h" -#include "core/modules/module_base.h" -#include "core/napi/callback_info.h" -#include "core/napi/js_native_api.h" -#include "core/napi/js_native_api_types.h" class TimerModule : public ModuleBase { public: diff --git a/driver/js/core/include/core/modules/ui_manager_module.h b/driver/js/include/driver/modules/ui_manager_module.h similarity index 88% rename from driver/js/core/include/core/modules/ui_manager_module.h rename to driver/js/include/driver/modules/ui_manager_module.h index 3035459eea8..cfc90f5af3f 100644 --- a/driver/js/core/include/core/modules/ui_manager_module.h +++ b/driver/js/include/driver/modules/ui_manager_module.h @@ -27,11 +27,11 @@ #include #include +#include "driver/modules/module_base.h" +#include "driver/napi/callback_info.h" +#include "driver/napi/js_native_api.h" +#include "driver/napi/js_native_api_types.h" #include "footstone/task.h" -#include "core/modules/module_base.h" -#include "core/napi/callback_info.h" -#include "core/napi/js_native_api.h" -#include "core/napi/js_native_api_types.h" #include "dom/dom_manager.h" #include "dom/dom_node.h" diff --git a/driver/js/core/include/core/napi/callback_info.h b/driver/js/include/driver/napi/callback_info.h similarity index 96% rename from driver/js/core/include/core/napi/callback_info.h rename to driver/js/include/driver/napi/callback_info.h index d12fb7066fd..511ee9b2182 100644 --- a/driver/js/core/include/core/napi/callback_info.h +++ b/driver/js/include/driver/napi/callback_info.h @@ -25,10 +25,10 @@ #include #include +#include "driver/base/macros.h" +#include "driver/napi/js_native_api_types.h" +#include "driver/scope.h" #include "footstone/unicode_string_view.h" -#include "core/base/macros.h" -#include "core/napi/js_native_api_types.h" -#include "core/scope.h" namespace hippy { namespace napi { diff --git a/driver/js/core/include/core/napi/js_native_api.h b/driver/js/include/driver/napi/js_native_api.h similarity index 96% rename from driver/js/core/include/core/napi/js_native_api.h rename to driver/js/include/driver/napi/js_native_api.h index d2f1db6e45a..1463f62833d 100644 --- a/driver/js/core/include/core/napi/js_native_api.h +++ b/driver/js/include/driver/napi/js_native_api.h @@ -27,7 +27,7 @@ #include -#include "core/napi/js_native_api_types.h" +#include "driver/napi/js_native_api_types.h" namespace hippy { namespace napi { diff --git a/driver/js/core/include/core/napi/js_native_api_types.h b/driver/js/include/driver/napi/js_native_api_types.h similarity index 99% rename from driver/js/core/include/core/napi/js_native_api_types.h rename to driver/js/include/driver/napi/js_native_api_types.h index 2af37e37120..02c775c0ab9 100644 --- a/driver/js/core/include/core/napi/js_native_api_types.h +++ b/driver/js/include/driver/napi/js_native_api_types.h @@ -28,12 +28,13 @@ #include #include -#include "footstone/logging.h" -#include "core/base/common.h" -#include "core/base/js_value_wrapper.h" -#include "footstone/hippy_value.h" #include "dom/dom_argument.h" #include "dom/dom_event.h" +#include "driver/base/common.h" +#include "driver/base/js_value_wrapper.h" +#include "footstone/hippy_value.h" +#include "footstone/logging.h" + class Scope; diff --git a/driver/js/core/include/core/napi/js_native_turbo.h b/driver/js/include/driver/napi/js_native_turbo.h similarity index 96% rename from driver/js/core/include/core/napi/js_native_turbo.h rename to driver/js/include/driver/napi/js_native_turbo.h index 497931c2e5d..7791cec5222 100644 --- a/driver/js/core/include/core/napi/js_native_turbo.h +++ b/driver/js/include/driver/napi/js_native_turbo.h @@ -22,8 +22,8 @@ #pragma once -#include "core/napi/js_native_api.h" -#include "core/napi/js_native_api_types.h" +#include "driver/napi/js_native_api.h" +#include "driver/napi/js_native_api_types.h" namespace hippy { namespace napi { diff --git a/driver/js/core/include/core/napi/jsc/js_native_api_jsc.h b/driver/js/include/driver/napi/jsc/js_native_api_jsc.h similarity index 98% rename from driver/js/core/include/core/napi/jsc/js_native_api_jsc.h rename to driver/js/include/driver/napi/jsc/js_native_api_jsc.h index d4ee3a5f142..a8835bb9d98 100644 --- a/driver/js/core/include/core/napi/jsc/js_native_api_jsc.h +++ b/driver/js/include/driver/napi/jsc/js_native_api_jsc.h @@ -28,17 +28,17 @@ #include #include -#include "footstone/logging.h" -#include "footstone/unicode_string_view.h" -#include "core/base/macros.h" -#include "core/napi/js_native_api_types.h" -#include "core/scope.h" -#include "core/modules/scene_builder.h" -#include "core/modules/animation_module.h" +#include "dom/dom_event.h" #include "dom/scene_builder.h" +#include "driver/base/macros.h" +#include "driver/modules/animation_module.h" +#include "driver/modules/event_module.h" +#include "driver/modules/scene_builder.h" +#include "driver/napi/js_native_api_types.h" +#include "driver/scope.h" +#include "footstone/logging.h" #include "footstone/string_view_utils.h" -#include "core/modules/event_module.h" -#include "dom/dom_event.h" +#include "footstone/unicode_string_view.h" template constexpr JSStringRef CreateWithCharacters(const char16_t (&u16)[N]) noexcept { diff --git a/driver/js/core/include/core/napi/jsc/js_native_jsc_helper.h b/driver/js/include/driver/napi/jsc/js_native_jsc_helper.h similarity index 91% rename from driver/js/core/include/core/napi/jsc/js_native_jsc_helper.h rename to driver/js/include/driver/napi/jsc/js_native_jsc_helper.h index 7d2a6bb10ca..9ad5d6eef1e 100644 --- a/driver/js/core/include/core/napi/jsc/js_native_jsc_helper.h +++ b/driver/js/include/driver/napi/jsc/js_native_jsc_helper.h @@ -26,8 +26,8 @@ #include -#include "core/napi/js_native_api_types.h" -#include "core/napi/jsc/js_native_api_jsc.h" +#include "driver/napi/js_native_api_types.h" +#include "driver/napi/jsc/js_native_api_jsc.h" namespace hippy { namespace napi { diff --git a/driver/js/core/include/core/napi/jsc/js_native_turbo_jsc.h b/driver/js/include/driver/napi/jsc/js_native_turbo_jsc.h similarity index 93% rename from driver/js/core/include/core/napi/jsc/js_native_turbo_jsc.h rename to driver/js/include/driver/napi/jsc/js_native_turbo_jsc.h index 0bc94568a65..2272e6600d2 100644 --- a/driver/js/core/include/core/napi/jsc/js_native_turbo_jsc.h +++ b/driver/js/include/driver/napi/jsc/js_native_turbo_jsc.h @@ -20,9 +20,8 @@ * */ - -#include -#include +#include "driver/napi/js_native_turbo.h" +#include "driver/napi/jsc/js_native_api_jsc.h" namespace hippy { namespace napi { diff --git a/driver/js/core/include/core/napi/native_source_code.h b/driver/js/include/driver/napi/native_source_code.h similarity index 100% rename from driver/js/core/include/core/napi/native_source_code.h rename to driver/js/include/driver/napi/native_source_code.h diff --git a/driver/js/core/include/core/napi/v8/js_native_api_v8.h b/driver/js/include/driver/napi/v8/js_native_api_v8.h similarity index 97% rename from driver/js/core/include/core/napi/v8/js_native_api_v8.h rename to driver/js/include/driver/napi/v8/js_native_api_v8.h index 01540e26b1c..0c4a08b62f1 100644 --- a/driver/js/core/include/core/napi/v8/js_native_api_v8.h +++ b/driver/js/include/driver/napi/v8/js_native_api_v8.h @@ -28,22 +28,22 @@ #include #include +#include "dom/dom_event.h" +#include "dom/scene_builder.h" +#include "driver/base/common.h" +#include "driver/base/js_value_wrapper.h" +#include "driver/base/macros.h" +#include "driver/modules/animation_module.h" +#include "driver/modules/event_module.h" +#include "driver/modules/module_base.h" +#include "driver/modules/scene_builder.h" +#include "driver/napi/callback_info.h" +#include "driver/napi/js_native_api.h" +#include "driver/napi/js_native_api_types.h" +#include "driver/napi/native_source_code.h" +#include "driver/scope.h" #include "footstone/logging.h" #include "footstone/unicode_string_view.h" -#include "core/base/common.h" -#include "core/base/js_value_wrapper.h" -#include "core/base/macros.h" -#include "core/modules/module_base.h" -#include "core/napi/callback_info.h" -#include "core/napi/js_native_api.h" -#include "core/napi/js_native_api_types.h" -#include "core/napi/native_source_code.h" -#include "core/scope.h" -#include "dom/scene_builder.h" -#include "core/modules/scene_builder.h" -#include "core/modules/event_module.h" -#include "core/modules/animation_module.h" -#include "dom/dom_event.h" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wconversion" diff --git a/driver/js/core/include/core/napi/v8/js_native_turbo_v8.h b/driver/js/include/driver/napi/v8/js_native_turbo_v8.h similarity index 98% rename from driver/js/core/include/core/napi/v8/js_native_turbo_v8.h rename to driver/js/include/driver/napi/v8/js_native_turbo_v8.h index 0e070ee5176..b5fbc065c35 100644 --- a/driver/js/core/include/core/napi/v8/js_native_turbo_v8.h +++ b/driver/js/include/driver/napi/v8/js_native_turbo_v8.h @@ -24,8 +24,9 @@ #include -#include "core/napi/js_native_turbo.h" -#include "core/napi/v8/js_native_api_v8.h" +#include "driver/napi/js_native_turbo.h" + +#include "driver/napi/v8/js_native_api_v8.h" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wconversion" #include "v8/v8.h" diff --git a/driver/js/core/include/core/napi/v8/serializer.h b/driver/js/include/driver/napi/v8/serializer.h similarity index 100% rename from driver/js/core/include/core/napi/v8/serializer.h rename to driver/js/include/driver/napi/v8/serializer.h diff --git a/driver/js/core/include/core/runtime/v8/inspector/v8_channel_impl.h b/driver/js/include/driver/runtime/v8/inspector/v8_channel_impl.h similarity index 88% rename from driver/js/core/include/core/runtime/v8/inspector/v8_channel_impl.h rename to driver/js/include/driver/runtime/v8/inspector/v8_channel_impl.h index 95e4205c245..b36d78b563b 100644 --- a/driver/js/core/include/core/runtime/v8/inspector/v8_channel_impl.h +++ b/driver/js/include/driver/runtime/v8/inspector/v8_channel_impl.h @@ -24,7 +24,6 @@ #include -#include "core/runtime/v8/bridge.h" #ifdef ENABLE_INSPECTOR #include "devtools/devtools_data_source.h" #endif @@ -38,15 +37,9 @@ namespace inspector { class V8ChannelImpl : public v8_inspector::V8Inspector::Channel { public: - using Bridge = hippy::Bridge; - V8ChannelImpl() = default; ~V8ChannelImpl() override = default; - inline std::shared_ptr GetBridge() { return bridge_; } - - inline void SetBridge(std::shared_ptr bridge) { bridge_ = bridge; } - #ifdef ENABLE_INSPECTOR inline void SetDevtoolsDataSource(std::shared_ptr devtools_data_source) { devtools_data_source_ = devtools_data_source; @@ -62,7 +55,6 @@ class V8ChannelImpl : public v8_inspector::V8Inspector::Channel { private: friend class V8InspectorClientImpl; - std::shared_ptr bridge_; #ifdef ENABLE_INSPECTOR std::shared_ptr devtools_data_source_; #endif diff --git a/driver/js/core/include/core/runtime/v8/inspector/v8_inspector_client_impl.h b/driver/js/include/driver/runtime/v8/inspector/v8_inspector_client_impl.h similarity index 94% rename from driver/js/core/include/core/runtime/v8/inspector/v8_inspector_client_impl.h rename to driver/js/include/driver/runtime/v8/inspector/v8_inspector_client_impl.h index 73cf60b2acb..67ce4f39182 100644 --- a/driver/js/core/include/core/runtime/v8/inspector/v8_inspector_client_impl.h +++ b/driver/js/include/driver/runtime/v8/inspector/v8_inspector_client_impl.h @@ -26,9 +26,9 @@ #include "footstone/unicode_string_view.h" #include "footstone/task_runner.h" -#include "core/runtime/v8/inspector/v8_channel_impl.h" -#include "core/runtime/v8/inspector/v8_inspector_context.h" -#include "core/runtime/v8/interrupt_queue.h" +#include "driver/runtime/v8/inspector/v8_channel_impl.h" +#include "driver/runtime/v8/inspector/v8_inspector_context.h" +#include "driver/runtime/v8/interrupt_queue.h" namespace hippy { namespace inspector { diff --git a/driver/js/core/include/core/runtime/v8/inspector/v8_inspector_context.h b/driver/js/include/driver/runtime/v8/inspector/v8_inspector_context.h similarity index 97% rename from driver/js/core/include/core/runtime/v8/inspector/v8_inspector_context.h rename to driver/js/include/driver/runtime/v8/inspector/v8_inspector_context.h index ee99d07476d..a872bba153a 100644 --- a/driver/js/core/include/core/runtime/v8/inspector/v8_inspector_context.h +++ b/driver/js/include/driver/runtime/v8/inspector/v8_inspector_context.h @@ -21,7 +21,7 @@ */ #pragma once -#include "core/runtime/v8/inspector/v8_channel_impl.h" +#include "driver/runtime/v8/inspector/v8_channel_impl.h" class Scope; diff --git a/driver/js/core/include/core/runtime/v8/interrupt_queue.h b/driver/js/include/driver/runtime/v8/interrupt_queue.h similarity index 100% rename from driver/js/core/include/core/runtime/v8/interrupt_queue.h rename to driver/js/include/driver/runtime/v8/interrupt_queue.h diff --git a/driver/js/core/include/core/runtime/v8/runtime.h b/driver/js/include/driver/runtime/v8/runtime.h similarity index 78% rename from driver/js/core/include/core/runtime/v8/runtime.h rename to driver/js/include/driver/runtime/v8/runtime.h index d189b005969..8b44e4a05c0 100644 --- a/driver/js/core/include/core/runtime/v8/runtime.h +++ b/driver/js/include/driver/runtime/v8/runtime.h @@ -24,24 +24,18 @@ #include +#include #include -#ifdef ANDROID_NATIVE_RENDER -#include "jni/turbo_module_runtime.h" -#include "jni/scoped_java_ref.h" -#endif - -#include "core/engine.h" -#include "core/napi/js_native_api.h" -#include "core/napi/v8/js_native_api_v8.h" -#include "core/napi/js_native_api_types.h" -#include "core/runtime/v8/bridge.h" +#include "driver/engine.h" +#include "driver/napi/js_native_api.h" +#include "driver/napi/v8/js_native_api_v8.h" +#include "driver/napi/js_native_api_types.h" #include "v8/v8.h" class Runtime { public: using CtxValue = hippy::napi::CtxValue; - using Bridge = hippy::Bridge; Runtime(bool enable_v8_serialization, bool is_dev); @@ -63,10 +57,14 @@ class Runtime { inline void SetEngine(std::shared_ptr engine) { engine_ = engine; } inline void SetScope(std::shared_ptr scope) { scope_ = scope; } - - inline std::shared_ptr GetBridge() { return bridge_; } - inline void SetBridge(std::shared_ptr bridge) { - bridge_ = bridge; + inline std::any GetData(uint8_t slot) { + return slot_[slot]; + } + inline bool HasData(uint8_t slot) { + return slot_.find(slot) != slot_.end(); + } + inline void SetData(uint8_t slot, std::any data) { + slot_[slot] = data; } #if defined(ENABLE_INSPECTOR) && !defined(V8_WITHOUT_INSPECTOR) inline void SetInspectorContext(std::shared_ptr inspector_context) { @@ -82,16 +80,6 @@ class Runtime { return devtools_data_source_; } #endif -#ifdef ANDROID_NATIVE_RENDER - inline std::shared_ptr GetTurboModuleRuntime() { - return turbo_module_runtime_; - } - inline void SetTurboModuleRuntime( - std::shared_ptr turbo_module_runtime) { - turbo_module_runtime_ = turbo_module_runtime; - } -#endif - static void Insert(const std::shared_ptr& runtime); static std::shared_ptr Find(int32_t id); static std::shared_ptr Find(v8::Isolate* isolate); @@ -107,14 +95,10 @@ class Runtime { std::shared_ptr scope_; std::shared_ptr bridge_func_; int32_t id_; -#ifdef ANDROID_NATIVE_RENDER - std::shared_ptr turbo_module_runtime_; -#endif + std::unordered_map slot_; #ifdef ENABLE_INSPECTOR std::shared_ptr devtools_data_source_; #endif - - std::shared_ptr bridge_; #if defined(ENABLE_INSPECTOR) && !defined(V8_WITHOUT_INSPECTOR) std::shared_ptr inspector_context_; #endif diff --git a/driver/js/core/include/core/runtime/v8/v8_bridge_utils.h b/driver/js/include/driver/runtime/v8/v8_bridge_utils.h similarity index 96% rename from driver/js/core/include/core/runtime/v8/v8_bridge_utils.h rename to driver/js/include/driver/runtime/v8/v8_bridge_utils.h index cbde514cd0c..b31da4c4bd9 100644 --- a/driver/js/core/include/core/runtime/v8/v8_bridge_utils.h +++ b/driver/js/include/driver/runtime/v8/v8_bridge_utils.h @@ -25,10 +25,9 @@ #include #include +#include "driver/base/common.h" #include "footstone/unicode_string_view.h" #include "runtime.h" -#include "core/base/common.h" -#include "core/runtime/v8/bridge.h" #include "v8/v8.h" namespace hippy { @@ -47,7 +46,6 @@ class V8BridgeUtils { using u8string = unicode_string_view::u8string; using V8VMInitParam = hippy::napi::V8VMInitParam; using RegisterFunction = hippy::base::RegisterFunction; - using Bridge = hippy::Bridge; using ReportJsException = std::function& runtime, const unicode_string_view& desc, @@ -60,7 +58,7 @@ class V8BridgeUtils { const std::shared_ptr& worker_manager, const std::shared_ptr& task_runner, const std::shared_ptr& param, - std::shared_ptr bridge, + const std::any& bridge, const RegisterFunction& scope_cb, const RegisterFunction& call_native_cb, const unicode_string_view& data_dir, diff --git a/driver/js/core/include/core/scope.h b/driver/js/include/driver/scope.h similarity index 97% rename from driver/js/core/include/core/scope.h rename to driver/js/include/driver/scope.h index d4fd1df4aec..e6473dca6ed 100644 --- a/driver/js/core/include/core/scope.h +++ b/driver/js/include/driver/scope.h @@ -25,22 +25,23 @@ #include #include -#include "footstone/unicode_string_view.h" -#include "footstone/task.h" -#include "core/base/common.h" -#include "core/base/uri_loader.h" -#include "core/engine.h" -#include "core/napi/js_native_api.h" -#include "core/napi/js_native_api_types.h" #include "dom/animation/animation_manager.h" #include "dom/animation/cubic_bezier_animation.h" #include "dom/animation/animation_set.h" #include "dom/dom_manager.h" +#include "dom/dom_node.h" #include "dom/render_manager.h" +#include "dom/root_node.h" #include "dom/scene_builder.h" +#include "driver/base/common.h" +#include "driver/base/uri_loader.h" +#include "driver/engine.h" +#include "driver/napi/js_native_api.h" +#include "driver/napi/js_native_api_types.h" #include "footstone/hippy_value.h" -#include "dom/root_node.h" -#include "dom/dom_node.h" +#include "footstone/task.h" +#include "footstone/unicode_string_view.h" + #ifdef ENABLE_INSPECTOR #include "devtools/devtools_data_source.h" #endif diff --git a/driver/js/core/js/bootstrap.js b/driver/js/lib/bootstrap.js similarity index 100% rename from driver/js/core/js/bootstrap.js rename to driver/js/lib/bootstrap.js diff --git a/driver/js/core/js/bridge/android/js2native.js b/driver/js/lib/bridge/android/js2native.js similarity index 100% rename from driver/js/core/js/bridge/android/js2native.js rename to driver/js/lib/bridge/android/js2native.js diff --git a/driver/js/core/js/bridge/android/native2js.js b/driver/js/lib/bridge/android/native2js.js similarity index 100% rename from driver/js/core/js/bridge/android/native2js.js rename to driver/js/lib/bridge/android/native2js.js diff --git a/driver/js/core/js/bridge/flutter/js2native.js b/driver/js/lib/bridge/flutter/js2native.js similarity index 100% rename from driver/js/core/js/bridge/flutter/js2native.js rename to driver/js/lib/bridge/flutter/js2native.js diff --git a/driver/js/core/js/bridge/flutter/native2js.js b/driver/js/lib/bridge/flutter/native2js.js similarity index 100% rename from driver/js/core/js/bridge/flutter/native2js.js rename to driver/js/lib/bridge/flutter/native2js.js diff --git a/driver/js/core/js/bridge/ios/js2native.js b/driver/js/lib/bridge/ios/js2native.js similarity index 100% rename from driver/js/core/js/bridge/ios/js2native.js rename to driver/js/lib/bridge/ios/js2native.js diff --git a/driver/js/core/js/bridge/ios/native2js.js b/driver/js/lib/bridge/ios/native2js.js similarity index 100% rename from driver/js/core/js/bridge/ios/native2js.js rename to driver/js/lib/bridge/ios/native2js.js diff --git a/driver/js/core/js/entry/android/hippy.js b/driver/js/lib/entry/android/hippy.js similarity index 100% rename from driver/js/core/js/entry/android/hippy.js rename to driver/js/lib/entry/android/hippy.js diff --git a/driver/js/core/js/entry/flutter/hippy.js b/driver/js/lib/entry/flutter/hippy.js similarity index 100% rename from driver/js/core/js/entry/flutter/hippy.js rename to driver/js/lib/entry/flutter/hippy.js diff --git a/driver/js/core/js/entry/ios/hippy.js b/driver/js/lib/entry/ios/hippy.js similarity index 100% rename from driver/js/core/js/entry/ios/hippy.js rename to driver/js/lib/entry/ios/hippy.js diff --git a/driver/js/core/js/global/ConsoleModule.js b/driver/js/lib/global/ConsoleModule.js similarity index 100% rename from driver/js/core/js/global/ConsoleModule.js rename to driver/js/lib/global/ConsoleModule.js diff --git a/driver/js/core/js/global/Dimensions.js b/driver/js/lib/global/Dimensions.js similarity index 100% rename from driver/js/core/js/global/Dimensions.js rename to driver/js/lib/global/Dimensions.js diff --git a/driver/js/core/js/global/DynamicLoad.js b/driver/js/lib/global/DynamicLoad.js similarity index 100% rename from driver/js/core/js/global/DynamicLoad.js rename to driver/js/lib/global/DynamicLoad.js diff --git a/driver/js/core/js/global/Event.js b/driver/js/lib/global/Event.js similarity index 100% rename from driver/js/core/js/global/Event.js rename to driver/js/lib/global/Event.js diff --git a/driver/js/core/js/global/Network.js b/driver/js/lib/global/Network.js similarity index 100% rename from driver/js/core/js/global/Network.js rename to driver/js/lib/global/Network.js diff --git a/driver/js/core/js/global/Others.js b/driver/js/lib/global/Others.js similarity index 100% rename from driver/js/core/js/global/Others.js rename to driver/js/lib/global/Others.js diff --git a/driver/js/core/js/global/Platform.js b/driver/js/lib/global/Platform.js similarity index 100% rename from driver/js/core/js/global/Platform.js rename to driver/js/lib/global/Platform.js diff --git a/driver/js/core/js/global/Storage.js b/driver/js/lib/global/Storage.js similarity index 100% rename from driver/js/core/js/global/Storage.js rename to driver/js/lib/global/Storage.js diff --git a/driver/js/core/js/global/TimerModule.js b/driver/js/lib/global/TimerModule.js similarity index 100% rename from driver/js/core/js/global/TimerModule.js rename to driver/js/lib/global/TimerModule.js diff --git a/driver/js/core/js/global/UIManagerModule.js b/driver/js/lib/global/UIManagerModule.js similarity index 100% rename from driver/js/core/js/global/UIManagerModule.js rename to driver/js/lib/global/UIManagerModule.js diff --git a/driver/js/core/js/global/UtilsModule.js b/driver/js/lib/global/UtilsModule.js similarity index 100% rename from driver/js/core/js/global/UtilsModule.js rename to driver/js/lib/global/UtilsModule.js diff --git a/driver/js/core/js/global/android/Turbo.js b/driver/js/lib/global/android/Turbo.js similarity index 100% rename from driver/js/core/js/global/android/Turbo.js rename to driver/js/lib/global/android/Turbo.js diff --git a/driver/js/core/js/global/android/global.js b/driver/js/lib/global/android/global.js similarity index 100% rename from driver/js/core/js/global/android/global.js rename to driver/js/lib/global/android/global.js diff --git a/driver/js/core/js/global/android/requestAnimationFrame.js b/driver/js/lib/global/android/requestAnimationFrame.js similarity index 100% rename from driver/js/core/js/global/android/requestAnimationFrame.js rename to driver/js/lib/global/android/requestAnimationFrame.js diff --git a/driver/js/core/js/global/flutter/Dimensions.js b/driver/js/lib/global/flutter/Dimensions.js similarity index 100% rename from driver/js/core/js/global/flutter/Dimensions.js rename to driver/js/lib/global/flutter/Dimensions.js diff --git a/driver/js/core/js/global/flutter/global.js b/driver/js/lib/global/flutter/global.js similarity index 100% rename from driver/js/core/js/global/flutter/global.js rename to driver/js/lib/global/flutter/global.js diff --git a/driver/js/core/js/global/flutter/requestAnimationFrame.js b/driver/js/lib/global/flutter/requestAnimationFrame.js similarity index 100% rename from driver/js/core/js/global/flutter/requestAnimationFrame.js rename to driver/js/lib/global/flutter/requestAnimationFrame.js diff --git a/driver/js/core/js/global/ios/Turbo.js b/driver/js/lib/global/ios/Turbo.js similarity index 100% rename from driver/js/core/js/global/ios/Turbo.js rename to driver/js/lib/global/ios/Turbo.js diff --git a/driver/js/core/js/global/ios/global.js b/driver/js/lib/global/ios/global.js similarity index 100% rename from driver/js/core/js/global/ios/global.js rename to driver/js/lib/global/ios/global.js diff --git a/driver/js/core/js/global/ios/promise.js b/driver/js/lib/global/ios/promise.js similarity index 100% rename from driver/js/core/js/global/ios/promise.js rename to driver/js/lib/global/ios/promise.js diff --git a/driver/js/core/js/global/ios/requestAnimationFrame.js b/driver/js/lib/global/ios/requestAnimationFrame.js similarity index 100% rename from driver/js/core/js/global/ios/requestAnimationFrame.js rename to driver/js/lib/global/ios/requestAnimationFrame.js diff --git a/driver/js/core/js/modules/ExceptionHandle.js b/driver/js/lib/modules/ExceptionHandle.js similarity index 100% rename from driver/js/core/js/modules/ExceptionHandle.js rename to driver/js/lib/modules/ExceptionHandle.js diff --git a/driver/js/core/js/modules/ios/jsTimersExecution.js b/driver/js/lib/modules/ios/jsTimersExecution.js similarity index 100% rename from driver/js/core/js/modules/ios/jsTimersExecution.js rename to driver/js/lib/modules/ios/jsTimersExecution.js diff --git a/driver/js/lint-staged.config.js b/driver/js/lint-staged.config.js index 22ef58d9388..60fdc1dddbd 100644 --- a/driver/js/lint-staged.config.js +++ b/driver/js/lint-staged.config.js @@ -1,7 +1,29 @@ +/* + * + * Tencent is pleased to support the open source community by making + * Hippy available. + * + * Copyright (C) 2022 THL A29 Limited, a Tencent company. + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + // eslint-disable-next-line import/no-extraneous-dependencies const micromatch = require('micromatch'); module.exports = (allFiles) => { - const codeFiles = micromatch(allFiles, ['**/packages/**/*.{js,ts,tsx,vue}', '**/examples/hippy-react-demo/**/*.{js,jsx}', '**/examples/hippy-vue-demo/**/*.{js,vue}', '**/scripts/**/*.js', '**/core/js/**/*.js']); + const codeFiles = micromatch(allFiles, ['**/packages/**/*.{js,ts,tsx,vue}', '**/examples/hippy-react-demo/**/*.{js,jsx}', '**/examples/hippy-vue-demo/**/*.{js,vue}', '**/scripts/**/*.js', '**/lib/**/*.js']); console.log('js codeFiles lint match length', codeFiles.length); return [`eslint --fix ${codeFiles.join(' ')}`]; }; diff --git a/driver/js/package.json b/driver/js/package.json index 2613a19a99a..7bdc275830f 100644 --- a/driver/js/package.json +++ b/driver/js/package.json @@ -13,7 +13,7 @@ "debugexample": "node ./scripts/debug-example.js", "coverage": "nyc ava", "codecov": "cat ./coverage/lcov.info | codecov", - "lint": "npx eslint --config .eslintrc.js --ignore-path .eslintignore --fix \"packages/**/*.@(js|ts|tsx|vue)\" \"examples/hippy-react-demo/**/*.@(js|jsx)\" \"examples/hippy-vue-demo/**/*.@(js|vue)\" \"scripts/**/*.js\" \"core/js/**/*.js\"", + "lint": "npx eslint --config .eslintrc.js --ignore-path .eslintignore --fix \"packages/**/*.@(js|ts|tsx|vue)\" \"examples/hippy-react-demo/**/*.@(js|jsx)\" \"examples/hippy-vue-demo/**/*.@(js|vue)\" \"scripts/**/*.js\" \"lib/**/*.js\"", "clean": "rimraf ./packages/*/node_modules ./examples/hippy-react-demo/node_modules ./examples/hippy-vue-demo/node_modules", "init": "npm install && npx lerna bootstrap && npm run build", "init:example": "node ./scripts/init-example.js", diff --git a/driver/js/scripts/build-core.js b/driver/js/scripts/build-core.js index 95597fe47ef..f7bc19656f5 100644 --- a/driver/js/scripts/build-core.js +++ b/driver/js/scripts/build-core.js @@ -78,8 +78,8 @@ const CodePieces = { #include -#include "core/napi/native_source_code.h" -#include "core/base/macros.h" +#include "driver/napi/native_source_code.h" +#include "driver/base/macros.h" // clang-format off @@ -169,19 +169,19 @@ function getAbsolutePath(relativePath) { function getAllRequiredFiles(platform) { return new Promise((resole) => { const rl = readline.createInterface({ - input: fs.createReadStream(getAbsolutePath(`../core/js/entry/${platform}/hippy.js`)), + input: fs.createReadStream(getAbsolutePath(`../lib/entry/${platform}/hippy.js`)), }); const filePaths = [ - getAbsolutePath('../core/js/bootstrap.js'), - getAbsolutePath(`../core/js/entry/${platform}/hippy.js`), - getAbsolutePath('../core/js/modules/ExceptionHandle.js'), + getAbsolutePath('../lib/bootstrap.js'), + getAbsolutePath(`../lib/entry/${platform}/hippy.js`), + getAbsolutePath('../lib/modules/ExceptionHandle.js'), ]; rl.on('line', (line) => { const lineSlice = line.split('//')[0]; if (lineSlice.indexOf('require(\'') > -1 || lineSlice.indexOf('require("') > -1) { const entry = line.split('(\'')[1].split('\')')[0]; - filePaths.push(getAbsolutePath(`../core/js/entry/${platform}/${entry}`)); + filePaths.push(getAbsolutePath(`../lib/entry/${platform}/${entry}`)); } }); rl.on('close', () => { @@ -260,6 +260,6 @@ function generateCpp(platform, buildDirPath) { } // Start to work -generateCpp('ios', getAbsolutePath('../ios/base')); -generateCpp('android', getAbsolutePath('../android/src/main/jni/src/bridge/')); +generateCpp('ios', getAbsolutePath('../../../framework/ios/base')); +generateCpp('android', getAbsolutePath('../../../framework/android/src/main/cpp/src/bridge/')); generateCpp('flutter', getAbsolutePath('../flutter/core/src/bridge/')); diff --git a/driver/js/scripts/build-example.js b/driver/js/scripts/build-example.js index cca77650493..5a09755c315 100644 --- a/driver/js/scripts/build-example.js +++ b/driver/js/scripts/build-example.js @@ -55,8 +55,8 @@ exec('npm run hippy:vendor', execOptions); // Build vendor js exec('npm run hippy:build', execOptions); // Build index js console.log('3/3 Copy the built files to native.'); -cp('-Rf', './dist/ios/*', '../ios-demo/res/'); // Update the ios demo project -cp('-Rf', './dist/android/*', '../android-demo/res/'); // # Update the android project +cp('-Rf', './dist/ios/*', '../../../../framework/examples/ios-demo/res/'); // Update the ios demo project +cp('-Rf', './dist/android/*', '../../../../framework/examples/android-demo/res/'); // # Update the android project cp('-Rf', './dist/android/*', `../../flutter/example/jsbundle/${example}/android/`); // # Update the flutter project, ios and android use same bundle console.log('👌 All done, you can open your native app now, enjoy.'); diff --git a/driver/js/core/src/base/file.cc b/driver/js/src/base/file.cc similarity index 99% rename from driver/js/core/src/base/file.cc rename to driver/js/src/base/file.cc index 803c9d4ace4..8c8a0e178f7 100644 --- a/driver/js/core/src/base/file.cc +++ b/driver/js/src/base/file.cc @@ -20,7 +20,7 @@ * */ -#include "core/base/file.h" +#include "driver/base/file.h" #include #include diff --git a/driver/js/core/src/base/js_value_wrapper.cc b/driver/js/src/base/js_value_wrapper.cc similarity index 99% rename from driver/js/core/src/base/js_value_wrapper.cc rename to driver/js/src/base/js_value_wrapper.cc index 6bec3fa365e..97cb1d9dd47 100644 --- a/driver/js/core/src/base/js_value_wrapper.cc +++ b/driver/js/src/base/js_value_wrapper.cc @@ -20,7 +20,7 @@ * */ -#include "core/base/js_value_wrapper.h" +#include "driver/base/js_value_wrapper.h" #include "footstone/hash.h" diff --git a/driver/js/core/src/devtools/adapter/impl/hippy_dom_tree_adapter.cc b/driver/js/src/devtools/adapter/impl/hippy_dom_tree_adapter.cc similarity index 100% rename from driver/js/core/src/devtools/adapter/impl/hippy_dom_tree_adapter.cc rename to driver/js/src/devtools/adapter/impl/hippy_dom_tree_adapter.cc diff --git a/driver/js/core/src/devtools/adapter/impl/hippy_screen_adapter.cc b/driver/js/src/devtools/adapter/impl/hippy_screen_adapter.cc similarity index 100% rename from driver/js/core/src/devtools/adapter/impl/hippy_screen_adapter.cc rename to driver/js/src/devtools/adapter/impl/hippy_screen_adapter.cc diff --git a/driver/js/core/src/devtools/adapter/impl/hippy_tracing_adapter.cc b/driver/js/src/devtools/adapter/impl/hippy_tracing_adapter.cc similarity index 100% rename from driver/js/core/src/devtools/adapter/impl/hippy_tracing_adapter.cc rename to driver/js/src/devtools/adapter/impl/hippy_tracing_adapter.cc diff --git a/driver/js/core/src/devtools/devtools_data_source.cc b/driver/js/src/devtools/devtools_data_source.cc similarity index 100% rename from driver/js/core/src/devtools/devtools_data_source.cc rename to driver/js/src/devtools/devtools_data_source.cc diff --git a/driver/js/core/src/devtools/devtools_utils.cc b/driver/js/src/devtools/devtools_utils.cc similarity index 100% rename from driver/js/core/src/devtools/devtools_utils.cc rename to driver/js/src/devtools/devtools_utils.cc diff --git a/driver/js/core/src/devtools/trace_control.cc b/driver/js/src/devtools/trace_control.cc similarity index 100% rename from driver/js/core/src/devtools/trace_control.cc rename to driver/js/src/devtools/trace_control.cc diff --git a/driver/js/core/src/engine.cc b/driver/js/src/engine.cc similarity index 98% rename from driver/js/core/src/engine.cc rename to driver/js/src/engine.cc index e2f74e5b46d..fc5c0cbdb7d 100644 --- a/driver/js/core/src/engine.cc +++ b/driver/js/src/engine.cc @@ -20,11 +20,11 @@ * */ -#include "core/engine.h" +#include "driver/engine.h" #include -#include "core/scope.h" +#include "driver/scope.h" #include "footstone/task.h" #include "footstone/worker.h" diff --git a/driver/js/core/src/modules/animation_module.cc b/driver/js/src/modules/animation_module.cc similarity index 99% rename from driver/js/core/src/modules/animation_module.cc rename to driver/js/src/modules/animation_module.cc index 01c7553ecba..fe020d2bd31 100644 --- a/driver/js/core/src/modules/animation_module.cc +++ b/driver/js/src/modules/animation_module.cc @@ -20,19 +20,19 @@ * */ -#include "core/modules/animation_module.h" +#include "driver/modules/animation_module.h" #include #include #include +#include "dom/node_props.h" +#include "driver/modules/ui_manager_module.h" +#include "driver/napi/js_native_api_types.h" +#include "driver/scope.h" #include "footstone/unicode_string_view.h" #include "footstone/string_view_utils.h" -#include "core/modules/ui_manager_module.h" -#include "core/napi/js_native_api_types.h" -#include "core/scope.h" #include "footstone/task.h" -#include "dom/node_props.h" template using InstanceDefine = hippy::napi::InstanceDefine; diff --git a/driver/js/core/src/modules/console_module.cc b/driver/js/src/modules/console_module.cc similarity index 94% rename from driver/js/core/src/modules/console_module.cc rename to driver/js/src/modules/console_module.cc index 47ebf9e23ee..ad84aeb550d 100644 --- a/driver/js/core/src/modules/console_module.cc +++ b/driver/js/src/modules/console_module.cc @@ -20,15 +20,15 @@ * */ -#include "core/modules/console_module.h" +#include "driver/modules/console_module.h" #include +#include "driver/modules/module_register.h" +#include "driver/napi/js_native_api.h" +#include "driver/scope.h" #include "footstone/logging.h" #include "footstone/string_view_utils.h" -#include "core/modules/module_register.h" -#include "core/napi/js_native_api.h" -#include "core/scope.h" using unicode_string_view = footstone::stringview::unicode_string_view; using Ctx = hippy::napi::Ctx; diff --git a/driver/js/core/src/modules/contextify_module.cc b/driver/js/src/modules/contextify_module.cc similarity index 96% rename from driver/js/core/src/modules/contextify_module.cc rename to driver/js/src/modules/contextify_module.cc index a2da782fee4..25fbfc27aba 100644 --- a/driver/js/core/src/modules/contextify_module.cc +++ b/driver/js/src/modules/contextify_module.cc @@ -20,20 +20,21 @@ * */ -#include "core/modules/contextify_module.h" +#include "driver/modules/contextify_module.h" #include #include #include +#include "driver/base/uri_loader.h" +#include "driver/modules/module_register.h" +#include "driver/napi/js_native_api.h" +#include "driver/napi/native_source_code.h" #include "footstone/logging.h" -#include "core/base/uri_loader.h" -#include "core/modules/module_register.h" -#include "core/napi/js_native_api.h" -#include "core/napi/native_source_code.h" #include "footstone/task.h" + #if JS_V8 -#include "core/napi/v8/js_native_api_v8.h" +#include "driver/napi/v8/js_native_api_v8.h" #endif REGISTER_MODULE(ContextifyModule, RunInThisContext) // NOLINT(cert-err58-cpp) diff --git a/driver/js/core/src/modules/event_module.cc b/driver/js/src/modules/event_module.cc similarity index 98% rename from driver/js/core/src/modules/event_module.cc rename to driver/js/src/modules/event_module.cc index fb59a506223..060ac8026b4 100644 --- a/driver/js/core/src/modules/event_module.cc +++ b/driver/js/src/modules/event_module.cc @@ -20,12 +20,13 @@ * */ -#include "core/modules/event_module.h" -#include "core/modules/ui_manager_module.h" -#include "core/napi/js_native_api_types.h" -#include "core/scope.h" +#include "driver/modules/event_module.h" + #include "dom/dom_event.h" #include "dom/dom_node.h" +#include "driver/modules/ui_manager_module.h" +#include "driver/napi/js_native_api_types.h" +#include "driver/scope.h" #include "footstone/hippy_value.h" #include "footstone/string_view_utils.h" diff --git a/driver/js/core/src/modules/module_register.cc b/driver/js/src/modules/module_register.cc similarity index 93% rename from driver/js/core/src/modules/module_register.cc rename to driver/js/src/modules/module_register.cc index bfc682edd10..653341cce11 100644 --- a/driver/js/core/src/modules/module_register.cc +++ b/driver/js/src/modules/module_register.cc @@ -20,11 +20,11 @@ * */ -#include "core/modules/module_register.h" +#include "driver/modules/module_register.h" #include // NOLINT(build/c++11) -#include "core/engine.h" +#include "driver/engine.h" namespace napi = ::hippy::napi; diff --git a/driver/js/core/src/modules/scene_builder.cc b/driver/js/src/modules/scene_builder.cc similarity index 99% rename from driver/js/core/src/modules/scene_builder.cc rename to driver/js/src/modules/scene_builder.cc index 235ac5e0819..be038ab7eed 100644 --- a/driver/js/core/src/modules/scene_builder.cc +++ b/driver/js/src/modules/scene_builder.cc @@ -20,15 +20,15 @@ * */ -#include "core/modules/scene_builder.h" +#include "driver/modules/scene_builder.h" +#include "dom/node_props.h" +#include "driver/modules/scene_builder.h" +#include "driver/modules/ui_manager_module.h" +#include "driver/napi/js_native_api_types.h" +#include "driver/scope.h" #include "footstone/unicode_string_view.h" #include "footstone/string_view_utils.h" -#include "core/modules/scene_builder.h" -#include "core/modules/ui_manager_module.h" -#include "core/napi/js_native_api_types.h" -#include "core/scope.h" -#include "dom/node_props.h" template using InstanceDefine = hippy::napi::InstanceDefine; diff --git a/driver/js/core/src/modules/timer_module.cc b/driver/js/src/modules/timer_module.cc similarity index 97% rename from driver/js/core/src/modules/timer_module.cc rename to driver/js/src/modules/timer_module.cc index 1e8569034d6..9b206e20a10 100644 --- a/driver/js/core/src/modules/timer_module.cc +++ b/driver/js/src/modules/timer_module.cc @@ -20,8 +20,10 @@ * */ -#include "core/modules/timer_module.h" +#include "driver/modules/timer_module.h" +#include "driver/base/common.h" +#include "driver/modules/module_register.h" #include "footstone/logging.h" #include "footstone/task.h" #include "footstone/check.h" @@ -29,8 +31,6 @@ #include "footstone/one_shot_timer.h" #include "footstone/repeating_timer.h" #include "footstone/string_view_utils.h" -#include "core/base/common.h" -#include "core/modules/module_register.h" REGISTER_MODULE(TimerModule, SetTimeout) // NOLINT(cert-err58-cpp) REGISTER_MODULE(TimerModule, ClearTimeout) // NOLINT(cert-err58-cpp) diff --git a/driver/js/core/src/modules/ui_manager_module.cc b/driver/js/src/modules/ui_manager_module.cc similarity index 97% rename from driver/js/core/src/modules/ui_manager_module.cc rename to driver/js/src/modules/ui_manager_module.cc index eea869998ac..6f2abd7b871 100644 --- a/driver/js/core/src/modules/ui_manager_module.cc +++ b/driver/js/src/modules/ui_manager_module.cc @@ -20,17 +20,17 @@ * */ -#include "core/modules/ui_manager_module.h" +#include "driver/modules/ui_manager_module.h" #include #include -#include "core/modules/module_register.h" -#include "footstone/task.h" -#include "dom/node_props.h" -#include "dom/dom_node.h" -#include "dom/dom_event.h" +#include "driver/modules/module_register.h" #include "dom/dom_argument.h" +#include "dom/dom_event.h" +#include "dom/dom_node.h" +#include "dom/node_props.h" +#include "footstone/task.h" REGISTER_MODULE(UIManagerModule, CallUIFunction) diff --git a/driver/js/core/src/napi/callback_info.cc b/driver/js/src/napi/callback_info.cc similarity index 94% rename from driver/js/core/src/napi/callback_info.cc rename to driver/js/src/napi/callback_info.cc index acd4d2a5814..c0eee31b4f4 100644 --- a/driver/js/core/src/napi/callback_info.cc +++ b/driver/js/src/napi/callback_info.cc @@ -20,9 +20,9 @@ * */ -#include "core/napi/callback_info.h" +#include "driver/napi/callback_info.h" -#include "core/napi/js_native_api.h" +#include "driver/napi/js_native_api.h" namespace hippy::napi { diff --git a/driver/js/core/src/napi/js_native_turbo.cc b/driver/js/src/napi/js_native_turbo.cc similarity index 98% rename from driver/js/core/src/napi/js_native_turbo.cc rename to driver/js/src/napi/js_native_turbo.cc index 58eb01158f4..6cb5709dd70 100644 --- a/driver/js/core/src/napi/js_native_turbo.cc +++ b/driver/js/src/napi/js_native_turbo.cc @@ -20,7 +20,7 @@ * */ -#include +#include "driver/napi/js_native_turbo.h" #include #include diff --git a/driver/js/core/src/napi/jsc/js_native_api_jsc.cc b/driver/js/src/napi/jsc/js_native_api_jsc.cc similarity index 99% rename from driver/js/core/src/napi/jsc/js_native_api_jsc.cc rename to driver/js/src/napi/jsc/js_native_api_jsc.cc index 910b579dcf3..f0563bdd463 100644 --- a/driver/js/core/src/napi/jsc/js_native_api_jsc.cc +++ b/driver/js/src/napi/jsc/js_native_api_jsc.cc @@ -20,18 +20,18 @@ * */ -#include "core/napi/jsc/js_native_api_jsc.h" +#include "driver/napi/jsc/js_native_api_jsc.h" #include #include #include #include +#include "driver/napi/callback_info.h" +#include "driver/napi/js_native_api.h" +#include "driver/napi/jsc/js_native_jsc_helper.h" #include "footstone/logging.h" #include "footstone/string_view_utils.h" -#include "core/napi/callback_info.h" -#include "core/napi/js_native_api.h" -#include "core/napi/jsc/js_native_jsc_helper.h" namespace hippy { namespace napi { diff --git a/driver/js/core/src/napi/jsc/js_native_api_value_jsc.cc b/driver/js/src/napi/jsc/js_native_api_value_jsc.cc similarity index 99% rename from driver/js/core/src/napi/jsc/js_native_api_value_jsc.cc rename to driver/js/src/napi/jsc/js_native_api_value_jsc.cc index 99da7ccf9f4..c96ac462051 100644 --- a/driver/js/core/src/napi/jsc/js_native_api_value_jsc.cc +++ b/driver/js/src/napi/jsc/js_native_api_value_jsc.cc @@ -23,12 +23,12 @@ #include #include +#include "driver/napi/js_native_api.h" +#include "driver/napi/jsc/js_native_api_jsc.h" +#include "driver/napi/jsc/js_native_jsc_helper.h" +#include "driver/napi/native_source_code.h" #include "footstone/logging.h" #include "footstone/string_view_utils.h" -#include "core/napi/js_native_api.h" -#include "core/napi/jsc/js_native_api_jsc.h" -#include "core/napi/jsc/js_native_jsc_helper.h" -#include "core/napi/native_source_code.h" namespace hippy { namespace napi { diff --git a/driver/js/core/src/napi/jsc/js_native_jsc_helper.cc b/driver/js/src/napi/jsc/js_native_jsc_helper.cc similarity index 87% rename from driver/js/core/src/napi/jsc/js_native_jsc_helper.cc rename to driver/js/src/napi/jsc/js_native_jsc_helper.cc index d057a99094b..d48ab21c005 100644 --- a/driver/js/core/src/napi/jsc/js_native_jsc_helper.cc +++ b/driver/js/src/napi/jsc/js_native_jsc_helper.cc @@ -20,15 +20,15 @@ * */ -#include "core/napi/jsc/js_native_jsc_helper.h" +#include "driver/napi/jsc/js_native_jsc_helper.h" #include +#include "driver/napi/js_native_api.h" +#include "driver/napi/js_native_api_types.h" +#include "driver/napi/jsc/js_native_api_jsc.h" +#include "driver/napi/native_source_code.h" #include "footstone/logging.h" -#include "core/napi/js_native_api.h" -#include "core/napi/js_native_api_types.h" -#include "core/napi/jsc/js_native_api_jsc.h" -#include "core/napi/native_source_code.h" namespace hippy { namespace napi { diff --git a/driver/js/core/src/napi/jsc/js_native_turbo_jsc.cc b/driver/js/src/napi/jsc/js_native_turbo_jsc.cc similarity index 98% rename from driver/js/core/src/napi/jsc/js_native_turbo_jsc.cc rename to driver/js/src/napi/jsc/js_native_turbo_jsc.cc index bb2653f4813..5f078fb5327 100644 --- a/driver/js/core/src/napi/jsc/js_native_turbo_jsc.cc +++ b/driver/js/src/napi/jsc/js_native_turbo_jsc.cc @@ -20,9 +20,9 @@ * */ -#include "core/napi/jsc/js_native_turbo_jsc.h" -#include "core/napi/jsc/js_native_jsc_helper.h" -#include "core/napi/jsc/js_native_api_jsc.h" +#include "driver/napi/jsc/js_native_turbo_jsc.h" +#include "driver/napi/jsc/js_native_jsc_helper.h" +#include "driver/napi/jsc/js_native_api_jsc.h" namespace hippy { namespace napi { diff --git a/driver/js/core/src/napi/v8/js_native_api_v8.cc b/driver/js/src/napi/v8/js_native_api_v8.cc similarity index 99% rename from driver/js/core/src/napi/v8/js_native_api_v8.cc rename to driver/js/src/napi/v8/js_native_api_v8.cc index 03260cb18d6..84e6ec8ebdb 100644 --- a/driver/js/core/src/napi/v8/js_native_api_v8.cc +++ b/driver/js/src/napi/v8/js_native_api_v8.cc @@ -20,21 +20,21 @@ * */ -#include "core/napi/v8/js_native_api_v8.h" +#include "driver/napi/v8/js_native_api_v8.h" #include #include +#include "driver/base/common.h" +#include "driver/modules/ui_manager_module.h" +#include "driver/napi/v8/serializer.h" #include "footstone/string_view_utils.h" #include "footstone/check.h" -#include "core/base/common.h" -#include "core/napi/v8/serializer.h" #ifdef ENABLE_INSPECTOR #include "devtools/devtools_macro.h" #endif #include "v8/libplatform/libplatform.h" #include "v8/v8.h" -#include "core/modules/ui_manager_module.h" namespace hippy { namespace napi { @@ -1028,8 +1028,6 @@ std::shared_ptr V8Ctx::CallFunction( const std::shared_ptr& function, size_t argument_count, const std::shared_ptr arguments[]) { - FOOTSTONE_DLOG(INFO) << "V8Ctx CallJs begin"; - if (!function) { FOOTSTONE_LOG(ERROR) << "function is nullptr"; return nullptr; @@ -1065,10 +1063,8 @@ std::shared_ptr V8Ctx::CallFunction( } } - FOOTSTONE_DLOG(INFO) << "v8 CallJs call begin"; v8::MaybeLocal maybe_result = v8_fn->Call( context, context->Global(), static_cast(argument_count), args); - FOOTSTONE_DLOG(INFO) << "v8 CallJs call end"; if (maybe_result.IsEmpty()) { FOOTSTONE_DLOG(INFO) << "maybe_result is empty"; diff --git a/driver/js/core/src/napi/v8/js_native_turbo_v8.cc b/driver/js/src/napi/v8/js_native_turbo_v8.cc similarity index 99% rename from driver/js/core/src/napi/v8/js_native_turbo_v8.cc rename to driver/js/src/napi/v8/js_native_turbo_v8.cc index 4d36aca5196..1782ccd43fd 100644 --- a/driver/js/core/src/napi/v8/js_native_turbo_v8.cc +++ b/driver/js/src/napi/v8/js_native_turbo_v8.cc @@ -20,7 +20,7 @@ * */ -#include "core/napi/v8/js_native_turbo_v8.h" +#include "driver/napi/v8/js_native_turbo_v8.h" #include "footstone/string_view_utils.h" diff --git a/driver/js/core/src/napi/v8/serializer.cc b/driver/js/src/napi/v8/serializer.cc similarity index 98% rename from driver/js/core/src/napi/v8/serializer.cc rename to driver/js/src/napi/v8/serializer.cc index c9c1c444aa4..af83d7fbed0 100644 --- a/driver/js/core/src/napi/v8/serializer.cc +++ b/driver/js/src/napi/v8/serializer.cc @@ -20,7 +20,7 @@ * */ -#include "core/napi/v8/serializer.h" +#include "driver/napi/v8/serializer.h" const int kMaxReusedBuffersSize = 128 * 1024; // 128k diff --git a/driver/js/core/src/runtime/v8/inspector/v8_channel_impl.cc b/driver/js/src/runtime/v8/inspector/v8_channel_impl.cc similarity index 95% rename from driver/js/core/src/runtime/v8/inspector/v8_channel_impl.cc rename to driver/js/src/runtime/v8/inspector/v8_channel_impl.cc index 9e444c994c4..91a71f1aedf 100644 --- a/driver/js/core/src/runtime/v8/inspector/v8_channel_impl.cc +++ b/driver/js/src/runtime/v8/inspector/v8_channel_impl.cc @@ -20,7 +20,7 @@ * */ -#include "core/runtime/v8/inspector/v8_channel_impl.h" +#include "driver/runtime/v8/inspector/v8_channel_impl.h" #include diff --git a/driver/js/core/src/runtime/v8/inspector/v8_inspector_client_impl.cc b/driver/js/src/runtime/v8/inspector/v8_inspector_client_impl.cc similarity index 98% rename from driver/js/core/src/runtime/v8/inspector/v8_inspector_client_impl.cc rename to driver/js/src/runtime/v8/inspector/v8_inspector_client_impl.cc index 59c5be290c0..748140b9285 100644 --- a/driver/js/core/src/runtime/v8/inspector/v8_inspector_client_impl.cc +++ b/driver/js/src/runtime/v8/inspector/v8_inspector_client_impl.cc @@ -20,12 +20,11 @@ * */ -#include "core/runtime/v8/inspector/v8_inspector_client_impl.h" +#include "driver/runtime/v8/inspector/v8_inspector_client_impl.h" #include -#include "core/runtime/v8/bridge.h" -#include "core/napi/v8/js_native_api_v8.h" +#include "driver/napi/v8/js_native_api_v8.h" namespace hippy::inspector { diff --git a/driver/js/core/src/runtime/v8/interrupt_queue.cc b/driver/js/src/runtime/v8/interrupt_queue.cc similarity index 97% rename from driver/js/core/src/runtime/v8/interrupt_queue.cc rename to driver/js/src/runtime/v8/interrupt_queue.cc index 9db965fe6da..e3d04955075 100644 --- a/driver/js/core/src/runtime/v8/interrupt_queue.cc +++ b/driver/js/src/runtime/v8/interrupt_queue.cc @@ -20,7 +20,7 @@ * */ -#include "core/runtime/v8/interrupt_queue.h" +#include "driver/runtime/v8/interrupt_queue.h" namespace hippy { inline namespace runtime { diff --git a/driver/js/core/src/runtime/v8/runtime.cc b/driver/js/src/runtime/v8/runtime.cc similarity index 98% rename from driver/js/core/src/runtime/v8/runtime.cc rename to driver/js/src/runtime/v8/runtime.cc index 4e774315c9a..661c32b2705 100644 --- a/driver/js/core/src/runtime/v8/runtime.cc +++ b/driver/js/src/runtime/v8/runtime.cc @@ -20,7 +20,7 @@ * */ -#include "core/runtime/v8/runtime.h" +#include "driver/runtime/v8/runtime.h" #include #include diff --git a/driver/js/core/src/runtime/v8/v8_bridge_utils.cc b/driver/js/src/runtime/v8/v8_bridge_utils.cc similarity index 98% rename from driver/js/core/src/runtime/v8/v8_bridge_utils.cc rename to driver/js/src/runtime/v8/v8_bridge_utils.cc index 50e4787184b..8a9100092d7 100644 --- a/driver/js/core/src/runtime/v8/v8_bridge_utils.cc +++ b/driver/js/src/runtime/v8/v8_bridge_utils.cc @@ -18,18 +18,19 @@ * limitations under the License. */ -#include "core/runtime/v8/v8_bridge_utils.h" +#include "driver/runtime/v8/v8_bridge_utils.h" #include +#include #include #include #include -#include "core/base/file.h" -#include "core/napi/v8/js_native_api_v8.h" -#include "core/napi/v8/serializer.h" #include "devtools/devtools_macro.h" +#include "driver/base/file.h" +#include "driver/napi/v8/js_native_api_v8.h" +#include "driver/napi/v8/serializer.h" #include "footstone/deserializer.h" #include "footstone/hippy_value.h" #include "footstone/logging.h" @@ -59,6 +60,7 @@ using V8VM = hippy::napi::V8VM; constexpr int64_t kDefaultGroupId = -1; constexpr int64_t kDebuggerGroupId = -9999; constexpr uint32_t kRuntimeSlotIndex = 0; +constexpr uint8_t kBridgeSlot = 1; constexpr char kHippyBridgeName[] = "hippyBridge"; constexpr char kHippyNativeGlobalKey[] = "__HIPPYNATIVEGLOBAL__"; @@ -86,14 +88,14 @@ int64_t V8BridgeUtils::InitInstance(bool enable_v8_serialization, const std::shared_ptr& worker_manager, const std::shared_ptr& task_runner, const std::shared_ptr& param, - std::shared_ptr bridge, + const std::any& bridge, const RegisterFunction& scope_cb, const RegisterFunction& call_native_cb, const unicode_string_view& data_dir, const unicode_string_view& ws_url) { std::shared_ptr runtime = std::make_shared(enable_v8_serialization, is_dev_module); - runtime->SetBridge(std::move(bridge)); + runtime->SetData(kBridgeSlot, std::move(bridge)); int32_t runtime_id = runtime->GetId(); Runtime::Insert(runtime); RegisterFunction vm_cb = [runtime_id](void* vm) { diff --git a/driver/js/core/src/scope.cc b/driver/js/src/scope.cc similarity index 99% rename from driver/js/core/src/scope.cc rename to driver/js/src/scope.cc index f24f2740a43..e78579f97d3 100644 --- a/driver/js/core/src/scope.cc +++ b/driver/js/src/scope.cc @@ -20,22 +20,23 @@ * */ -#include "core/scope.h" +#include "driver/scope.h" #include #include #include #include +#include "dom/dom_node.h" +#include "driver/modules/module_register.h" +#include "driver/napi/native_source_code.h" #include "footstone/logging.h" #include "footstone/string_view_utils.h" #include "footstone/task.h" #include "footstone/task_runner.h" -#include "core/modules/module_register.h" -#include "core/napi/native_source_code.h" -#include "dom/dom_node.h" + #ifdef JS_V8 -#include "core/napi/v8/js_native_api_v8.h" +#include "driver/napi/v8/js_native_api_v8.h" #endif using unicode_string_view = footstone::stringview::unicode_string_view; diff --git a/driver/js/android/.gitignore b/framework/android/.gitignore similarity index 100% rename from driver/js/android/.gitignore rename to framework/android/.gitignore diff --git a/driver/js/android/build.gradle b/framework/android/build.gradle similarity index 99% rename from driver/js/android/build.gradle rename to framework/android/build.gradle index 06e118346a3..59a069468ee 100644 --- a/driver/js/android/build.gradle +++ b/framework/android/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'com.android.library' apply from: './mavencentral.gradle' ext { - CMAKE_PATH = "$projectDir.absolutePath/src/main/jni/CMakeLists.txt" + CMAKE_PATH = "src/main/cpp/CMakeLists.txt" OUTPUT_PATH = "$buildDir/outputs/aar" skipCmakeAndNinja = System.getenv('skipCmakeAndNinja') != null } diff --git a/driver/js/android/gradle.properties b/framework/android/gradle.properties similarity index 100% rename from driver/js/android/gradle.properties rename to framework/android/gradle.properties diff --git a/driver/js/android/mavencentral.gradle b/framework/android/mavencentral.gradle similarity index 100% rename from driver/js/android/mavencentral.gradle rename to framework/android/mavencentral.gradle diff --git a/driver/js/android/proguard-rules.pro b/framework/android/proguard-rules.pro similarity index 100% rename from driver/js/android/proguard-rules.pro rename to framework/android/proguard-rules.pro diff --git a/driver/js/android/src/main/AndroidManifest.xml b/framework/android/src/main/AndroidManifest.xml similarity index 100% rename from driver/js/android/src/main/AndroidManifest.xml rename to framework/android/src/main/AndroidManifest.xml diff --git a/driver/js/android/src/main/jni/CMakeLists.txt b/framework/android/src/main/cpp/CMakeLists.txt similarity index 70% rename from driver/js/android/src/main/jni/CMakeLists.txt rename to framework/android/src/main/cpp/CMakeLists.txt index 8873b7bd046..3f0b18fa0c4 100644 --- a/driver/js/android/src/main/jni/CMakeLists.txt +++ b/framework/android/src/main/cpp/CMakeLists.txt @@ -22,7 +22,7 @@ cmake_minimum_required(VERSION 3.14) project("hippy") -get_filename_component(PROJECT_ROOT_DIR "${PROJECT_SOURCE_DIR}/../../../../../.." REALPATH) +get_filename_component(PROJECT_ROOT_DIR "${PROJECT_SOURCE_DIR}/../../../../.." REALPATH) include("${PROJECT_ROOT_DIR}/buildconfig/cmake/GlobalPackagesModule.cmake") include("${PROJECT_ROOT_DIR}/buildconfig/cmake/compiler_toolchain.cmake") @@ -47,47 +47,55 @@ if (${ANDROID_STL} STREQUAL "c++_static") endif () # endregion +# region v8 +if ("${JS_ENGINE}" STREQUAL "V8") + GlobalPackages_Add(v8) + target_link_libraries(${PROJECT_NAME} PRIVATE v8) + get_target_property(V8_WITHOUT_INSPECTOR v8 INTERFACE_V8_WITHOUT_INSPECTOR) + if (V8_WITHOUT_INSPECTOR) + target_compile_definitions(${PROJECT_NAME} PRIVATE "V8_WITHOUT_INSPECTOR") + endif () +endif () +# endregion + # region footstone GlobalPackages_Add(footstone) target_link_libraries(${PROJECT_NAME} PRIVATE footstone) # endregion +# region js_driver +add_subdirectory(${PROJECT_ROOT_DIR}/driver/js ${CMAKE_CURRENT_BINARY_DIR}/driver/js) +target_link_libraries(${PROJECT_NAME} PRIVATE js_driver) +# endregion + +# region dom +GlobalPackages_Add(dom) +target_link_libraries(${PROJECT_NAME} PRIVATE dom) +# endregion + # region jni GlobalPackages_Add(jni) target_link_libraries(${PROJECT_NAME} PRIVATE jni) # endregion -# region core -add_subdirectory(${PROJECT_ROOT_DIR}/driver/js/core ${CMAKE_CURRENT_BINARY_DIR}/core) -target_link_libraries(${PROJECT_NAME} PRIVATE core) -# endregion - -# region v8 -GlobalPackages_Add(v8) -target_link_libraries(${PROJECT_NAME} PRIVATE v8) -get_target_property(V8_WITHOUT_INSPECTOR v8 INTERFACE_V8_WITHOUT_INSPECTOR) -if (V8_WITHOUT_INSPECTOR) - target_compile_definitions(${PROJECT_NAME} PRIVATE "V8_WITHOUT_INSPECTOR") -endif () +# region native renderer +add_subdirectory(${PROJECT_ROOT_DIR}/renderer/native/android/src/main/jni ${CMAKE_CURRENT_BINARY_DIR}/renderer/native) +target_link_libraries(${PROJECT_NAME} PUBLIC native_renderer) # endregion # region source set set(SOURCE_SET - src/bridge/bridge.cc src/bridge/entry.cc src/bridge/java2js.cc src/bridge/js2java.cc src/bridge/native_source_code_android.cc src/jni/exception_handler.cc src/jni/uri.cc - src/loader/adr_loader.cc) -# TODO: modify the conditions, when moving into the framework -if (TARGET native_renderer) - list(APPEND SOURCE_SET - src/jni/convert_utils.cc - src/jni/turbo_module_manager.cc - src/jni/java_turbo_module.cc) -endif () + src/loader/adr_loader.cc + src/jni/convert_utils.cc + src/jni/turbo_module_manager.cc + src/jni/java_turbo_module.cc) + # This is a top-level shared library, # so the source code visibility is always PRIVATE target_sources(${PROJECT_NAME} PRIVATE ${SOURCE_SET}) diff --git a/driver/js/android/src/main/jni/include/hippy.h b/framework/android/src/main/cpp/include/bridge/bridge.h similarity index 56% rename from driver/js/android/src/main/jni/include/hippy.h rename to framework/android/src/main/cpp/include/bridge/bridge.h index 90f73f24b2c..1e3c48dd1fb 100644 --- a/driver/js/android/src/main/jni/include/hippy.h +++ b/framework/android/src/main/cpp/include/bridge/bridge.h @@ -10,7 +10,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE_2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -22,19 +22,23 @@ #pragma once -#include "bridge/entry.h" -#include "bridge/java2js.h" -#include "bridge/js2java.h" -#include "core/runtime/v8/runtime.h" -#include "core/napi/v8/serializer.h" -#include "jni/exception_handler.h" -#include "jni/jni_env.h" -#include "jni/jni_register.h" -#include "jni/jni_utils.h" +#include + #include "jni/scoped_java_ref.h" -#include "loader/adr_loader.h" -#if defined(ENABLE_INSPECTOR) && !defined(V8_WITHOUT_INSPECTOR) -#include "core/runtime/v8/inspector/v8_channel_impl.h" -#include "core/runtime/v8/inspector/v8_inspector_client_impl.h" -#endif -#include "v8/v8.h" + +constexpr uint8_t kBridgeSlot = 1; + +namespace hippy { + class Bridge { + public: + Bridge(JNIEnv* j_env, jobject j_obj): ref_(std::make_shared(j_env, j_obj)){} + inline jobject GetObj() { + return ref_->GetObj(); + } + inline std::shared_ptr GetRef() { + return ref_; + } + private: + std::shared_ptr ref_; + }; +} diff --git a/driver/js/android/src/main/jni/include/bridge/entry.h b/framework/android/src/main/cpp/include/bridge/entry.h similarity index 100% rename from driver/js/android/src/main/jni/include/bridge/entry.h rename to framework/android/src/main/cpp/include/bridge/entry.h diff --git a/driver/js/android/src/main/jni/include/bridge/java2js.h b/framework/android/src/main/cpp/include/bridge/java2js.h similarity index 100% rename from driver/js/android/src/main/jni/include/bridge/java2js.h rename to framework/android/src/main/cpp/include/bridge/java2js.h diff --git a/driver/js/android/src/main/jni/include/bridge/js2java.h b/framework/android/src/main/cpp/include/bridge/js2java.h similarity index 95% rename from driver/js/android/src/main/jni/include/bridge/js2java.h rename to framework/android/src/main/cpp/include/bridge/js2java.h index 063e4f69485..f1222f1e264 100644 --- a/driver/js/android/src/main/jni/include/bridge/js2java.h +++ b/framework/android/src/main/cpp/include/bridge/js2java.h @@ -24,7 +24,7 @@ #include -#include "core/core.h" +#include "driver/napi/v8/js_native_api_v8.h" namespace hippy { namespace bridge { diff --git a/driver/js/android/src/main/jni/include/jni/convert_utils.h b/framework/android/src/main/cpp/include/jni/convert_utils.h similarity index 97% rename from driver/js/android/src/main/jni/include/jni/convert_utils.h rename to framework/android/src/main/cpp/include/jni/convert_utils.h index d83729a34d2..8f776a374a3 100644 --- a/driver/js/android/src/main/jni/include/jni/convert_utils.h +++ b/framework/android/src/main/cpp/include/jni/convert_utils.h @@ -23,7 +23,13 @@ #pragma once #include -#include "core/core.h" + +#include +#include +#include + +#include "driver/napi/js_native_api.h" +#include "driver/napi/js_native_turbo.h" #include "jni/scoped_java_ref.h" struct JNIArgs { diff --git a/driver/js/android/src/main/jni/include/jni/exception_handler.h b/framework/android/src/main/cpp/include/jni/exception_handler.h similarity index 96% rename from driver/js/android/src/main/jni/include/jni/exception_handler.h rename to framework/android/src/main/cpp/include/jni/exception_handler.h index f812e6e8bc0..9d8414ea1b0 100644 --- a/driver/js/android/src/main/jni/include/jni/exception_handler.h +++ b/framework/android/src/main/cpp/include/jni/exception_handler.h @@ -25,7 +25,7 @@ #include #include -#include "core/runtime/v8/runtime.h" +#include "driver/runtime/v8/runtime.h" class JNIEnvironment; diff --git a/driver/js/android/src/main/jni/include/jni/java_turbo_module.h b/framework/android/src/main/cpp/include/jni/java_turbo_module.h similarity index 95% rename from driver/js/android/src/main/jni/include/jni/java_turbo_module.h rename to framework/android/src/main/cpp/include/jni/java_turbo_module.h index 164d9b14195..172ed0fdaed 100644 --- a/driver/js/android/src/main/jni/include/jni/java_turbo_module.h +++ b/framework/android/src/main/cpp/include/jni/java_turbo_module.h @@ -26,9 +26,8 @@ #include -#include "core/core.h" - -#include "convert_utils.h" +#include "driver/napi/js_native_turbo.h" +#include "jni/convert_utils.h" #include "jni/scoped_java_ref.h" class JavaTurboModule : public hippy::napi::HippyTurboModule { diff --git a/driver/js/android/src/main/jni/include/jni/turbo_module_manager.h b/framework/android/src/main/cpp/include/jni/turbo_module_manager.h similarity index 100% rename from driver/js/android/src/main/jni/include/jni/turbo_module_manager.h rename to framework/android/src/main/cpp/include/jni/turbo_module_manager.h diff --git a/driver/js/android/src/main/jni/include/jni/turbo_module_runtime.h b/framework/android/src/main/cpp/include/jni/turbo_module_runtime.h similarity index 97% rename from driver/js/android/src/main/jni/include/jni/turbo_module_runtime.h rename to framework/android/src/main/cpp/include/jni/turbo_module_runtime.h index bda9f26c63c..e2b7644cba2 100644 --- a/driver/js/android/src/main/jni/include/jni/turbo_module_runtime.h +++ b/framework/android/src/main/cpp/include/jni/turbo_module_runtime.h @@ -24,10 +24,10 @@ #include -#include "core/core.h" - #include "jni/jni_env.h" +constexpr uint8_t kTurboSlot = 2; + class TurboModuleRuntime { public: jobject turbo_module_manager_obj_; diff --git a/driver/js/android/src/main/jni/include/jni/uri.h b/framework/android/src/main/cpp/include/jni/uri.h similarity index 100% rename from driver/js/android/src/main/jni/include/jni/uri.h rename to framework/android/src/main/cpp/include/jni/uri.h diff --git a/driver/js/android/src/main/jni/include/loader/adr_loader.h b/framework/android/src/main/cpp/include/loader/adr_loader.h similarity index 96% rename from driver/js/android/src/main/jni/include/loader/adr_loader.h rename to framework/android/src/main/cpp/include/loader/adr_loader.h index 0ce28d57d35..6fc3ac1c2e6 100644 --- a/driver/js/android/src/main/jni/include/loader/adr_loader.h +++ b/framework/android/src/main/cpp/include/loader/adr_loader.h @@ -24,10 +24,12 @@ #include -#include +#include -#include "core/core.h" +#include "driver/base/uri_loader.h" #include "footstone/check.h" +#include "footstone/string_view_utils.h" +#include "footstone/task_runner.h" #include "jni/scoped_java_ref.h" template diff --git a/driver/js/android/src/main/jni/minimum_exports.lst b/framework/android/src/main/cpp/minimum_exports.lst similarity index 100% rename from driver/js/android/src/main/jni/minimum_exports.lst rename to framework/android/src/main/cpp/minimum_exports.lst diff --git a/driver/js/android/src/main/jni/src/bridge/entry.cc b/framework/android/src/main/cpp/src/bridge/entry.cc similarity index 98% rename from driver/js/android/src/main/jni/src/bridge/entry.cc rename to framework/android/src/main/cpp/src/bridge/entry.cc index 68453ebc1a0..3a2c41f3028 100644 --- a/driver/js/android/src/main/jni/src/bridge/entry.cc +++ b/framework/android/src/main/cpp/src/bridge/entry.cc @@ -34,8 +34,8 @@ #include "bridge/entry.h" #include "bridge/java2js.h" #include "bridge/js2java.h" -#include "core/runtime/v8/runtime.h" -#include "core/runtime/v8/v8_bridge_utils.h" +#include "driver/runtime/v8/runtime.h" +#include "driver/runtime/v8/v8_bridge_utils.h" #include "dom/animation/animation_manager.h" #include "dom/dom_manager.h" #include "dom/node_props.h" @@ -46,14 +46,15 @@ #include "footstone/string_view_utils.h" #include "footstone/worker_manager.h" #include "jni/exception_handler.h" +#include "jni/java_turbo_module.h" #include "jni/jni_env.h" #include "jni/jni_register.h" -#include "jni/uri.h" #include "jni/jni_utils.h" +#include "jni/turbo_module_manager.h" +#include "jni/uri.h" #include "loader/adr_loader.h" + #ifdef ANDROID_NATIVE_RENDER -#include "jni/java_turbo_module.h" -#include "jni/turbo_module_manager.h" #include "render/native_render_manager.h" #include "render/native_render_jni.h" #endif @@ -142,7 +143,7 @@ using u8string = unicode_string_view::u8string; using StringViewUtils = hippy::base::StringViewUtils; using V8BridgeUtils = hippy::runtime::V8BridgeUtils; using Ctx = hippy::napi::Ctx; -using ADRBridge = hippy::ADRBridge; +using Bridge = hippy::Bridge; using V8VMInitParam = hippy::napi::V8VMInitParam; using RegisterFunction = hippy::base::RegisterFunction; @@ -374,8 +375,10 @@ jboolean RunScriptFromUri(JNIEnv* j_env, }); std::shared_ptr loader = std::make_shared(); - auto bridge = std::static_pointer_cast(runtime->GetBridge()); - loader->SetBridge(bridge->GetRef()); + FOOTSTONE_DCHECK(runtime->HasData(kBridgeSlot)); + auto bridge = std::any_cast>(runtime->GetData(kBridgeSlot)); + auto ref = bridge->GetRef(); + loader->SetBridge(ref); loader->SetWorkerTaskRunner(runtime->GetEngine()->GetWorkerTaskRunner()); runtime->GetScope()->SetUriLoader(loader); AAssetManager* aasset_manager = nullptr; @@ -462,7 +465,6 @@ jlong InitInstance(JNIEnv* j_env, const unicode_string_view& stack) { ExceptionHandler::ReportJsException(runtime, desc, stack); }); - std::shared_ptr bridge = std::make_shared(j_env, j_object); const unicode_string_view data_dir = JniUtils::ToStrView(j_env, j_data_dir); const unicode_string_view ws_url = JniUtils::ToStrView(j_env, j_ws_url); std::shared_ptr worker_manager; @@ -480,7 +482,7 @@ jlong InitInstance(JNIEnv* j_env, worker_manager, dom_task_runner, param, - bridge, + std::make_shared(j_env, j_object), scope_cb, call_native_cb, data_dir, @@ -549,10 +551,11 @@ jint JNI_OnLoad(JavaVM* j_vm, __unused void* reserved) { JNIEnvironment::GetInstance()->init(j_vm, j_env); Uri::Init(); -#ifdef ANDROID_NATIVE_RENDER ConvertUtils::Init(); JavaTurboModule::Init(); TurboModuleManager::Init(); + +#ifdef ANDROID_NATIVE_RENDER NativeRenderJni::Init(); #endif @@ -563,12 +566,12 @@ void JNI_OnUnload(__unused JavaVM* j_vm, __unused void* reserved) { hippy::napi::V8VM::PlatformDestroy(); Uri::Destroy(); -#ifdef ANDROID_NATIVE_RENDER ConvertUtils::Destroy(); JavaTurboModule::Destroy(); TurboModuleManager::Destroy(); + +#ifdef ANDROID_NATIVE_RENDER NativeRenderJni::Destroy(); #endif - JNIEnvironment::DestroyInstance(); } diff --git a/driver/js/android/src/main/jni/src/bridge/java2js.cc b/framework/android/src/main/cpp/src/bridge/java2js.cc similarity index 98% rename from driver/js/android/src/main/jni/src/bridge/java2js.cc rename to framework/android/src/main/cpp/src/bridge/java2js.cc index bf0fb024a8b..a978148ba2a 100644 --- a/driver/js/android/src/main/jni/src/bridge/java2js.cc +++ b/framework/android/src/main/cpp/src/bridge/java2js.cc @@ -25,8 +25,8 @@ #include #include "bridge/js2java.h" -#include "core/runtime/v8/runtime.h" -#include "core/runtime/v8/v8_bridge_utils.h" +#include "driver/runtime/v8/runtime.h" +#include "driver/runtime/v8/v8_bridge_utils.h" #include "footstone/string_view_utils.h" #include "jni/jni_register.h" #include "jni/jni_utils.h" diff --git a/driver/js/android/src/main/jni/src/bridge/js2java.cc b/framework/android/src/main/cpp/src/bridge/js2java.cc similarity index 89% rename from driver/js/android/src/main/jni/src/bridge/js2java.cc rename to framework/android/src/main/cpp/src/bridge/js2java.cc index c9eac9b9ebb..8ec99ccc2f2 100644 --- a/driver/js/android/src/main/jni/src/bridge/js2java.cc +++ b/framework/android/src/main/cpp/src/bridge/js2java.cc @@ -24,14 +24,14 @@ #include +#include "bridge/bridge.h" +#include "driver/runtime/v8/v8_bridge_utils.h" +#include "driver/napi/v8/serializer.h" #include "footstone/logging.h" -#include "footstone/unicode_string_view.h" -#include "core/runtime/v8/v8_bridge_utils.h" #include "footstone/string_view_utils.h" -#include "core/napi/v8/serializer.h" +#include "footstone/unicode_string_view.h" #include "jni/jni_env.h" #include "jni/jni_utils.h" -#include "bridge/bridge.h" namespace hippy::bridge { @@ -68,9 +68,9 @@ void CallNative(hippy::napi::CBDataTuple* data) { j_method = instance->GetMethods().j_call_natives_method_id; } - auto bridge = std::static_pointer_cast(runtime->GetBridge()); - j_env->CallVoidMethod(bridge->GetObj(), j_method, j_module, - j_func, j_cb_id, j_buffer); + FOOTSTONE_DCHECK(runtime->HasData(kBridgeSlot)); + auto bridge = std::any_cast>(runtime->GetData(kBridgeSlot)); + j_env->CallVoidMethod(bridge->GetObj(), j_method, j_module, j_func, j_cb_id, j_buffer); JNIEnvironment::ClearJEnvException(j_env); // delete local ref diff --git a/driver/js/android/src/main/jni/src/bridge/native_source_code_android.cc b/framework/android/src/main/cpp/src/bridge/native_source_code_android.cc similarity index 99% rename from driver/js/android/src/main/jni/src/bridge/native_source_code_android.cc rename to framework/android/src/main/cpp/src/bridge/native_source_code_android.cc index be0b2c9aa9f..36d4b0627c8 100644 --- a/driver/js/android/src/main/jni/src/bridge/native_source_code_android.cc +++ b/framework/android/src/main/cpp/src/bridge/native_source_code_android.cc @@ -20,8 +20,8 @@ #include -#include "core/napi/native_source_code.h" -#include "core/base/macros.h" +#include "driver/napi/native_source_code.h" +#include "driver/base/macros.h" // clang-format off diff --git a/driver/js/android/src/main/jni/src/jni/convert_utils.cc b/framework/android/src/main/cpp/src/jni/convert_utils.cc similarity index 99% rename from driver/js/android/src/main/jni/src/jni/convert_utils.cc rename to framework/android/src/main/cpp/src/jni/convert_utils.cc index 3e58ed6ec0c..b07ea869726 100644 --- a/driver/js/android/src/main/jni/src/jni/convert_utils.cc +++ b/framework/android/src/main/cpp/src/jni/convert_utils.cc @@ -25,7 +25,9 @@ #include #include +#include "driver/napi/v8/js_native_api_v8.h" #include "footstone/check.h" +#include "footstone/string_view_utils.h" #include "jni/java_turbo_module.h" #include "jni/jni_env.h" #include "jni/jni_utils.h" diff --git a/driver/js/android/src/main/jni/src/jni/exception_handler.cc b/framework/android/src/main/cpp/src/jni/exception_handler.cc similarity index 84% rename from driver/js/android/src/main/jni/src/jni/exception_handler.cc rename to framework/android/src/main/cpp/src/jni/exception_handler.cc index 9c60b0b6d45..ef2e5fad910 100644 --- a/driver/js/android/src/main/jni/src/jni/exception_handler.cc +++ b/framework/android/src/main/cpp/src/jni/exception_handler.cc @@ -22,10 +22,10 @@ #include "jni/exception_handler.h" -#include "core/core.h" +#include "bridge/bridge.h" +#include "footstone/string_view_utils.h" #include "jni/jni_env.h" #include "jni/jni_utils.h" -#include "bridge/bridge.h" using StringViewUtils = hippy::base::StringViewUtils; @@ -38,12 +38,11 @@ void ExceptionHandler::ReportJsException(const std::shared_ptr& runtime jstring j_exception = JniUtils::StrViewToJString(j_env, desc); jstring j_stack_trace = JniUtils::StrViewToJString(j_env, stack); - if (runtime->GetBridge()) { - auto bridge = std::static_pointer_cast(runtime->GetBridge()); + if (runtime->HasData(kBridgeSlot)) { + auto slot = runtime->GetData(kBridgeSlot); + auto bridge = std::any_cast>(slot); j_env->CallVoidMethod(bridge->GetObj(), - JNIEnvironment::GetInstance() - ->GetMethods() - .j_report_exception_method_id, + JNIEnvironment::GetInstance()->GetMethods().j_report_exception_method_id, j_exception, j_stack_trace); JNIEnvironment::ClearJEnvException(j_env); } diff --git a/driver/js/android/src/main/jni/src/jni/java_turbo_module.cc b/framework/android/src/main/cpp/src/jni/java_turbo_module.cc similarity index 98% rename from driver/js/android/src/main/jni/src/jni/java_turbo_module.cc rename to framework/android/src/main/cpp/src/jni/java_turbo_module.cc index 4ef9c1d4472..b23afa5134c 100644 --- a/driver/js/android/src/main/jni/src/jni/java_turbo_module.cc +++ b/framework/android/src/main/cpp/src/jni/java_turbo_module.cc @@ -21,6 +21,9 @@ */ #include "jni/java_turbo_module.h" + +#include "driver/napi/v8/js_native_api_v8.h" +#include "footstone/string_view_utils.h" #include "jni/jni_env.h" #include "jni/jni_utils.h" diff --git a/driver/js/android/src/main/jni/src/jni/turbo_module_manager.cc b/framework/android/src/main/cpp/src/jni/turbo_module_manager.cc similarity index 77% rename from driver/js/android/src/main/jni/src/jni/turbo_module_manager.cc rename to framework/android/src/main/cpp/src/jni/turbo_module_manager.cc index 98403a21723..ba6a08dbe26 100644 --- a/driver/js/android/src/main/jni/src/jni/turbo_module_manager.cc +++ b/framework/android/src/main/cpp/src/jni/turbo_module_manager.cc @@ -24,11 +24,15 @@ #include -#include "core/runtime/v8/runtime.h" -#include "core/napi/v8/js_native_api_v8.h" +#include "driver/runtime/v8/runtime.h" +#include "driver/napi/v8/js_native_api_v8.h" +#include "driver/napi/v8/js_native_turbo_v8.h" +#include "footstone/string_view_utils.h" #include "jni/java_turbo_module.h" +#include "jni/jni_env.h" #include "jni/jni_register.h" #include "jni/jni_utils.h" +#include "jni/turbo_module_runtime.h" REGISTER_JNI("com/tencent/mtt/hippy/bridge/jsi/TurboModuleManager", // NOLINT(cert-err58-cpp) "install", @@ -40,7 +44,7 @@ using unicode_string_view = footstone::stringview::unicode_string_view; using StringViewUtils = hippy::base::StringViewUtils; jclass turbo_module_manager_clazz; -jmethodID get_method_id; +jmethodID j_method_id; /** * com.tencent.mtt.hippy.bridge.jsi.TurboModuleManager.get @@ -48,14 +52,16 @@ jmethodID get_method_id; std::shared_ptr QueryTurboModuleImpl(std::shared_ptr &runtime, const std::string &module_name) { FOOTSTONE_DLOG(INFO) << "enter QueryTurboModuleImpl " << module_name.c_str(); - JNIEnv *env = JNIEnvironment::GetInstance()->AttachCurrentThread(); - jstring name = env->NewStringUTF(module_name.c_str()); - jobject module_impl = env->CallObjectMethod( - runtime->GetTurboModuleRuntime()->turbo_module_manager_obj_, - get_method_id, name); - auto result = std::make_shared(env, module_impl); - env->DeleteLocalRef(name); - env->DeleteLocalRef(module_impl); + JNIEnv *j_env = JNIEnvironment::GetInstance()->AttachCurrentThread(); + jstring j_name = j_env->NewStringUTF(module_name.c_str()); + FOOTSTONE_DCHECK(runtime->HasData(kTurboSlot)); + auto turbo_runtime = std::any_cast>(runtime->GetData(kTurboSlot)); + jobject module_impl = j_env->CallObjectMethod( + turbo_runtime->turbo_module_manager_obj_, + j_method_id, j_name); + auto result = std::make_shared(j_env, module_impl); + j_env->DeleteLocalRef(j_name); + j_env->DeleteLocalRef(module_impl); return result; } @@ -65,8 +71,7 @@ void GetTurboModule(const v8::FunctionCallbackInfo &info) { int64_t runtime_key = (reinterpret_cast(data->Value())); auto runtime = Runtime::Find(footstone::check::checked_numeric_cast(runtime_key)); - std::shared_ptr ctx = - std::static_pointer_cast(runtime->GetScope()->GetContext()); + std::shared_ptr ctx = std::static_pointer_cast(runtime->GetScope()->GetContext()); std::shared_ptr v8_ctx = std::static_pointer_cast(ctx); auto isolate = v8_ctx->isolate_; v8::HandleScope handle_scope(isolate); @@ -79,16 +84,14 @@ void GetTurboModule(const v8::FunctionCallbackInfo &info) { v8::String::Utf8Value module_name(info.GetIsolate(), info[0]); std::string name = module_name.operator*(); - std::shared_ptr turbo_module_runtime = - runtime->GetTurboModuleRuntime(); - if (!turbo_module_runtime) { + if (!runtime->HasData(kTurboSlot)) { FOOTSTONE_LOG(ERROR) << "getTurboModule but turboModuleRuntime is null"; info.GetReturnValue().SetUndefined(); return; } - - std::shared_ptr result = - turbo_module_runtime->module_cache_[name]; + auto slot = runtime->GetData(kTurboSlot); + auto turbo_module_runtime = std::any_cast>(slot); + std::shared_ptr result = turbo_module_runtime->module_cache_[name]; if (!result) { // 2. if not cached, query from Java std::shared_ptr module_impl = @@ -155,16 +158,14 @@ void BindNativeFunction(const std::shared_ptr& runtime, } void TurboModuleManager::Init() { - JNIEnv *env = JNIEnvironment::GetInstance()->AttachCurrentThread(); - jclass clazz = - env->FindClass("com/tencent/mtt/hippy/bridge/jsi/TurboModuleManager"); - turbo_module_manager_clazz = reinterpret_cast(env->NewGlobalRef(clazz)); - env->DeleteLocalRef(clazz); - - get_method_id = - env->GetMethodID(turbo_module_manager_clazz, "get", - "(Ljava/lang/String;)Lcom/tencent/mtt/hippy/modules/" - "nativemodules/HippyNativeModuleBase;"); + JNIEnv *j_env = JNIEnvironment::GetInstance()->AttachCurrentThread(); + jclass j_class = j_env->FindClass("com/tencent/mtt/hippy/bridge/jsi/TurboModuleManager"); + turbo_module_manager_clazz = reinterpret_cast(j_env->NewGlobalRef(j_class)); + j_env->DeleteLocalRef(j_class); + + j_method_id = j_env->GetMethodID(turbo_module_manager_clazz, "get", + "(Ljava/lang/String;)Lcom/tencent/mtt/hippy/modules/" + "nativemodules/HippyNativeModuleBase;"); } void TurboModuleManager::Destroy() { @@ -173,7 +174,7 @@ void TurboModuleManager::Destroy() { env->DeleteGlobalRef(turbo_module_manager_clazz); } - get_method_id = nullptr; + j_method_id = nullptr; } int Install(JNIEnv *, jobject j_obj, jlong j_runtime_id) { @@ -184,7 +185,7 @@ int Install(JNIEnv *, jobject j_obj, jlong j_runtime_id) { return -1; } - runtime->SetTurboModuleRuntime(std::make_shared(j_obj)); + runtime->SetData(kTurboSlot, std::make_shared(j_obj)); // v8的操作放到js线程 auto runner = runtime->GetEngine()->GetJsTaskRunner(); diff --git a/driver/js/android/src/main/jni/src/jni/uri.cc b/framework/android/src/main/cpp/src/jni/uri.cc similarity index 99% rename from driver/js/android/src/main/jni/src/jni/uri.cc rename to framework/android/src/main/cpp/src/jni/uri.cc index ec70fd07875..f0d84f4d2f1 100644 --- a/driver/js/android/src/main/jni/src/jni/uri.cc +++ b/framework/android/src/main/cpp/src/jni/uri.cc @@ -22,7 +22,7 @@ #include "jni/uri.h" -#include "core/core.h" +#include "footstone/string_view_utils.h" #include "jni/jni_env.h" #include "jni/jni_utils.h" diff --git a/driver/js/android/src/main/jni/src/loader/adr_loader.cc b/framework/android/src/main/cpp/src/loader/adr_loader.cc similarity index 99% rename from driver/js/android/src/main/jni/src/loader/adr_loader.cc rename to framework/android/src/main/cpp/src/loader/adr_loader.cc index 24d23ebaf1d..5731bcf9f0c 100644 --- a/driver/js/android/src/main/jni/src/loader/adr_loader.cc +++ b/framework/android/src/main/cpp/src/loader/adr_loader.cc @@ -24,7 +24,8 @@ #include -#include "core/runtime/v8/runtime.h" +#include "driver/runtime/v8/runtime.h" +#include "driver/base/file.h" #include "footstone/string_view_utils.h" #include "jni/jni_env.h" #include "jni/jni_register.h" diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyAPIProvider.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyAPIProvider.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyAPIProvider.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/HippyAPIProvider.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyEngine.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngine.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyEngine.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngine.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyEngineContext.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineContext.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyEngineContext.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineContext.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyEngineHost.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineHost.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyEngineHost.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineHost.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyEngineLifecycleEventListener.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineLifecycleEventListener.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyEngineLifecycleEventListener.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineLifecycleEventListener.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManager.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManager.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManager.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManager.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManagerImpl.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManagerImpl.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManagerImpl.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManagerImpl.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyGlobalConfigs.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyGlobalConfigs.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyGlobalConfigs.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/HippyGlobalConfigs.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyInstanceContext.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyInstanceContext.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyInstanceContext.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/HippyInstanceContext.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyNormalEngineManager.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyNormalEngineManager.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyNormalEngineManager.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/HippyNormalEngineManager.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyRootViewParams.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyRootViewParams.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/HippyRootViewParams.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/HippyRootViewParams.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/HippySingleThreadEngineManager.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippySingleThreadEngineManager.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/HippySingleThreadEngineManager.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/HippySingleThreadEngineManager.java diff --git a/framework/android/src/main/java/com/tencent/mtt/hippy/IHippyNativeLogHandler.java b/framework/android/src/main/java/com/tencent/mtt/hippy/IHippyNativeLogHandler.java new file mode 100644 index 00000000000..fbf0a716765 --- /dev/null +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/IHippyNativeLogHandler.java @@ -0,0 +1,23 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.tencent.mtt.hippy; + +@SuppressWarnings({"unused"}) +public interface IHippyNativeLogHandler { + + void onReceiveNativeLogMessage(String msg); +} diff --git a/framework/android/src/main/java/com/tencent/mtt/hippy/NativeAccess.java b/framework/android/src/main/java/com/tencent/mtt/hippy/NativeAccess.java new file mode 100644 index 00000000000..2dab12bbed8 --- /dev/null +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/NativeAccess.java @@ -0,0 +1,34 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.tencent.mtt.hippy; + +import com.tencent.mtt.hippy.runtime.builtins.JSSharedArrayBuffer; +import com.tencent.mtt.hippy.runtime.builtins.wasm.WasmModule; + +@SuppressWarnings("JavaJniMissingFunction") +public class NativeAccess { + + private NativeAccess() { + + } + + // region bridge.serialization.delegate + public static native JSSharedArrayBuffer getSharedArrayBufferFromId(int clone_id); + + public static native WasmModule getWasmModuleFromId(int transfer_id); + // endregion +} diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/DefaultLogAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/DefaultLogAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/DefaultLogAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/DefaultLogAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/HippyLogAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/HippyLogAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/HippyLogAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/HippyLogAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/device/DefaultDeviceAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/device/DefaultDeviceAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/device/DefaultDeviceAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/device/DefaultDeviceAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/device/HippyDeviceAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/device/HippyDeviceAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/device/HippyDeviceAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/device/HippyDeviceAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/exception/DefaultExceptionHandler.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/exception/DefaultExceptionHandler.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/exception/DefaultExceptionHandler.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/exception/DefaultExceptionHandler.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/exception/HippyExceptionHandlerAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/exception/HippyExceptionHandlerAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/exception/HippyExceptionHandlerAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/exception/HippyExceptionHandlerAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/executor/DefaultExecutorSupplierAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/executor/DefaultExecutorSupplierAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/executor/DefaultExecutorSupplierAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/executor/DefaultExecutorSupplierAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/executor/HippyExecutorSupplierAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/executor/HippyExecutorSupplierAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/executor/HippyExecutorSupplierAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/executor/HippyExecutorSupplierAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/font/DefaultFontScaleAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/font/DefaultFontScaleAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/font/DefaultFontScaleAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/font/DefaultFontScaleAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/font/HippyFontScaleAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/font/HippyFontScaleAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/font/HippyFontScaleAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/font/HippyFontScaleAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/http/DefaultHttpAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/http/DefaultHttpAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/http/DefaultHttpAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/http/DefaultHttpAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HippyHttpAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HippyHttpAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HippyHttpAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HippyHttpAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HippyHttpRequest.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HippyHttpRequest.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HippyHttpRequest.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HippyHttpRequest.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HippyHttpResponse.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HippyHttpResponse.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HippyHttpResponse.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HippyHttpResponse.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HttpHeader.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HttpHeader.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HttpHeader.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/http/HttpHeader.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/monitor/DefaultEngineMonitorAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/monitor/DefaultEngineMonitorAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/monitor/DefaultEngineMonitorAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/monitor/DefaultEngineMonitorAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/monitor/HippyEngineMonitorAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/monitor/HippyEngineMonitorAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/monitor/HippyEngineMonitorAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/monitor/HippyEngineMonitorAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/monitor/HippyEngineMonitorEvent.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/monitor/HippyEngineMonitorEvent.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/monitor/HippyEngineMonitorEvent.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/monitor/HippyEngineMonitorEvent.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/sharedpreferences/DefaultSharedPreferencesAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/sharedpreferences/DefaultSharedPreferencesAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/sharedpreferences/DefaultSharedPreferencesAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/sharedpreferences/DefaultSharedPreferencesAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/sharedpreferences/HippySharedPreferencesAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/sharedpreferences/HippySharedPreferencesAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/sharedpreferences/HippySharedPreferencesAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/sharedpreferences/HippySharedPreferencesAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/soloader/DefaultSoLoaderAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/soloader/DefaultSoLoaderAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/soloader/DefaultSoLoaderAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/soloader/DefaultSoLoaderAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/soloader/HippySoLoaderAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/soloader/HippySoLoaderAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/soloader/HippySoLoaderAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/soloader/HippySoLoaderAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/DefaultStorageAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/DefaultStorageAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/DefaultStorageAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/DefaultStorageAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/HippyStorageAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/HippyStorageAdapter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/HippyStorageAdapter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/HippyStorageAdapter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/HippyStorageKeyValue.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/HippyStorageKeyValue.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/HippyStorageKeyValue.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/HippyStorageKeyValue.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/IHippySQLiteHelper.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/IHippySQLiteHelper.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/IHippySQLiteHelper.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/IHippySQLiteHelper.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/SQLiteHelper.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/SQLiteHelper.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/SQLiteHelper.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/adapter/storage/SQLiteHelper.java diff --git a/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/thirdparty/HippyThirdPartyAdapter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/thirdparty/HippyThirdPartyAdapter.java new file mode 100644 index 00000000000..4ec5dfabac8 --- /dev/null +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/adapter/thirdparty/HippyThirdPartyAdapter.java @@ -0,0 +1,39 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.tencent.mtt.hippy.adapter.thirdparty; + +import org.json.JSONObject; + +@SuppressWarnings({"unused"}) +public abstract class HippyThirdPartyAdapter { + + public abstract void onRuntimeInit(long runtimeId); + + public abstract void onRuntimeDestroy(); + + public abstract String getPackageName(); + + public abstract String getAppVersion(); + + public abstract void setPageUrl(String url); + + public abstract String getPageUrl(); + + public abstract void setExtraData(JSONObject extraData); + + public abstract JSONObject getExtraData(); +} diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridge.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridge.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridge.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridge.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeImpl.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeImpl.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeImpl.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeImpl.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManager.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManager.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManager.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManager.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyCallNativeParams.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyCallNativeParams.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyCallNativeParams.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyCallNativeParams.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyCoreAPI.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyCoreAPI.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyCoreAPI.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyCoreAPI.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/NativeCallback.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/NativeCallback.java similarity index 65% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/NativeCallback.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/NativeCallback.java index 90f1bb06c17..34cb13d2339 100644 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/NativeCallback.java +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/NativeCallback.java @@ -1,3 +1,19 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.tencent.mtt.hippy.bridge; import android.os.Handler; diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyAssetBundleLoader.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyAssetBundleLoader.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyAssetBundleLoader.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyAssetBundleLoader.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyBundleLoader.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyBundleLoader.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyBundleLoader.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyBundleLoader.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyFileBundleLoader.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyFileBundleLoader.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyFileBundleLoader.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyFileBundleLoader.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyRemoteBundleLoader.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyRemoteBundleLoader.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyRemoteBundleLoader.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/bundleloader/HippyRemoteBundleLoader.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/jsi/TurboModuleManager.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/jsi/TurboModuleManager.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/jsi/TurboModuleManager.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/jsi/TurboModuleManager.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/libraryloader/LibraryLoader.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/libraryloader/LibraryLoader.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/libraryloader/LibraryLoader.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/libraryloader/LibraryLoader.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/DeserializerDelegate.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/DeserializerDelegate.java similarity index 61% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/DeserializerDelegate.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/DeserializerDelegate.java index c3a4c6e72e7..091f6d84cff 100644 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/DeserializerDelegate.java +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/DeserializerDelegate.java @@ -1,3 +1,19 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.tencent.mtt.hippy.bridge.serialization.delegate; import com.tencent.mtt.hippy.NativeAccess; diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/SerializerDelegate.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/SerializerDelegate.java similarity index 75% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/SerializerDelegate.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/SerializerDelegate.java index e4707ee6cfd..31626499656 100644 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/SerializerDelegate.java +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/SerializerDelegate.java @@ -1,3 +1,19 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.tencent.mtt.hippy.bridge.serialization.delegate; import com.tencent.mtt.hippy.exception.UnexpectedTypeException; diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/SerializerDelegateHost.java b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/SerializerDelegateHost.java similarity index 59% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/SerializerDelegateHost.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/SerializerDelegateHost.java index 1e7e5eb375c..de3a8bba3b4 100644 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/SerializerDelegateHost.java +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/bridge/serialization/delegate/SerializerDelegateHost.java @@ -1,3 +1,19 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.tencent.mtt.hippy.bridge.serialization.delegate; import com.tencent.mtt.hippy.runtime.builtins.JSSharedArrayBuffer; diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/common/Callback.java b/framework/android/src/main/java/com/tencent/mtt/hippy/common/Callback.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/common/Callback.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/common/Callback.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/common/ConstantValue.java b/framework/android/src/main/java/com/tencent/mtt/hippy/common/ConstantValue.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/common/ConstantValue.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/common/ConstantValue.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/common/HippyJsException.java b/framework/android/src/main/java/com/tencent/mtt/hippy/common/HippyJsException.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/common/HippyJsException.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/common/HippyJsException.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/common/ThreadExecutorManager.java b/framework/android/src/main/java/com/tencent/mtt/hippy/common/ThreadExecutorManager.java similarity index 81% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/common/ThreadExecutorManager.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/common/ThreadExecutorManager.java index 2530d8902a6..51a6e760838 100644 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/common/ThreadExecutorManager.java +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/common/ThreadExecutorManager.java @@ -1,3 +1,19 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.tencent.mtt.hippy.common; import com.tencent.mtt.hippy.HippyEngine; diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/BundleFetchCallBack.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/BundleFetchCallBack.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/BundleFetchCallBack.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/BundleFetchCallBack.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DebugWebSocketClient.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DebugWebSocketClient.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DebugWebSocketClient.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DebugWebSocketClient.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevExceptionDialog.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevExceptionDialog.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevExceptionDialog.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevExceptionDialog.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevFactory.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevFactory.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevFactory.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevFactory.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevFloatButton.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevFloatButton.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevFloatButton.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevFloatButton.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteDebugManager.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteDebugManager.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteDebugManager.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteDebugManager.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteDebugProxy.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteDebugProxy.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteDebugProxy.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteDebugProxy.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteServerData.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteServerData.java similarity index 78% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteServerData.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteServerData.java index 9fcfeff21da..e25e5bff4ca 100644 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteServerData.java +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevRemoteServerData.java @@ -1,3 +1,19 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.tencent.mtt.hippy.devsupport; import android.text.TextUtils; diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerCallBack.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerCallBack.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerCallBack.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerCallBack.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerConfig.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerConfig.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerConfig.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerConfig.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerException.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerException.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerException.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerException.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerHelper.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerHelper.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerHelper.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerHelper.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerImpl.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerImpl.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerImpl.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerImpl.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerImplDisable.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerImplDisable.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerImplDisable.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerImplDisable.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerInterface.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerInterface.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerInterface.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevServerInterface.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevSupportManager.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevSupportManager.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevSupportManager.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/DevSupportManager.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/JavascriptException.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/JavascriptException.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/JavascriptException.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/JavascriptException.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/LiveReloadController.java b/framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/LiveReloadController.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/devsupport/LiveReloadController.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/devsupport/LiveReloadController.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModuleANRMonitor.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModuleANRMonitor.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModuleANRMonitor.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModuleANRMonitor.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModuleManager.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModuleManager.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModuleManager.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModuleManager.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModuleManagerImpl.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModuleManagerImpl.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModuleManagerImpl.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModuleManagerImpl.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModulePromise.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModulePromise.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModulePromise.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/HippyModulePromise.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/PromiseImpl.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/PromiseImpl.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/PromiseImpl.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/PromiseImpl.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/Dimensions.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/Dimensions.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/Dimensions.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/Dimensions.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/EventDispatcher.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/EventDispatcher.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/EventDispatcher.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/EventDispatcher.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/HippyJavaScriptModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/HippyJavaScriptModule.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/HippyJavaScriptModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/HippyJavaScriptModule.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/HippyJavaScriptModuleInvocationHandler.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/HippyJavaScriptModuleInvocationHandler.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/HippyJavaScriptModuleInvocationHandler.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/javascriptmodules/HippyJavaScriptModuleInvocationHandler.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/HippyNativeModuleBase.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/HippyNativeModuleBase.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/HippyNativeModuleBase.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/HippyNativeModuleBase.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/HippyNativeModuleInfo.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/HippyNativeModuleInfo.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/HippyNativeModuleInfo.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/HippyNativeModuleInfo.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/HippySettableFuture.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/HippySettableFuture.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/HippySettableFuture.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/HippySettableFuture.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/audio/AudioPlayerModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/audio/AudioPlayerModule.java similarity index 88% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/audio/AudioPlayerModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/audio/AudioPlayerModule.java index c1d3c4810f4..fa4170cb326 100644 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/audio/AudioPlayerModule.java +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/audio/AudioPlayerModule.java @@ -1,3 +1,19 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.tencent.mtt.hippy.modules.nativemodules.audio; import android.content.Context; diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/audio/MediaPlayerStateWrapper.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/audio/MediaPlayerStateWrapper.java similarity index 91% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/audio/MediaPlayerStateWrapper.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/audio/MediaPlayerStateWrapper.java index 6850cae7e5c..6bf0f77bc20 100644 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/audio/MediaPlayerStateWrapper.java +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/audio/MediaPlayerStateWrapper.java @@ -1,3 +1,19 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.tencent.mtt.hippy.modules.nativemodules.audio; import android.content.Context; diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/clipboard/ClipboardModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/clipboard/ClipboardModule.java similarity index 75% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/clipboard/ClipboardModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/clipboard/ClipboardModule.java index 5529aca6c56..6e2ce8c8fa7 100644 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/clipboard/ClipboardModule.java +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/clipboard/ClipboardModule.java @@ -1,3 +1,19 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.tencent.mtt.hippy.modules.nativemodules.clipboard; import android.content.ClipData; diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/console/ConsoleModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/console/ConsoleModule.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/console/ConsoleModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/console/ConsoleModule.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/debug/DevMenu.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/debug/DevMenu.java similarity index 50% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/debug/DevMenu.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/debug/DevMenu.java index 865636592cf..7b02fe1f503 100644 --- a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/debug/DevMenu.java +++ b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/debug/DevMenu.java @@ -1,3 +1,19 @@ +/* Tencent is pleased to support the open source community by making Hippy available. + * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.tencent.mtt.hippy.modules.nativemodules.debug; import com.tencent.mtt.hippy.HippyEngineContext; diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/deviceevent/DeviceEventModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/deviceevent/DeviceEventModule.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/deviceevent/DeviceEventModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/deviceevent/DeviceEventModule.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/exception/ExceptionModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/exception/ExceptionModule.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/exception/ExceptionModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/exception/ExceptionModule.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/image/ImageLoaderModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/image/ImageLoaderModule.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/image/ImageLoaderModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/image/ImageLoaderModule.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/netinfo/NetInfoModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/netinfo/NetInfoModule.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/netinfo/NetInfoModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/netinfo/NetInfoModule.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/network/NetworkModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/network/NetworkModule.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/network/NetworkModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/network/NetworkModule.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/network/WebSocketModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/network/WebSocketModule.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/network/WebSocketModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/network/WebSocketModule.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/storage/StorageModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/storage/StorageModule.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/storage/StorageModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/storage/StorageModule.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/timer/TimerModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/timer/TimerModule.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/timer/TimerModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/timer/TimerModule.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/utils/UtilsModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/utils/UtilsModule.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/utils/UtilsModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/modules/nativemodules/utils/UtilsModule.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/JSException.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/JSException.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/JSException.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/JSException.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/StackFrame.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/StackFrame.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/StackFrame.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/StackFrame.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/StackTrace.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/StackTrace.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/StackTrace.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/StackTrace.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSArrayBuffer.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSArrayBuffer.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSArrayBuffer.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSArrayBuffer.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSDataView.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSDataView.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSDataView.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSDataView.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSError.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSError.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSError.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSError.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSMap.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSMap.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSMap.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSMap.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSONDump.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSONDump.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSONDump.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSONDump.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSObject.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSObject.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSObject.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSObject.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSOddball.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSOddball.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSOddball.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSOddball.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSRegExp.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSRegExp.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSRegExp.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSRegExp.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSSet.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSSet.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSSet.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSSet.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSSharedArrayBuffer.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSSharedArrayBuffer.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSSharedArrayBuffer.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSSharedArrayBuffer.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSValue.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSValue.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSValue.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/JSValue.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/array/JSAbstractArray.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/array/JSAbstractArray.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/array/JSAbstractArray.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/array/JSAbstractArray.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/array/JSDenseArray.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/array/JSDenseArray.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/array/JSDenseArray.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/array/JSDenseArray.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/array/JSSparseArray.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/array/JSSparseArray.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/array/JSSparseArray.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/array/JSSparseArray.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSBigintObject.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSBigintObject.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSBigintObject.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSBigintObject.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSBooleanObject.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSBooleanObject.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSBooleanObject.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSBooleanObject.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSNumberObject.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSNumberObject.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSNumberObject.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSNumberObject.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSPrimitiveWrapper.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSPrimitiveWrapper.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSPrimitiveWrapper.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSPrimitiveWrapper.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSStringObject.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSStringObject.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSStringObject.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/objects/JSStringObject.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/wasm/WasmMemory.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/wasm/WasmMemory.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/wasm/WasmMemory.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/wasm/WasmMemory.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/wasm/WasmModule.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/wasm/WasmModule.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/wasm/WasmModule.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/builtins/wasm/WasmModule.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/utils/ValueConverter.java b/framework/android/src/main/java/com/tencent/mtt/hippy/runtime/utils/ValueConverter.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/runtime/utils/ValueConverter.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/runtime/utils/ValueConverter.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/serialization/compatible/Deserializer.java b/framework/android/src/main/java/com/tencent/mtt/hippy/serialization/compatible/Deserializer.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/serialization/compatible/Deserializer.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/serialization/compatible/Deserializer.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/serialization/compatible/Serializer.java b/framework/android/src/main/java/com/tencent/mtt/hippy/serialization/compatible/Serializer.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/serialization/compatible/Serializer.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/serialization/compatible/Serializer.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/serialization/recommend/Deserializer.java b/framework/android/src/main/java/com/tencent/mtt/hippy/serialization/recommend/Deserializer.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/serialization/recommend/Deserializer.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/serialization/recommend/Deserializer.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/serialization/recommend/Serializer.java b/framework/android/src/main/java/com/tencent/mtt/hippy/serialization/recommend/Serializer.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/serialization/recommend/Serializer.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/serialization/recommend/Serializer.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/utils/FileUtils.java b/framework/android/src/main/java/com/tencent/mtt/hippy/utils/FileUtils.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/utils/FileUtils.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/utils/FileUtils.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/utils/TimeMonitor.java b/framework/android/src/main/java/com/tencent/mtt/hippy/utils/TimeMonitor.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/utils/TimeMonitor.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/utils/TimeMonitor.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/websocket/Header.java b/framework/android/src/main/java/com/tencent/mtt/hippy/websocket/Header.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/websocket/Header.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/websocket/Header.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/websocket/HybiParser.java b/framework/android/src/main/java/com/tencent/mtt/hippy/websocket/HybiParser.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/websocket/HybiParser.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/websocket/HybiParser.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/websocket/StatusLine.java b/framework/android/src/main/java/com/tencent/mtt/hippy/websocket/StatusLine.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/websocket/StatusLine.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/websocket/StatusLine.java diff --git a/driver/js/android/src/main/java/com/tencent/mtt/hippy/websocket/WebSocketClient.java b/framework/android/src/main/java/com/tencent/mtt/hippy/websocket/WebSocketClient.java similarity index 100% rename from driver/js/android/src/main/java/com/tencent/mtt/hippy/websocket/WebSocketClient.java rename to framework/android/src/main/java/com/tencent/mtt/hippy/websocket/WebSocketClient.java diff --git a/driver/js/android/src/main/res/anim/fade_in.xml b/framework/android/src/main/res/anim/fade_in.xml similarity index 100% rename from driver/js/android/src/main/res/anim/fade_in.xml rename to framework/android/src/main/res/anim/fade_in.xml diff --git a/driver/js/android/src/main/res/anim/fade_out.xml b/framework/android/src/main/res/anim/fade_out.xml similarity index 100% rename from driver/js/android/src/main/res/anim/fade_out.xml rename to framework/android/src/main/res/anim/fade_out.xml diff --git a/driver/js/android/src/main/res/anim/slide_down.xml b/framework/android/src/main/res/anim/slide_down.xml similarity index 100% rename from driver/js/android/src/main/res/anim/slide_down.xml rename to framework/android/src/main/res/anim/slide_down.xml diff --git a/driver/js/android/src/main/res/anim/slide_up.xml b/framework/android/src/main/res/anim/slide_up.xml similarity index 100% rename from driver/js/android/src/main/res/anim/slide_up.xml rename to framework/android/src/main/res/anim/slide_up.xml diff --git a/driver/js/android/src/main/res/values/attrs.xml b/framework/android/src/main/res/values/attrs.xml similarity index 100% rename from driver/js/android/src/main/res/values/attrs.xml rename to framework/android/src/main/res/values/attrs.xml diff --git a/driver/js/android/src/main/res/values/themes.xml b/framework/android/src/main/res/values/themes.xml similarity index 100% rename from driver/js/android/src/main/res/values/themes.xml rename to framework/android/src/main/res/values/themes.xml diff --git a/driver/js/examples/android-demo/.gitignore b/framework/examples/android-demo/.gitignore similarity index 100% rename from driver/js/examples/android-demo/.gitignore rename to framework/examples/android-demo/.gitignore diff --git a/driver/js/examples/android-demo/build.gradle b/framework/examples/android-demo/build.gradle similarity index 98% rename from driver/js/examples/android-demo/build.gradle rename to framework/examples/android-demo/build.gradle index 2ef4f0671ee..15dd7ccac6e 100644 --- a/driver/js/examples/android-demo/build.gradle +++ b/framework/examples/android-demo/build.gradle @@ -103,7 +103,7 @@ dependencies { api (name: 'android-sdk', ext: 'aar') } else { api project(path: ':link_supplier') - api project(path: ':hippy-driver') + api project(path: ':hippy-framework') api project(path: ':hippy-support') api project(path: ':renderer-native') api project(path: ':serialization') diff --git a/driver/js/examples/android-demo/hippydemo.jks b/framework/examples/android-demo/hippydemo.jks similarity index 100% rename from driver/js/examples/android-demo/hippydemo.jks rename to framework/examples/android-demo/hippydemo.jks diff --git a/driver/js/examples/android-demo/proguard-rules.pro b/framework/examples/android-demo/proguard-rules.pro similarity index 100% rename from driver/js/examples/android-demo/proguard-rules.pro rename to framework/examples/android-demo/proguard-rules.pro diff --git a/driver/js/examples/android-demo/res/assets/defaultSource.jpg b/framework/examples/android-demo/res/assets/defaultSource.jpg similarity index 100% rename from driver/js/examples/android-demo/res/assets/defaultSource.jpg rename to framework/examples/android-demo/res/assets/defaultSource.jpg diff --git a/driver/js/examples/android-demo/res/assets/hippyLogoWhite.png b/framework/examples/android-demo/res/assets/hippyLogoWhite.png similarity index 100% rename from driver/js/examples/android-demo/res/assets/hippyLogoWhite.png rename to framework/examples/android-demo/res/assets/hippyLogoWhite.png diff --git a/driver/js/examples/android-demo/res/asyncComponentFromHttp.android.js b/framework/examples/android-demo/res/asyncComponentFromHttp.android.js similarity index 100% rename from driver/js/examples/android-demo/res/asyncComponentFromHttp.android.js rename to framework/examples/android-demo/res/asyncComponentFromHttp.android.js diff --git a/driver/js/examples/android-demo/res/asyncComponentFromLocal.android.js b/framework/examples/android-demo/res/asyncComponentFromLocal.android.js similarity index 100% rename from driver/js/examples/android-demo/res/asyncComponentFromLocal.android.js rename to framework/examples/android-demo/res/asyncComponentFromLocal.android.js diff --git a/driver/js/examples/android-demo/res/fonts/TTTGB.otf b/framework/examples/android-demo/res/fonts/TTTGB.otf similarity index 100% rename from driver/js/examples/android-demo/res/fonts/TTTGB.otf rename to framework/examples/android-demo/res/fonts/TTTGB.otf diff --git a/driver/js/examples/android-demo/res/index.android.js b/framework/examples/android-demo/res/index.android.js similarity index 100% rename from driver/js/examples/android-demo/res/index.android.js rename to framework/examples/android-demo/res/index.android.js diff --git a/driver/js/examples/android-demo/res/vendor.android.js b/framework/examples/android-demo/res/vendor.android.js similarity index 99% rename from driver/js/examples/android-demo/res/vendor.android.js rename to framework/examples/android-demo/res/vendor.android.js index 0c4e66fbae4..9d554f20952 100644 --- a/driver/js/examples/android-demo/res/vendor.android.js +++ b/framework/examples/android-demo/res/vendor.android.js @@ -1,7 +1,7 @@ var hippyReactBase=function(e){var t={};function n(r){if(t[r])return t[r].exports;var i=t[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var i in e)n.d(r,i,function(t){return e[t]}.bind(null,i));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}({"../../packages/hippy-react/dist/index.js":function(e,t,n){"use strict";n.r(t),function(e){n.d(t,"Animated",(function(){return mn})),n.d(t,"Animation",(function(){return je})),n.d(t,"AnimationSet",(function(){return Be})),n.d(t,"AppRegistry",(function(){return un})),n.d(t,"AsyncStorage",(function(){return Wn})),n.d(t,"BackAndroid",(function(){return Vn})),n.d(t,"Clipboard",(function(){return qn})),n.d(t,"ConsoleModule",(function(){return or})),n.d(t,"Dimensions",(function(){return pr})),n.d(t,"Easing",(function(){return yn})),n.d(t,"Focusable",(function(){return jn})),n.d(t,"Hippy",(function(){return lr})),n.d(t,"HippyEventEmitter",(function(){return be})),n.d(t,"HippyEventListener",(function(){return ye})),n.d(t,"HippyRegister",(function(){return Kn})),n.d(t,"Image",(function(){return hn})),n.d(t,"ImageBackground",(function(){return ur})),n.d(t,"ImageLoaderModule",(function(){return Yn})),n.d(t,"ListView",(function(){return wn})),n.d(t,"ListViewItem",(function(){return gn})),n.d(t,"Modal",(function(){return Fn})),n.d(t,"Navigator",(function(){return Sn})),n.d(t,"NetInfo",(function(){return Xn})),n.d(t,"NetworkModule",(function(){return Qn})),n.d(t,"PixelRatio",(function(){return hr})),n.d(t,"Platform",(function(){return ar})),n.d(t,"PullFooter",(function(){return vn})),n.d(t,"PullHeader",(function(){return bn})),n.d(t,"RNfqb",(function(){return sr})),n.d(t,"RNfqbEventEmitter",(function(){return fr})),n.d(t,"RNfqbEventListener",(function(){return dr})),n.d(t,"RNfqbRegister",(function(){return cr})),n.d(t,"RefreshWrapper",(function(){return kn})),n.d(t,"ScrollView",(function(){return Tn})),n.d(t,"StyleSheet",(function(){return Rn})),n.d(t,"Text",(function(){return dn})),n.d(t,"TextInput",(function(){return In})),n.d(t,"TimerModule",(function(){return ir})),n.d(t,"UIManagerModule",(function(){return Jn})),n.d(t,"View",(function(){return cn})),n.d(t,"ViewPager",(function(){return xn})),n.d(t,"WaterfallView",(function(){return Bn})),n.d(t,"WebSocket",(function(){return Dn})),n.d(t,"WebView",(function(){return Hn})),n.d(t,"callNative",(function(){return er})),n.d(t,"callNativeWithCallbackId",(function(){return nr})),n.d(t,"callNativeWithPromise",(function(){return tr})),n.d(t,"colorParse",(function(){return _e})),n.d(t,"default",(function(){return sn})),n.d(t,"flushSync",(function(){return Zn})),n.d(t,"removeNativeCallback",(function(){return rr}));var r=n("./node_modules/react/index.js"),i=n.n(r),o=n("./node_modules/@hippy/react-reconciler/index.js"),a=n.n(o);const l=["children"],s=["collapsable","style"],u=["style"],c=["children","style","imageStyle","imageRef","source","sources","src","srcs","tintColor","tintColors"],f=["children"],d=["children"],p=["children","style","renderRow","renderPullHeader","renderPullFooter","getRowType","getRowStyle","getHeaderStyle","getFooterStyle","getRowKey","dataSource","initialListSize","rowShouldSticky","onRowLayout","onHeaderPulling","onHeaderReleased","onFooterPulling","onFooterReleased","onAppear","onDisappear","onWillAppear","onWillDisappear"],h=["children"],m=["initialRoute"],y=["component"],g=["children","onPageScrollStateChanged"],b=["style","renderBanner","numberOfColumns","columnSpacing","interItemSpacing","numberOfItems","preloadItemNumber","renderItem","renderPullHeader","renderPullFooter","getItemType","getItemKey","getItemStyle","contentInset","onItemLayout","onHeaderPulling","onHeaderReleased","onFooterPulling","onFooterReleased","containPullHeader","containPullFooter","containBannerView"];function v(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function w(e){for(var t=1;t=0||(i[n]=e[n]);return i} /*! * @hippy/react v2.2.1 - * Build at: Mon Aug 01 2022 14:36:46 GMT+0800 (China Standard Time) + * Build at: Mon Aug 08 2022 15:51:31 GMT+0800 (China Standard Time) * * Tencent is pleased to support the open source community by making * Hippy available. diff --git a/driver/js/examples/android-demo/src/main/AndroidManifest.xml b/framework/examples/android-demo/src/main/AndroidManifest.xml similarity index 100% rename from driver/js/examples/android-demo/src/main/AndroidManifest.xml rename to framework/examples/android-demo/src/main/AndroidManifest.xml diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/BaseActivity.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/BaseActivity.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/BaseActivity.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/BaseActivity.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyAPIProvider.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyAPIProvider.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyAPIProvider.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyAPIProvider.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyActivity.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyActivity.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyActivity.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyActivity.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyActivityDeprecated.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyActivityDeprecated.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyActivityDeprecated.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyActivityDeprecated.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyControllerProvider.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyControllerProvider.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyControllerProvider.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyControllerProvider.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyHippyEngineHost.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyHippyEngineHost.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyHippyEngineHost.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/MyHippyEngineHost.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/adapter/MyExceptionHandler.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/adapter/MyExceptionHandler.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/adapter/MyExceptionHandler.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/adapter/MyExceptionHandler.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/adapter/MyImageLoader.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/adapter/MyImageLoader.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/adapter/MyImageLoader.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/adapter/MyImageLoader.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/MyModule.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/MyModule.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/MyModule.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/MyModule.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/TestModule.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/TestModule.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/TestModule.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/TestModule.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/DemoJavaTurboModule.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/DemoJavaTurboModule.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/DemoJavaTurboModule.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/DemoJavaTurboModule.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/TurboArray.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/TurboArray.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/TurboArray.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/TurboArray.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/TurboConfig.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/TurboConfig.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/TurboConfig.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/TurboConfig.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/TurboMap.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/TurboMap.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/TurboMap.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/module/turbo/TurboMap.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/view/MyCustomViewController.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/view/MyCustomViewController.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/view/MyCustomViewController.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/view/MyCustomViewController.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/view/MyView.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/view/MyView.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/view/MyView.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/view/MyView.java diff --git a/driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/view/MyViewController.java b/framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/view/MyViewController.java similarity index 100% rename from driver/js/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/view/MyViewController.java rename to framework/examples/android-demo/src/main/java/com/tencent/mtt/hippy/example/view/MyViewController.java diff --git a/driver/js/examples/android-demo/src/main/res/values/strings.xml b/framework/examples/android-demo/src/main/res/values/strings.xml similarity index 100% rename from driver/js/examples/android-demo/src/main/res/values/strings.xml rename to framework/examples/android-demo/src/main/res/values/strings.xml diff --git a/driver/js/examples/ios-demo/HippyDemo.xcodeproj/project.pbxproj b/framework/examples/ios-demo/HippyDemo.xcodeproj/project.pbxproj similarity index 84% rename from driver/js/examples/ios-demo/HippyDemo.xcodeproj/project.pbxproj rename to framework/examples/ios-demo/HippyDemo.xcodeproj/project.pbxproj index 06137d260c6..3ba6e45a038 100644 --- a/driver/js/examples/ios-demo/HippyDemo.xcodeproj/project.pbxproj +++ b/framework/examples/ios-demo/HippyDemo.xcodeproj/project.pbxproj @@ -15,65 +15,19 @@ 067AB97523B5F309009D5EE2 /* MyViewManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 067AB97123B5F309009D5EE2 /* MyViewManager.mm */; }; 067AB97623B5F309009D5EE2 /* MyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 067AB97423B5F309009D5EE2 /* MyView.m */; }; 9252AE8B2809532F00B27E50 /* root_node.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9252AE8A2809532F00B27E50 /* root_node.cc */; }; - 9B4E720E2876D0B9006566E1 /* string_utils.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9B4E720D2876D0B9006566E1 /* string_utils.cc */; }; AC63515623F92C99007FABA5 /* TTTGB-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = AC63515523F92C99007FABA5 /* TTTGB-Medium.otf */; }; - D3D52E8B2873D48600740B66 /* libdevtools_backend.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D52E8A2873D47900740B66 /* libdevtools_backend.a */; }; - D3D52E952873E8D100740B66 /* trace_control.cc in Sources */ = {isa = PBXBuildFile; fileRef = D3D52E8D2873E8D100740B66 /* trace_control.cc */; }; - D3D52E962873E8D100740B66 /* devtools_data_source.cc in Sources */ = {isa = PBXBuildFile; fileRef = D3D52E8E2873E8D100740B66 /* devtools_data_source.cc */; }; - D3D52E972873E8D100740B66 /* hippy_screen_adapter.cc in Sources */ = {isa = PBXBuildFile; fileRef = D3D52E912873E8D100740B66 /* hippy_screen_adapter.cc */; }; - D3D52E982873E8D100740B66 /* hippy_dom_tree_adapter.cc in Sources */ = {isa = PBXBuildFile; fileRef = D3D52E922873E8D100740B66 /* hippy_dom_tree_adapter.cc */; }; - D3D52E992873E8D100740B66 /* hippy_tracing_adapter.cc in Sources */ = {isa = PBXBuildFile; fileRef = D3D52E932873E8D100740B66 /* hippy_tracing_adapter.cc */; }; - D3D52E9A2873E8D100740B66 /* devtools_utils.cc in Sources */ = {isa = PBXBuildFile; fileRef = D3D52E942873E8D100740B66 /* devtools_utils.cc */; }; D42D2C7B2833C84D0079B47B /* dom_listener.cc in Sources */ = {isa = PBXBuildFile; fileRef = D42D2C7A2833C84D0079B47B /* dom_listener.cc */; }; - D4B09E392750D2C000643CDF /* Flex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4B09E362750D21600643CDF /* Flex.cpp */; }; D4B5A080281663F400ABBD9C /* scene_builder.cc in Sources */ = {isa = PBXBuildFile; fileRef = D4B5A07E281663F400ABBD9C /* scene_builder.cc */; }; D4B5A081281663F400ABBD9C /* scene.cc in Sources */ = {isa = PBXBuildFile; fileRef = D4B5A07F281663F400ABBD9C /* scene.cc */; }; - D4B5A0862816641600ABBD9C /* event_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = D4B5A0842816641600ABBD9C /* event_module.cc */; }; - D4B5A0872816641600ABBD9C /* scene_builder.cc in Sources */ = {isa = PBXBuildFile; fileRef = D4B5A0852816641600ABBD9C /* scene_builder.cc */; }; - D806C5082872BC3C00E62992 /* repeating_timer.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C4EF2872BC3B00E62992 /* repeating_timer.cc */; }; - D806C5092872BC3C00E62992 /* task.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C4F02872BC3B00E62992 /* task.cc */; }; - D806C50B2872BC3C00E62992 /* idle_timer.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C4F22872BC3B00E62992 /* idle_timer.cc */; }; - D806C5122872BC3C00E62992 /* deserializer.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C4FC2872BC3B00E62992 /* deserializer.cc */; }; - D806C5132872BC3C00E62992 /* log_settings_state.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C4FD2872BC3B00E62992 /* log_settings_state.cc */; }; - D806C5142872BC3C00E62992 /* worker_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C4FE2872BC3B00E62992 /* worker_manager.cc */; }; - D806C5152872BC3C00E62992 /* one_shot_timer.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C4FF2872BC3B00E62992 /* one_shot_timer.cc */; }; - D806C5162872BC3C00E62992 /* hippy_value.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C5002872BC3B00E62992 /* hippy_value.cc */; }; - D806C5172872BC3C00E62992 /* log_settings.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C5012872BC3B00E62992 /* log_settings.cc */; }; - D806C5182872BC3C00E62992 /* serializer.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C5022872BC3C00E62992 /* serializer.cc */; }; - D806C5192872BC3C00E62992 /* worker.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C5032872BC3C00E62992 /* worker.cc */; }; - D806C51A2872BC3C00E62992 /* idle_task.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C5042872BC3C00E62992 /* idle_task.cc */; }; - D806C51B2872BC3C00E62992 /* base_timer.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C5052872BC3C00E62992 /* base_timer.cc */; }; - D806C51C2872BC3C00E62992 /* task_runner.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C5062872BC3C00E62992 /* task_runner.cc */; }; - D806C51D2872BC3C00E62992 /* unicode_string_view.cc in Sources */ = {isa = PBXBuildFile; fileRef = D806C5072872BC3C00E62992 /* unicode_string_view.cc */; }; D84AB8EC273A5AAD00987D03 /* dom_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB8E5273A5AAD00987D03 /* dom_manager.cc */; }; D84AB8ED273A5AAD00987D03 /* dom_node.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB8E6273A5AAD00987D03 /* dom_node.cc */; }; D84AB8EF273A5AAD00987D03 /* layout_node.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB8E8273A5AAD00987D03 /* layout_node.cc */; }; - D84AB9B6273A618B00987D03 /* scope.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB967273A618B00987D03 /* scope.cc */; }; - D84AB9B7273A618B00987D03 /* engine.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB968273A618B00987D03 /* engine.cc */; }; - D84AB9BC273A618B00987D03 /* module_register.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB970273A618B00987D03 /* module_register.cc */; }; - D84AB9BD273A618B00987D03 /* ui_manager_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB971273A618B00987D03 /* ui_manager_module.cc */; }; - D84AB9BE273A618B00987D03 /* console_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB972273A618B00987D03 /* console_module.cc */; }; - D84AB9BF273A618B00987D03 /* timer_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB973273A618B00987D03 /* timer_module.cc */; }; - D84AB9C0273A618B00987D03 /* contextify_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB974273A618B00987D03 /* contextify_module.cc */; }; - D84AB9C1273A618B00987D03 /* js_value_wrapper.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB976273A618B00987D03 /* js_value_wrapper.cc */; }; - D84AB9C2273A618B00987D03 /* file.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB977273A618B00987D03 /* file.cc */; }; - D84AB9C9273A618B00987D03 /* callback_info.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB980273A618B00987D03 /* callback_info.cc */; }; - D84AB9CA273A618B00987D03 /* js_native_jsc_helper.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB982273A618B00987D03 /* js_native_jsc_helper.cc */; }; - D84AB9CC273A618B00987D03 /* js_native_api_value_jsc.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB984273A618B00987D03 /* js_native_api_value_jsc.cc */; }; - D84AB9CD273A618B00987D03 /* js_native_api_jsc.cc in Sources */ = {isa = PBXBuildFile; fileRef = D84AB985273A618B00987D03 /* js_native_api_jsc.cc */; }; D86B3E60284E31EB007E729B /* animation_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = D86B3E5B284E31EB007E729B /* animation_manager.cc */; }; D86B3E61284E31EB007E729B /* animation_math.cc in Sources */ = {isa = PBXBuildFile; fileRef = D86B3E5C284E31EB007E729B /* animation_math.cc */; }; D86B3E62284E31EB007E729B /* animation.cc in Sources */ = {isa = PBXBuildFile; fileRef = D86B3E5D284E31EB007E729B /* animation.cc */; }; D86B3E63284E31EB007E729B /* cubic_bezier_animation.cc in Sources */ = {isa = PBXBuildFile; fileRef = D86B3E5E284E31EB007E729B /* cubic_bezier_animation.cc */; }; D86B3E64284E31EB007E729B /* animation_set.cc in Sources */ = {isa = PBXBuildFile; fileRef = D86B3E5F284E31EB007E729B /* animation_set.cc */; }; - D88F440B28470C3E00989F01 /* animation_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = D88F440A28470C3E00989F01 /* animation_module.cc */; }; - D8907F99288648A1005696C7 /* cv_driver.cc in Sources */ = {isa = PBXBuildFile; fileRef = D8907F98288648A1005696C7 /* cv_driver.cc */; }; - D8907FF02887FDA2005696C7 /* looper_driver.cc in Sources */ = {isa = PBXBuildFile; fileRef = D8907FE12887FDA2005696C7 /* looper_driver.cc */; }; - D8907FF12887FDA2005696C7 /* logging.cc in Sources */ = {isa = PBXBuildFile; fileRef = D8907FE32887FDA2005696C7 /* logging.cc */; }; - D8907FF22887FDA2005696C7 /* worker_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = D8907FE42887FDA2005696C7 /* worker_impl.cc */; }; F0889ED581FF7516357B3726 /* libPods-HippyDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C98B5A3CF5267599CFCFF48A /* libPods-HippyDemo.a */; }; - F400C2E3274F65FA008BD74B /* js_native_turbo_jsc.cc in Sources */ = {isa = PBXBuildFile; fileRef = F400C2E2274F65FA008BD74B /* js_native_turbo_jsc.cc */; }; - F400C2E7274F66ED008BD74B /* js_native_turbo.cc in Sources */ = {isa = PBXBuildFile; fileRef = F400C2E6274F66ED008BD74B /* js_native_turbo.cc */; }; F4079544281ABD7A00DD084A /* RenderVsyncManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4079543281ABA4100DD084A /* RenderVsyncManager.mm */; }; F419C383274634E9003E242A /* taitank_layout_node.cc in Sources */ = {isa = PBXBuildFile; fileRef = F419C382274634E9003E242A /* taitank_layout_node.cc */; }; F42EA79A277C354C007874A2 /* TurboConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = F42EA796277C354C007874A2 /* TurboConfig.m */; }; @@ -88,7 +42,6 @@ F438B757281250CD0078435B /* NativeRenderParserUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = F438B753281250CD0078435B /* NativeRenderParserUtils.m */; }; F438B75A281283550078435B /* NativeRenderErrorHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = F438B759281283550078435B /* NativeRenderErrorHandler.m */; }; F43A2D09275882650056F36C /* diff_utils.cc in Sources */ = {isa = PBXBuildFile; fileRef = F43A2D08275882650056F36C /* diff_utils.cc */; }; - F441DFB12872903700FD5205 /* HippyRootViewManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F441DFB02872903700FD5205 /* HippyRootViewManager.mm */; }; F45D265328067B6900CAB185 /* NativeRenderScrollView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F45D25AD28067B6900CAB185 /* NativeRenderScrollView.mm */; }; F45D265428067B6900CAB185 /* NativeRenderScrollViewManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F45D25B028067B6900CAB185 /* NativeRenderScrollViewManager.mm */; }; F45D265528067B6900CAB185 /* NativeRenderRefreshWrapperItemView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F45D25B328067B6900CAB185 /* NativeRenderRefreshWrapperItemView.mm */; }; @@ -207,13 +160,58 @@ F468DE9F2812ACEA00319196 /* NativeRenderFont.mm in Sources */ = {isa = PBXBuildFile; fileRef = F468DE992812ACEA00319196 /* NativeRenderFont.mm */; }; F473F1452859C37100422C1A /* NativeRenderComponentMap.mm in Sources */ = {isa = PBXBuildFile; fileRef = F473F13F2859C37100422C1A /* NativeRenderComponentMap.mm */; }; F4810954277062AD005C221B /* layer_optimized_render_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = F4810953277062AD005C221B /* layer_optimized_render_manager.cc */; }; - F482919A274E420C00D91128 /* HPStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F482918B274E420C00D91128 /* HPStyle.cpp */; }; - F482919B274E420C00D91128 /* HPConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F482918D274E420C00D91128 /* HPConfig.cpp */; }; - F482919C274E420C00D91128 /* HPUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F482918E274E420C00D91128 /* HPUtil.cpp */; }; - F482919D274E420C00D91128 /* HPNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4829192274E420C00D91128 /* HPNode.cpp */; }; - F482919E274E420C00D91128 /* FlexLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4829194274E420C00D91128 /* FlexLine.cpp */; }; - F482919F274E420D00D91128 /* Hippy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4829195274E420C00D91128 /* Hippy.cpp */; }; - F48291A0274E420D00D91128 /* HPLayoutCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4829197274E420C00D91128 /* HPLayoutCache.cpp */; }; + F48D3802289BA662007BD6FE /* scope.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D379E289BA661007BD6FE /* scope.cc */; }; + F48D3803289BA662007BD6FE /* engine.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D379F289BA661007BD6FE /* engine.cc */; }; + F48D3809289BA662007BD6FE /* trace_control.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37A9289BA661007BD6FE /* trace_control.cc */; }; + F48D380A289BA662007BD6FE /* devtools_data_source.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37AA289BA661007BD6FE /* devtools_data_source.cc */; }; + F48D380B289BA662007BD6FE /* hippy_screen_adapter.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37AD289BA661007BD6FE /* hippy_screen_adapter.cc */; }; + F48D380C289BA662007BD6FE /* hippy_dom_tree_adapter.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37AE289BA661007BD6FE /* hippy_dom_tree_adapter.cc */; }; + F48D380D289BA662007BD6FE /* hippy_tracing_adapter.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37AF289BA661007BD6FE /* hippy_tracing_adapter.cc */; }; + F48D380E289BA662007BD6FE /* devtools_utils.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37B0289BA661007BD6FE /* devtools_utils.cc */; }; + F48D380F289BA662007BD6FE /* module_register.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37B2289BA661007BD6FE /* module_register.cc */; }; + F48D3810289BA662007BD6FE /* ui_manager_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37B3289BA661007BD6FE /* ui_manager_module.cc */; }; + F48D3811289BA662007BD6FE /* animation_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37B4289BA661007BD6FE /* animation_module.cc */; }; + F48D3812289BA662007BD6FE /* console_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37B5289BA661007BD6FE /* console_module.cc */; }; + F48D3813289BA662007BD6FE /* scene_builder.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37B6289BA661007BD6FE /* scene_builder.cc */; }; + F48D3814289BA662007BD6FE /* timer_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37B7289BA661007BD6FE /* timer_module.cc */; }; + F48D3815289BA662007BD6FE /* contextify_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37B8289BA661007BD6FE /* contextify_module.cc */; }; + F48D3816289BA662007BD6FE /* event_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37B9289BA661007BD6FE /* event_module.cc */; }; + F48D3817289BA662007BD6FE /* js_value_wrapper.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37BB289BA661007BD6FE /* js_value_wrapper.cc */; }; + F48D3818289BA662007BD6FE /* file.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37BC289BA661007BD6FE /* file.cc */; }; + F48D381C289BA662007BD6FE /* callback_info.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37C2289BA661007BD6FE /* callback_info.cc */; }; + F48D381D289BA662007BD6FE /* js_native_turbo.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37C3289BA661007BD6FE /* js_native_turbo.cc */; }; + F48D381E289BA662007BD6FE /* js_native_jsc_helper.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37C5289BA661007BD6FE /* js_native_jsc_helper.cc */; }; + F48D381F289BA662007BD6FE /* js_native_turbo_jsc.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37C6289BA661007BD6FE /* js_native_turbo_jsc.cc */; }; + F48D3820289BA662007BD6FE /* js_native_api_value_jsc.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37C7289BA661007BD6FE /* js_native_api_value_jsc.cc */; }; + F48D3821289BA662007BD6FE /* js_native_api_jsc.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D37C8289BA661007BD6FE /* js_native_api_jsc.cc */; }; + F48D3863289BA6A1007BD6FE /* log_settings_state.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3848289BA6A1007BD6FE /* log_settings_state.cc */; }; + F48D3864289BA6A1007BD6FE /* log_settings.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3849289BA6A1007BD6FE /* log_settings.cc */; }; + F48D3865289BA6A1007BD6FE /* one_shot_timer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D384A289BA6A1007BD6FE /* one_shot_timer.cc */; }; + F48D3869289BA6A1007BD6FE /* looper_driver.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3851289BA6A1007BD6FE /* looper_driver.cc */; }; + F48D386A289BA6A1007BD6FE /* logging.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3852289BA6A1007BD6FE /* logging.cc */; }; + F48D386B289BA6A1007BD6FE /* worker_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3853289BA6A1007BD6FE /* worker_impl.cc */; }; + F48D386C289BA6A1007BD6FE /* string_utils.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3854289BA6A1007BD6FE /* string_utils.cc */; }; + F48D386D289BA6A1007BD6FE /* worker_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3855289BA6A1007BD6FE /* worker_manager.cc */; }; + F48D386E289BA6A1007BD6FE /* hippy_value.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3856289BA6A1007BD6FE /* hippy_value.cc */; }; + F48D386F289BA6A1007BD6FE /* base_timer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3857289BA6A1007BD6FE /* base_timer.cc */; }; + F48D3870289BA6A1007BD6FE /* serializer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3858289BA6A1007BD6FE /* serializer.cc */; }; + F48D3871289BA6A1007BD6FE /* unicode_string_view.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3859289BA6A1007BD6FE /* unicode_string_view.cc */; }; + F48D3872289BA6A1007BD6FE /* idle_task.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D385A289BA6A1007BD6FE /* idle_task.cc */; }; + F48D3873289BA6A1007BD6FE /* cv_driver.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D385B289BA6A1007BD6FE /* cv_driver.cc */; }; + F48D3874289BA6A1007BD6FE /* repeating_timer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D385C289BA6A1007BD6FE /* repeating_timer.cc */; }; + F48D3875289BA6A1007BD6FE /* task_runner.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D385D289BA6A1007BD6FE /* task_runner.cc */; }; + F48D3876289BA6A1007BD6FE /* task.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D385E289BA6A1007BD6FE /* task.cc */; }; + F48D3877289BA6A1007BD6FE /* deserializer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D385F289BA6A1007BD6FE /* deserializer.cc */; }; + F48D3878289BA6A1007BD6FE /* worker.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3860289BA6A1007BD6FE /* worker.cc */; }; + F48D3879289BA6A1007BD6FE /* idle_timer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F48D3861289BA6A1007BD6FE /* idle_timer.cc */; }; + F48D388B289BA6E2007BD6FE /* HPStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F48D387B289BA6E2007BD6FE /* HPStyle.cpp */; }; + F48D388C289BA6E2007BD6FE /* HPConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F48D387D289BA6E2007BD6FE /* HPConfig.cpp */; }; + F48D388D289BA6E2007BD6FE /* HPUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F48D387E289BA6E2007BD6FE /* HPUtil.cpp */; }; + F48D388E289BA6E2007BD6FE /* HPNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F48D3882289BA6E2007BD6FE /* HPNode.cpp */; }; + F48D388F289BA6E2007BD6FE /* Flex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F48D3884289BA6E2007BD6FE /* Flex.cpp */; }; + F48D3890289BA6E3007BD6FE /* FlexLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F48D3885289BA6E2007BD6FE /* FlexLine.cpp */; }; + F48D3891289BA6E3007BD6FE /* Hippy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F48D3886289BA6E2007BD6FE /* Hippy.cpp */; }; + F48D3892289BA6E3007BD6FE /* HPLayoutCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F48D3888289BA6E2007BD6FE /* HPLayoutCache.cpp */; }; F4A8424227D38CF900AEFC88 /* NativeRenderManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4A8423F27D38CF900AEFC88 /* NativeRenderManager.mm */; }; F4A8424327D38CF900AEFC88 /* NativeRenderImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4A8424127D38CF900AEFC88 /* NativeRenderImpl.mm */; }; F4B938F82840B58C00187AFA /* NativeRenderWaterfallViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4B938F72840B58C00187AFA /* NativeRenderWaterfallViewCell.mm */; }; @@ -227,23 +225,31 @@ F4CEDF9D27D858C700583C9E /* NativeRenderDefaultImageProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = F4CEDF9927D858C700583C9E /* NativeRenderDefaultImageProvider.m */; }; F4E7B43D276C61EB00F17139 /* dom_argument.cc in Sources */ = {isa = PBXBuildFile; fileRef = F4E7B439276C61EA00F17139 /* dom_argument.cc */; }; F4E7B43E276C61EB00F17139 /* dom_event.cc in Sources */ = {isa = PBXBuildFile; fileRef = F4E7B43A276C61EB00F17139 /* dom_event.cc */; }; + F4FC1600289BBBCA00A35F4A /* libdevtools_backend.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F48D38F8289BA876007BD6FE /* libdevtools_backend.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - D3D52E892873D47900740B66 /* PBXContainerItemProxy */ = { + F48D38F7289BA876007BD6FE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = D3D52E822873D47900740B66 /* devtools_backend.xcodeproj */; + containerPortal = F48D38EF289BA876007BD6FE /* devtools_backend.xcodeproj */; proxyType = 2; - remoteGlobalIDString = D6D87F076D7C4DE396D14BC1; + remoteGlobalIDString = C7A145BE2C5140888E441D14; remoteInfo = devtools_backend; }; - D3D52EAD287567BD00740B66 /* PBXContainerItemProxy */ = { + F48D38F9289BA876007BD6FE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = D3D52E822873D47900740B66 /* devtools_backend.xcodeproj */; + containerPortal = F48D38EF289BA876007BD6FE /* devtools_backend.xcodeproj */; proxyType = 2; - remoteGlobalIDString = BB7EBFD012CA4A8E827F8AE8; + remoteGlobalIDString = EE9BD29DDDB44C6C81C05592; remoteInfo = footstone; }; + F4FC15FE289BBB9F00A35F4A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F48D38EF289BA876007BD6FE /* devtools_backend.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 185776207AB448DF87CC6D5F; + remoteInfo = devtools_backend; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -264,54 +270,15 @@ 5EFC12FC2074771164E4766F /* Pods-HippyDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HippyDemo.debug.xcconfig"; path = "Target Support Files/Pods-HippyDemo/Pods-HippyDemo.debug.xcconfig"; sourceTree = ""; }; 9252AE8A2809532F00B27E50 /* root_node.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = root_node.cc; sourceTree = ""; }; 9252AE8C2809534100B27E50 /* root_node.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = root_node.h; sourceTree = ""; }; - 9B4E720C2876D0A8006566E1 /* string_utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = string_utils.h; sourceTree = ""; }; - 9B4E720D2876D0B9006566E1 /* string_utils.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_utils.cc; sourceTree = ""; }; A04A0CACCEE3C91B722BD4AC /* Pods-HippyDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HippyDemo.release.xcconfig"; path = "Target Support Files/Pods-HippyDemo/Pods-HippyDemo.release.xcconfig"; sourceTree = ""; }; AC63515523F92C99007FABA5 /* TTTGB-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "TTTGB-Medium.otf"; sourceTree = ""; }; B2C1237A278C0C140081B8AF /* DemoConfigs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemoConfigs.h; sourceTree = ""; }; C98B5A3CF5267599CFCFF48A /* libPods-HippyDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-HippyDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - D3D52E822873D47900740B66 /* devtools_backend.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = devtools_backend.xcodeproj; path = devtools_backend/devtools_backend.xcodeproj; sourceTree = ""; }; - D3D52E8D2873E8D100740B66 /* trace_control.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = trace_control.cc; sourceTree = ""; }; - D3D52E8E2873E8D100740B66 /* devtools_data_source.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = devtools_data_source.cc; sourceTree = ""; }; - D3D52E912873E8D100740B66 /* hippy_screen_adapter.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hippy_screen_adapter.cc; sourceTree = ""; }; - D3D52E922873E8D100740B66 /* hippy_dom_tree_adapter.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hippy_dom_tree_adapter.cc; sourceTree = ""; }; - D3D52E932873E8D100740B66 /* hippy_tracing_adapter.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hippy_tracing_adapter.cc; sourceTree = ""; }; - D3D52E942873E8D100740B66 /* devtools_utils.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = devtools_utils.cc; sourceTree = ""; }; - D3D52E9C2873E8DD00740B66 /* trace_control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = trace_control.h; sourceTree = ""; }; - D3D52E9D2873E8DD00740B66 /* devtools_data_source.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = devtools_data_source.h; sourceTree = ""; }; - D3D52E9F2873E8DD00740B66 /* hippy_dom_tree_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_dom_tree_adapter.h; sourceTree = ""; }; - D3D52EA02873E8DD00740B66 /* hippy_vm_request_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_vm_request_adapter.h; sourceTree = ""; }; - D3D52EA12873E8DD00740B66 /* hippy_tracing_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_tracing_adapter.h; sourceTree = ""; }; - D3D52EA22873E8DD00740B66 /* hippy_screen_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_screen_adapter.h; sourceTree = ""; }; - D3D52EA32873E8DD00740B66 /* hippy_runtime_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_runtime_adapter.h; sourceTree = ""; }; - D3D52EA42873E8DD00740B66 /* devtools_macro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = devtools_macro.h; sourceTree = ""; }; - D3D52EA52873E8DE00740B66 /* hippy_dom_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_dom_data.h; sourceTree = ""; }; - D3D52EA62873E8DE00740B66 /* devtools_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = devtools_utils.h; sourceTree = ""; }; D42D2C7A2833C84D0079B47B /* dom_listener.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dom_listener.cc; sourceTree = ""; }; - D4B09E362750D21600643CDF /* Flex.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Flex.cpp; sourceTree = ""; }; D4B5A07E281663F400ABBD9C /* scene_builder.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene_builder.cc; sourceTree = ""; }; D4B5A07F281663F400ABBD9C /* scene.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene.cc; sourceTree = ""; }; D4B5A0822816640500ABBD9C /* scene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scene.h; sourceTree = ""; }; D4B5A0832816640500ABBD9C /* scene_builder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scene_builder.h; sourceTree = ""; }; - D4B5A0842816641600ABBD9C /* event_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = event_module.cc; sourceTree = ""; }; - D4B5A0852816641600ABBD9C /* scene_builder.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene_builder.cc; sourceTree = ""; }; - D4B5A0882816642300ABBD9C /* event_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = event_module.h; sourceTree = ""; }; - D4B5A0892816642300ABBD9C /* scene_builder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scene_builder.h; sourceTree = ""; }; - D806C4EF2872BC3B00E62992 /* repeating_timer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repeating_timer.cc; sourceTree = ""; }; - D806C4F02872BC3B00E62992 /* task.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = task.cc; sourceTree = ""; }; - D806C4F22872BC3B00E62992 /* idle_timer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = idle_timer.cc; sourceTree = ""; }; - D806C4FC2872BC3B00E62992 /* deserializer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = deserializer.cc; sourceTree = ""; }; - D806C4FD2872BC3B00E62992 /* log_settings_state.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = log_settings_state.cc; sourceTree = ""; }; - D806C4FE2872BC3B00E62992 /* worker_manager.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = worker_manager.cc; sourceTree = ""; }; - D806C4FF2872BC3B00E62992 /* one_shot_timer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = one_shot_timer.cc; sourceTree = ""; }; - D806C5002872BC3B00E62992 /* hippy_value.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hippy_value.cc; sourceTree = ""; }; - D806C5012872BC3B00E62992 /* log_settings.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = log_settings.cc; sourceTree = ""; }; - D806C5022872BC3C00E62992 /* serializer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serializer.cc; sourceTree = ""; }; - D806C5032872BC3C00E62992 /* worker.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = worker.cc; sourceTree = ""; }; - D806C5042872BC3C00E62992 /* idle_task.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = idle_task.cc; sourceTree = ""; }; - D806C5052872BC3C00E62992 /* base_timer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = base_timer.cc; sourceTree = ""; }; - D806C5062872BC3C00E62992 /* task_runner.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = task_runner.cc; sourceTree = ""; }; - D806C5072872BC3C00E62992 /* unicode_string_view.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unicode_string_view.cc; sourceTree = ""; }; D84AB8DA273A5AAD00987D03 /* layout_node.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = layout_node.h; sourceTree = ""; tabWidth = 2; }; D84AB8DB273A5AAD00987D03 /* dom_listener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dom_listener.h; sourceTree = ""; }; D84AB8DC273A5AAD00987D03 /* dom_node.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = dom_node.h; sourceTree = ""; tabWidth = 2; }; @@ -321,40 +288,6 @@ D84AB8E5273A5AAD00987D03 /* dom_manager.cc */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = dom_manager.cc; sourceTree = ""; tabWidth = 2; }; D84AB8E6273A5AAD00987D03 /* dom_node.cc */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = dom_node.cc; sourceTree = ""; tabWidth = 2; }; D84AB8E8273A5AAD00987D03 /* layout_node.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = layout_node.cc; sourceTree = ""; }; - D84AB923273A618B00987D03 /* engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = engine.h; sourceTree = ""; }; - D84AB924273A618B00987D03 /* core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = core.h; sourceTree = ""; }; - D84AB92B273A618B00987D03 /* module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = module_register.h; sourceTree = ""; }; - D84AB92C273A618B00987D03 /* console_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console_module.h; sourceTree = ""; }; - D84AB92D273A618B00987D03 /* ui_manager_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_manager_module.h; sourceTree = ""; }; - D84AB92E273A618B00987D03 /* timer_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timer_module.h; sourceTree = ""; }; - D84AB92F273A618B00987D03 /* module_base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = module_base.h; sourceTree = ""; }; - D84AB930273A618B00987D03 /* contextify_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = contextify_module.h; sourceTree = ""; }; - D84AB931273A618B00987D03 /* scope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scope.h; sourceTree = ""; }; - D84AB933273A618B00987D03 /* js_value_wrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_value_wrapper.h; sourceTree = ""; }; - D84AB934273A618B00987D03 /* uri_loader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uri_loader.h; sourceTree = ""; }; - D84AB937273A618B00987D03 /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = ""; }; - D84AB93A273A618B00987D03 /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; - D84AB93B273A618B00987D03 /* macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macros.h; sourceTree = ""; }; - D84AB93E273A618B00987D03 /* hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hash.h; sourceTree = ""; }; - D84AB942273A618B00987D03 /* callback_info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = callback_info.h; sourceTree = ""; }; - D84AB943273A618B00987D03 /* js_native_api_types.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = js_native_api_types.h; sourceTree = ""; tabWidth = 2; }; - D84AB944273A618B00987D03 /* js_native_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_native_api.h; sourceTree = ""; }; - D84AB945273A618B00987D03 /* native_source_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = native_source_code.h; sourceTree = ""; }; - D84AB947273A618B00987D03 /* js_native_jsc_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_native_jsc_helper.h; sourceTree = ""; }; - D84AB948273A618B00987D03 /* js_native_api_jsc.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = js_native_api_jsc.h; sourceTree = ""; tabWidth = 2; }; - D84AB967273A618B00987D03 /* scope.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scope.cc; sourceTree = ""; }; - D84AB968273A618B00987D03 /* engine.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = engine.cc; sourceTree = ""; }; - D84AB970273A618B00987D03 /* module_register.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = module_register.cc; sourceTree = ""; }; - D84AB971273A618B00987D03 /* ui_manager_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = ui_manager_module.cc; sourceTree = ""; tabWidth = 2; }; - D84AB972273A618B00987D03 /* console_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console_module.cc; sourceTree = ""; }; - D84AB973273A618B00987D03 /* timer_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timer_module.cc; sourceTree = ""; }; - D84AB974273A618B00987D03 /* contextify_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = contextify_module.cc; sourceTree = ""; }; - D84AB976273A618B00987D03 /* js_value_wrapper.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_value_wrapper.cc; sourceTree = ""; }; - D84AB977273A618B00987D03 /* file.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file.cc; sourceTree = ""; }; - D84AB980273A618B00987D03 /* callback_info.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = callback_info.cc; sourceTree = ""; }; - D84AB982273A618B00987D03 /* js_native_jsc_helper.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_native_jsc_helper.cc; sourceTree = ""; }; - D84AB984273A618B00987D03 /* js_native_api_value_jsc.cc */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = js_native_api_value_jsc.cc; sourceTree = ""; tabWidth = 2; }; - D84AB985273A618B00987D03 /* js_native_api_jsc.cc */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = js_native_api_jsc.cc; sourceTree = ""; tabWidth = 2; }; D86B3E55284E31D2007E729B /* animation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = animation.h; sourceTree = ""; }; D86B3E56284E31D2007E729B /* animation_manager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = animation_manager.h; sourceTree = ""; }; D86B3E57284E31D2007E729B /* animation_math.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = animation_math.h; sourceTree = ""; }; @@ -365,41 +298,6 @@ D86B3E5D284E31EB007E729B /* animation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation.cc; sourceTree = ""; }; D86B3E5E284E31EB007E729B /* cubic_bezier_animation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cubic_bezier_animation.cc; sourceTree = ""; }; D86B3E5F284E31EB007E729B /* animation_set.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation_set.cc; sourceTree = ""; }; - D88F2A31286AA6AD008D1439 /* task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = task.h; sourceTree = ""; }; - D88F2A32286AA6AD008D1439 /* idle_task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = idle_task.h; sourceTree = ""; }; - D88F2A35286AA6AD008D1439 /* string_view_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = string_view_utils.h; sourceTree = ""; }; - D88F2A3D286AA6AD008D1439 /* logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logging.h; sourceTree = ""; }; - D88F2A3F286AA6AD008D1439 /* worker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = worker.h; sourceTree = ""; }; - D88F2A40286AA6AD008D1439 /* one_shot_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = one_shot_timer.h; sourceTree = ""; }; - D88F2A41286AA6AD008D1439 /* task_runner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = task_runner.h; sourceTree = ""; }; - D88F2A43286AA6AD008D1439 /* log_level.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log_level.h; sourceTree = ""; }; - D88F2A44286AA6AD008D1439 /* macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macros.h; sourceTree = ""; }; - D88F2A45286AA6AD008D1439 /* check.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = check.h; sourceTree = ""; }; - D88F2A46286AA6AD008D1439 /* time_point.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = time_point.h; sourceTree = ""; }; - D88F2A47286AA6AD008D1439 /* repeating_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = repeating_timer.h; sourceTree = ""; }; - D88F2A48286AA6AD008D1439 /* base_time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base_time.h; sourceTree = ""; }; - D88F2A49286AA6AD008D1439 /* log_settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log_settings.h; sourceTree = ""; }; - D88F2A4C286AA6AD008D1439 /* time_delta.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = time_delta.h; sourceTree = ""; }; - D88F2A4E286AA6AD008D1439 /* idle_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = idle_timer.h; sourceTree = ""; }; - D88F2A51286AA6AD008D1439 /* unicode_string_view.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unicode_string_view.h; sourceTree = ""; }; - D88F2A52286AA6AD008D1439 /* base_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base_timer.h; sourceTree = ""; }; - D88F2A53286AA6AD008D1439 /* worker_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = worker_manager.h; sourceTree = ""; }; - D88F440528470C2000989F01 /* animation_module.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = animation_module.h; sourceTree = ""; }; - D88F440A28470C3E00989F01 /* animation_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation_module.cc; sourceTree = ""; }; - D8907F9728864884005696C7 /* cv_driver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cv_driver.h; sourceTree = ""; }; - D8907F98288648A1005696C7 /* cv_driver.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cv_driver.cc; sourceTree = ""; }; - D8907FE12887FDA2005696C7 /* looper_driver.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = looper_driver.cc; sourceTree = ""; }; - D8907FE32887FDA2005696C7 /* logging.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logging.cc; sourceTree = ""; }; - D8907FE42887FDA2005696C7 /* worker_impl.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = worker_impl.cc; sourceTree = ""; }; - D8A88897286D413200D60489 /* deserializer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = deserializer.h; sourceTree = ""; }; - D8A88898286D414C00D60489 /* hash.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hash.h; sourceTree = ""; }; - D8A88899286D414C00D60489 /* hippy_value.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hippy_value.h; sourceTree = ""; }; - D8A8889A286D415600D60489 /* serializer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = serializer.h; sourceTree = ""; }; - D8DB860E28859C180012C084 /* looper_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = looper_driver.h; sourceTree = ""; }; - F400C2E2274F65FA008BD74B /* js_native_turbo_jsc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_native_turbo_jsc.cc; sourceTree = ""; }; - F400C2E4274F6691008BD74B /* js_native_turbo_jsc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_native_turbo_jsc.h; sourceTree = ""; }; - F400C2E5274F66E3008BD74B /* js_native_turbo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_native_turbo.h; sourceTree = ""; }; - F400C2E6274F66ED008BD74B /* js_native_turbo.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_native_turbo.cc; sourceTree = ""; }; F4047DE2287BC10F0061C3E0 /* NSObject+ToJSCtxValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject+ToJSCtxValue.h"; sourceTree = ""; }; F4047DE3287BC10F0061C3E0 /* NSObject+ToJSCtxValue.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSObject+ToJSCtxValue.mm"; sourceTree = ""; }; F4079542281ABA4100DD084A /* RenderVsyncManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RenderVsyncManager.h; sourceTree = ""; }; @@ -688,22 +586,132 @@ F473F1442859C37100422C1A /* NativeRenderComponentMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeRenderComponentMap.h; sourceTree = ""; }; F4810952277062A1005C221B /* layer_optimized_render_manager.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = layer_optimized_render_manager.h; sourceTree = ""; tabWidth = 2; }; F4810953277062AD005C221B /* layer_optimized_render_manager.cc */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = layer_optimized_render_manager.cc; sourceTree = ""; tabWidth = 2; }; - F482918B274E420C00D91128 /* HPStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HPStyle.cpp; sourceTree = ""; }; - F482918C274E420C00D91128 /* FlexLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlexLine.h; sourceTree = ""; }; - F482918D274E420C00D91128 /* HPConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HPConfig.cpp; sourceTree = ""; }; - F482918E274E420C00D91128 /* HPUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HPUtil.cpp; sourceTree = ""; }; - F482918F274E420C00D91128 /* HPNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HPNode.h; sourceTree = ""; }; - F4829190274E420C00D91128 /* Flex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Flex.h; sourceTree = ""; }; - F4829191274E420C00D91128 /* HPConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HPConfig.h; sourceTree = ""; }; - F4829192274E420C00D91128 /* HPNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = HPNode.cpp; sourceTree = ""; tabWidth = 2; }; - F4829193274E420C00D91128 /* Hippy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Hippy.h; sourceTree = ""; }; - F4829194274E420C00D91128 /* FlexLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FlexLine.cpp; sourceTree = ""; }; - F4829195274E420C00D91128 /* Hippy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = Hippy.cpp; sourceTree = ""; tabWidth = 2; }; - F4829196274E420C00D91128 /* HPLayoutCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HPLayoutCache.h; sourceTree = ""; }; - F4829197274E420C00D91128 /* HPLayoutCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HPLayoutCache.cpp; sourceTree = ""; }; - F4829198274E420C00D91128 /* HPUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HPUtil.h; sourceTree = ""; }; - F4829199274E420C00D91128 /* HPStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HPStyle.h; sourceTree = ""; }; F487A001284E28AA0068A9F6 /* NativeRenderInvalidating.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeRenderInvalidating.h; sourceTree = ""; }; + F48D379E289BA661007BD6FE /* scope.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scope.cc; sourceTree = ""; }; + F48D379F289BA661007BD6FE /* engine.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = engine.cc; sourceTree = ""; }; + F48D37A9289BA661007BD6FE /* trace_control.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = trace_control.cc; sourceTree = ""; }; + F48D37AA289BA661007BD6FE /* devtools_data_source.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = devtools_data_source.cc; sourceTree = ""; }; + F48D37AD289BA661007BD6FE /* hippy_screen_adapter.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hippy_screen_adapter.cc; sourceTree = ""; }; + F48D37AE289BA661007BD6FE /* hippy_dom_tree_adapter.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hippy_dom_tree_adapter.cc; sourceTree = ""; }; + F48D37AF289BA661007BD6FE /* hippy_tracing_adapter.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hippy_tracing_adapter.cc; sourceTree = ""; }; + F48D37B0289BA661007BD6FE /* devtools_utils.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = devtools_utils.cc; sourceTree = ""; }; + F48D37B2289BA661007BD6FE /* module_register.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = module_register.cc; sourceTree = ""; }; + F48D37B3289BA661007BD6FE /* ui_manager_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ui_manager_module.cc; sourceTree = ""; }; + F48D37B4289BA661007BD6FE /* animation_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animation_module.cc; sourceTree = ""; }; + F48D37B5289BA661007BD6FE /* console_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console_module.cc; sourceTree = ""; }; + F48D37B6289BA661007BD6FE /* scene_builder.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene_builder.cc; sourceTree = ""; }; + F48D37B7289BA661007BD6FE /* timer_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timer_module.cc; sourceTree = ""; }; + F48D37B8289BA661007BD6FE /* contextify_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = contextify_module.cc; sourceTree = ""; }; + F48D37B9289BA661007BD6FE /* event_module.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = event_module.cc; sourceTree = ""; }; + F48D37BB289BA661007BD6FE /* js_value_wrapper.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_value_wrapper.cc; sourceTree = ""; }; + F48D37BC289BA661007BD6FE /* file.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file.cc; sourceTree = ""; }; + F48D37C2289BA661007BD6FE /* callback_info.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = callback_info.cc; sourceTree = ""; }; + F48D37C3289BA661007BD6FE /* js_native_turbo.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_native_turbo.cc; sourceTree = ""; }; + F48D37C5289BA661007BD6FE /* js_native_jsc_helper.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_native_jsc_helper.cc; sourceTree = ""; }; + F48D37C6289BA661007BD6FE /* js_native_turbo_jsc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_native_turbo_jsc.cc; sourceTree = ""; }; + F48D37C7289BA661007BD6FE /* js_native_api_value_jsc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_native_api_value_jsc.cc; sourceTree = ""; }; + F48D37C8289BA661007BD6FE /* js_native_api_jsc.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_native_api_jsc.cc; sourceTree = ""; }; + F48D37CB289BA661007BD6FE /* engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = engine.h; sourceTree = ""; }; + F48D37D6289BA661007BD6FE /* driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = driver.h; sourceTree = ""; }; + F48D37D8289BA661007BD6FE /* module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = module_register.h; sourceTree = ""; }; + F48D37D9289BA661007BD6FE /* console_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = console_module.h; sourceTree = ""; }; + F48D37DA289BA661007BD6FE /* ui_manager_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_manager_module.h; sourceTree = ""; }; + F48D37DB289BA661007BD6FE /* event_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = event_module.h; sourceTree = ""; }; + F48D37DC289BA661007BD6FE /* animation_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animation_module.h; sourceTree = ""; }; + F48D37DD289BA661007BD6FE /* timer_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timer_module.h; sourceTree = ""; }; + F48D37DE289BA661007BD6FE /* scene_builder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scene_builder.h; sourceTree = ""; }; + F48D37DF289BA661007BD6FE /* module_base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = module_base.h; sourceTree = ""; }; + F48D37E0289BA661007BD6FE /* contextify_module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = contextify_module.h; sourceTree = ""; }; + F48D37E1289BA661007BD6FE /* scope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scope.h; sourceTree = ""; }; + F48D37E3289BA661007BD6FE /* js_value_wrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_value_wrapper.h; sourceTree = ""; }; + F48D37E4289BA662007BD6FE /* uri_loader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uri_loader.h; sourceTree = ""; }; + F48D37E5289BA662007BD6FE /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = file.h; sourceTree = ""; }; + F48D37E6289BA662007BD6FE /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; + F48D37E7289BA662007BD6FE /* macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macros.h; sourceTree = ""; }; + F48D37ED289BA662007BD6FE /* callback_info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = callback_info.h; sourceTree = ""; }; + F48D37EE289BA662007BD6FE /* js_native_api_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_native_api_types.h; sourceTree = ""; }; + F48D37EF289BA662007BD6FE /* js_native_turbo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_native_turbo.h; sourceTree = ""; }; + F48D37F0289BA662007BD6FE /* js_native_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_native_api.h; sourceTree = ""; }; + F48D37F1289BA662007BD6FE /* native_source_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = native_source_code.h; sourceTree = ""; }; + F48D37F3289BA662007BD6FE /* js_native_turbo_jsc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_native_turbo_jsc.h; sourceTree = ""; }; + F48D37F4289BA662007BD6FE /* js_native_jsc_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_native_jsc_helper.h; sourceTree = ""; }; + F48D37F5289BA662007BD6FE /* js_native_api_jsc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_native_api_jsc.h; sourceTree = ""; }; + F48D37F7289BA662007BD6FE /* trace_control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = trace_control.h; sourceTree = ""; }; + F48D37F8289BA662007BD6FE /* devtools_data_source.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = devtools_data_source.h; sourceTree = ""; }; + F48D37FA289BA662007BD6FE /* hippy_dom_tree_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_dom_tree_adapter.h; sourceTree = ""; }; + F48D37FB289BA662007BD6FE /* hippy_vm_request_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_vm_request_adapter.h; sourceTree = ""; }; + F48D37FC289BA662007BD6FE /* hippy_tracing_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_tracing_adapter.h; sourceTree = ""; }; + F48D37FD289BA662007BD6FE /* hippy_screen_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_screen_adapter.h; sourceTree = ""; }; + F48D37FE289BA662007BD6FE /* hippy_runtime_adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_runtime_adapter.h; sourceTree = ""; }; + F48D37FF289BA662007BD6FE /* devtools_macro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = devtools_macro.h; sourceTree = ""; }; + F48D3800289BA662007BD6FE /* hippy_dom_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_dom_data.h; sourceTree = ""; }; + F48D3801289BA662007BD6FE /* devtools_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = devtools_utils.h; sourceTree = ""; }; + F48D3826289BA6A1007BD6FE /* task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = task.h; sourceTree = ""; }; + F48D3827289BA6A1007BD6FE /* idle_task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = idle_task.h; sourceTree = ""; }; + F48D3828289BA6A1007BD6FE /* string_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = string_utils.h; sourceTree = ""; }; + F48D3829289BA6A1007BD6FE /* string_view_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = string_view_utils.h; sourceTree = ""; }; + F48D382E289BA6A1007BD6FE /* looper_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = looper_driver.h; sourceTree = ""; }; + F48D382F289BA6A1007BD6FE /* deserializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deserializer.h; sourceTree = ""; }; + F48D3830289BA6A1007BD6FE /* cv_driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cv_driver.h; sourceTree = ""; }; + F48D3831289BA6A1007BD6FE /* driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = driver.h; sourceTree = ""; }; + F48D3832289BA6A1007BD6FE /* logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logging.h; sourceTree = ""; }; + F48D3833289BA6A1007BD6FE /* worker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = worker.h; sourceTree = ""; }; + F48D3834289BA6A1007BD6FE /* one_shot_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = one_shot_timer.h; sourceTree = ""; }; + F48D3835289BA6A1007BD6FE /* task_runner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = task_runner.h; sourceTree = ""; }; + F48D3836289BA6A1007BD6FE /* serializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = serializer.h; sourceTree = ""; }; + F48D3837289BA6A1007BD6FE /* hippy_value.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hippy_value.h; sourceTree = ""; }; + F48D3838289BA6A1007BD6FE /* log_level.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log_level.h; sourceTree = ""; }; + F48D3839289BA6A1007BD6FE /* macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macros.h; sourceTree = ""; }; + F48D383A289BA6A1007BD6FE /* check.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = check.h; sourceTree = ""; }; + F48D383B289BA6A1007BD6FE /* time_point.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = time_point.h; sourceTree = ""; }; + F48D383C289BA6A1007BD6FE /* repeating_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = repeating_timer.h; sourceTree = ""; }; + F48D383D289BA6A1007BD6FE /* base_time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base_time.h; sourceTree = ""; }; + F48D383E289BA6A1007BD6FE /* worker_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = worker_impl.h; sourceTree = ""; }; + F48D383F289BA6A1007BD6FE /* log_settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log_settings.h; sourceTree = ""; }; + F48D3840289BA6A1007BD6FE /* persistent_object_map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = persistent_object_map.h; sourceTree = ""; }; + F48D3841289BA6A1007BD6FE /* time_delta.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = time_delta.h; sourceTree = ""; }; + F48D3842289BA6A1007BD6FE /* idle_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = idle_timer.h; sourceTree = ""; }; + F48D3843289BA6A1007BD6FE /* hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hash.h; sourceTree = ""; }; + F48D3844289BA6A1007BD6FE /* unicode_string_view.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unicode_string_view.h; sourceTree = ""; }; + F48D3845289BA6A1007BD6FE /* base_timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base_timer.h; sourceTree = ""; }; + F48D3846289BA6A1007BD6FE /* worker_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = worker_manager.h; sourceTree = ""; }; + F48D3848289BA6A1007BD6FE /* log_settings_state.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = log_settings_state.cc; sourceTree = ""; }; + F48D3849289BA6A1007BD6FE /* log_settings.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = log_settings.cc; sourceTree = ""; }; + F48D384A289BA6A1007BD6FE /* one_shot_timer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = one_shot_timer.cc; sourceTree = ""; }; + F48D3851289BA6A1007BD6FE /* looper_driver.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = looper_driver.cc; sourceTree = ""; }; + F48D3852289BA6A1007BD6FE /* logging.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logging.cc; sourceTree = ""; }; + F48D3853289BA6A1007BD6FE /* worker_impl.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = worker_impl.cc; sourceTree = ""; }; + F48D3854289BA6A1007BD6FE /* string_utils.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_utils.cc; sourceTree = ""; }; + F48D3855289BA6A1007BD6FE /* worker_manager.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = worker_manager.cc; sourceTree = ""; }; + F48D3856289BA6A1007BD6FE /* hippy_value.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hippy_value.cc; sourceTree = ""; }; + F48D3857289BA6A1007BD6FE /* base_timer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = base_timer.cc; sourceTree = ""; }; + F48D3858289BA6A1007BD6FE /* serializer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serializer.cc; sourceTree = ""; }; + F48D3859289BA6A1007BD6FE /* unicode_string_view.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unicode_string_view.cc; sourceTree = ""; }; + F48D385A289BA6A1007BD6FE /* idle_task.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = idle_task.cc; sourceTree = ""; }; + F48D385B289BA6A1007BD6FE /* cv_driver.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cv_driver.cc; sourceTree = ""; }; + F48D385C289BA6A1007BD6FE /* repeating_timer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repeating_timer.cc; sourceTree = ""; }; + F48D385D289BA6A1007BD6FE /* task_runner.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = task_runner.cc; sourceTree = ""; }; + F48D385E289BA6A1007BD6FE /* task.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = task.cc; sourceTree = ""; }; + F48D385F289BA6A1007BD6FE /* deserializer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = deserializer.cc; sourceTree = ""; }; + F48D3860289BA6A1007BD6FE /* worker.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = worker.cc; sourceTree = ""; }; + F48D3861289BA6A1007BD6FE /* idle_timer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = idle_timer.cc; sourceTree = ""; }; + F48D387B289BA6E2007BD6FE /* HPStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HPStyle.cpp; sourceTree = ""; }; + F48D387C289BA6E2007BD6FE /* FlexLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlexLine.h; sourceTree = ""; }; + F48D387D289BA6E2007BD6FE /* HPConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HPConfig.cpp; sourceTree = ""; }; + F48D387E289BA6E2007BD6FE /* HPUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HPUtil.cpp; sourceTree = ""; }; + F48D387F289BA6E2007BD6FE /* HPNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HPNode.h; sourceTree = ""; }; + F48D3880289BA6E2007BD6FE /* Flex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Flex.h; sourceTree = ""; }; + F48D3881289BA6E2007BD6FE /* HPConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HPConfig.h; sourceTree = ""; }; + F48D3882289BA6E2007BD6FE /* HPNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HPNode.cpp; sourceTree = ""; }; + F48D3883289BA6E2007BD6FE /* Hippy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Hippy.h; sourceTree = ""; }; + F48D3884289BA6E2007BD6FE /* Flex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Flex.cpp; sourceTree = ""; }; + F48D3885289BA6E2007BD6FE /* FlexLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FlexLine.cpp; sourceTree = ""; }; + F48D3886289BA6E2007BD6FE /* Hippy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Hippy.cpp; sourceTree = ""; }; + F48D3887289BA6E2007BD6FE /* HPLayoutCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HPLayoutCache.h; sourceTree = ""; }; + F48D3888289BA6E2007BD6FE /* HPLayoutCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HPLayoutCache.cpp; sourceTree = ""; }; + F48D3889289BA6E2007BD6FE /* HPUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HPUtil.h; sourceTree = ""; }; + F48D388A289BA6E2007BD6FE /* HPStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HPStyle.h; sourceTree = ""; }; + F48D38EF289BA876007BD6FE /* devtools_backend.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = devtools_backend.xcodeproj; path = devtools_backend/devtools_backend.xcodeproj; sourceTree = ""; }; F4A8423E27D38CF900AEFC88 /* NativeRenderImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeRenderImpl.h; sourceTree = ""; }; F4A8423F27D38CF900AEFC88 /* NativeRenderManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeRenderManager.mm; sourceTree = ""; }; F4A8424027D38CF900AEFC88 /* NativeRenderManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeRenderManager.h; sourceTree = ""; }; @@ -742,7 +750,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D3D52E8B2873D48600740B66 /* libdevtools_backend.a in Frameworks */, + F4FC1600289BBBCA00A35F4A /* libdevtools_backend.a in Frameworks */, F0889ED581FF7516357B3726 /* libPods-HippyDemo.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -753,11 +761,11 @@ 0612F01523A8BE320079E622 = { isa = PBXGroup; children = ( - D3D52E822873D47900740B66 /* devtools_backend.xcodeproj */, - D88F2A2C286AA6AD008D1439 /* footstone */, + F48D38EF289BA876007BD6FE /* devtools_backend.xcodeproj */, + F48D387A289BA6E2007BD6FE /* engine */, + F48D3822289BA6A1007BD6FE /* footstone */, + F48D379C289BA643007BD6FE /* driver */, F468DDB72812A95100319196 /* ios */, - F482918A274E420C00D91128 /* engine */, - D84AB8F1273A618A00987D03 /* core */, D84AB8D6273A5AAD00987D03 /* dom */, AC63515223F922E5007FABA5 /* fonts */, 064C5AEF23AB1A70001E80DD /* res */, @@ -830,69 +838,6 @@ path = fonts; sourceTree = ""; }; - D3D52E832873D47900740B66 /* Products */ = { - isa = PBXGroup; - children = ( - D3D52E8A2873D47900740B66 /* libdevtools_backend.a */, - D3D52EAE287567BD00740B66 /* libfootstone.a */, - ); - name = Products; - sourceTree = ""; - }; - D3D52E8C2873E8D100740B66 /* devtools */ = { - isa = PBXGroup; - children = ( - D3D52E8D2873E8D100740B66 /* trace_control.cc */, - D3D52E8E2873E8D100740B66 /* devtools_data_source.cc */, - D3D52E8F2873E8D100740B66 /* adapter */, - D3D52E942873E8D100740B66 /* devtools_utils.cc */, - ); - path = devtools; - sourceTree = ""; - }; - D3D52E8F2873E8D100740B66 /* adapter */ = { - isa = PBXGroup; - children = ( - D3D52E902873E8D100740B66 /* impl */, - ); - path = adapter; - sourceTree = ""; - }; - D3D52E902873E8D100740B66 /* impl */ = { - isa = PBXGroup; - children = ( - D3D52E912873E8D100740B66 /* hippy_screen_adapter.cc */, - D3D52E922873E8D100740B66 /* hippy_dom_tree_adapter.cc */, - D3D52E932873E8D100740B66 /* hippy_tracing_adapter.cc */, - ); - path = impl; - sourceTree = ""; - }; - D3D52E9B2873E8DD00740B66 /* devtools */ = { - isa = PBXGroup; - children = ( - D3D52E9C2873E8DD00740B66 /* trace_control.h */, - D3D52E9D2873E8DD00740B66 /* devtools_data_source.h */, - D3D52E9E2873E8DD00740B66 /* adapter */, - D3D52EA42873E8DD00740B66 /* devtools_macro.h */, - D3D52EA52873E8DE00740B66 /* hippy_dom_data.h */, - D3D52EA62873E8DE00740B66 /* devtools_utils.h */, - ); - path = devtools; - sourceTree = ""; - }; - D3D52E9E2873E8DD00740B66 /* adapter */ = { - isa = PBXGroup; - children = ( - D3D52E9F2873E8DD00740B66 /* hippy_dom_tree_adapter.h */, - D3D52EA02873E8DD00740B66 /* hippy_vm_request_adapter.h */, - D3D52EA12873E8DD00740B66 /* hippy_tracing_adapter.h */, - D3D52EA22873E8DD00740B66 /* hippy_screen_adapter.h */, - D3D52EA32873E8DD00740B66 /* hippy_runtime_adapter.h */, - ); - path = adapter; - sourceTree = ""; - }; D84AB8D6273A5AAD00987D03 /* dom */ = { isa = PBXGroup; children = ( @@ -900,7 +845,7 @@ D84AB8E3273A5AAD00987D03 /* src */, ); name = dom; - path = ../../../../dom; + path = ../../../dom; sourceTree = ""; }; D84AB8D8273A5AAD00987D03 /* include */ = { @@ -962,148 +907,6 @@ path = dom; sourceTree = ""; }; - D84AB8F1273A618A00987D03 /* core */ = { - isa = PBXGroup; - children = ( - D84AB921273A618B00987D03 /* include */, - D84AB966273A618B00987D03 /* src */, - ); - name = core; - path = ../../core; - sourceTree = ""; - }; - D84AB921273A618B00987D03 /* include */ = { - isa = PBXGroup; - children = ( - D3D52E9B2873E8DD00740B66 /* devtools */, - D84AB922273A618B00987D03 /* core */, - ); - path = include; - sourceTree = ""; - }; - D84AB922273A618B00987D03 /* core */ = { - isa = PBXGroup; - children = ( - D84AB923273A618B00987D03 /* engine.h */, - D84AB924273A618B00987D03 /* core.h */, - D84AB92A273A618B00987D03 /* modules */, - D84AB931273A618B00987D03 /* scope.h */, - D84AB932273A618B00987D03 /* base */, - D84AB93F273A618B00987D03 /* napi */, - ); - path = core; - sourceTree = ""; - }; - D84AB92A273A618B00987D03 /* modules */ = { - isa = PBXGroup; - children = ( - D88F440528470C2000989F01 /* animation_module.h */, - D4B5A0882816642300ABBD9C /* event_module.h */, - D4B5A0892816642300ABBD9C /* scene_builder.h */, - D84AB92B273A618B00987D03 /* module_register.h */, - D84AB92C273A618B00987D03 /* console_module.h */, - D84AB92D273A618B00987D03 /* ui_manager_module.h */, - D84AB92E273A618B00987D03 /* timer_module.h */, - D84AB92F273A618B00987D03 /* module_base.h */, - D84AB930273A618B00987D03 /* contextify_module.h */, - ); - path = modules; - sourceTree = ""; - }; - D84AB932273A618B00987D03 /* base */ = { - isa = PBXGroup; - children = ( - D84AB933273A618B00987D03 /* js_value_wrapper.h */, - D84AB934273A618B00987D03 /* uri_loader.h */, - D84AB937273A618B00987D03 /* file.h */, - D84AB93A273A618B00987D03 /* common.h */, - D84AB93B273A618B00987D03 /* macros.h */, - D84AB93E273A618B00987D03 /* hash.h */, - ); - path = base; - sourceTree = ""; - }; - D84AB93F273A618B00987D03 /* napi */ = { - isa = PBXGroup; - children = ( - F400C2E5274F66E3008BD74B /* js_native_turbo.h */, - D84AB942273A618B00987D03 /* callback_info.h */, - D84AB943273A618B00987D03 /* js_native_api_types.h */, - D84AB944273A618B00987D03 /* js_native_api.h */, - D84AB945273A618B00987D03 /* native_source_code.h */, - D84AB946273A618B00987D03 /* jsc */, - ); - path = napi; - sourceTree = ""; - }; - D84AB946273A618B00987D03 /* jsc */ = { - isa = PBXGroup; - children = ( - F400C2E4274F6691008BD74B /* js_native_turbo_jsc.h */, - D84AB947273A618B00987D03 /* js_native_jsc_helper.h */, - D84AB948273A618B00987D03 /* js_native_api_jsc.h */, - ); - path = jsc; - sourceTree = ""; - }; - D84AB966273A618B00987D03 /* src */ = { - isa = PBXGroup; - children = ( - D3D52E8C2873E8D100740B66 /* devtools */, - D84AB967273A618B00987D03 /* scope.cc */, - D84AB968273A618B00987D03 /* engine.cc */, - D84AB96F273A618B00987D03 /* modules */, - D84AB975273A618B00987D03 /* base */, - D84AB97C273A618B00987D03 /* napi */, - ); - path = src; - sourceTree = ""; - }; - D84AB96F273A618B00987D03 /* modules */ = { - isa = PBXGroup; - children = ( - D88F440A28470C3E00989F01 /* animation_module.cc */, - D4B5A0842816641600ABBD9C /* event_module.cc */, - D4B5A0852816641600ABBD9C /* scene_builder.cc */, - D84AB970273A618B00987D03 /* module_register.cc */, - D84AB971273A618B00987D03 /* ui_manager_module.cc */, - D84AB972273A618B00987D03 /* console_module.cc */, - D84AB973273A618B00987D03 /* timer_module.cc */, - D84AB974273A618B00987D03 /* contextify_module.cc */, - ); - path = modules; - sourceTree = ""; - }; - D84AB975273A618B00987D03 /* base */ = { - isa = PBXGroup; - children = ( - D84AB976273A618B00987D03 /* js_value_wrapper.cc */, - D84AB977273A618B00987D03 /* file.cc */, - ); - path = base; - sourceTree = ""; - }; - D84AB97C273A618B00987D03 /* napi */ = { - isa = PBXGroup; - children = ( - F400C2E6274F66ED008BD74B /* js_native_turbo.cc */, - D84AB980273A618B00987D03 /* callback_info.cc */, - D84AB981273A618B00987D03 /* jsc */, - ); - path = napi; - sourceTree = ""; - }; - D84AB981273A618B00987D03 /* jsc */ = { - isa = PBXGroup; - children = ( - F400C2E2274F65FA008BD74B /* js_native_turbo_jsc.cc */, - D84AB982273A618B00987D03 /* js_native_jsc_helper.cc */, - D84AB984273A618B00987D03 /* js_native_api_value_jsc.cc */, - D84AB985273A618B00987D03 /* js_native_api_jsc.cc */, - ); - path = jsc; - sourceTree = ""; - }; D86B3E54284E31D2007E729B /* animation */ = { isa = PBXGroup; children = ( @@ -1128,116 +931,6 @@ path = animation; sourceTree = ""; }; - D88F2A2C286AA6AD008D1439 /* footstone */ = { - isa = PBXGroup; - children = ( - D88F2A2E286AA6AD008D1439 /* include */, - D88F2A54286AA6AD008D1439 /* src */, - ); - name = footstone; - path = ../../../../modules/footstone; - sourceTree = ""; - }; - D88F2A2E286AA6AD008D1439 /* include */ = { - isa = PBXGroup; - children = ( - D88F2A2F286AA6AD008D1439 /* footstone */, - ); - path = include; - sourceTree = ""; - }; - D88F2A2F286AA6AD008D1439 /* footstone */ = { - isa = PBXGroup; - children = ( - D8907F9728864884005696C7 /* cv_driver.h */, - D8A8889A286D415600D60489 /* serializer.h */, - D8A88898286D414C00D60489 /* hash.h */, - D8A88899286D414C00D60489 /* hippy_value.h */, - D8A88897286D413200D60489 /* deserializer.h */, - D88F2A31286AA6AD008D1439 /* task.h */, - D88F2A32286AA6AD008D1439 /* idle_task.h */, - D88F2A35286AA6AD008D1439 /* string_view_utils.h */, - 9B4E720C2876D0A8006566E1 /* string_utils.h */, - D88F2A37286AA6AD008D1439 /* platform */, - D88F2A3D286AA6AD008D1439 /* logging.h */, - D88F2A3F286AA6AD008D1439 /* worker.h */, - D88F2A40286AA6AD008D1439 /* one_shot_timer.h */, - D88F2A41286AA6AD008D1439 /* task_runner.h */, - D88F2A43286AA6AD008D1439 /* log_level.h */, - D88F2A44286AA6AD008D1439 /* macros.h */, - D88F2A45286AA6AD008D1439 /* check.h */, - D88F2A46286AA6AD008D1439 /* time_point.h */, - D88F2A47286AA6AD008D1439 /* repeating_timer.h */, - D88F2A48286AA6AD008D1439 /* base_time.h */, - D88F2A49286AA6AD008D1439 /* log_settings.h */, - D88F2A4C286AA6AD008D1439 /* time_delta.h */, - D88F2A4E286AA6AD008D1439 /* idle_timer.h */, - D88F2A51286AA6AD008D1439 /* unicode_string_view.h */, - D88F2A52286AA6AD008D1439 /* base_timer.h */, - D88F2A53286AA6AD008D1439 /* worker_manager.h */, - ); - path = footstone; - sourceTree = ""; - }; - D88F2A37286AA6AD008D1439 /* platform */ = { - isa = PBXGroup; - children = ( - D88F2A3A286AA6AD008D1439 /* ios */, - ); - path = platform; - sourceTree = ""; - }; - D88F2A3A286AA6AD008D1439 /* ios */ = { - isa = PBXGroup; - children = ( - D8DB860E28859C180012C084 /* looper_driver.h */, - ); - path = ios; - sourceTree = ""; - }; - D88F2A54286AA6AD008D1439 /* src */ = { - isa = PBXGroup; - children = ( - D8907FDA2887FDA2005696C7 /* platform */, - D8907F98288648A1005696C7 /* cv_driver.cc */, - 9B4E720D2876D0B9006566E1 /* string_utils.cc */, - D806C5052872BC3C00E62992 /* base_timer.cc */, - D806C4FC2872BC3B00E62992 /* deserializer.cc */, - D806C5002872BC3B00E62992 /* hippy_value.cc */, - D806C5042872BC3C00E62992 /* idle_task.cc */, - D806C4F22872BC3B00E62992 /* idle_timer.cc */, - D806C4FD2872BC3B00E62992 /* log_settings_state.cc */, - D806C5012872BC3B00E62992 /* log_settings.cc */, - D806C4FF2872BC3B00E62992 /* one_shot_timer.cc */, - D806C4EF2872BC3B00E62992 /* repeating_timer.cc */, - D806C5022872BC3C00E62992 /* serializer.cc */, - D806C5062872BC3C00E62992 /* task_runner.cc */, - D806C4F02872BC3B00E62992 /* task.cc */, - D806C5072872BC3C00E62992 /* unicode_string_view.cc */, - D806C4FE2872BC3B00E62992 /* worker_manager.cc */, - D806C5032872BC3C00E62992 /* worker.cc */, - ); - path = src; - sourceTree = ""; - }; - D8907FDA2887FDA2005696C7 /* platform */ = { - isa = PBXGroup; - children = ( - D8907FE02887FDA2005696C7 /* ios */, - ); - path = platform; - sourceTree = ""; - }; - D8907FE02887FDA2005696C7 /* ios */ = { - isa = PBXGroup; - children = ( - D8907FE12887FDA2005696C7 /* looper_driver.cc */, - D8907FE32887FDA2005696C7 /* logging.cc */, - D8907FE42887FDA2005696C7 /* worker_impl.cc */, - ); - path = ios; - sourceTree = ""; - }; E1DA5B4EDA341771CC7E3DCD /* Pods */ = { isa = PBXGroup; children = ( @@ -1813,28 +1506,346 @@ path = devtools; sourceTree = ""; }; - F482918A274E420C00D91128 /* engine */ = { + F48D379C289BA643007BD6FE /* driver */ = { + isa = PBXGroup; + children = ( + F48D37C9289BA661007BD6FE /* include */, + F48D379D289BA661007BD6FE /* src */, + ); + name = driver; + sourceTree = ""; + }; + F48D379D289BA661007BD6FE /* src */ = { + isa = PBXGroup; + children = ( + F48D379E289BA661007BD6FE /* scope.cc */, + F48D379F289BA661007BD6FE /* engine.cc */, + F48D37A8289BA661007BD6FE /* devtools */, + F48D37B1289BA661007BD6FE /* modules */, + F48D37BA289BA661007BD6FE /* base */, + F48D37BD289BA661007BD6FE /* napi */, + ); + name = src; + path = ../../../driver/js/src; + sourceTree = ""; + }; + F48D37A8289BA661007BD6FE /* devtools */ = { + isa = PBXGroup; + children = ( + F48D37A9289BA661007BD6FE /* trace_control.cc */, + F48D37AA289BA661007BD6FE /* devtools_data_source.cc */, + F48D37AB289BA661007BD6FE /* adapter */, + F48D37B0289BA661007BD6FE /* devtools_utils.cc */, + ); + path = devtools; + sourceTree = ""; + }; + F48D37AB289BA661007BD6FE /* adapter */ = { + isa = PBXGroup; + children = ( + F48D37AC289BA661007BD6FE /* impl */, + ); + path = adapter; + sourceTree = ""; + }; + F48D37AC289BA661007BD6FE /* impl */ = { + isa = PBXGroup; + children = ( + F48D37AD289BA661007BD6FE /* hippy_screen_adapter.cc */, + F48D37AE289BA661007BD6FE /* hippy_dom_tree_adapter.cc */, + F48D37AF289BA661007BD6FE /* hippy_tracing_adapter.cc */, + ); + path = impl; + sourceTree = ""; + }; + F48D37B1289BA661007BD6FE /* modules */ = { + isa = PBXGroup; + children = ( + F48D37B2289BA661007BD6FE /* module_register.cc */, + F48D37B3289BA661007BD6FE /* ui_manager_module.cc */, + F48D37B4289BA661007BD6FE /* animation_module.cc */, + F48D37B5289BA661007BD6FE /* console_module.cc */, + F48D37B6289BA661007BD6FE /* scene_builder.cc */, + F48D37B7289BA661007BD6FE /* timer_module.cc */, + F48D37B8289BA661007BD6FE /* contextify_module.cc */, + F48D37B9289BA661007BD6FE /* event_module.cc */, + ); + path = modules; + sourceTree = ""; + }; + F48D37BA289BA661007BD6FE /* base */ = { + isa = PBXGroup; + children = ( + F48D37BB289BA661007BD6FE /* js_value_wrapper.cc */, + F48D37BC289BA661007BD6FE /* file.cc */, + ); + path = base; + sourceTree = ""; + }; + F48D37BD289BA661007BD6FE /* napi */ = { + isa = PBXGroup; + children = ( + F48D37C2289BA661007BD6FE /* callback_info.cc */, + F48D37C3289BA661007BD6FE /* js_native_turbo.cc */, + F48D37C4289BA661007BD6FE /* jsc */, + ); + path = napi; + sourceTree = ""; + }; + F48D37C4289BA661007BD6FE /* jsc */ = { + isa = PBXGroup; + children = ( + F48D37C5289BA661007BD6FE /* js_native_jsc_helper.cc */, + F48D37C6289BA661007BD6FE /* js_native_turbo_jsc.cc */, + F48D37C7289BA661007BD6FE /* js_native_api_value_jsc.cc */, + F48D37C8289BA661007BD6FE /* js_native_api_jsc.cc */, + ); + path = jsc; + sourceTree = ""; + }; + F48D37C9289BA661007BD6FE /* include */ = { + isa = PBXGroup; + children = ( + F48D37CA289BA661007BD6FE /* driver */, + F48D37F6289BA662007BD6FE /* devtools */, + ); + name = include; + path = ../../../driver/js/include; + sourceTree = ""; + }; + F48D37CA289BA661007BD6FE /* driver */ = { + isa = PBXGroup; + children = ( + F48D37CB289BA661007BD6FE /* engine.h */, + F48D37D6289BA661007BD6FE /* driver.h */, + F48D37D7289BA661007BD6FE /* modules */, + F48D37E1289BA661007BD6FE /* scope.h */, + F48D37E2289BA661007BD6FE /* base */, + F48D37E8289BA662007BD6FE /* napi */, + ); + path = driver; + sourceTree = ""; + }; + F48D37D7289BA661007BD6FE /* modules */ = { isa = PBXGroup; children = ( - F482918B274E420C00D91128 /* HPStyle.cpp */, - F482918C274E420C00D91128 /* FlexLine.h */, - F482918D274E420C00D91128 /* HPConfig.cpp */, - F482918E274E420C00D91128 /* HPUtil.cpp */, - F482918F274E420C00D91128 /* HPNode.h */, - D4B09E362750D21600643CDF /* Flex.cpp */, - F4829190274E420C00D91128 /* Flex.h */, - F4829191274E420C00D91128 /* HPConfig.h */, - F4829192274E420C00D91128 /* HPNode.cpp */, - F4829193274E420C00D91128 /* Hippy.h */, - F4829194274E420C00D91128 /* FlexLine.cpp */, - F4829195274E420C00D91128 /* Hippy.cpp */, - F4829196274E420C00D91128 /* HPLayoutCache.h */, - F4829197274E420C00D91128 /* HPLayoutCache.cpp */, - F4829198274E420C00D91128 /* HPUtil.h */, - F4829199274E420C00D91128 /* HPStyle.h */, + F48D37D8289BA661007BD6FE /* module_register.h */, + F48D37D9289BA661007BD6FE /* console_module.h */, + F48D37DA289BA661007BD6FE /* ui_manager_module.h */, + F48D37DB289BA661007BD6FE /* event_module.h */, + F48D37DC289BA661007BD6FE /* animation_module.h */, + F48D37DD289BA661007BD6FE /* timer_module.h */, + F48D37DE289BA661007BD6FE /* scene_builder.h */, + F48D37DF289BA661007BD6FE /* module_base.h */, + F48D37E0289BA661007BD6FE /* contextify_module.h */, + ); + path = modules; + sourceTree = ""; + }; + F48D37E2289BA661007BD6FE /* base */ = { + isa = PBXGroup; + children = ( + F48D37E3289BA661007BD6FE /* js_value_wrapper.h */, + F48D37E4289BA662007BD6FE /* uri_loader.h */, + F48D37E5289BA662007BD6FE /* file.h */, + F48D37E6289BA662007BD6FE /* common.h */, + F48D37E7289BA662007BD6FE /* macros.h */, + ); + path = base; + sourceTree = ""; + }; + F48D37E8289BA662007BD6FE /* napi */ = { + isa = PBXGroup; + children = ( + F48D37ED289BA662007BD6FE /* callback_info.h */, + F48D37EE289BA662007BD6FE /* js_native_api_types.h */, + F48D37EF289BA662007BD6FE /* js_native_turbo.h */, + F48D37F0289BA662007BD6FE /* js_native_api.h */, + F48D37F1289BA662007BD6FE /* native_source_code.h */, + F48D37F2289BA662007BD6FE /* jsc */, + ); + path = napi; + sourceTree = ""; + }; + F48D37F2289BA662007BD6FE /* jsc */ = { + isa = PBXGroup; + children = ( + F48D37F3289BA662007BD6FE /* js_native_turbo_jsc.h */, + F48D37F4289BA662007BD6FE /* js_native_jsc_helper.h */, + F48D37F5289BA662007BD6FE /* js_native_api_jsc.h */, + ); + path = jsc; + sourceTree = ""; + }; + F48D37F6289BA662007BD6FE /* devtools */ = { + isa = PBXGroup; + children = ( + F48D37F7289BA662007BD6FE /* trace_control.h */, + F48D37F8289BA662007BD6FE /* devtools_data_source.h */, + F48D37F9289BA662007BD6FE /* adapter */, + F48D37FF289BA662007BD6FE /* devtools_macro.h */, + F48D3800289BA662007BD6FE /* hippy_dom_data.h */, + F48D3801289BA662007BD6FE /* devtools_utils.h */, + ); + path = devtools; + sourceTree = ""; + }; + F48D37F9289BA662007BD6FE /* adapter */ = { + isa = PBXGroup; + children = ( + F48D37FA289BA662007BD6FE /* hippy_dom_tree_adapter.h */, + F48D37FB289BA662007BD6FE /* hippy_vm_request_adapter.h */, + F48D37FC289BA662007BD6FE /* hippy_tracing_adapter.h */, + F48D37FD289BA662007BD6FE /* hippy_screen_adapter.h */, + F48D37FE289BA662007BD6FE /* hippy_runtime_adapter.h */, + ); + path = adapter; + sourceTree = ""; + }; + F48D3822289BA6A1007BD6FE /* footstone */ = { + isa = PBXGroup; + children = ( + F48D3824289BA6A1007BD6FE /* include */, + F48D3847289BA6A1007BD6FE /* src */, + ); + name = footstone; + path = ../../../modules/footstone; + sourceTree = ""; + }; + F48D3824289BA6A1007BD6FE /* include */ = { + isa = PBXGroup; + children = ( + F48D3825289BA6A1007BD6FE /* footstone */, + ); + path = include; + sourceTree = ""; + }; + F48D3825289BA6A1007BD6FE /* footstone */ = { + isa = PBXGroup; + children = ( + F48D3826289BA6A1007BD6FE /* task.h */, + F48D3827289BA6A1007BD6FE /* idle_task.h */, + F48D3828289BA6A1007BD6FE /* string_utils.h */, + F48D3829289BA6A1007BD6FE /* string_view_utils.h */, + F48D382A289BA6A1007BD6FE /* platform */, + F48D382F289BA6A1007BD6FE /* deserializer.h */, + F48D3830289BA6A1007BD6FE /* cv_driver.h */, + F48D3831289BA6A1007BD6FE /* driver.h */, + F48D3832289BA6A1007BD6FE /* logging.h */, + F48D3833289BA6A1007BD6FE /* worker.h */, + F48D3834289BA6A1007BD6FE /* one_shot_timer.h */, + F48D3835289BA6A1007BD6FE /* task_runner.h */, + F48D3836289BA6A1007BD6FE /* serializer.h */, + F48D3837289BA6A1007BD6FE /* hippy_value.h */, + F48D3838289BA6A1007BD6FE /* log_level.h */, + F48D3839289BA6A1007BD6FE /* macros.h */, + F48D383A289BA6A1007BD6FE /* check.h */, + F48D383B289BA6A1007BD6FE /* time_point.h */, + F48D383C289BA6A1007BD6FE /* repeating_timer.h */, + F48D383D289BA6A1007BD6FE /* base_time.h */, + F48D383E289BA6A1007BD6FE /* worker_impl.h */, + F48D383F289BA6A1007BD6FE /* log_settings.h */, + F48D3840289BA6A1007BD6FE /* persistent_object_map.h */, + F48D3841289BA6A1007BD6FE /* time_delta.h */, + F48D3842289BA6A1007BD6FE /* idle_timer.h */, + F48D3843289BA6A1007BD6FE /* hash.h */, + F48D3844289BA6A1007BD6FE /* unicode_string_view.h */, + F48D3845289BA6A1007BD6FE /* base_timer.h */, + F48D3846289BA6A1007BD6FE /* worker_manager.h */, + ); + path = footstone; + sourceTree = ""; + }; + F48D382A289BA6A1007BD6FE /* platform */ = { + isa = PBXGroup; + children = ( + F48D382D289BA6A1007BD6FE /* ios */, + ); + path = platform; + sourceTree = ""; + }; + F48D382D289BA6A1007BD6FE /* ios */ = { + isa = PBXGroup; + children = ( + F48D382E289BA6A1007BD6FE /* looper_driver.h */, + ); + path = ios; + sourceTree = ""; + }; + F48D3847289BA6A1007BD6FE /* src */ = { + isa = PBXGroup; + children = ( + F48D3848289BA6A1007BD6FE /* log_settings_state.cc */, + F48D3849289BA6A1007BD6FE /* log_settings.cc */, + F48D384A289BA6A1007BD6FE /* one_shot_timer.cc */, + F48D384B289BA6A1007BD6FE /* platform */, + F48D3854289BA6A1007BD6FE /* string_utils.cc */, + F48D3855289BA6A1007BD6FE /* worker_manager.cc */, + F48D3856289BA6A1007BD6FE /* hippy_value.cc */, + F48D3857289BA6A1007BD6FE /* base_timer.cc */, + F48D3858289BA6A1007BD6FE /* serializer.cc */, + F48D3859289BA6A1007BD6FE /* unicode_string_view.cc */, + F48D385A289BA6A1007BD6FE /* idle_task.cc */, + F48D385B289BA6A1007BD6FE /* cv_driver.cc */, + F48D385C289BA6A1007BD6FE /* repeating_timer.cc */, + F48D385D289BA6A1007BD6FE /* task_runner.cc */, + F48D385E289BA6A1007BD6FE /* task.cc */, + F48D385F289BA6A1007BD6FE /* deserializer.cc */, + F48D3860289BA6A1007BD6FE /* worker.cc */, + F48D3861289BA6A1007BD6FE /* idle_timer.cc */, + ); + path = src; + sourceTree = ""; + }; + F48D384B289BA6A1007BD6FE /* platform */ = { + isa = PBXGroup; + children = ( + F48D3850289BA6A1007BD6FE /* ios */, + ); + path = platform; + sourceTree = ""; + }; + F48D3850289BA6A1007BD6FE /* ios */ = { + isa = PBXGroup; + children = ( + F48D3851289BA6A1007BD6FE /* looper_driver.cc */, + F48D3852289BA6A1007BD6FE /* logging.cc */, + F48D3853289BA6A1007BD6FE /* worker_impl.cc */, + ); + path = ios; + sourceTree = ""; + }; + F48D387A289BA6E2007BD6FE /* engine */ = { + isa = PBXGroup; + children = ( + F48D387B289BA6E2007BD6FE /* HPStyle.cpp */, + F48D387C289BA6E2007BD6FE /* FlexLine.h */, + F48D387D289BA6E2007BD6FE /* HPConfig.cpp */, + F48D387E289BA6E2007BD6FE /* HPUtil.cpp */, + F48D387F289BA6E2007BD6FE /* HPNode.h */, + F48D3880289BA6E2007BD6FE /* Flex.h */, + F48D3881289BA6E2007BD6FE /* HPConfig.h */, + F48D3882289BA6E2007BD6FE /* HPNode.cpp */, + F48D3883289BA6E2007BD6FE /* Hippy.h */, + F48D3884289BA6E2007BD6FE /* Flex.cpp */, + F48D3885289BA6E2007BD6FE /* FlexLine.cpp */, + F48D3886289BA6E2007BD6FE /* Hippy.cpp */, + F48D3887289BA6E2007BD6FE /* HPLayoutCache.h */, + F48D3888289BA6E2007BD6FE /* HPLayoutCache.cpp */, + F48D3889289BA6E2007BD6FE /* HPUtil.h */, + F48D388A289BA6E2007BD6FE /* HPStyle.h */, ); name = engine; - path = ../../../../layout/engine; + path = ../../../layout/engine; + sourceTree = ""; + }; + F48D38F0289BA876007BD6FE /* Products */ = { + isa = PBXGroup; + children = ( + F48D38F8289BA876007BD6FE /* libdevtools_backend.a */, + F48D38FA289BA876007BD6FE /* libfootstone.a */, + ); + name = Products; sourceTree = ""; }; F4A8423D27D38CF900AEFC88 /* renderer */ = { @@ -1866,7 +1877,7 @@ F4079543281ABA4100DD084A /* RenderVsyncManager.mm */, ); name = renderer; - path = ../../../../renderer/native/ios/renderer; + path = ../../../renderer/native/ios/renderer; sourceTree = ""; }; F4CEDF9227D8587900583C9E /* utils */ = { @@ -1905,7 +1916,7 @@ F4F1FCB1286C4A0C005B39D4 /* NativeRenderDefines.h */, ); name = utils; - path = ../../../../renderer/native/ios/utils; + path = ../../../renderer/native/ios/utils; sourceTree = ""; }; /* End PBXGroup section */ @@ -1923,6 +1934,7 @@ buildRules = ( ); dependencies = ( + F4FC15FF289BBB9F00A35F4A /* PBXTargetDependency */, ); name = HippyDemo; productName = HippyDemo; @@ -1956,8 +1968,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = D3D52E832873D47900740B66 /* Products */; - ProjectRef = D3D52E822873D47900740B66 /* devtools_backend.xcodeproj */; + ProductGroup = F48D38F0289BA876007BD6FE /* Products */; + ProjectRef = F48D38EF289BA876007BD6FE /* devtools_backend.xcodeproj */; }, ); projectRoot = ""; @@ -1968,18 +1980,18 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - D3D52E8A2873D47900740B66 /* libdevtools_backend.a */ = { + F48D38F8289BA876007BD6FE /* libdevtools_backend.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libdevtools_backend.a; - remoteRef = D3D52E892873D47900740B66 /* PBXContainerItemProxy */; + remoteRef = F48D38F7289BA876007BD6FE /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - D3D52EAE287567BD00740B66 /* libfootstone.a */ = { + F48D38FA289BA876007BD6FE /* libfootstone.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libfootstone.a; - remoteRef = D3D52EAD287567BD00740B66 /* PBXContainerItemProxy */; + remoteRef = F48D38F9289BA876007BD6FE /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -2028,109 +2040,103 @@ files = ( F468DE772812A95200319196 /* HippyJSExecutor.mm in Sources */, F4CEDF9C27D858C700583C9E /* NativeRenderDownloadTask.m in Sources */, + F48D3891289BA6E3007BD6FE /* Hippy.cpp in Sources */, F4BD045827D5AE2500339A2C /* UIView+Render.mm in Sources */, - D806C5152872BC3C00E62992 /* one_shot_timer.cc in Sources */, + F48D380A289BA662007BD6FE /* devtools_data_source.cc in Sources */, F468DE562812A95200319196 /* HippyOCTurboModule.mm in Sources */, - D4B09E392750D2C000643CDF /* Flex.cpp in Sources */, + F48D3878289BA6A1007BD6FE /* worker.cc in Sources */, F45D266E28067B6900CAB185 /* NativeRenderImageView.m in Sources */, D42D2C7B2833C84D0079B47B /* dom_listener.cc in Sources */, F4C1DAA52811795200CED4C4 /* NativeRenderLog.mm in Sources */, F468DE5F2812A95200319196 /* ios_loader.cc in Sources */, 067AB97623B5F309009D5EE2 /* MyView.m in Sources */, F468DE602812A95200319196 /* HippyEventObserverModule.mm in Sources */, - D3D52E992873E8D100740B66 /* hippy_tracing_adapter.cc in Sources */, F45D265728067B6900CAB185 /* NativeRenderRefreshWrapperViewManager.mm in Sources */, F45D265628067B6900CAB185 /* NativeRenderRefreshWrapper.mm in Sources */, F468DE672812A95200319196 /* HippyImageCacheManager.m in Sources */, + F48D386F289BA6A1007BD6FE /* base_timer.cc in Sources */, F45D268428067B6900CAB185 /* NativeRenderObjectView.mm in Sources */, - D3D52E962873E8D100740B66 /* devtools_data_source.cc in Sources */, 0612F02923A8BE320079E622 /* ViewController.mm in Sources */, 0612F02323A8BE320079E622 /* AppDelegate.m in Sources */, F438B74928124B200078435B /* NativeRenderI18nUtils.m in Sources */, + F48D3811289BA662007BD6FE /* animation_module.cc in Sources */, F45D266428067B6900CAB185 /* NativeRenderSimpleWebView.m in Sources */, F45D269428067B6900CAB185 /* NativeRenderTextManager.mm in Sources */, F45D266228067B6900CAB185 /* NativeRenderTextField.mm in Sources */, F45D265D28067B6900CAB185 /* NativeRenderViewPagerItemManager.mm in Sources */, + F48D380E289BA662007BD6FE /* devtools_utils.cc in Sources */, F4079544281ABD7A00DD084A /* RenderVsyncManager.mm in Sources */, + F48D3810289BA662007BD6FE /* ui_manager_module.cc in Sources */, + F48D3876289BA6A1007BD6FE /* task.cc in Sources */, F468DE802812A95200319196 /* HippyDisplayLink.m in Sources */, F468DE6E2812A95200319196 /* HippyPerformanceLogger.mm in Sources */, F45D269228067B6900CAB185 /* NativeRenderObjectText.mm in Sources */, - F400C2E3274F65FA008BD74B /* js_native_turbo_jsc.cc in Sources */, F45D268828067B6900CAB185 /* NativeRenderTouchesView.mm in Sources */, F45D268F28067B6900CAB185 /* NativeRenderNavigatorViewManager.mm in Sources */, F45D269028067B6900CAB185 /* NativeRenderFooterRefreshManager.mm in Sources */, - F482919B274E420C00D91128 /* HPConfig.cpp in Sources */, F45D268B28067B6900CAB185 /* NativeRenderNavigatorRootViewController.m in Sources */, - D806C5172872BC3C00E62992 /* log_settings.cc in Sources */, F468DE8F2812A95200319196 /* HippyDevInfo.m in Sources */, F438B75A281283550078435B /* NativeRenderErrorHandler.m in Sources */, - D84AB9BD273A618B00987D03 /* ui_manager_module.cc in Sources */, + F48D3813289BA662007BD6FE /* scene_builder.cc in Sources */, + F48D3802289BA662007BD6FE /* scope.cc in Sources */, F438B745281248010078435B /* OCTypeToDomArgument.mm in Sources */, F468DE612812A95200319196 /* HippyAsyncLocalStorage.mm in Sources */, - F482919E274E420C00D91128 /* FlexLine.cpp in Sources */, - D806C5142872BC3C00E62992 /* worker_manager.cc in Sources */, - F482919A274E420C00D91128 /* HPStyle.cpp in Sources */, + F48D381D289BA662007BD6FE /* js_native_turbo.cc in Sources */, + F48D386E289BA6A1007BD6FE /* hippy_value.cc in Sources */, + F48D3872289BA6A1007BD6FE /* idle_task.cc in Sources */, + F48D380F289BA662007BD6FE /* module_register.cc in Sources */, D84AB8ED273A5AAD00987D03 /* dom_node.cc in Sources */, 067AB97523B5F309009D5EE2 /* MyViewManager.mm in Sources */, - D4B5A0862816641600ABBD9C /* event_module.cc in Sources */, F4810954277062AD005C221B /* layer_optimized_render_manager.cc in Sources */, F4B938F82840B58C00187AFA /* NativeRenderWaterfallViewCell.mm in Sources */, - F48291A0274E420D00D91128 /* HPLayoutCache.cpp in Sources */, - 9B4E720E2876D0B9006566E1 /* string_utils.cc in Sources */, F45D268C28067B6900CAB185 /* NativeRenderNavigatorItemViewController.m in Sources */, F45D268A28067B6900CAB185 /* NativeRenderSmartViewPagerView.mm in Sources */, F4C1CE23281131EC00CED4C4 /* NSData+DataType.m in Sources */, - D806C50B2872BC3C00E62992 /* idle_timer.cc in Sources */, + F48D3863289BA6A1007BD6FE /* log_settings_state.cc in Sources */, F468DE632812A95200319196 /* HippyRedBox.mm in Sources */, - D806C5092872BC3C00E62992 /* task.cc in Sources */, - D84AB9BE273A618B00987D03 /* console_module.cc in Sources */, + F48D3821289BA662007BD6FE /* js_native_api_jsc.cc in Sources */, F45D267C28067B6900CAB185 /* NativeRenderBaseListViewDataSource.mm in Sources */, + F48D3877289BA6A1007BD6FE /* deserializer.cc in Sources */, F45D269528067B6900CAB185 /* NativeRenderModalCustomPresentationController.m in Sources */, - D84AB9C1273A618B00987D03 /* js_value_wrapper.cc in Sources */, D86B3E61284E31EB007E729B /* animation_math.cc in Sources */, F468DE832812A95200319196 /* HippySRSIMDHelpers.m in Sources */, F4B938FB2840C93C00187AFA /* NativeRenderObjectWatefallItem.mm in Sources */, - D3D52E972873E8D100740B66 /* hippy_screen_adapter.cc in Sources */, F45D266328067B6900CAB185 /* NativeRenderTextSelection.m in Sources */, F45D266C28067B6900CAB185 /* NativeRenderCollectionViewWaterfallLayout.m in Sources */, + F48D3818289BA662007BD6FE /* file.cc in Sources */, F45D268528067B6900CAB185 /* NativeRenderBorderDrawing.m in Sources */, - D84AB9CD273A618B00987D03 /* js_native_api_jsc.cc in Sources */, - D806C5162872BC3C00E62992 /* hippy_value.cc in Sources */, F468DE642812A95200319196 /* HippyDevLoadingView.mm in Sources */, + F48D380C289BA662007BD6FE /* hippy_dom_tree_adapter.cc in Sources */, F45D266A28067B6900CAB185 /* NativeRenderWaterfallViewManager.mm in Sources */, F473F1452859C37100422C1A /* NativeRenderComponentMap.mm in Sources */, F468DE582812A95200319196 /* NSObject+HippyTurbo.mm in Sources */, - D8907FF12887FDA2005696C7 /* logging.cc in Sources */, - D806C51D2872BC3C00E62992 /* unicode_string_view.cc in Sources */, F438B744281248010078435B /* NativeRenderGradientObject.m in Sources */, F468DE9E2812ACEA00319196 /* NativeRenderObjectRootView.mm in Sources */, + F48D3871289BA6A1007BD6FE /* unicode_string_view.cc in Sources */, F468DE9D2812ACEA00319196 /* NativeRenderComponentData.mm in Sources */, F45D269828067B6A00CAB185 /* NativeRenderModalCustomAnimationTransition.m in Sources */, - F441DFB12872903700FD5205 /* HippyRootViewManager.mm in Sources */, F45D267028067B6900CAB185 /* NativeRenderAnimatedImageView.m in Sources */, - D84AB9B6273A618B00987D03 /* scope.cc in Sources */, + F48D386A289BA6A1007BD6FE /* logging.cc in Sources */, F45D265B28067B6900CAB185 /* NativeRenderViewPagerManager.mm in Sources */, + F48D3816289BA662007BD6FE /* event_module.cc in Sources */, + F48D3817289BA662007BD6FE /* js_value_wrapper.cc in Sources */, F468DE792812A95200319196 /* HippyKeyCommands.m in Sources */, - D84AB9CA273A618B00987D03 /* js_native_jsc_helper.cc in Sources */, F45D266928067B6900CAB185 /* NativeRenderWaterfallViewDataSource.mm in Sources */, F45D265C28067B6900CAB185 /* NativeRenderViewPagerItem.mm in Sources */, F45D265528067B6900CAB185 /* NativeRenderRefreshWrapperItemView.mm in Sources */, - D84AB9B7273A618B00987D03 /* engine.cc in Sources */, - D3D52E9A2873E8D100740B66 /* devtools_utils.cc in Sources */, - F400C2E7274F66ED008BD74B /* js_native_turbo.cc in Sources */, + F48D3873289BA6A1007BD6FE /* cv_driver.cc in Sources */, F468DE662812A95200319196 /* HippyImageLoaderModule.mm in Sources */, - D84AB9C9273A618B00987D03 /* callback_info.cc in Sources */, F4E7B43E276C61EB00F17139 /* dom_event.cc in Sources */, F45D265A28067B6900CAB185 /* NativeRenderViewPager.mm in Sources */, F468DE5A2812A95200319196 /* HippyFetchInfo.m in Sources */, - D84AB9BF273A618B00987D03 /* timer_module.cc in Sources */, F45D267228067B6900CAB185 /* NativeRenderImageView+NativeRenderTouchesImplementation.mm in Sources */, - D8907F99288648A1005696C7 /* cv_driver.cc in Sources */, F468DE5C2812A95200319196 /* HippyNetInfo.mm in Sources */, F468DE7C2812A95200319196 /* HippyBridge.mm in Sources */, D84AB8EF273A5AAD00987D03 /* layout_node.cc in Sources */, + F48D3892289BA6E3007BD6FE /* HPLayoutCache.cpp in Sources */, F468DE572812A95200319196 /* HippyTurboModuleManager.mm in Sources */, D4B5A080281663F400ABBD9C /* scene_builder.cc in Sources */, + F48D388E289BA6E2007BD6FE /* HPNode.cpp in Sources */, F438B746281248010078435B /* NativeRenderDomNodeUtils.mm in Sources */, F468DE5E2812A95200319196 /* HippyTiming.mm in Sources */, F42EA79B277C354C007874A2 /* TurboBaseModule.mm in Sources */, @@ -2143,11 +2149,14 @@ F4CEDF9D27D858C700583C9E /* NativeRenderDefaultImageProvider.m in Sources */, F468DE592812A95200319196 /* HippyNetWork.m in Sources */, F45D269A28067B6A00CAB185 /* NativeRenderModalHostView.mm in Sources */, + F48D3869289BA6A1007BD6FE /* looper_driver.cc in Sources */, F45D265428067B6900CAB185 /* NativeRenderScrollViewManager.mm in Sources */, F45D266628067B6900CAB185 /* NativeRenderHeaderRefreshManager.mm in Sources */, - D3D52E982873E8D100740B66 /* hippy_dom_tree_adapter.cc in Sources */, F468DE702812A95200319196 /* HippyModuleMethod.mm in Sources */, F438B757281250CD0078435B /* NativeRenderParserUtils.m in Sources */, + F48D380D289BA662007BD6FE /* hippy_tracing_adapter.cc in Sources */, + F48D386D289BA6A1007BD6FE /* worker_manager.cc in Sources */, + F48D381C289BA662007BD6FE /* callback_info.cc in Sources */, 0612F03423A8BE330079E622 /* main.m in Sources */, F4E7B43D276C61EB00F17139 /* dom_argument.cc in Sources */, F45D267B28067B6900CAB185 /* NativeRenderListTableView.m in Sources */, @@ -2156,70 +2165,72 @@ F45D266F28067B6900CAB185 /* NativeRenderAnimatedImage.m in Sources */, F45D267128067B6900CAB185 /* NativeRenderImageViewManager.mm in Sources */, F438B754281250CD0078435B /* NativeRenderConvert+Transform.m in Sources */, - D806C51A2872BC3C00E62992 /* idle_task.cc in Sources */, - F482919F274E420D00D91128 /* Hippy.cpp in Sources */, + F48D388B289BA6E2007BD6FE /* HPStyle.cpp in Sources */, F468DE732812A95200319196 /* HippyBundleURLProvider.m in Sources */, F45D268E28067B6900CAB185 /* NativeRenderNavigationControllerAnimator.m in Sources */, + F48D388C289BA6E2007BD6FE /* HPConfig.cpp in Sources */, D86B3E60284E31EB007E729B /* animation_manager.cc in Sources */, + F48D3812289BA662007BD6FE /* console_module.cc in Sources */, F45D267428067B6900CAB185 /* NativeRenderObjectBaseListItem.mm in Sources */, D84AB8EC273A5AAD00987D03 /* dom_manager.cc in Sources */, F45D268028067B6900CAB185 /* NativeRenderViewManager.mm in Sources */, + F48D388F289BA6E2007BD6FE /* Flex.cpp in Sources */, + F48D3815289BA662007BD6FE /* contextify_module.cc in Sources */, F45D266528067B6900CAB185 /* NativeRenderSimpleWebViewManager.mm in Sources */, F43A2D09275882650056F36C /* diff_utils.cc in Sources */, - D3D52E952873E8D100740B66 /* trace_control.cc in Sources */, - D4B5A0872816641600ABBD9C /* scene_builder.cc in Sources */, + F48D3890289BA6E3007BD6FE /* FlexLine.cpp in Sources */, F45D267D28067B6900CAB185 /* UIView+MountEvent.m in Sources */, + F48D380B289BA662007BD6FE /* hippy_screen_adapter.cc in Sources */, D4B5A081281663F400ABBD9C /* scene.cc in Sources */, F4A8424327D38CF900AEFC88 /* NativeRenderImpl.mm in Sources */, F45D266B28067B6900CAB185 /* NativeRenderWaterfallItemView.mm in Sources */, F45D266028067B6900CAB185 /* NativeRenderTextViewManager.mm in Sources */, F45D269328067B6900CAB185 /* NativeRenderText.mm in Sources */, F438B755281250CD0078435B /* NativeRenderUtils.m in Sources */, - D84AB9CC273A618B00987D03 /* js_native_api_value_jsc.cc in Sources */, + F48D3809289BA662007BD6FE /* trace_control.cc in Sources */, + F48D3874289BA6A1007BD6FE /* repeating_timer.cc in Sources */, F468DE712812A95200319196 /* HippyDeviceBaseInfo.mm in Sources */, F468DE5D2812A95200319196 /* HippyNetInfoIntenal.m in Sources */, + F48D381E289BA662007BD6FE /* js_native_jsc_helper.cc in Sources */, F42EA79A277C354C007874A2 /* TurboConfig.m in Sources */, - D806C51B2872BC3C00E62992 /* base_timer.cc in Sources */, D86B3E64284E31EB007E729B /* animation_set.cc in Sources */, F468DE742812A95200319196 /* HippyJSEnginesMapper.mm in Sources */, F45D267F28067B6900CAB185 /* UIView+NativeRender.mm in Sources */, - D806C5122872BC3C00E62992 /* deserializer.cc in Sources */, + F48D3865289BA6A1007BD6FE /* one_shot_timer.cc in Sources */, F45D267528067B6900CAB185 /* NativeRenderBaseListView.mm in Sources */, F45D268628067B6900CAB185 /* UIView+DomEvent.mm in Sources */, F468DE9F2812ACEA00319196 /* NativeRenderFont.mm in Sources */, - D88F440B28470C3E00989F01 /* animation_module.cc in Sources */, F45D268228067B6900CAB185 /* NativeRenderView.mm in Sources */, - D84AB9C0273A618B00987D03 /* contextify_module.cc in Sources */, F45D265328067B6900CAB185 /* NativeRenderScrollView.mm in Sources */, + F48D386B289BA6A1007BD6FE /* worker_impl.cc in Sources */, F45D265F28067B6900CAB185 /* NativeRenderBaseTextInput.mm in Sources */, - D806C5132872BC3C00E62992 /* log_settings_state.cc in Sources */, - F482919D274E420C00D91128 /* HPNode.cpp in Sources */, + F48D3875289BA6A1007BD6FE /* task_runner.cc in Sources */, + F48D3820289BA662007BD6FE /* js_native_api_value_jsc.cc in Sources */, + F48D3879289BA6A1007BD6FE /* idle_timer.cc in Sources */, F45D268928067B6900CAB185 /* NativeRenderSmartViewPagerViewManager.mm in Sources */, F45D265828067B6900CAB185 /* NativeRenderRefreshWrapperItemViewManager.mm in Sources */, - D8907FF22887FDA2005696C7 /* worker_impl.cc in Sources */, F468DE622812A95200319196 /* HippyDevMenu.mm in Sources */, - D84AB9BC273A618B00987D03 /* module_register.cc in Sources */, - D84AB9C2273A618B00987D03 /* file.cc in Sources */, + F48D3870289BA6A1007BD6FE /* serializer.cc in Sources */, F4CEDF9B27D858C700583C9E /* NativeRenderImageDataLoader.m in Sources */, F45D269728067B6900CAB185 /* NativeRenderModalTransitioningDelegate.mm in Sources */, - D806C51C2872BC3C00E62992 /* task_runner.cc in Sources */, F45D266D28067B6900CAB185 /* NativeRenderWaterfallItemViewManager.mm in Sources */, F4A8424227D38CF900AEFC88 /* NativeRenderManager.mm in Sources */, + F48D386C289BA6A1007BD6FE /* string_utils.cc in Sources */, F45EF2D9287BC47C00D79828 /* NSObject+ToJSCtxValue.mm in Sources */, - D8907FF02887FDA2005696C7 /* looper_driver.cc in Sources */, F45D265E28067B6900CAB185 /* NativeRenderTextView.mm in Sources */, F468DE842812A95200319196 /* HippyWebSocketManager.m in Sources */, D86B3E62284E31EB007E729B /* animation.cc in Sources */, F468DE752812A95200319196 /* HippyJavaScriptLoader.mm in Sources */, - D806C5182872BC3C00E62992 /* serializer.cc in Sources */, F468DE6F2812A95200319196 /* HippyJSStackFrame.m in Sources */, F45D268128067B6900CAB185 /* UIView+DirectionalLayout.mm in Sources */, - D806C5192872BC3C00E62992 /* worker.cc in Sources */, + F48D3864289BA6A1007BD6FE /* log_settings.cc in Sources */, + F48D3814289BA662007BD6FE /* timer_module.cc in Sources */, F468DE692812A95200319196 /* HippyAssert.m in Sources */, F45D265928067B6900CAB185 /* NativeRenderRefresh.mm in Sources */, + F48D381F289BA662007BD6FE /* js_native_turbo_jsc.cc in Sources */, F4C1CE262811439A00CED4C4 /* UIView+Sequence.m in Sources */, F468DE7B2812A95200319196 /* native_source_code_ios.cc in Sources */, - D806C5082872BC3C00E62992 /* repeating_timer.cc in Sources */, + F48D388D289BA6E2007BD6FE /* HPUtil.cpp in Sources */, F438B756281250CD0078435B /* NativeRenderConvert.mm in Sources */, F468DE762812A95200319196 /* HippyBatchedBridge.mm in Sources */, F468DE822812A95200319196 /* HippySRWebSocket.m in Sources */, @@ -2227,7 +2238,6 @@ 9252AE8B2809532F00B27E50 /* root_node.cc in Sources */, F45D266828067B6900CAB185 /* NativeRenderWaterfallView.mm in Sources */, D86B3E63284E31EB007E729B /* cubic_bezier_animation.cc in Sources */, - F482919C274E420C00D91128 /* HPUtil.cpp in Sources */, F45D269628067B6900CAB185 /* NativeRenderModalHostViewManager.mm in Sources */, F45D267A28067B6900CAB185 /* NativeRenderCollectionViewFlowLayout.m in Sources */, F468DE722812A95200319196 /* HippyRootView.mm in Sources */, @@ -2237,6 +2247,7 @@ F468DE7F2812A95200319196 /* HippyFrameUpdate.m in Sources */, F45D267628067B6900CAB185 /* NativeRenderBaseListViewCell.mm in Sources */, 067AB96F23B5EEF4009D5EE2 /* TestModule.mm in Sources */, + F48D3803289BA662007BD6FE /* engine.cc in Sources */, F468DE7E2812A95200319196 /* HippyModuleData.mm in Sources */, F468DE652812A95200319196 /* HippyExceptionModule.mm in Sources */, F45D267928067B6900CAB185 /* NativeRenderBaseListItemViewManager.mm in Sources */, @@ -2247,6 +2258,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + F4FC15FF289BBB9F00A35F4A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = devtools_backend; + targetProxy = F4FC15FE289BBB9F00A35F4A /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 0612F03523A8BE330079E622 /* Debug */ = { isa = XCBuildConfiguration; @@ -2373,18 +2392,18 @@ USE_TAITANK, "DEBUG=1", "$(inherited)", - "ENABLE_INSPECTOR=true", + "ENABLE_INSPECTOR=1", "JS_USE_JSC=1", "V8_WITHOUT_INSPECTOR=1", ); HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../../../modules/footstone/include", - "$(SRCROOT)/../../../../modules/footstone", - "$(SRCROOT)/../../core/include", - "$(SRCROOT)/../../../../layout", - "$(SRCROOT)/../../../../dom/include", - "$(SRCROOT)/../../../../devtools/devtools-backend", - "$(SRCROOT)/../../../../devtools/devtools-backend/include", + "$(SRCROOT)/../../../modules/footstone/include", + "$(SRCROOT)/../../../modules/footstone", + "$(SRCROOT)/../../../driver/js/include", + "$(SRCROOT)/../../../layout", + "$(SRCROOT)/../../../dom/include", + "$(SRCROOT)/../../../devtools/devtools-backend", + "$(SRCROOT)/../../../devtools/devtools-backend/include", "$(SRCROOT)/devtools_backend/_deps/websocketpp-src", "$(SRCROOT)/devtools_backend/_deps/asio-src/asio/include", "$(SRCROOT)/devtools_backend/_deps/json-src/single_include", @@ -2421,13 +2440,13 @@ "NDEBUG=1", ); HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../../../modules/footstone/include", - "$(SRCROOT)/../../../../modules/footstone", - "$(SRCROOT)/../../core/include", - "$(SRCROOT)/../../../../layout", - "$(SRCROOT)/../../../../dom/include", - "$(SRCROOT)/../../../../devtools/devtools-backend", - "$(SRCROOT)/../../../../devtools/devtools-backend/include", + "$(SRCROOT)/../../../modules/footstone/include", + "$(SRCROOT)/../../../modules/footstone", + "$(SRCROOT)/../../../driver/js/include", + "$(SRCROOT)/../../../layout", + "$(SRCROOT)/../../../dom/include", + "$(SRCROOT)/../../../devtools/devtools-backend", + "$(SRCROOT)/../../../devtools/devtools-backend/include", "$(SRCROOT)/devtools_backend/_deps/websocketpp-src", "$(SRCROOT)/devtools_backend/_deps/asio-src/asio/include", "$(SRCROOT)/devtools_backend/_deps/json-src/single_include", diff --git a/driver/js/examples/ios-demo/HippyDemo/AppDelegate.h b/framework/examples/ios-demo/HippyDemo/AppDelegate.h similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/AppDelegate.h rename to framework/examples/ios-demo/HippyDemo/AppDelegate.h diff --git a/driver/js/examples/ios-demo/HippyDemo/AppDelegate.m b/framework/examples/ios-demo/HippyDemo/AppDelegate.m similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/AppDelegate.m rename to framework/examples/ios-demo/HippyDemo/AppDelegate.m diff --git a/driver/js/examples/ios-demo/HippyDemo/DemoConfigs.h b/framework/examples/ios-demo/HippyDemo/DemoConfigs.h similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/DemoConfigs.h rename to framework/examples/ios-demo/HippyDemo/DemoConfigs.h diff --git a/driver/js/examples/ios-demo/HippyDemo/Info.plist b/framework/examples/ios-demo/HippyDemo/Info.plist similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/Info.plist rename to framework/examples/ios-demo/HippyDemo/Info.plist diff --git a/driver/js/examples/ios-demo/HippyDemo/TestModule.h b/framework/examples/ios-demo/HippyDemo/TestModule.h similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/TestModule.h rename to framework/examples/ios-demo/HippyDemo/TestModule.h diff --git a/driver/js/examples/ios-demo/HippyDemo/TestModule.mm b/framework/examples/ios-demo/HippyDemo/TestModule.mm similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/TestModule.mm rename to framework/examples/ios-demo/HippyDemo/TestModule.mm diff --git a/driver/js/examples/ios-demo/HippyDemo/ViewController.h b/framework/examples/ios-demo/HippyDemo/ViewController.h similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/ViewController.h rename to framework/examples/ios-demo/HippyDemo/ViewController.h diff --git a/driver/js/examples/ios-demo/HippyDemo/ViewController.mm b/framework/examples/ios-demo/HippyDemo/ViewController.mm similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/ViewController.mm rename to framework/examples/ios-demo/HippyDemo/ViewController.mm diff --git a/driver/js/examples/ios-demo/HippyDemo/main.m b/framework/examples/ios-demo/HippyDemo/main.m similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/main.m rename to framework/examples/ios-demo/HippyDemo/main.m diff --git a/driver/js/examples/ios-demo/HippyDemo/myview/MyView.h b/framework/examples/ios-demo/HippyDemo/myview/MyView.h similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/myview/MyView.h rename to framework/examples/ios-demo/HippyDemo/myview/MyView.h diff --git a/driver/js/examples/ios-demo/HippyDemo/myview/MyView.m b/framework/examples/ios-demo/HippyDemo/myview/MyView.m similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/myview/MyView.m rename to framework/examples/ios-demo/HippyDemo/myview/MyView.m diff --git a/driver/js/examples/ios-demo/HippyDemo/myview/MyViewManager.h b/framework/examples/ios-demo/HippyDemo/myview/MyViewManager.h similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/myview/MyViewManager.h rename to framework/examples/ios-demo/HippyDemo/myview/MyViewManager.h diff --git a/driver/js/examples/ios-demo/HippyDemo/myview/MyViewManager.mm b/framework/examples/ios-demo/HippyDemo/myview/MyViewManager.mm similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/myview/MyViewManager.mm rename to framework/examples/ios-demo/HippyDemo/myview/MyViewManager.mm diff --git a/driver/js/examples/ios-demo/HippyDemo/turbomodule/TurboBaseModule.h b/framework/examples/ios-demo/HippyDemo/turbomodule/TurboBaseModule.h similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/turbomodule/TurboBaseModule.h rename to framework/examples/ios-demo/HippyDemo/turbomodule/TurboBaseModule.h diff --git a/driver/js/examples/ios-demo/HippyDemo/turbomodule/TurboBaseModule.mm b/framework/examples/ios-demo/HippyDemo/turbomodule/TurboBaseModule.mm similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/turbomodule/TurboBaseModule.mm rename to framework/examples/ios-demo/HippyDemo/turbomodule/TurboBaseModule.mm diff --git a/driver/js/examples/ios-demo/HippyDemo/turbomodule/TurboConfig.h b/framework/examples/ios-demo/HippyDemo/turbomodule/TurboConfig.h similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/turbomodule/TurboConfig.h rename to framework/examples/ios-demo/HippyDemo/turbomodule/TurboConfig.h diff --git a/driver/js/examples/ios-demo/HippyDemo/turbomodule/TurboConfig.m b/framework/examples/ios-demo/HippyDemo/turbomodule/TurboConfig.m similarity index 100% rename from driver/js/examples/ios-demo/HippyDemo/turbomodule/TurboConfig.m rename to framework/examples/ios-demo/HippyDemo/turbomodule/TurboConfig.m diff --git a/driver/js/examples/ios-demo/Podfile b/framework/examples/ios-demo/Podfile similarity index 67% rename from driver/js/examples/ios-demo/Podfile rename to framework/examples/ios-demo/Podfile index 652ae6f470f..998cc870df4 100644 --- a/driver/js/examples/ios-demo/Podfile +++ b/framework/examples/ios-demo/Podfile @@ -4,7 +4,7 @@ install! 'cocoapods', :deterministic_uuids => false, :disable_input_output_paths def run_devtools_cmake system("rm -rf devtools_backend") system("mkdir devtools_backend") - system("cmake ../../../../devtools/devtools-backend/CMakeLists.txt -B ./devtools_backend -G Xcode -DMODULE_TOOLS=YES -DCMAKE_TOOLCHAIN_FILE=./ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_BITCODE=YES -DENABLE_ARC=YES -DDEPLOYMENT_TARGET=11.0 -DENABLE_INSPECTOR=YES") + system("cmake ../../../devtools/devtools-backend/CMakeLists.txt -B ./devtools_backend -G Xcode -DMODULE_TOOLS=YES -DCMAKE_TOOLCHAIN_FILE=./ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_BITCODE=YES -DENABLE_ARC=YES -DDEPLOYMENT_TARGET=11.0 -DENABLE_INSPECTOR=YES") end pre_install do |installer| diff --git a/driver/js/examples/ios-demo/fonts/TTTGB-Medium.otf b/framework/examples/ios-demo/fonts/TTTGB-Medium.otf similarity index 100% rename from driver/js/examples/ios-demo/fonts/TTTGB-Medium.otf rename to framework/examples/ios-demo/fonts/TTTGB-Medium.otf diff --git a/driver/js/examples/ios-demo/res/assets/defaultSource.jpg b/framework/examples/ios-demo/res/assets/defaultSource.jpg similarity index 100% rename from driver/js/examples/ios-demo/res/assets/defaultSource.jpg rename to framework/examples/ios-demo/res/assets/defaultSource.jpg diff --git a/driver/js/examples/ios-demo/res/assets/hippyLogoWhite.png b/framework/examples/ios-demo/res/assets/hippyLogoWhite.png similarity index 100% rename from driver/js/examples/ios-demo/res/assets/hippyLogoWhite.png rename to framework/examples/ios-demo/res/assets/hippyLogoWhite.png diff --git a/driver/js/examples/ios-demo/res/asyncComponentFromHttp.ios.js b/framework/examples/ios-demo/res/asyncComponentFromHttp.ios.js similarity index 100% rename from driver/js/examples/ios-demo/res/asyncComponentFromHttp.ios.js rename to framework/examples/ios-demo/res/asyncComponentFromHttp.ios.js diff --git a/driver/js/examples/ios-demo/res/asyncComponentFromLocal.ios.js b/framework/examples/ios-demo/res/asyncComponentFromLocal.ios.js similarity index 100% rename from driver/js/examples/ios-demo/res/asyncComponentFromLocal.ios.js rename to framework/examples/ios-demo/res/asyncComponentFromLocal.ios.js diff --git a/driver/js/examples/ios-demo/res/index.ios.js b/framework/examples/ios-demo/res/index.ios.js similarity index 100% rename from driver/js/examples/ios-demo/res/index.ios.js rename to framework/examples/ios-demo/res/index.ios.js diff --git a/driver/js/examples/ios-demo/res/vendor.ios.js b/framework/examples/ios-demo/res/vendor.ios.js similarity index 99% rename from driver/js/examples/ios-demo/res/vendor.ios.js rename to framework/examples/ios-demo/res/vendor.ios.js index 3fa8ee170bd..cdb55b756c8 100644 --- a/driver/js/examples/ios-demo/res/vendor.ios.js +++ b/framework/examples/ios-demo/res/vendor.ios.js @@ -1,7 +1,7 @@ var hippyReactBase=function(e){var t={};function n(r){if(t[r])return t[r].exports;var i=t[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var i in e)n.d(r,i,function(t){return e[t]}.bind(null,i));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}({"../../packages/hippy-react/dist/index.js":function(e,t,n){"use strict";n.r(t),function(e){n.d(t,"Animated",(function(){return zn})),n.d(t,"Animation",(function(){return tt})),n.d(t,"AnimationSet",(function(){return at})),n.d(t,"AppRegistry",(function(){return In})),n.d(t,"AsyncStorage",(function(){return ur})),n.d(t,"BackAndroid",(function(){return sr})),n.d(t,"Clipboard",(function(){return fr})),n.d(t,"ConsoleModule",(function(){return Cr})),n.d(t,"Dimensions",(function(){return Rr})),n.d(t,"Easing",(function(){return On})),n.d(t,"Focusable",(function(){return nr})),n.d(t,"Hippy",(function(){return Nr})),n.d(t,"HippyEventEmitter",(function(){return Oe})),n.d(t,"HippyEventListener",(function(){return Te})),n.d(t,"HippyRegister",(function(){return hr})),n.d(t,"Image",(function(){return Tn})),n.d(t,"ImageBackground",(function(){return Ir})),n.d(t,"ImageLoaderModule",(function(){return mr})),n.d(t,"ListView",(function(){return Mn})),n.d(t,"ListViewItem",(function(){return jn})),n.d(t,"Modal",(function(){return tr})),n.d(t,"Navigator",(function(){return Bn})),n.d(t,"NetInfo",(function(){return vr})),n.d(t,"NetworkModule",(function(){return dr})),n.d(t,"PixelRatio",(function(){return Tr})),n.d(t,"Platform",(function(){return xr})),n.d(t,"PullFooter",(function(){return Hn})),n.d(t,"PullHeader",(function(){return Fn})),n.d(t,"RNfqb",(function(){return Pr})),n.d(t,"RNfqbEventEmitter",(function(){return Ar})),n.d(t,"RNfqbEventListener",(function(){return Lr})),n.d(t,"RNfqbRegister",(function(){return _r})),n.d(t,"RefreshWrapper",(function(){return Dn})),n.d(t,"ScrollView",(function(){return Zn})),n.d(t,"StyleSheet",(function(){return Xn})),n.d(t,"Text",(function(){return Ln})),n.d(t,"TextInput",(function(){return Qn})),n.d(t,"TimerModule",(function(){return Er})),n.d(t,"UIManagerModule",(function(){return yr})),n.d(t,"View",(function(){return _n})),n.d(t,"ViewPager",(function(){return Vn})),n.d(t,"WaterfallView",(function(){return lr})),n.d(t,"WebSocket",(function(){return or})),n.d(t,"WebView",(function(){return rr})),n.d(t,"callNative",(function(){return br})),n.d(t,"callNativeWithCallbackId",(function(){return wr})),n.d(t,"callNativeWithPromise",(function(){return kr})),n.d(t,"colorParse",(function(){return Qe})),n.d(t,"default",(function(){return Pn})),n.d(t,"flushSync",(function(){return gr})),n.d(t,"removeNativeCallback",(function(){return Sr}));var r=n("./node_modules/react/index.js"),i=n.n(r),o=n("./node_modules/@hippy/react-reconciler/index.js"),a=n.n(o),l=["children"],u=["collapsable","style"],s=["style"],c=["children","style","imageStyle","imageRef","source","sources","src","srcs","tintColor","tintColors"],f=["children"],d=["children"],p=["children","style","renderRow","renderPullHeader","renderPullFooter","getRowType","getRowStyle","getHeaderStyle","getFooterStyle","getRowKey","dataSource","initialListSize","rowShouldSticky","onRowLayout","onHeaderPulling","onHeaderReleased","onFooterPulling","onFooterReleased","onAppear","onDisappear","onWillAppear","onWillDisappear"],h=["children"],m=["component"],v=["initialRoute"],y=["children","onPageScrollStateChanged"],g=["style","renderBanner","numberOfColumns","columnSpacing","interItemSpacing","numberOfItems","preloadItemNumber","renderItem","renderPullHeader","renderPullFooter","getItemType","getItemKey","getItemStyle","contentInset","onItemLayout","onHeaderPulling","onHeaderReleased","onFooterPulling","onFooterReleased","containPullHeader","containPullFooter","containBannerView"];function b(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),Object.defineProperty(e,"prototype",{writable:!1}),t&&k(e,t)}function k(e,t){return(k=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(e,t){return e.__proto__=t,e})(e,t)}function w(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(e){return!1}}();return function(){var n,r=C(e);if(t){var i=C(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return S(this,n)}}function S(e,t){if(t&&("object"===j(t)||"function"==typeof t))return t;if(void 0!==t)throw new TypeError("Derived constructors may only return object or undefined");return E(e)}function E(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function C(e){return(C=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function x(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function N(e){for(var t=1;t=0||(i[n]=e[n]);return i}(e,t);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);for(r=0;r=0||Object.prototype.propertyIsEnumerable.call(e,n)&&(i[n]=e[n])}return i}function _(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){var n=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null==n)return;var r,i,o=[],a=!0,l=!1;try{for(n=n.call(e);!(a=(r=n.next()).done)&&(o.push(r.value),!t||o.length!==t);a=!0);}catch(e){l=!0,i=e}finally{try{a||null==n.return||n.return()}finally{if(l)throw i}}return o}(e,t)||z(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function A(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function L(e,t){for(var n=0;ne.length)&&(t=e.length);for(var n=0,r=new Array(t);n -#import "core/engine.h" +#import "driver/engine.h" #import "dom/dom_manager.h" #import "footstone/worker.h" #import "footstone/task_runner.h" diff --git a/driver/js/ios/base/HippyJSEnginesMapper.mm b/framework/ios/base/HippyJSEnginesMapper.mm similarity index 100% rename from driver/js/ios/base/HippyJSEnginesMapper.mm rename to framework/ios/base/HippyJSEnginesMapper.mm diff --git a/driver/js/ios/base/HippyJSStackFrame.h b/framework/ios/base/HippyJSStackFrame.h similarity index 100% rename from driver/js/ios/base/HippyJSStackFrame.h rename to framework/ios/base/HippyJSStackFrame.h diff --git a/driver/js/ios/base/HippyJSStackFrame.m b/framework/ios/base/HippyJSStackFrame.m similarity index 100% rename from driver/js/ios/base/HippyJSStackFrame.m rename to framework/ios/base/HippyJSStackFrame.m diff --git a/driver/js/ios/base/HippyJavaScriptLoader.h b/framework/ios/base/HippyJavaScriptLoader.h similarity index 100% rename from driver/js/ios/base/HippyJavaScriptLoader.h rename to framework/ios/base/HippyJavaScriptLoader.h diff --git a/driver/js/ios/base/HippyJavaScriptLoader.mm b/framework/ios/base/HippyJavaScriptLoader.mm similarity index 100% rename from driver/js/ios/base/HippyJavaScriptLoader.mm rename to framework/ios/base/HippyJavaScriptLoader.mm diff --git a/driver/js/ios/base/HippyKeyCommands.h b/framework/ios/base/HippyKeyCommands.h similarity index 100% rename from driver/js/ios/base/HippyKeyCommands.h rename to framework/ios/base/HippyKeyCommands.h diff --git a/driver/js/ios/base/HippyKeyCommands.m b/framework/ios/base/HippyKeyCommands.m similarity index 100% rename from driver/js/ios/base/HippyKeyCommands.m rename to framework/ios/base/HippyKeyCommands.m diff --git a/driver/js/ios/base/HippyMethodInterceptorProtocol.h b/framework/ios/base/HippyMethodInterceptorProtocol.h similarity index 100% rename from driver/js/ios/base/HippyMethodInterceptorProtocol.h rename to framework/ios/base/HippyMethodInterceptorProtocol.h diff --git a/driver/js/ios/base/HippyModuleData.h b/framework/ios/base/HippyModuleData.h similarity index 100% rename from driver/js/ios/base/HippyModuleData.h rename to framework/ios/base/HippyModuleData.h diff --git a/driver/js/ios/base/HippyModuleData.mm b/framework/ios/base/HippyModuleData.mm similarity index 100% rename from driver/js/ios/base/HippyModuleData.mm rename to framework/ios/base/HippyModuleData.mm diff --git a/driver/js/ios/base/HippyModuleMethod.h b/framework/ios/base/HippyModuleMethod.h similarity index 100% rename from driver/js/ios/base/HippyModuleMethod.h rename to framework/ios/base/HippyModuleMethod.h diff --git a/driver/js/ios/base/HippyModuleMethod.mm b/framework/ios/base/HippyModuleMethod.mm similarity index 100% rename from driver/js/ios/base/HippyModuleMethod.mm rename to framework/ios/base/HippyModuleMethod.mm diff --git a/driver/js/ios/base/HippyPerformanceLogger.h b/framework/ios/base/HippyPerformanceLogger.h similarity index 100% rename from driver/js/ios/base/HippyPerformanceLogger.h rename to framework/ios/base/HippyPerformanceLogger.h diff --git a/driver/js/ios/base/HippyPerformanceLogger.mm b/framework/ios/base/HippyPerformanceLogger.mm similarity index 100% rename from driver/js/ios/base/HippyPerformanceLogger.mm rename to framework/ios/base/HippyPerformanceLogger.mm diff --git a/driver/js/ios/base/HippyRootView.h b/framework/ios/base/HippyRootView.h similarity index 100% rename from driver/js/ios/base/HippyRootView.h rename to framework/ios/base/HippyRootView.h diff --git a/driver/js/ios/base/HippyRootView.mm b/framework/ios/base/HippyRootView.mm similarity index 100% rename from driver/js/ios/base/HippyRootView.mm rename to framework/ios/base/HippyRootView.mm diff --git a/driver/js/ios/base/HippyRootViewDelegate.h b/framework/ios/base/HippyRootViewDelegate.h similarity index 100% rename from driver/js/ios/base/HippyRootViewDelegate.h rename to framework/ios/base/HippyRootViewDelegate.h diff --git a/driver/js/ios/base/executors/HippyJSExecutor.h b/framework/ios/base/executors/HippyJSExecutor.h similarity index 100% rename from driver/js/ios/base/executors/HippyJSExecutor.h rename to framework/ios/base/executors/HippyJSExecutor.h diff --git a/driver/js/ios/base/executors/HippyJSExecutor.mm b/framework/ios/base/executors/HippyJSExecutor.mm similarity index 99% rename from driver/js/ios/base/executors/HippyJSExecutor.mm rename to framework/ios/base/executors/HippyJSExecutor.mm index 0f2d9d4add4..9ff04c7cfc4 100644 --- a/driver/js/ios/base/executors/HippyJSExecutor.mm +++ b/framework/ios/base/executors/HippyJSExecutor.mm @@ -46,16 +46,16 @@ #include "footstone/string_view_utils.h" #include "footstone/task_runner.h" #include "footstone/task.h" -#include "core/napi/js_native_api.h" -#include "core/scope.h" -#include "core/engine.h" +#include "driver/napi/js_native_api.h" +#include "driver/scope.h" +#include "driver/engine.h" #import "HippyOCTurboModule+Inner.h" #import "HippyTurboModuleManager.h" #import "HippyDevInfo.h" #import "HippyBundleURLProvider.h" #import "NSObject+ToJSCtxValue.h" #ifdef JS_USE_JSC -#import "core/napi/jsc/js_native_api_jsc.h" +#import "driver/napi/jsc/js_native_api_jsc.h" #endif //JS_USE_JSC NSString *const HippyJSCThreadName = @"com.tencent.hippy.JavaScript"; diff --git a/driver/js/ios/base/native_source_code_ios.cc b/framework/ios/base/native_source_code_ios.cc similarity index 99% rename from driver/js/ios/base/native_source_code_ios.cc rename to framework/ios/base/native_source_code_ios.cc index eaa788e24c8..808001df654 100644 --- a/driver/js/ios/base/native_source_code_ios.cc +++ b/framework/ios/base/native_source_code_ios.cc @@ -20,8 +20,8 @@ #include -#include "core/napi/native_source_code.h" -#include "core/base/macros.h" +#include "driver/napi/native_source_code.h" +#include "driver/base/macros.h" // clang-format off diff --git a/driver/js/ios/debug/devtools/HippyDevInfo.h b/framework/ios/debug/devtools/HippyDevInfo.h similarity index 100% rename from driver/js/ios/debug/devtools/HippyDevInfo.h rename to framework/ios/debug/devtools/HippyDevInfo.h diff --git a/driver/js/ios/debug/devtools/HippyDevInfo.m b/framework/ios/debug/devtools/HippyDevInfo.m similarity index 100% rename from driver/js/ios/debug/devtools/HippyDevInfo.m rename to framework/ios/debug/devtools/HippyDevInfo.m diff --git a/driver/js/ios/debug/websocket/HippySRSIMDHelpers.h b/framework/ios/debug/websocket/HippySRSIMDHelpers.h similarity index 100% rename from driver/js/ios/debug/websocket/HippySRSIMDHelpers.h rename to framework/ios/debug/websocket/HippySRSIMDHelpers.h diff --git a/driver/js/ios/debug/websocket/HippySRSIMDHelpers.m b/framework/ios/debug/websocket/HippySRSIMDHelpers.m similarity index 100% rename from driver/js/ios/debug/websocket/HippySRSIMDHelpers.m rename to framework/ios/debug/websocket/HippySRSIMDHelpers.m diff --git a/driver/js/ios/debug/websocket/HippySRWebSocket.h b/framework/ios/debug/websocket/HippySRWebSocket.h similarity index 100% rename from driver/js/ios/debug/websocket/HippySRWebSocket.h rename to framework/ios/debug/websocket/HippySRWebSocket.h diff --git a/driver/js/ios/debug/websocket/HippySRWebSocket.m b/framework/ios/debug/websocket/HippySRWebSocket.m similarity index 100% rename from driver/js/ios/debug/websocket/HippySRWebSocket.m rename to framework/ios/debug/websocket/HippySRWebSocket.m diff --git a/driver/js/ios/debug/websocket/HippyWebSocketManager.h b/framework/ios/debug/websocket/HippyWebSocketManager.h similarity index 100% rename from driver/js/ios/debug/websocket/HippyWebSocketManager.h rename to framework/ios/debug/websocket/HippyWebSocketManager.h diff --git a/driver/js/ios/debug/websocket/HippyWebSocketManager.m b/framework/ios/debug/websocket/HippyWebSocketManager.m similarity index 100% rename from driver/js/ios/debug/websocket/HippyWebSocketManager.m rename to framework/ios/debug/websocket/HippyWebSocketManager.m diff --git a/driver/js/ios/debug/websocket/HippyWebSocketProxy.h b/framework/ios/debug/websocket/HippyWebSocketProxy.h similarity index 100% rename from driver/js/ios/debug/websocket/HippyWebSocketProxy.h rename to framework/ios/debug/websocket/HippyWebSocketProxy.h diff --git a/driver/js/ios/debug/websocket/HippyWebSocketProxyDelegate.h b/framework/ios/debug/websocket/HippyWebSocketProxyDelegate.h similarity index 100% rename from driver/js/ios/debug/websocket/HippyWebSocketProxyDelegate.h rename to framework/ios/debug/websocket/HippyWebSocketProxyDelegate.h diff --git a/driver/js/ios/module/clipboard/HippyClipboardModule.h b/framework/ios/module/clipboard/HippyClipboardModule.h similarity index 100% rename from driver/js/ios/module/clipboard/HippyClipboardModule.h rename to framework/ios/module/clipboard/HippyClipboardModule.h diff --git a/driver/js/ios/module/clipboard/HippyClipboardModule.m b/framework/ios/module/clipboard/HippyClipboardModule.m similarity index 100% rename from driver/js/ios/module/clipboard/HippyClipboardModule.m rename to framework/ios/module/clipboard/HippyClipboardModule.m diff --git a/driver/js/ios/module/dev/HippyDevLoadingView.h b/framework/ios/module/dev/HippyDevLoadingView.h similarity index 100% rename from driver/js/ios/module/dev/HippyDevLoadingView.h rename to framework/ios/module/dev/HippyDevLoadingView.h diff --git a/driver/js/ios/module/dev/HippyDevLoadingView.mm b/framework/ios/module/dev/HippyDevLoadingView.mm similarity index 100% rename from driver/js/ios/module/dev/HippyDevLoadingView.mm rename to framework/ios/module/dev/HippyDevLoadingView.mm diff --git a/driver/js/ios/module/dev/HippyDevMenu.h b/framework/ios/module/dev/HippyDevMenu.h similarity index 100% rename from driver/js/ios/module/dev/HippyDevMenu.h rename to framework/ios/module/dev/HippyDevMenu.h diff --git a/driver/js/ios/module/dev/HippyDevMenu.mm b/framework/ios/module/dev/HippyDevMenu.mm similarity index 100% rename from driver/js/ios/module/dev/HippyDevMenu.mm rename to framework/ios/module/dev/HippyDevMenu.mm diff --git a/driver/js/ios/module/dev/HippyRedBox.h b/framework/ios/module/dev/HippyRedBox.h similarity index 100% rename from driver/js/ios/module/dev/HippyRedBox.h rename to framework/ios/module/dev/HippyRedBox.h diff --git a/driver/js/ios/module/dev/HippyRedBox.mm b/framework/ios/module/dev/HippyRedBox.mm similarity index 100% rename from driver/js/ios/module/dev/HippyRedBox.mm rename to framework/ios/module/dev/HippyRedBox.mm diff --git a/driver/js/ios/module/event observer/HippyEventObserverModule.h b/framework/ios/module/event observer/HippyEventObserverModule.h similarity index 100% rename from driver/js/ios/module/event observer/HippyEventObserverModule.h rename to framework/ios/module/event observer/HippyEventObserverModule.h diff --git a/driver/js/ios/module/event observer/HippyEventObserverModule.mm b/framework/ios/module/event observer/HippyEventObserverModule.mm similarity index 100% rename from driver/js/ios/module/event observer/HippyEventObserverModule.mm rename to framework/ios/module/event observer/HippyEventObserverModule.mm diff --git a/driver/js/ios/module/exception/HippyExceptionModule.h b/framework/ios/module/exception/HippyExceptionModule.h similarity index 100% rename from driver/js/ios/module/exception/HippyExceptionModule.h rename to framework/ios/module/exception/HippyExceptionModule.h diff --git a/driver/js/ios/module/exception/HippyExceptionModule.mm b/framework/ios/module/exception/HippyExceptionModule.mm similarity index 100% rename from driver/js/ios/module/exception/HippyExceptionModule.mm rename to framework/ios/module/exception/HippyExceptionModule.mm diff --git a/driver/js/ios/module/image loader/HippyImageCacheManager.h b/framework/ios/module/image loader/HippyImageCacheManager.h similarity index 100% rename from driver/js/ios/module/image loader/HippyImageCacheManager.h rename to framework/ios/module/image loader/HippyImageCacheManager.h diff --git a/driver/js/ios/module/image loader/HippyImageCacheManager.m b/framework/ios/module/image loader/HippyImageCacheManager.m similarity index 100% rename from driver/js/ios/module/image loader/HippyImageCacheManager.m rename to framework/ios/module/image loader/HippyImageCacheManager.m diff --git a/driver/js/ios/module/image loader/HippyImageLoaderModule.h b/framework/ios/module/image loader/HippyImageLoaderModule.h similarity index 100% rename from driver/js/ios/module/image loader/HippyImageLoaderModule.h rename to framework/ios/module/image loader/HippyImageLoaderModule.h diff --git a/driver/js/ios/module/image loader/HippyImageLoaderModule.mm b/framework/ios/module/image loader/HippyImageLoaderModule.mm similarity index 100% rename from driver/js/ios/module/image loader/HippyImageLoaderModule.mm rename to framework/ios/module/image loader/HippyImageLoaderModule.mm diff --git a/driver/js/ios/module/loader/ios_loader.cc b/framework/ios/module/loader/ios_loader.cc similarity index 97% rename from driver/js/ios/module/loader/ios_loader.cc rename to framework/ios/module/loader/ios_loader.cc index 6bec944f287..b2b61d0e9aa 100644 --- a/driver/js/ios/module/loader/ios_loader.cc +++ b/framework/ios/module/loader/ios_loader.cc @@ -23,8 +23,6 @@ #include "ios_loader.h" -#include "core/core.h" - IOSLoader::IOSLoader(RequestUntrustedContentPtr loader, CFTypeRef userData): loader_(loader), userData_(CFRetain(userData)) {} IOSLoader::~IOSLoader() { diff --git a/driver/js/ios/module/loader/ios_loader.h b/framework/ios/module/loader/ios_loader.h similarity index 92% rename from driver/js/ios/module/loader/ios_loader.h rename to framework/ios/module/loader/ios_loader.h index 6b2a6f16900..6620bbe40c0 100644 --- a/driver/js/ios/module/loader/ios_loader.h +++ b/framework/ios/module/loader/ios_loader.h @@ -22,7 +22,9 @@ #pragma once -#include "core/core.h" +#import +#include "driver/base/uri_loader.h" +#include "footstone/logging.h" namespace { using unicode_string_view = footstone::stringview::unicode_string_view; @@ -41,8 +43,7 @@ class IOSLoader : public hippy::base::UriLoader { virtual bool RequestUntrustedContent(const unicode_string_view& uri, u8string& content) { FOOTSTONE_UNIMPLEMENTED(); - return ""; - }; + } private: RequestUntrustedContentPtr loader_; diff --git a/driver/js/ios/module/localstorage/HippyAsyncLocalStorage.h b/framework/ios/module/localstorage/HippyAsyncLocalStorage.h similarity index 100% rename from driver/js/ios/module/localstorage/HippyAsyncLocalStorage.h rename to framework/ios/module/localstorage/HippyAsyncLocalStorage.h diff --git a/driver/js/ios/module/localstorage/HippyAsyncLocalStorage.mm b/framework/ios/module/localstorage/HippyAsyncLocalStorage.mm similarity index 100% rename from driver/js/ios/module/localstorage/HippyAsyncLocalStorage.mm rename to framework/ios/module/localstorage/HippyAsyncLocalStorage.mm diff --git a/driver/js/ios/module/netinfo/HippyNetInfo.h b/framework/ios/module/netinfo/HippyNetInfo.h similarity index 100% rename from driver/js/ios/module/netinfo/HippyNetInfo.h rename to framework/ios/module/netinfo/HippyNetInfo.h diff --git a/driver/js/ios/module/netinfo/HippyNetInfo.mm b/framework/ios/module/netinfo/HippyNetInfo.mm similarity index 100% rename from driver/js/ios/module/netinfo/HippyNetInfo.mm rename to framework/ios/module/netinfo/HippyNetInfo.mm diff --git a/driver/js/ios/module/netinfo/HippyNetInfoIntenal.h b/framework/ios/module/netinfo/HippyNetInfoIntenal.h similarity index 100% rename from driver/js/ios/module/netinfo/HippyNetInfoIntenal.h rename to framework/ios/module/netinfo/HippyNetInfoIntenal.h diff --git a/driver/js/ios/module/netinfo/HippyNetInfoIntenal.m b/framework/ios/module/netinfo/HippyNetInfoIntenal.m similarity index 100% rename from driver/js/ios/module/netinfo/HippyNetInfoIntenal.m rename to framework/ios/module/netinfo/HippyNetInfoIntenal.m diff --git a/driver/js/ios/module/network/HippyFetchInfo.h b/framework/ios/module/network/HippyFetchInfo.h similarity index 100% rename from driver/js/ios/module/network/HippyFetchInfo.h rename to framework/ios/module/network/HippyFetchInfo.h diff --git a/driver/js/ios/module/network/HippyFetchInfo.m b/framework/ios/module/network/HippyFetchInfo.m similarity index 100% rename from driver/js/ios/module/network/HippyFetchInfo.m rename to framework/ios/module/network/HippyFetchInfo.m diff --git a/driver/js/ios/module/network/HippyNetWork.h b/framework/ios/module/network/HippyNetWork.h similarity index 100% rename from driver/js/ios/module/network/HippyNetWork.h rename to framework/ios/module/network/HippyNetWork.h diff --git a/driver/js/ios/module/network/HippyNetWork.m b/framework/ios/module/network/HippyNetWork.m similarity index 100% rename from driver/js/ios/module/network/HippyNetWork.m rename to framework/ios/module/network/HippyNetWork.m diff --git a/driver/js/ios/module/timing/HippyTiming.h b/framework/ios/module/timing/HippyTiming.h similarity index 100% rename from driver/js/ios/module/timing/HippyTiming.h rename to framework/ios/module/timing/HippyTiming.h diff --git a/driver/js/ios/module/timing/HippyTiming.mm b/framework/ios/module/timing/HippyTiming.mm similarity index 100% rename from driver/js/ios/module/timing/HippyTiming.mm rename to framework/ios/module/timing/HippyTiming.mm diff --git a/driver/js/ios/module/turbo/HippyOCTurboModule+Inner.h b/framework/ios/module/turbo/HippyOCTurboModule+Inner.h similarity index 95% rename from driver/js/ios/module/turbo/HippyOCTurboModule+Inner.h rename to framework/ios/module/turbo/HippyOCTurboModule+Inner.h index a99a9b4f04d..f9bef871abf 100644 --- a/driver/js/ios/module/turbo/HippyOCTurboModule+Inner.h +++ b/framework/ios/module/turbo/HippyOCTurboModule+Inner.h @@ -23,7 +23,7 @@ #ifndef HippyOCTurboModule_Inner_h #define HippyOCTurboModule_Inner_h -#import +#import "driver/napi/jsc/js_native_turbo_jsc.h" #import "HippyOCTurboModule.h" @interface HippyOCTurboModule (Inner) diff --git a/driver/js/ios/module/turbo/HippyOCTurboModule.h b/framework/ios/module/turbo/HippyOCTurboModule.h similarity index 100% rename from driver/js/ios/module/turbo/HippyOCTurboModule.h rename to framework/ios/module/turbo/HippyOCTurboModule.h diff --git a/driver/js/ios/module/turbo/HippyOCTurboModule.mm b/framework/ios/module/turbo/HippyOCTurboModule.mm similarity index 99% rename from driver/js/ios/module/turbo/HippyOCTurboModule.mm rename to framework/ios/module/turbo/HippyOCTurboModule.mm index 47bfc8db971..d42101f98e1 100644 --- a/driver/js/ios/module/turbo/HippyOCTurboModule.mm +++ b/framework/ios/module/turbo/HippyOCTurboModule.mm @@ -27,9 +27,9 @@ #import "NativeRenderUtils.h" #import "NativeRenderLog.h" #import "HippyModuleMethod.h" -#include -#include "core/napi/jsc/js_native_jsc_helper.h" -#include "core/napi/jsc/js_native_api_jsc.h" +#include "driver/napi/jsc/js_native_turbo_jsc.h" +#include "driver/napi/jsc/js_native_jsc_helper.h" +#include "driver/napi/jsc/js_native_api_jsc.h" #include #include #import "NSObject+HippyTurbo.h" diff --git a/driver/js/ios/module/turbo/HippyTurboModule.h b/framework/ios/module/turbo/HippyTurboModule.h similarity index 100% rename from driver/js/ios/module/turbo/HippyTurboModule.h rename to framework/ios/module/turbo/HippyTurboModule.h diff --git a/driver/js/ios/module/turbo/HippyTurboModuleManager.h b/framework/ios/module/turbo/HippyTurboModuleManager.h similarity index 100% rename from driver/js/ios/module/turbo/HippyTurboModuleManager.h rename to framework/ios/module/turbo/HippyTurboModuleManager.h diff --git a/driver/js/ios/module/turbo/HippyTurboModuleManager.mm b/framework/ios/module/turbo/HippyTurboModuleManager.mm similarity index 100% rename from driver/js/ios/module/turbo/HippyTurboModuleManager.mm rename to framework/ios/module/turbo/HippyTurboModuleManager.mm diff --git a/driver/js/ios/module/turbo/NSObject+HippyTurbo.h b/framework/ios/module/turbo/NSObject+HippyTurbo.h similarity index 100% rename from driver/js/ios/module/turbo/NSObject+HippyTurbo.h rename to framework/ios/module/turbo/NSObject+HippyTurbo.h diff --git a/driver/js/ios/module/turbo/NSObject+HippyTurbo.mm b/framework/ios/module/turbo/NSObject+HippyTurbo.mm similarity index 100% rename from driver/js/ios/module/turbo/NSObject+HippyTurbo.mm rename to framework/ios/module/turbo/NSObject+HippyTurbo.mm diff --git a/driver/js/ios/utils/HippyAssert.h b/framework/ios/utils/HippyAssert.h similarity index 100% rename from driver/js/ios/utils/HippyAssert.h rename to framework/ios/utils/HippyAssert.h diff --git a/driver/js/ios/utils/HippyAssert.m b/framework/ios/utils/HippyAssert.m similarity index 100% rename from driver/js/ios/utils/HippyAssert.m rename to framework/ios/utils/HippyAssert.m diff --git a/driver/js/ios/utils/HippyDefines.h b/framework/ios/utils/HippyDefines.h similarity index 100% rename from driver/js/ios/utils/HippyDefines.h rename to framework/ios/utils/HippyDefines.h diff --git a/driver/js/ios/utils/HippyErrorCustomizer.h b/framework/ios/utils/HippyErrorCustomizer.h similarity index 100% rename from driver/js/ios/utils/HippyErrorCustomizer.h rename to framework/ios/utils/HippyErrorCustomizer.h diff --git a/driver/js/ios/utils/HippyErrorInfo.h b/framework/ios/utils/HippyErrorInfo.h similarity index 100% rename from driver/js/ios/utils/HippyErrorInfo.h rename to framework/ios/utils/HippyErrorInfo.h diff --git a/driver/js/ios/utils/HippyErrorInfo.m b/framework/ios/utils/HippyErrorInfo.m similarity index 100% rename from driver/js/ios/utils/HippyErrorInfo.m rename to framework/ios/utils/HippyErrorInfo.m diff --git a/driver/js/ios/utils/HippyNullability.h b/framework/ios/utils/HippyNullability.h similarity index 100% rename from driver/js/ios/utils/HippyNullability.h rename to framework/ios/utils/HippyNullability.h diff --git a/driver/js/ios/utils/NSObject+ToJSCtxValue.h b/framework/ios/utils/NSObject+ToJSCtxValue.h similarity index 96% rename from driver/js/ios/utils/NSObject+ToJSCtxValue.h rename to framework/ios/utils/NSObject+ToJSCtxValue.h index eb796e417d0..799f8ce7e99 100644 --- a/driver/js/ios/utils/NSObject+ToJSCtxValue.h +++ b/framework/ios/utils/NSObject+ToJSCtxValue.h @@ -21,7 +21,7 @@ */ #import -#import "core/napi/js_native_api_types.h" +#import "driver/napi/js_native_api_types.h" #import "HippyDefines.h" NS_ASSUME_NONNULL_BEGIN diff --git a/driver/js/ios/utils/NSObject+ToJSCtxValue.mm b/framework/ios/utils/NSObject+ToJSCtxValue.mm similarity index 100% rename from driver/js/ios/utils/NSObject+ToJSCtxValue.mm rename to framework/ios/utils/NSObject+ToJSCtxValue.mm diff --git a/modules/footstone/include/footstone/logging.h b/modules/footstone/include/footstone/logging.h index 8685a899362..3a00cb5bc62 100644 --- a/modules/footstone/include/footstone/logging.h +++ b/modules/footstone/include/footstone/logging.h @@ -175,8 +175,12 @@ bool ShouldCreateLogMessage(LogSeverity severity); abort(); \ } while (0) -#define FOOTSTONE_UNIMPLEMENTED() \ - FOOTSTONE_LOG(ERROR) << "Not implemented in: " << __PRETTY_FUNCTION__ +#define FOOTSTONE_UNIMPLEMENTED() \ + do { \ + FOOTSTONE_LOG(ERROR) << "Not implemented in: " << __PRETTY_FUNCTION__; \ + abort(); \ + } while (0) + #define FOOTSTONE_USE(expr) \ do { \ diff --git a/settings.gradle b/settings.gradle index 9213b065353..3e937555dcc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,8 +4,8 @@ project(':renderer-native').projectDir = new File('renderer/native/android') include 'hippy-support' project(':hippy-support').projectDir = new File('modules/android/hippy_support') -include 'hippy-driver' -project(':hippy-driver').projectDir = new File('driver/js/android') +include 'hippy-framework' +project(':hippy-framework').projectDir = new File('framework/android') include 'serialization' project(':serialization').projectDir = new File('modules/android/serialization') @@ -14,4 +14,4 @@ include 'link_supplier' project(':link_supplier').projectDir = new File('modules/android/link_supplier') include 'example' -project(':example').projectDir = new File('driver/js/examples/android-demo') +project(':example').projectDir = new File('framework/examples/android-demo')