69151be refactor: consolidate reveal state · dumber

M internal/ui/coordinator/content/content_reveal_test.go +16 -0


@@ -54,6 +54,22 @@ func TestRevealState_IsBoundToCurrentWebViewAcrossReplacementPaths(t *testing.T)
54	54		assert.False(t, c.WebViewRevealed(paneID), "popup registration must not inherit a prior WebView reveal")
55	55		}
56	56
	57	+	func TestRevealState_StoresIdentityAsTheOnlyStateValue(t *testing.T) {
	58	+	paneID := entity.PaneID("pane-1")
	59	+	wv := revealTestWebView(t, 101, 1)
	60	+	c := newRevealTestCoordinator()
	61	+	c.setWebViewLocked(paneID, wv)
	62	+	identity, _ := identityForWebView(wv)
	63	+
	64	+	c.markPendingReveal(paneID, identity)
	65	+	c.markWebViewRevealed(paneID, identity)
	66	+
	67	+	c.revealMu.Lock()
	68	+	defer c.revealMu.Unlock()
	69	+	assert.Equal(t, identity, c.pendingReveal[paneID])
	70	+	assert.Equal(t, identity, c.revealedWebViews[paneID])
	71	+	}
	72	+
57	73		func TestRevealState_ReleaseClearsStateWithoutWebViewMapping(t *testing.T) {
58	74		paneID := entity.PaneID("pane-1")
59	75		wv := revealTestWebView(t, 101, 1)


@@ -54,6 +54,22 @@ func TestRevealState_IsBoundToCurrentWebViewAcrossReplacementPaths(t *testing.T)
54	assert.False(t, c.WebViewRevealed(paneID), "popup registration must not inherit a prior WebView reveal")	54		assert.False(t, c.WebViewRevealed(paneID), "popup registration must not inherit a prior WebView reveal")
55	}	55		}
56		56
		57	+	func TestRevealState_StoresIdentityAsTheOnlyStateValue(t *testing.T) {
		58	+	paneID := entity.PaneID("pane-1")
		59	+	wv := revealTestWebView(t, 101, 1)
		60	+	c := newRevealTestCoordinator()
		61	+	c.setWebViewLocked(paneID, wv)
		62	+	identity, _ := identityForWebView(wv)
		63	+
		64	+	c.markPendingReveal(paneID, identity)
		65	+	c.markWebViewRevealed(paneID, identity)
		66	+
		67	+	c.revealMu.Lock()
		68	+	defer c.revealMu.Unlock()
		69	+	assert.Equal(t, identity, c.pendingReveal[paneID])
		70	+	assert.Equal(t, identity, c.revealedWebViews[paneID])
		71	+	}
		72	+
