Skip to content

Commit c44049d

Browse files
ci_lynxjianliang00
authored andcommitted
[AutoRoll] Roll revisions automatically from repositories: lynx/primjs
AutoSubmit: True FullCheck: True '' SkipChecks: cpp-header-path
1 parent cedd0a9 commit c44049d

File tree

14 files changed

+313
-638
lines changed

14 files changed

+313
-638
lines changed

build_overrides/darwin.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Devtool_Native_includes =
8484

8585
PrimJS_Qjs_Dep = [
8686
"PrimJS/quickjs",
87-
"3.6.0-rc.0",
87+
"3.8.0-alpha.0",
8888
]
8989
Lepus_deps = [ PrimJS_Qjs_Dep ]
9090

core/runtime/lepusng/quick_context.cc

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,10 @@ static LEPUSValue LepusConvertToObjectCallBack(LEPUSContext* ctx,
4343
LEPUSValue val);
4444

4545
// register for quickjs to free LepusRef
46-
static LEPUSValue LepusRefFreeCallBack(LEPUSRuntime* rt, LEPUSValue val) {
47-
LEPUSLepusRef* pref = static_cast<LEPUSLepusRef*>(LEPUS_VALUE_GET_PTR(val));
48-
reinterpret_cast<fml::RefCountedThreadSafeStorage*>(pref->p)->Release();
49-
if (!LEPUS_IsGCModeRT(rt)) {
50-
LEPUS_FreeValueRT(rt, pref->lepus_val);
51-
lepus_free_rt(rt, pref);
52-
}
53-
return LEPUS_UNDEFINED;
46+
static void LepusRefFreeCallBack(void* p) {
47+
if (!p) return;
48+
reinterpret_cast<fml::RefCountedThreadSafeStorage*>(p)->Release();
49+
return;
5450
}
5551

5652
static void RefCountedObjVisitor(LEPUSRuntime* rt, void* p, uint64_t trace_tool,

dependencies/DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ deps = {
200200
"third_party/quickjs/src": {
201201
"type": "git",
202202
"url": "https://github.com/lynx-family/primjs.git",
203-
"commit": "572f55190b38a3b329e123623d30118b798c8d66",
203+
"commit": "7708cd5ccefffc86ed080666218d9e80703d17f4",
204204
"ignore_in_git": True,
205205
},
206206
"third_party/debug_router/src": {

devtool/js_inspect/lepus/lepus_internal/lepusng/lepusng_debugger.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ void LepusNGDebugger::ProcessPausedMessages(const std::string& message) {
292292
LEPUSDebuggerInfo* info = GetDebuggerInfo(context_->GetLepusContext());
293293
if (!info) return;
294294
if (message != "") {
295-
PushBackQueue(GetDebuggerMessageQueue(info), message.c_str());
295+
PushBackQueue(context_->GetLepusContext(), message.c_str());
296296
}
297297
ProcessProtocolMessages(info);
298298
}

devtool/js_inspect/quickjs/quickjs_internal/interface.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void ProcessProtocolMessages(LEPUSDebuggerInfo *info);
4646
void HandleDebuggerException(LEPUSContext *ctx);
4747

4848
// push protocol message to mesasge queue
49-
void PushBackQueue(struct queue *q, const char *content);
49+
void PushBackQueue(LEPUSContext *, const char *content);
5050

5151
// send Debugger.paused event
5252
// ref:
@@ -59,8 +59,6 @@ void SetDebuggerInfoOpaque(LEPUSDebuggerInfo *info, void *opaque);
5959

6060
struct LEPUSDebuggerInfo *GetDebuggerInfo(LEPUSContext *ctx);
6161

62-
struct queue *GetDebuggerMessageQueue(struct LEPUSDebuggerInfo *info);
63-
6462
void SetDebuggerSourceCode(LEPUSContext *ctx, char *source_code);
6563

6664
LEPUSScriptSource *AddDebuggerScript(LEPUSContext *ctx, char *script_source,

devtool/js_inspect/quickjs/quickjs_internal/quickjs_debugger_ng.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void QuickjsDebugger::ProcessPausedMessages(const std::string &message,
143143
LEPUSDebuggerInfo *info = GetDebuggerInfo(context_->GetContext());
144144
if (!info) return;
145145
if (message != "") {
146-
PushBackQueue(GetDebuggerMessageQueue(info), message.c_str());
146+
PushBackQueue(context_->GetContext(), message.c_str());
147147
}
148148
ProcessProtocolMessagesWithViewID(info, session_id);
149149
}

explorer/harmony/oh-package.json5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"version": "0.0.1",
1616
"dependencies": {
17-
"@lynx/primjs": "3.6.0-rc.0",
17+
"@lynx/primjs": "3.8.0-alpha.0",
1818
},
1919
"dynamicDependencies": {},
2020
"parameterFile": "./parameter.json",

platform/android/lynx_android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,8 @@ dependencies {
332332
androidTestImplementation "com.google.auto.service:auto-service-annotations:1.0-rc5"
333333
androidTestAnnotationProcessor "com.google.auto.service:auto-service:1.0-rc5"
334334

335-
implementation 'org.lynxsdk.lynx:primjs:3.6.0-rc.0'
336-
extractJNI 'org.lynxsdk.lynx:primjs:3.6.0-rc.0'
335+
implementation 'org.lynxsdk.lynx:primjs:3.8.0-alpha.0'
336+
extractJNI 'org.lynxsdk.lynx:primjs:3.8.0-alpha.0'
337337
extractJNI 'org.lynxsdk.lynx:v8so:11.1.277.4'
338338

339339
api project(':LynxJSSDK')

platform/harmony/oh-package.json5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"main": "",
99
"version": "0.0.1",
1010
"dependencies": {
11-
"@lynx/primjs": "3.6.0-rc.0",
11+
"@lynx/primjs": "3.8.0-alpha.0",
1212
},
1313
"dynamicDependencies": {},
1414
"overrides": {

third_party/napi/include/js_native_api_adapter.h

Lines changed: 295 additions & 320 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)