0b00d6c content: apply safe simplify follow-ups · dumber

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


@@ -92,12 +92,8 @@ func (wv *WebView) runOpenerNavigationCallbacks(uri string) {
92	92
93	93		// HasActivePopupOpenerBridge implements port.PopupOpenerCapable.
94	94		func (wv *WebView) HasActivePopupOpenerBridge() bool {
95		-	if wv == nil {
96		-	return false
97		-	}
98		-	wv.mu.RLock()
99		-	defer wv.mu.RUnlock()
100		-	return !wv.popupNoJavaScriptAccess && wv.popupOpenerBridgeParent != nil
	95	+	_, active, _ := wv.popupOpenerBridgeState()
	96	+	return active
101	97		}
102	98
103	99		func (wv *WebView) popupOpenerBridgeState() (parentURI string, active bool, blocked bool) {

 // HasActivePopupOpenerBridge implements port.PopupOpenerCapable.
 func (wv *WebView) HasActivePopupOpenerBridge() bool {
-	if wv == nil {
+	_, active, _ := wv.popupOpenerBridgeState()
-		return false
+	return active
-	}
-	wv.mu.RLock()
-	defer wv.mu.RUnlock()
-	return !wv.popupNoJavaScriptAccess && wv.popupOpenerBridgeParent != nil
 }
 func (wv *WebView) popupOpenerBridgeState() (parentURI string, active bool, blocked bool) {

M internal/infrastructure/cef/webview_popup_proxy.go +3 -6


@@ -9,10 +9,9 @@ import (
9	9		)
10	10
11	11		type syntheticPopupState struct {
12		-	WebView port.WebView
13		-	PendingURI string
14		-	NoJavaScriptAccess bool
15		-	Closed bool
	12	+	WebView port.WebView
	13	+	PendingURI string
	14	+	Closed bool
16	15		}
17	16
18	17		func (wv WebView) syntheticPopupState(proxyID string) syntheticPopupState {

@@ -67,7 +66,6 @@ func (wv *WebView) handleSyntheticPopupOpen(targetURL, frameName, proxyID string
67	66		wv.syntheticPopupMu.Unlock()
68	67		return
69	68		}
70		-	state.NoJavaScriptAccess = noJavaScriptAccess
71	69		wv.syntheticPopupMu.Unlock()
72	70
73	71		wv.runOnGTK(func() {

@@ -116,7 +114,6 @@ func (wv *WebView) handleSyntheticPopupOpen(targetURL, frameName, proxyID string
116	114		return
117	115		}
118	116		state.WebView = popupWV
119		-	state.NoJavaScriptAccess = noJavaScriptAccess
120	117		pendingURI = strings.TrimSpace(state.PendingURI)
121	118		wv.syntheticPopupMu.Unlock()
122	119

 )
 type syntheticPopupState struct {
-	WebView            port.WebView
+	WebView    port.WebView
-	PendingURI         string
+	PendingURI string
-	NoJavaScriptAccess bool
+	Closed     bool
-	Closed             bool
 }
 func (wv *WebView) syntheticPopupState(proxyID string) *syntheticPopupState {
 		wv.syntheticPopupMu.Unlock()
 		return
 	}
-	state.NoJavaScriptAccess = noJavaScriptAccess
 	wv.syntheticPopupMu.Unlock()
 	wv.runOnGTK(func() {
 			return
 		}
 		state.WebView = popupWV
-		state.NoJavaScriptAccess = noJavaScriptAccess
 		pendingURI = strings.TrimSpace(state.PendingURI)
 		wv.syntheticPopupMu.Unlock()

M internal/ui/coordinator/content/popup.go +1 -1


@@ -229,7 +229,7 @@ func (c *Coordinator) createPopupWebView(
229	229		parentID port.WebViewID,
230	230		targetURI string,
231	231		noJavaScriptAccess bool,
232		-	) (port.WebView, string, bool, error) {
	232	+	) (port.WebView, bool, error) {
233	233		return c.ensurePopupManager().createPopupWebView(ctx, parentID, targetURI, noJavaScriptAccess)
234	234		}
235	235


@@ -229,7 +229,7 @@ func (c *Coordinator) createPopupWebView(
229		parentID port.WebViewID,	229		parentID port.WebViewID,
230		targetURI string,	230		targetURI string,
231		noJavaScriptAccess bool,	231		noJavaScriptAccess bool,
232	-	) (port.WebView, string, bool, error) {	232	+	) (port.WebView, bool, error) {
233		return c.ensurePopupManager().createPopupWebView(ctx, parentID, targetURI, noJavaScriptAccess)	233		return c.ensurePopupManager().createPopupWebView(ctx, parentID, targetURI, noJavaScriptAccess)
234		}	234		}
235			235

M internal/ui/coordinator/content/popup_manager.go +10 -16


@@ -348,9 +348,9 @@ func (pm *popupManager) createPopupWebView(
348	348		parentID port.WebViewID,
349	349		targetURI string,
350	350		noJavaScriptAccess bool,
351		-	) (port.WebView, string, bool, error) {
	351	+	) (port.WebView, bool, error) {
352	352		if pm == nil \|\| pm.factory == nil {
353		-	return nil, targetURI, false, fmt.Errorf("no webview factory configured")
	353	+	return nil, false, fmt.Errorf("no webview factory configured")
354	354		}
355	355
356	356		log := logging.FromContext(ctx)

@@ -360,7 +360,7 @@ func (pm *popupManager) createPopupWebView(
360	360		popupWV, err := pm.factory.CreateRelated(ctx, parentID)
361	361		if err == nil && popupWV != nil {
362	362		pm.markRelatedPopupSupported()
363		-	return popupWV, targetURI, false, nil
	363	+	return popupWV, false, nil
364	364		}
365	365		if err == nil {
366	366		relatedErr = fmt.Errorf("related popup webview factory returned nil without error")

@@ -399,18 +399,18 @@ func (pm *popupManager) createPopupWebView(
399	399		popupWV, fallbackErr := pm.factory.Create(ctx)
400	400		if fallbackErr != nil {
401	401		if relatedErr != nil {
402		-	return nil, targetURI, false, fmt.Errorf("create popup webview: related failed: %w; fallback failed: %w", relatedErr, fallbackErr)
	402	+	return nil, false, fmt.Errorf("create popup webview: related failed: %w; fallback failed: %w", relatedErr, fallbackErr)
403	403		}
404		-	return nil, targetURI, false, fmt.Errorf("create popup webview: fallback failed: %w", fallbackErr)
	404	+	return nil, false, fmt.Errorf("create popup webview: fallback failed: %w", fallbackErr)
405	405		}
406	406		if popupWV == nil {
407	407		if relatedErr != nil {
408		-	return nil, targetURI, false, fmt.Errorf("create popup webview: related failed: %w; fallback returned nil", relatedErr)
	408	+	return nil, false, fmt.Errorf("create popup webview: related failed: %w; fallback returned nil", relatedErr)
409	409		}
410		-	return nil, targetURI, false, fmt.Errorf("create popup webview: fallback returned nil")
	410	+	return nil, false, fmt.Errorf("create popup webview: fallback returned nil")
411	411		}
412	412
413		-	return popupWV, targetURI, true, nil
	413	+	return popupWV, true, nil
414	414		}
415	415
416	416		func (pm *popupManager) reuseNamedPopup(

@@ -481,15 +481,11 @@ func (pm *popupManager) handlePopupCreate(
481	481		}
482	482		}
483	483
484		-	popupWV, effectiveTargetURI, usedRegularFallback, err := pm.createPopupWebView(ctx, parentID, req.TargetURI, req.NoJavaScriptAccess)
	484	+	popupWV, usedRegularFallback, err := pm.createPopupWebView(ctx, parentID, req.TargetURI, req.NoJavaScriptAccess)
485	485		if err != nil {
486	486		log.Error().Err(err).Msg("failed to create webview for popup")
487	487		return nil
488	488		}
489		-
490		-	if effectiveTargetURI != req.TargetURI {
491		-	req.TargetURI = effectiveTargetURI
492		-	}
493	489		if usedRegularFallback {
494	490		if openerBridge, ok := popupWV.(port.PopupOpenerCapable); ok {
495	491		openerBridge.EnablePopupOpenerBridge(parentWV, req.NoJavaScriptAccess)

@@ -679,9 +675,7 @@ func (pm *popupManager) handlePopupClose(ctx context.Context, hooks popupCoordin
679	675		fields = fields.
680	676		Str("current_uri", logging.TruncateURL(wv.URI(), logURLMaxLen)).
681	677		Bool("is_loading", wv.IsLoading())
682		-	if opener, ok := wv.(port.PopupOpenerCapable); ok {
683		-	fields = fields.Bool("synthetic_opener_active", opener.HasActivePopupOpenerBridge())
684		-	}
	678	+	fields = fields.Bool("synthetic_opener_active", popupUsesSyntheticOpenerSignals(wv))
685	679		}
686	680		}
687	681		}

 	parentID port.WebViewID,
 	targetURI string,
 	noJavaScriptAccess bool,
-) (port.WebView, string, bool, error) {
+) (port.WebView, bool, error) {
 	if pm == nil || pm.factory == nil {
-		return nil, targetURI, false, fmt.Errorf("no webview factory configured")
+		return nil, false, fmt.Errorf("no webview factory configured")
 	}
 	log := logging.FromContext(ctx)
 		popupWV, err := pm.factory.CreateRelated(ctx, parentID)
 		if err == nil && popupWV != nil {
 			pm.markRelatedPopupSupported()
-			return popupWV, targetURI, false, nil
+			return popupWV, false, nil
 		}
 		if err == nil {
 			relatedErr = fmt.Errorf("related popup webview factory returned nil without error")
 	popupWV, fallbackErr := pm.factory.Create(ctx)
 	if fallbackErr != nil {
 		if relatedErr != nil {
-			return nil, targetURI, false, fmt.Errorf("create popup webview: related failed: %w; fallback failed: %w", relatedErr, fallbackErr)
+			return nil, false, fmt.Errorf("create popup webview: related failed: %w; fallback failed: %w", relatedErr, fallbackErr)
 		}
-		return nil, targetURI, false, fmt.Errorf("create popup webview: fallback failed: %w", fallbackErr)
+		return nil, false, fmt.Errorf("create popup webview: fallback failed: %w", fallbackErr)
 	}
 	if popupWV == nil {
 		if relatedErr != nil {
-			return nil, targetURI, false, fmt.Errorf("create popup webview: related failed: %w; fallback returned nil", relatedErr)
+			return nil, false, fmt.Errorf("create popup webview: related failed: %w; fallback returned nil", relatedErr)
 		}
-		return nil, targetURI, false, fmt.Errorf("create popup webview: fallback returned nil")
+		return nil, false, fmt.Errorf("create popup webview: fallback returned nil")
 	}
-	return popupWV, targetURI, true, nil
+	return popupWV, true, nil
 }
 func (pm *popupManager) reuseNamedPopup(
 		}
 	}
-	popupWV, effectiveTargetURI, usedRegularFallback, err := pm.createPopupWebView(ctx, parentID, req.TargetURI, req.NoJavaScriptAccess)
+	popupWV, usedRegularFallback, err := pm.createPopupWebView(ctx, parentID, req.TargetURI, req.NoJavaScriptAccess)
 	if err != nil {
 		log.Error().Err(err).Msg("failed to create webview for popup")
 		return nil
 	}
-	if effectiveTargetURI != req.TargetURI {
-		req.TargetURI = effectiveTargetURI
-	}
 	if usedRegularFallback {
 		if openerBridge, ok := popupWV.(port.PopupOpenerCapable); ok {
 			openerBridge.EnablePopupOpenerBridge(parentWV, req.NoJavaScriptAccess)
 				fields = fields.
 					Str("current_uri", logging.TruncateURL(wv.URI(), logURLMaxLen)).
 					Bool("is_loading", wv.IsLoading())
-				if opener, ok := wv.(port.PopupOpenerCapable); ok {
+				fields = fields.Bool("synthetic_opener_active", popupUsesSyntheticOpenerSignals(wv))
-					fields = fields.Bool("synthetic_opener_active", opener.HasActivePopupOpenerBridge())
-				}
 			}
 		}
 	}