c3e55f7 Address CodeRabbit migration feedback · dumber

M internal/infrastructure/cef/cef2gtk_adapter.go +1 -2


@@ -181,13 +181,12 @@ func (a *Cef2gtkAdapter) Destroy() error {
181	181		if a == nil {
182	182		return ErrAdapterDestroyed
183	183		}
	184	+	a.destroyed.Store(true)
184	185		if a.view == nil {
185		-	a.destroyed.Store(true)
186	186		return ErrAdapterDestroyed
187	187		}
188	188		err := a.view.Destroy()
189	189		a.view = nil
190		-	a.destroyed.Store(true)
191	190		return err
192	191		}
193	192

 	if a == nil {
 		return ErrAdapterDestroyed
 	}
+	a.destroyed.Store(true)
 	if a.view == nil {
-		a.destroyed.Store(true)
 		return ErrAdapterDestroyed
 	}
 	err := a.view.Destroy()
 	a.view = nil
-	a.destroyed.Store(true)
 	return err
 }

M internal/infrastructure/cef/focus_bridge.go +6 -2


@@ -6,7 +6,11 @@ func syncWindowlessBrowserFocus(host purecef.BrowserHost) {
6	6		if host == nil {
7	7		return
8	8		}
9		-	host.WasHidden(0)
10		-	host.SetFocus(1)
	9	+	const (
	10	+	cefFalse = 0
	11	+	cefTrue = 1
	12	+	)
	13	+	host.WasHidden(cefFalse) // visible
	14	+	host.SetFocus(cefTrue) // focused
11	15		host.Invalidate(purecef.PaintElementTypePetView)
12	16		}

 	if host == nil {
 		return
 	}
-	host.WasHidden(0)
+	const (
-	host.SetFocus(1)
+		cefFalse = 0
+		cefTrue  = 1
+	)
+	host.WasHidden(cefFalse) // visible
+	host.SetFocus(cefTrue)   // focused
 	host.Invalidate(purecef.PaintElementTypePetView)
 }

M internal/infrastructure/cef/render_handler_adapter.go +1 -2


@@ -24,8 +24,7 @@ func newDumberRenderHandler(wv *WebView) purecef.RenderHandler {
24	24		},
25	25		}
26	26		if wv == nil \|\| wv.viewBridge == nil {
27		-	var view *cef2gtk.View
28		-	return view.RenderHandler(hooks)
	27	+	return nil
29	28		}
30	29		return wv.viewBridge.RenderHandler(hooks)
31	30		}

 		},
 	}
 	if wv == nil || wv.viewBridge == nil {
-		var view *cef2gtk.View
+		return nil
-		return view.RenderHandler(hooks)
 	}
 	return wv.viewBridge.RenderHandler(hooks)
 }

M internal/infrastructure/cef/webview.go +3 -7


@@ -1020,18 +1020,14 @@ func (wv *WebView) Destroy() {
1020	1020		} else {
1021	1021		wv.runCloseCallbacks()
1022	1022		}
1023		-	if wv.viewBridge != nil {
	1023	+	if bridge := wv.viewBridge; bridge != nil {
1024	1024		wv.runOnGTKSync(func() {
1025	1025		if wv.removeSizeObserver != nil {
1026	1026		wv.removeSizeObserver()
1027	1027		wv.removeSizeObserver = nil
1028	1028		}
1029		-	bridge := wv.viewBridge
1030		-	wv.viewBridge = nil
1031		-	if bridge != nil {
1032		-	_ = bridge.DetachInput()
1033		-	_ = bridge.Destroy()
1034		-	}
	1029	+	_ = bridge.DetachInput()
	1030	+	_ = bridge.Destroy()
1035	1031		})
1036	1032		}
1037	1033		}

 	} else {
 		wv.runCloseCallbacks()
 	}
-	if wv.viewBridge != nil {
+	if bridge := wv.viewBridge; bridge != nil {
 		wv.runOnGTKSync(func() {
 			if wv.removeSizeObserver != nil {
 				wv.removeSizeObserver()
 				wv.removeSizeObserver = nil
 			}
-			bridge := wv.viewBridge
+			_ = bridge.DetachInput()
-			wv.viewBridge = nil
+			_ = bridge.Destroy()
-			if bridge != nil {
-				_ = bridge.DetachInput()
-				_ = bridge.Destroy()
-			}
 		})
 	}
 }

M internal/infrastructure/cef/webview_handlers_test.go +4 -6


@@ -500,17 +500,15 @@ func TestOptionalHandlersAreAlwaysEnabled(t *testing.T) {
500	500		// AudioHandler is always enabled (required for media decoding).
501	501		require.Same(t, h, h.GetAudioHandler())
502	502		require.Same(t, h, h.GetContextMenuHandler())
503		-	require.NotSame(t, h, h.GetRenderHandler())
	503	+	require.Nil(t, h.GetRenderHandler())
504	504		}
505	505
506		-	func TestGetRenderHandlerPreservesTextSelectionCallback(t *testing.T) {
	506	+	func TestRenderTextSelectionHookPreservesWebViewState(t *testing.T) {
507	507		wv := &WebView{ctx: context.Background()}
508		-	h := &handlerSet{wv: wv}
509	508
510		-	rh := h.GetRenderHandler()
511		-	rh.OnTextSelectionChanged(nil, "selected via client", nil)
	509	+	handleRenderTextSelectionChanged(wv, "selected via hook")
512	510
513		-	require.Equal(t, "selected via client", wv.selectedTextSnapshot())
	511	+	require.Equal(t, "selected via hook", wv.selectedTextSnapshot())
514	512		}
515	513
516	514		func TestGetDownloadHandler_EnabledWhenEngineConfigured(t *testing.T) {

 	// AudioHandler is always enabled (required for media decoding).
 	require.Same(t, h, h.GetAudioHandler())
 	require.Same(t, h, h.GetContextMenuHandler())
-	require.NotSame(t, h, h.GetRenderHandler())
+	require.Nil(t, h.GetRenderHandler())
 }
-func TestGetRenderHandlerPreservesTextSelectionCallback(t *testing.T) {
+func TestRenderTextSelectionHookPreservesWebViewState(t *testing.T) {
 	wv := &WebView{ctx: context.Background()}
-	h := &handlerSet{wv: wv}
-	rh := h.GetRenderHandler()
+	handleRenderTextSelectionChanged(wv, "selected via hook")
-	rh.OnTextSelectionChanged(nil, "selected via client", nil)
-	require.Equal(t, "selected via client", wv.selectedTextSnapshot())
+	require.Equal(t, "selected via hook", wv.selectedTextSnapshot())
 }
 func TestGetDownloadHandler_EnabledWhenEngineConfigured(t *testing.T) {