57	func TestRevealState_ReleaseClearsStateWithoutWebViewMapping(t *testing.T) {	73		func TestRevealState_ReleaseClearsStateWithoutWebViewMapping(t *testing.T) {
58	paneID := entity.PaneID("pane-1")	74		paneID := entity.PaneID("pane-1")
59	wv := revealTestWebView(t, 101, 1)	75		wv := revealTestWebView(t, 101, 1)

M internal/ui/coordinator/content/coordinator.go +22 -36


@@ -80,11 +80,9 @@ type Coordinator struct {
80	80
81	81		// revealMu is always acquired after webViewsMu. Reveal state is keyed by the
82	82		// WebView identity (ID plus pool-reuse generation), never by pane alone.
83		-	revealMu sync.Mutex
84		-	pendingReveal map[entity.PaneID]bool
85		-	revealedWebViews map[entity.PaneID]bool
86		-	revealedWebViewIdentity map[entity.PaneID]webViewIdentity
87		-	pendingRevealIdentity map[entity.PaneID]webViewIdentity
	83	+	revealMu sync.Mutex
	84	+	pendingReveal map[entity.PaneID]webViewIdentity
	85	+	revealedWebViews map[entity.PaneID]webViewIdentity
88	86
89	87		appearanceMu sync.Mutex
90	88		pendingScriptRefresh map[entity.PaneID]bool

@@ -149,25 +147,23 @@ func NewCoordinator(
149	147		log.Debug().Msg("creating content coordinator")
150	148
151	149		return &Coordinator{
152		-	logger: log.With().Str("component", "content-coordinator").Logger(),
153		-	pool: pool,
154		-	injector: injector,
155		-	widgetFactory: widgetFactory,
156		-	faviconAdapter: faviconAdapter,
157		-	zoomUC: zoomUC,
158		-	permissionUC: permissionUC,
159		-	webViews: make(map[entity.PaneID]port.WebView),
160		-	webViewPaneIDs: make(map[port.WebViewID]entity.PaneID),
161		-	paneTitles: make(map[entity.PaneID]string),
162		-	navOrigins: make(map[entity.PaneID]string),
163		-	pendingReveal: make(map[entity.PaneID]bool),
164		-	revealedWebViews: make(map[entity.PaneID]bool),
165		-	revealedWebViewIdentity: make(map[entity.PaneID]webViewIdentity),
166		-	pendingRevealIdentity: make(map[entity.PaneID]webViewIdentity),
167		-	pendingScriptRefresh: make(map[entity.PaneID]bool),
168		-	pendingThemePanes: make(map[entity.PaneID]bool),
169		-	getActiveWS: getActiveWS,
170		-	popups: newPopupManager(),
	150	+	logger: log.With().Str("component", "content-coordinator").Logger(),
	151	+	pool: pool,
	152	+	injector: injector,
	153	+	widgetFactory: widgetFactory,
	154	+	faviconAdapter: faviconAdapter,
	155	+	zoomUC: zoomUC,
	156	+	permissionUC: permissionUC,
	157	+	webViews: make(map[entity.PaneID]port.WebView),
	158	+	webViewPaneIDs: make(map[port.WebViewID]entity.PaneID),
	159	+	paneTitles: make(map[entity.PaneID]string),
	160	+	navOrigins: make(map[entity.PaneID]string),
	161	+	pendingReveal: make(map[entity.PaneID]webViewIdentity),
	162	+	revealedWebViews: make(map[entity.PaneID]webViewIdentity),
	163	+	pendingScriptRefresh: make(map[entity.PaneID]bool),
	164	+	pendingThemePanes: make(map[entity.PaneID]bool),
	165	+	getActiveWS: getActiveWS,
	166	+	popups: newPopupManager(),
171	167		}
172	168		}
173	169

@@ -334,16 +330,10 @@ func identityForWebView(wv port.WebView) (webViewIdentity, bool) {
334	330
335	331		func (c *Coordinator) ensureRevealMapsLocked() {
336	332		if c.pendingReveal == nil {
337		-	c.pendingReveal = make(map[entity.PaneID]bool)
	333	+	c.pendingReveal = make(map[entity.PaneID]webViewIdentity)
338	334		}
339	335		if c.revealedWebViews == nil {
340		-	c.revealedWebViews = make(map[entity.PaneID]bool)
341		-	}
342		-	if c.revealedWebViewIdentity == nil {
343		-	c.revealedWebViewIdentity = make(map[entity.PaneID]webViewIdentity)
344		-	}
345		-	if c.pendingRevealIdentity == nil {
346		-	c.pendingRevealIdentity = make(map[entity.PaneID]webViewIdentity)
	336	+	c.revealedWebViews = make(map[entity.PaneID]webViewIdentity)
347	337		}
348	338		}
349	339

@@ -368,9 +358,7 @@ func (c *Coordinator) setWebViewLocked(paneID entity.PaneID, wv port.WebView) {
368	358		}
369	359		c.ensureRevealMapsLocked()
370	360		delete(c.pendingReveal, paneID)
371		-	delete(c.pendingRevealIdentity, paneID)
372	361		delete(c.revealedWebViews, paneID)
373		-	delete(c.revealedWebViewIdentity, paneID)
374	362		}
375	363
376	364		// deleteWebViewLocked removes both the mapping and any presentation state,

@@ -389,9 +377,7 @@ func (c *Coordinator) deleteWebViewLocked(paneID entity.PaneID) port.WebView {
389	377		}
390	378		c.ensureRevealMapsLocked()
391	379		delete(c.pendingReveal, paneID)
392		-	delete(c.pendingRevealIdentity, paneID)
393	380		delete(c.revealedWebViews, paneID)
394		-	delete(c.revealedWebViewIdentity, paneID)
395	381		return wv
396	382		}
397	383

 	// revealMu is always acquired after webViewsMu. Reveal state is keyed by the
 	// WebView identity (ID plus pool-reuse generation), never by pane alone.
-	revealMu                sync.Mutex
+	revealMu         sync.Mutex
-	pendingReveal           map[entity.PaneID]bool
+	pendingReveal    map[entity.PaneID]webViewIdentity
-	revealedWebViews        map[entity.PaneID]bool
+	revealedWebViews map[entity.PaneID]webViewIdentity
-	revealedWebViewIdentity map[entity.PaneID]webViewIdentity
-	pendingRevealIdentity   map[entity.PaneID]webViewIdentity
 	appearanceMu          sync.Mutex
 	pendingScriptRefresh  map[entity.PaneID]bool
 	log.Debug().Msg("creating content coordinator")
 	return &Coordinator{
-		logger:                  log.With().Str("component", "content-coordinator").Logger(),
+		logger:               log.With().Str("component", "content-coordinator").Logger(),
-		pool:                    pool,
+		pool:                 pool,
-		injector:                injector,
+		injector:             injector,
-		widgetFactory:           widgetFactory,
+		widgetFactory:        widgetFactory,
-		faviconAdapter:          faviconAdapter,
+		faviconAdapter:       faviconAdapter,
-		zoomUC:                  zoomUC,
+		zoomUC:               zoomUC,
-		permissionUC:            permissionUC,
+		permissionUC:         permissionUC,
-		webViews:                make(map[entity.PaneID]port.WebView),
+		webViews:             make(map[entity.PaneID]port.WebView),
-		webViewPaneIDs:          make(map[port.WebViewID]entity.PaneID),
+		webViewPaneIDs:       make(map[port.WebViewID]entity.PaneID),
-		paneTitles:              make(map[entity.PaneID]string),
+		paneTitles:           make(map[entity.PaneID]string),
-		navOrigins:              make(map[entity.PaneID]string),
+		navOrigins:           make(map[entity.PaneID]string),
-		pendingReveal:           make(map[entity.PaneID]bool),
+		pendingReveal:        make(map[entity.PaneID]webViewIdentity),
-		revealedWebViews:        make(map[entity.PaneID]bool),
+		revealedWebViews:     make(map[entity.PaneID]webViewIdentity),
-		revealedWebViewIdentity: make(map[entity.PaneID]webViewIdentity),
+		pendingScriptRefresh: make(map[entity.PaneID]bool),
-		pendingRevealIdentity:   make(map[entity.PaneID]webViewIdentity),
+		pendingThemePanes:    make(map[entity.PaneID]bool),
-		pendingScriptRefresh:    make(map[entity.PaneID]bool),
+		getActiveWS:          getActiveWS,
-		pendingThemePanes:       make(map[entity.PaneID]bool),
+		popups:               newPopupManager(),
-		getActiveWS:             getActiveWS,
-		popups:                  newPopupManager(),
 	}
 }
 func (c *Coordinator) ensureRevealMapsLocked() {
 	if c.pendingReveal == nil {
-		c.pendingReveal = make(map[entity.PaneID]bool)
+		c.pendingReveal = make(map[entity.PaneID]webViewIdentity)
 	}
 	if c.revealedWebViews == nil {
-		c.revealedWebViews = make(map[entity.PaneID]bool)
+		c.revealedWebViews = make(map[entity.PaneID]webViewIdentity)
-	}
-	if c.revealedWebViewIdentity == nil {
-		c.revealedWebViewIdentity = make(map[entity.PaneID]webViewIdentity)
-	}
-	if c.pendingRevealIdentity == nil {
-		c.pendingRevealIdentity = make(map[entity.PaneID]webViewIdentity)
 	}
 }
 	}
 	c.ensureRevealMapsLocked()
 	delete(c.pendingReveal, paneID)
