refactor(webkit-settings): pass context as first parameter instead of storing

Remove stored ctx field from SettingsManager and update all methods
(CreateSettings, applySettings, UpdateFromConfig, ApplyToWebView) to
accept context as first parameter, following project convention of using
log := logging.FromContext(ctx) in each method.

commit: 401b02cd15abebcdc79a9e0e2bf6a0cf891efa85
author: brice · 10mo ago · 2025-12-17 06:44 UTC
parent: b106e60
signature: unsigned

1 file · +12 -12

M internal/infrastructure/webkit/settings.go +12 -12


@@ -12,21 +12,21 @@ import (
12	12		// SettingsManager creates and manages WebKit Settings instances from config.
13	13		type SettingsManager struct {
14	14		cfg *config.Config
15		-	ctx context.Context
16	15		mu sync.RWMutex
17	16		}
18	17
19	18		// NewSettingsManager creates a new SettingsManager with the given config.
20	19		func NewSettingsManager(ctx context.Context, cfg config.Config) SettingsManager {
	20	+	log := logging.FromContext(ctx)
	21	+	log.Debug().Msg("creating settings manager")
21	22		return &SettingsManager{
22	23		cfg: cfg,
23		-	ctx: logging.WithComponent(ctx, "webkit-settings"),
24	24		}
25	25		}
26	26
27	27		// CreateSettings creates a new webkit.Settings instance configured from the current config.
28		-	func (sm SettingsManager) CreateSettings() webkit.Settings {
29		-	log := logging.FromContext(sm.ctx)
	28	+	func (sm SettingsManager) CreateSettings(ctx context.Context) webkit.Settings {
	29	+	log := logging.FromContext(ctx)
30	30
31	31		sm.mu.RLock()
32	32		cfg := sm.cfg

@@ -38,12 +38,13 @@ func (sm SettingsManager) CreateSettings() webkit.Settings {
38	38		return nil
39	39		}
40	40
41		-	sm.applySettings(settings, cfg)
	41	+	sm.applySettings(ctx, settings, cfg)
42	42		return settings
43	43		}
44	44
45	45		// applySettings applies configuration to a webkit.Settings instance.
46		-	func (sm SettingsManager) applySettings(settings webkit.Settings, cfg *config.Config) {
	46	+	func (sm SettingsManager) applySettings(ctx context.Context, settings webkit.Settings, cfg *config.Config) {
	47	+	log := logging.FromContext(ctx)
47	48		// JavaScript settings
48	49		settings.SetEnableJavascript(true)
49	50		settings.SetEnableJavascriptMarkup(true)

@@ -108,7 +109,6 @@ func (sm SettingsManager) applySettings(settings webkit.Settings, cfg *config.
108	109		// WebRTC
109	110		settings.SetEnableWebrtc(true)
110	111
111		-	log := logging.FromContext(sm.ctx)
112	112		log.Debug().
113	113		Str("sans_font", cfg.Appearance.SansFont).
114	114		Str("rendering_mode", string(cfg.RenderingMode)).

@@ -119,8 +119,8 @@ func (sm SettingsManager) applySettings(settings webkit.Settings, cfg *config.
119	119		// UpdateFromConfig updates the manager with a new config (for hot-reload).
120	120		// Note: This doesn't update already-created Settings instances.
121	121		// New WebViews will use the updated config.
122		-	func (sm SettingsManager) UpdateFromConfig(cfg config.Config) {
123		-	log := logging.FromContext(sm.ctx)
	122	+	func (sm SettingsManager) UpdateFromConfig(ctx context.Context, cfg config.Config) {
	123	+	log := logging.FromContext(ctx)
124	124		sm.mu.Lock()
125	125		defer sm.mu.Unlock()
126	126		sm.cfg = cfg

@@ -129,12 +129,12 @@ func (sm SettingsManager) UpdateFromConfig(cfg config.Config) {
129	129
130	130		// ApplyToWebView applies current settings to an existing WebView.
131	131		// This can be used to update a WebView's settings after config hot-reload.
132		-	func (sm SettingsManager) ApplyToWebView(wv webkit.WebView) {
	132	+	func (sm SettingsManager) ApplyToWebView(ctx context.Context, wv webkit.WebView) {
133	133		if wv == nil {
134	134		return
135	135		}
136	136
137		-	settings := sm.CreateSettings()
	137	+	settings := sm.CreateSettings(ctx)
138	138		if settings == nil {
139	139		return
140	140		}

@@ -147,6 +147,6 @@ func (sm SettingsManager) ApplyToWebView(wv webkit.WebView) {
147	147		sm.mu.RLock()
148	148		cfg := sm.cfg
149	149		sm.mu.RUnlock()
150		-	sm.applySettings(existingSettings, cfg)
	150	+	sm.applySettings(ctx, existingSettings, cfg)
151	151		}
152	152		}

 // SettingsManager creates and manages WebKit Settings instances from config.
 type SettingsManager struct {
 	cfg *config.Config
-	ctx context.Context
 	mu  sync.RWMutex
 }
 // NewSettingsManager creates a new SettingsManager with the given config.
 func NewSettingsManager(ctx context.Context, cfg *config.Config) *SettingsManager {
+	log := logging.FromContext(ctx)
+	log.Debug().Msg("creating settings manager")
 	return &SettingsManager{
 		cfg: cfg,
-		ctx: logging.WithComponent(ctx, "webkit-settings"),
 	}
 }
 // CreateSettings creates a new webkit.Settings instance configured from the current config.
-func (sm *SettingsManager) CreateSettings() *webkit.Settings {
+func (sm *SettingsManager) CreateSettings(ctx context.Context) *webkit.Settings {
-	log := logging.FromContext(sm.ctx)
+	log := logging.FromContext(ctx)
 	sm.mu.RLock()
 	cfg := sm.cfg
 		return nil
 	}
-	sm.applySettings(settings, cfg)
+	sm.applySettings(ctx, settings, cfg)
 	return settings
 }
 // applySettings applies configuration to a webkit.Settings instance.
-func (sm *SettingsManager) applySettings(settings *webkit.Settings, cfg *config.Config) {
+func (sm *SettingsManager) applySettings(ctx context.Context, settings *webkit.Settings, cfg *config.Config) {
+	log := logging.FromContext(ctx)
 	// JavaScript settings
 	settings.SetEnableJavascript(true)
 	settings.SetEnableJavascriptMarkup(true)
 	// WebRTC
 	settings.SetEnableWebrtc(true)
-	log := logging.FromContext(sm.ctx)
 	log.Debug().
 		Str("sans_font", cfg.Appearance.SansFont).
 		Str("rendering_mode", string(cfg.RenderingMode)).
 // UpdateFromConfig updates the manager with a new config (for hot-reload).
 // Note: This doesn't update already-created Settings instances.
 // New WebViews will use the updated config.
-func (sm *SettingsManager) UpdateFromConfig(cfg *config.Config) {
+func (sm *SettingsManager) UpdateFromConfig(ctx context.Context, cfg *config.Config) {
-	log := logging.FromContext(sm.ctx)
+	log := logging.FromContext(ctx)
 	sm.mu.Lock()
 	defer sm.mu.Unlock()
 	sm.cfg = cfg
 // ApplyToWebView applies current settings to an existing WebView.
 // This can be used to update a WebView's settings after config hot-reload.
-func (sm *SettingsManager) ApplyToWebView(wv *webkit.WebView) {
+func (sm *SettingsManager) ApplyToWebView(ctx context.Context, wv *webkit.WebView) {
 	if wv == nil {
 		return
 	}
-	settings := sm.CreateSettings()
+	settings := sm.CreateSettings(ctx)
 	if settings == nil {
 		return
 	}
 		sm.mu.RLock()
 		cfg := sm.cfg
 		sm.mu.RUnlock()
-		sm.applySettings(existingSettings, cfg)
+		sm.applySettings(ctx, existingSettings, cfg)
 	}
 }