skip to content

detached 6f48527

build: avoid undefined symbol by referencing omnibox script via getter; add ucm_js_access.go and use getOmniboxScript() from cgo file

commit: 6f48527d86f7165c6cdabe94b36d574bec7cdd8f
author: bamen · 13mo ago · 2025-09-09 20:41 UTC
committer: bamen · 13mo ago · 2025-09-09 19:29 UTC
parent: 930ae39
signature: unsigned

2 files · +9 -1

A pkg/webkit/ucm_js_access.go +8 -0

@@ -0,0 +1,8 @@
	1	+	package webkit
	2	+
	3	+	// getOmniboxScript exposes the injected omnibox/find component script as a function
	4	+	// to avoid any build-tag edge cases when referenced from cgo files.
	5	+	func getOmniboxScript() string {
	6	+	return ucmOmniboxScript
	7	+	}
	8	+

@@ -0,0 +1,8 @@
			1	+	package webkit
			2	+
			3	+	// getOmniboxScript exposes the injected omnibox/find component script as a function
			4	+	// to avoid any build-tag edge cases when referenced from cgo files.
			5	+	func getOmniboxScript() string {
			6	+	return ucmOmniboxScript
			7	+	}
			8	+

M pkg/webkit/webview_cgo.go +1 -1


@@ -846,7 +846,7 @@ func (w *WebView) enableUserContentManager() {
846	846		}
847	847
848	848		// Add user script at document-start (omnibox/find reusable component)
849		-	src := C.CString(ucmOmniboxScript)
	849	+	src := C.CString(getOmniboxScript())
850	850		defer C.free(unsafe.Pointer(src))
851	851		script := C.webkit_user_script_new((*C.gchar)(src), C.WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES, C.WEBKIT_USER_SCRIPT_INJECT_AT_DOCUMENT_START, nil, nil)
852	852		if script != nil {


@@ -846,7 +846,7 @@ func (w *WebView) enableUserContentManager() {
846		}	846		}
847			847
848		// Add user script at document-start (omnibox/find reusable component)	848		// Add user script at document-start (omnibox/find reusable component)
849	-	src := C.CString(ucmOmniboxScript)	849	+	src := C.CString(getOmniboxScript())
850		defer C.free(unsafe.Pointer(src))	850		defer C.free(unsafe.Pointer(src))
851		script := C.webkit_user_script_new((*C.gchar)(src), C.WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES, C.WEBKIT_USER_SCRIPT_INJECT_AT_DOCUMENT_START, nil, nil)	851		script := C.webkit_user_script_new((*C.gchar)(src), C.WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES, C.WEBKIT_USER_SCRIPT_INJECT_AT_DOCUMENT_START, nil, nil)
852		if script != nil {	852		if script != nil {