-	delete(c.pendingRevealIdentity, paneID)
 	delete(c.revealedWebViews, paneID)
-	delete(c.revealedWebViewIdentity, paneID)
 }
 // deleteWebViewLocked removes both the mapping and any presentation state,
 	}
 	c.ensureRevealMapsLocked()
 	delete(c.pendingReveal, paneID)
-	delete(c.pendingRevealIdentity, paneID)
 	delete(c.revealedWebViews, paneID)
-	delete(c.revealedWebViewIdentity, paneID)
 	return wv
 }

M internal/ui/coordinator/content/navigation.go +8 -9


@@ -255,8 +255,7 @@ func (c *Coordinator) markPendingReveal(paneID entity.PaneID, identity webViewId
255	255		return
256	256		}
257	257		c.ensureRevealMapsLocked()
258		-	c.pendingReveal[paneID] = true
259		-	c.pendingRevealIdentity[paneID] = identity
	258	+	c.pendingReveal[paneID] = identity
260	259		}
261	260
262	261		func (c *Coordinator) clearPendingReveal(paneID entity.PaneID, identity webViewIdentity) {

@@ -264,11 +263,11 @@ func (c *Coordinator) clearPendingReveal(paneID entity.PaneID, identity webViewI
264	263		c.revealMu.Lock()
265	264		defer c.revealMu.Unlock()
266	265		defer c.webViewsMu.RUnlock()
267		-	if c.pendingRevealIdentity[paneID] != identity {
	266	+	pendingIdentity, pending := c.pendingReveal[paneID]
	267	+	if !pending \|\| pendingIdentity != identity {
268	268		return
269	269		}
270	270		delete(c.pendingReveal, paneID)
271		-	delete(c.pendingRevealIdentity, paneID)
272	271		}
273	272
274	273		// WebViewRevealed reports whether this pane's current WebView has completed a

@@ -293,7 +292,8 @@ func (c *Coordinator) webViewRevealed(paneID entity.PaneID, expected port.WebVie
293	292		return false
294	293		}
295	294		}
296		-	return c.revealedWebViews[paneID] && c.revealedWebViewIdentity[paneID] == identity
	295	+	revealedIdentity, revealed := c.revealedWebViews[paneID]
	296	+	return revealed && revealedIdentity == identity
297	297		}
298	298
299	299		func (c *Coordinator) markWebViewRevealed(paneID entity.PaneID, identity webViewIdentity) bool {

@@ -306,8 +306,7 @@ func (c *Coordinator) markWebViewRevealed(paneID entity.PaneID, identity webView
306	306		return false
307	307		}
308	308		c.ensureRevealMapsLocked()
309		-	c.revealedWebViews[paneID] = true
310		-	c.revealedWebViewIdentity[paneID] = identity
	309	+	c.revealedWebViews[paneID] = identity
311	310		return true
312	311		}
313	312

