detached 51fc2d4

fix: post viewport sync to CEF UI thread

commit
51fc2d45370b447414b5dbff64ba15bb2077306d
author
brice · · 2026-05-16 15:10 UTC
parent
0fa06a1
signature
GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email
2 files · +42 -3
M internal/infrastructure/cef/webview_viewport.go +12 -3
@@ -265,10 +265,19 @@ func (wv *WebView) disconnectViewportSyncHooksOnGTKThread() {
265265 }
266266
267267 func (wv *WebView) notifyViewportSyncOnCEFUIThread(host viewportSyncBrowserHost, visible bool) {
268- notifyBrowserViewportSync(host, visible)
269- if wv != nil {
270- wv.reapplyCurrentZoomForBackingScale("viewport-sync")
268+ if host == nil {
269+ return
270+ }
271+ task := cefNewTask(cefTaskFunc(func() {
272+ notifyBrowserViewportSync(host, visible)
273+ if wv != nil {
274+ wv.reapplyCurrentZoomForBackingScale("viewport-sync")
275+ }
276+ }))
277+ if task == nil {
278+ return
271279 }
280+ cefPostDelayedTask(purecef.ThreadIDTidUi, task, 0)
272281 }
273282
274283 func notifyBrowserViewportSync(host viewportSyncBrowserHost, visible bool) {
@@ -265,10 +265,19 @@ func (wv *WebView) disconnectViewportSyncHooksOnGTKThread() {
265 }265 }
266 266
267 func (wv *WebView) notifyViewportSyncOnCEFUIThread(host viewportSyncBrowserHost, visible bool) {267 func (wv *WebView) notifyViewportSyncOnCEFUIThread(host viewportSyncBrowserHost, visible bool) {
268- notifyBrowserViewportSync(host, visible)268+ if host == nil {
269- if wv != nil {269+ return
270- wv.reapplyCurrentZoomForBackingScale("viewport-sync")270+ }
271+ task := cefNewTask(cefTaskFunc(func() {
272+ notifyBrowserViewportSync(host, visible)
273+ if wv != nil {
274+ wv.reapplyCurrentZoomForBackingScale("viewport-sync")
275+ }
276+ }))
277+ if task == nil {
278+ return
271 }279 }
280+ cefPostDelayedTask(purecef.ThreadIDTidUi, task, 0)
272 }281 }
273 282
274 func notifyBrowserViewportSync(host viewportSyncBrowserHost, visible bool) {283 func notifyBrowserViewportSync(host viewportSyncBrowserHost, visible bool) {
M internal/infrastructure/cef/webview_viewport_test.go +30 -0
@@ -48,6 +48,36 @@ func TestNotifyBrowserViewportSync_HiddenSkipsWasHidden(t *testing.T) {
4848 require.Equal(t, []string{"NotifyScreenInfoChanged", "WasResized", "Invalidate"}, host.calls)
4949 }
5050
51+func TestNotifyViewportSyncOnCEFUIThread_PostsCEFWork(t *testing.T) {
52+ oldNewTask := cefNewTask
53+ oldPostDelayedTask := cefPostDelayedTask
54+ defer func() {
55+ cefNewTask = oldNewTask
56+ cefPostDelayedTask = oldPostDelayedTask
57+ }()
58+
59+ cefNewTask = func(task purecef.Task) purecef.Task { return task }
60+
61+ var scheduled purecef.Task
62+ cefPostDelayedTask = func(threadID purecef.ThreadID, task purecef.Task, delayMs int64) int32 {
63+ require.Equal(t, purecef.ThreadIDTidUi, threadID)
64+ require.Zero(t, delayMs)
65+ require.NotNil(t, task)
66+ scheduled = task
67+ return 1
68+ }
69+
70+ host := &viewportSyncOrderHost{}
71+ wv := &WebView{}
72+ wv.notifyViewportSyncOnCEFUIThread(host, true)
73+
74+ require.Empty(t, host.calls)
75+ require.NotNil(t, scheduled)
76+
77+ scheduled.Execute()
78+ require.Equal(t, []string{"WasHidden", "NotifyScreenInfoChanged", "WasResized", "Invalidate"}, host.calls)
79+}
80+
5181 func TestScheduleResizeRepaintPulse_CoalescesToLatestSequence(t *testing.T) {
5282 oldNewTask := cefNewTask
5383 oldPostDelayedTask := cefPostDelayedTask
@@ -48,6 +48,36 @@ func TestNotifyBrowserViewportSync_HiddenSkipsWasHidden(t *testing.T) {
48 require.Equal(t, []string{"NotifyScreenInfoChanged", "WasResized", "Invalidate"}, host.calls)48 require.Equal(t, []string{"NotifyScreenInfoChanged", "WasResized", "Invalidate"}, host.calls)
49 }49 }
50 50
51+func TestNotifyViewportSyncOnCEFUIThread_PostsCEFWork(t *testing.T) {
52+ oldNewTask := cefNewTask
53+ oldPostDelayedTask := cefPostDelayedTask
54+ defer func() {
55+ cefNewTask = oldNewTask
56+ cefPostDelayedTask = oldPostDelayedTask
57+ }()
58+
59+ cefNewTask = func(task purecef.Task) purecef.Task { return task }
60+
61+ var scheduled purecef.Task
62+ cefPostDelayedTask = func(threadID purecef.ThreadID, task purecef.Task, delayMs int64) int32 {
63+ require.Equal(t, purecef.ThreadIDTidUi, threadID)
64+ require.Zero(t, delayMs)
65+ require.NotNil(t, task)
66+ scheduled = task
67+ return 1
68+ }
69+
70+ host := &viewportSyncOrderHost{}
71+ wv := &WebView{}
72+ wv.notifyViewportSyncOnCEFUIThread(host, true)
73+
74+ require.Empty(t, host.calls)
75+ require.NotNil(t, scheduled)
76+
77+ scheduled.Execute()
78+ require.Equal(t, []string{"WasHidden", "NotifyScreenInfoChanged", "WasResized", "Invalidate"}, host.calls)
79+}
80+
51 func TestScheduleResizeRepaintPulse_CoalescesToLatestSequence(t *testing.T) {81 func TestScheduleResizeRepaintPulse_CoalescesToLatestSequence(t *testing.T) {
52 oldNewTask := cefNewTask82 oldNewTask := cefNewTask
53 oldPostDelayedTask := cefPostDelayedTask83 oldPostDelayedTask := cefPostDelayedTask

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 8

Tags 42

↑↓ moveenter openesc close