From b5b51004e8de80dcd43849e4da1d2623ee3d3008 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Tue, 17 Dec 2024 20:59:10 -0800 Subject: [PATCH] Bump WebKit (#15828) Co-authored-by: Dylan Conway <35280289+dylan-conway@users.noreply.github.com> --- cmake/tools/SetupWebKit.cmake | 2 +- src/bun.js/bindings/ZigGlobalObject.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cmake/tools/SetupWebKit.cmake b/cmake/tools/SetupWebKit.cmake index 47ad1b9e34f971..b876c54da52e4d 100644 --- a/cmake/tools/SetupWebKit.cmake +++ b/cmake/tools/SetupWebKit.cmake @@ -2,7 +2,7 @@ option(WEBKIT_VERSION "The version of WebKit to use") option(WEBKIT_LOCAL "If a local version of WebKit should be used instead of downloading") if(NOT WEBKIT_VERSION) - set(WEBKIT_VERSION 58549ddc4d9e7164823fe9d4e86c46c003e46a19) + set(WEBKIT_VERSION 3845bf370ff4e9a5c0b96036255142c7904be963) endif() if(WEBKIT_LOCAL) diff --git a/src/bun.js/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp index 8315670db234ee..7ac2bcf7cb6a9d 100644 --- a/src/bun.js/bindings/ZigGlobalObject.cpp +++ b/src/bun.js/bindings/ZigGlobalObject.cpp @@ -1139,8 +1139,9 @@ const JSC::GlobalObjectMethodTable GlobalObject::s_globalObjectMethodTable = { nullptr, // compileStreaming nullptr, // instantiateStreaming &Zig::deriveShadowRealmGlobalObject, - nullptr, // codeForEval - nullptr, // canCompileStrings + &codeForEval, // codeForEval + &canCompileStrings, // canCompileStrings + &trustedScriptStructure, // trustedScriptStructure }; const JSC::GlobalObjectMethodTable EvalGlobalObject::s_globalObjectMethodTable = { @@ -1164,8 +1165,9 @@ const JSC::GlobalObjectMethodTable EvalGlobalObject::s_globalObjectMethodTable = nullptr, // compileStreaming nullptr, // instantiateStreaming &Zig::deriveShadowRealmGlobalObject, - nullptr, // codeForEval - nullptr, // canCompileStrings + &codeForEval, // codeForEval + &canCompileStrings, // canCompileStrings + &trustedScriptStructure, // trustedScriptStructure }; GlobalObject::GlobalObject(JSC::VM& vm, JSC::Structure* structure, const JSC::GlobalObjectMethodTable* methodTable)