Delay cef2gtk GL preparation

commit: 40b8fb03a0ce2d32011768797692e1d331b09470
author: brice · 5mo ago · 2026-04-30 02:45 UTC
parent: 1d14237
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

1 file · +15 -16

M internal/infrastructure/cef/factory.go +15 -16


@@ -123,17 +123,6 @@ func (f WebViewFactory) newWebView(ctx context.Context) (WebView, error) {
123	123		wv.handlers = handlers
124	124		wv.findCtrl = newFindController()
125	125
126		-	var prepareErr error
127		-	wv.runOnGTKSync(func() {
128		-	prepareErr = viewBridge.PrepareOnGTKThread()
129		-	})
130		-	if prepareErr != nil {
131		-	if ctx != nil {
132		-	logging.FromContext(ctx).Error().Err(prepareErr).Uint64("webview_id", uint64(id)).Msg("cef: failed to prepare cef2gtk view")
133		-	}
134		-	return nil, fmt.Errorf("prepare cef2gtk view: %w", prepareErr)
135		-	}
136		-
137	126		// Build a CEF client backed by our handlerSet.
138	127		// Store on WebView to prevent GC collection before CEF AddRef's it.
139	128		wv.client = purecef.NewClient(wv.handlers)

@@ -159,17 +148,27 @@ func (f *WebViewFactory) configureInitialBrowserCreation(
159	148		if wv.viewBridge == nil {
160	149		return
161	150		}
162		-	firstResize := true
	151	+	browserCreateScheduled := false
163	152		wv.runOnGTKSync(func() {
164	153		wv.removeSizeObserver = wv.viewBridge.AddSizeObserver(func(w, h int32) {
165		-	if firstResize {
166		-	firstResize = false
	154	+	// Size observers run on the GTK thread. Prepare the GtkGLArea only after it
	155	+	// has been packed and allocated; preparing at WebView construction time can
	156	+	// run before GTK has created a GL context.
	157	+	if !browserCreateScheduled {
	158	+	if err := wv.viewBridge.PrepareOnGTKThread(); err != nil {
	159	+	logging.FromContext(ctx).Warn().
	160	+	Err(err).
	161	+	Uint64("webview_id", uint64(wv.id)).
	162	+	Int32("resize_width", w).
	163	+	Int32("resize_height", h).
	164	+	Msg("cef: cef2gtk view not ready after resize, will retry")
	165	+	return
	166	+	}
	167	+	browserCreateScheduled = true
167	168		onFirstResize(w, h)
168	169		return
169	170		}
170	171
171		-	// Size observers run on the GTK thread; the captured firstResize state is
172		-	// therefore single-threaded.
173	172		wv.mu.RLock()
174	173		host := wv.host
175	174		wv.mu.RUnlock()

 	wv.handlers = handlers
 	wv.findCtrl = newFindController()
-	var prepareErr error
-	wv.runOnGTKSync(func() {
-		prepareErr = viewBridge.PrepareOnGTKThread()
-	})
-	if prepareErr != nil {
-		if ctx != nil {
-			logging.FromContext(ctx).Error().Err(prepareErr).Uint64("webview_id", uint64(id)).Msg("cef: failed to prepare cef2gtk view")
-		}
-		return nil, fmt.Errorf("prepare cef2gtk view: %w", prepareErr)
-	}
 	// Build a CEF client backed by our handlerSet.
 	// Store on WebView to prevent GC collection before CEF AddRef's it.
 	wv.client = purecef.NewClient(wv.handlers)
 	if wv.viewBridge == nil {
 		return
 	}
-	firstResize := true
+	browserCreateScheduled := false
 	wv.runOnGTKSync(func() {
 		wv.removeSizeObserver = wv.viewBridge.AddSizeObserver(func(w, h int32) {
-			if firstResize {
+			// Size observers run on the GTK thread. Prepare the GtkGLArea only after it
-				firstResize = false
+			// has been packed and allocated; preparing at WebView construction time can
+			// run before GTK has created a GL context.
+			if !browserCreateScheduled {
+				if err := wv.viewBridge.PrepareOnGTKThread(); err != nil {
+					logging.FromContext(ctx).Warn().
+						Err(err).
+						Uint64("webview_id", uint64(wv.id)).
+						Int32("resize_width", w).
+						Int32("resize_height", h).
+						Msg("cef: cef2gtk view not ready after resize, will retry")
+					return
+				}
+				browserCreateScheduled = true
 				onFirstResize(w, h)
 				return
 			}
-			// Size observers run on the GTK thread; the captured firstResize state is
-			// therefore single-threaded.
 			wv.mu.RLock()
 			host := wv.host
 			wv.mu.RUnlock()