@@ -321,7 +320,8 @@ func (c *Coordinator) revealIfPending(
321	320
322	321		c.webViewsMu.RLock()
323	322		c.revealMu.Lock()
324		-	if c.pendingRevealIdentity[paneID] != identity \|\| !c.pendingReveal[paneID] {
	323	+	pendingIdentity, pending := c.pendingReveal[paneID]
	324	+	if !pending \|\| pendingIdentity != identity {
325	325		c.revealMu.Unlock()
326	326		c.webViewsMu.RUnlock()
327	327		c.revealMutationMu.Unlock()

@@ -335,7 +335,6 @@ func (c *Coordinator) revealIfPending(
335	335		return
336	336		}
337	337		delete(c.pendingReveal, paneID)
338		-	delete(c.pendingRevealIdentity, paneID)
339	338		c.revealMu.Unlock()
340	339		c.webViewsMu.RUnlock()
341	340

 		return
 	}
 	c.ensureRevealMapsLocked()
-	c.pendingReveal[paneID] = true
+	c.pendingReveal[paneID] = identity
-	c.pendingRevealIdentity[paneID] = identity
 }
 func (c *Coordinator) clearPendingReveal(paneID entity.PaneID, identity webViewIdentity) {
 	c.revealMu.Lock()
 	defer c.revealMu.Unlock()
 	defer c.webViewsMu.RUnlock()
-	if c.pendingRevealIdentity[paneID] != identity {
+	pendingIdentity, pending := c.pendingReveal[paneID]
+	if !pending || pendingIdentity != identity {
 		return
 	}
 	delete(c.pendingReveal, paneID)
-	delete(c.pendingRevealIdentity, paneID)
 }
 // WebViewRevealed reports whether this pane's current WebView has completed a
 			return false
 		}
 	}
-	return c.revealedWebViews[paneID] && c.revealedWebViewIdentity[paneID] == identity
+	revealedIdentity, revealed := c.revealedWebViews[paneID]
+	return revealed && revealedIdentity == identity
 }
 func (c *Coordinator) markWebViewRevealed(paneID entity.PaneID, identity webViewIdentity) bool {
 		return false
 	}
 	c.ensureRevealMapsLocked()
-	c.revealedWebViews[paneID] = true
+	c.revealedWebViews[paneID] = identity
-	c.revealedWebViewIdentity[paneID] = identity
 	return true
 }
 	c.webViewsMu.RLock()
 	c.revealMu.Lock()
-	if c.pendingRevealIdentity[paneID] != identity || !c.pendingReveal[paneID] {
+	pendingIdentity, pending := c.pendingReveal[paneID]
+	if !pending || pendingIdentity != identity {
 		c.revealMu.Unlock()
 		c.webViewsMu.RUnlock()
 		c.revealMutationMu.Unlock()
 		return
 	}
 	delete(c.pendingReveal, paneID)
-	delete(c.pendingRevealIdentity, paneID)
 	c.revealMu.Unlock()
 	c.webViewsMu.RUnlock()