refactor: rename jscontext to jsPage.

XianyuTech · Dec 13, 2021 · 1ff440b · 1ff440b
1 parent 657f9f4
commit 1ff440b
Show file tree

Hide file tree

Showing 17 changed files with 191 additions and 2,241 deletions.
diff --git a/bridge/CMakeLists.txt b/bridge/CMakeLists.txt
@@ -176,8 +176,8 @@ if ($ENV{KRAKEN_JS_ENGINE} MATCHES "quickjs")
   list(APPEND BRIDGE_LINK_LIBS quickjs)
 
   list(APPEND BRIDGE_SOURCE
-    bridge_qjs.cc
-    bridge_qjs.h
+    page.cc
+    page.h
     bindings/qjs/garbage_collected.h
     bindings/qjs/js_context.cc
     bindings/qjs/js_context.h

diff --git a/bridge/foundation/logging.cc b/bridge/foundation/logging.cc
@@ -7,11 +7,7 @@
 #include <algorithm>
 #include "colors.h"
 
-#if KRAKEN_JSC_ENGINE
-#include "bridge_jsc.h"
-#elif KRAKEN_QUICK_JS_ENGINE
-#include "bridge_qjs.h"
-#endif
+#include "page.h"
 
 #if defined(IS_ANDROID)
 #include <android/log.h>
@@ -140,8 +136,8 @@ void printLog(int32_t contextId, std::stringstream& stream, std::string level, v
       KRAKEN_LOG(VERBOSE) << stream.str();
   }
 
-  if (kraken::JSBridge::consoleMessageHandler != nullptr) {
-    kraken::JSBridge::consoleMessageHandler(ctx, stream.str(), static_cast<int>(_log_level));
+  if (kraken::KrakenPage::consoleMessageHandler != nullptr) {
+    kraken::KrakenPage::consoleMessageHandler(ctx, stream.str(), static_cast<int>(_log_level));
   }
 }
 

diff --git a/bridge/include/kraken_bridge.h b/bridge/include/kraken_bridge.h
@@ -91,15 +91,15 @@ typedef void (*Task)(void*);
 typedef void (*ConsoleMessageHandler)(void* ctx, const std::string& message, int logLevel);
 
 KRAKEN_EXPORT_C
-void initJSContextPool(int poolSize);
+void initJSPagePool(int poolSize);
 KRAKEN_EXPORT_C
-void disposeContext(int32_t contextId);
+void disposePage(int32_t contextId);
 KRAKEN_EXPORT_C
-int32_t allocateNewContext(int32_t targetContextId);
+int32_t allocateNewPage(int32_t targetContextId);
 KRAKEN_EXPORT_C
-void* getJSContext(int32_t contextId);
-bool checkContext(int32_t contextId);
-bool checkContext(int32_t contextId, void* context);
+void* getPage(int32_t contextId);
+bool checkPage(int32_t contextId);
+bool checkPage(int32_t contextId, void* context);
 KRAKEN_EXPORT_C
 void evaluateScripts(int32_t contextId, NativeString* code, const char* bundleFilename, int startLine);
 KRAKEN_EXPORT_C