refactor: simplify logic between CefTexture and CefTexture2D (#171)

Author: dsh0416

crates/gdcef/src/cef_texture/browser_lifecycle.rs

@@ -1,34 +1,36 @@
-use super::{CefTexture, backend};
+use super::CefTexture;
 use crate::browser::LifecycleState;
+use crate::cef_texture::backend;
 use crate::error::CefError;
 use godot::prelude::*;
 
 impl CefTexture {
     fn log_cleanup_state_violations(&self) {
-        if self.app.state.is_some() {
+        if self.with_app(|app| app.state.is_some()) {
             godot::global::godot_warn!(
                 "[CefTexture] Cleanup invariant violation: runtime state not fully cleared"
             );
         }
+        let lifecycle_state = self.with_app(|app| app.lifecycle_state());
         if !matches!(
-            self.app.lifecycle_state(),
+            lifecycle_state,
             LifecycleState::Closed | LifecycleState::Retained
         ) {
             godot::global::godot_warn!(
                 "[CefTexture] Cleanup invariant violation: unexpected lifecycle state {:?}",
-                self.app.lifecycle_state()
+                lifecycle_state
             );
         }
     }
 
     pub(super) fn cleanup_instance(&mut self) {
         self.base_mut().set_visible(false);
-        backend::cleanup_runtime(&mut self.app, self.popup_texture_2d_rd.as_mut());
+        let mut popup_texture_2d_rd = self.popup_texture_2d_rd.take();
+        self.with_app_mut(|app| backend::cleanup_runtime(app, popup_texture_2d_rd.as_mut()));
+        self.popup_texture_2d_rd = popup_texture_2d_rd;
 
         self.ime_active = false;
         self.ime_proxy = None;
-        self.last_find_query = GString::new();
-        self.last_find_match_case = false;
 
         if let Some(mut overlay) = self.popup_overlay.take() {
             overlay.queue_free();
@@ -50,33 +52,35 @@ impl CefTexture {
     }
 
     pub(super) fn try_create_browser(&mut self) -> Result<(), CefError> {
-        if self.app.state.is_some() {
+        if self.with_app(|app| app.state.is_some()) {
             return Ok(());
         }
-        if !self.app.begin_browser_create() {
+        if !self.with_app_mut(|app| app.begin_browser_create()) {
             return Ok(());
         }
 
         let logical_size = self.base().get_size();
         let dpi = self.get_pixel_scale_factor();
+        let max_fps = self.get_max_fps();
         let params = backend::BackendCreateParams {
             logical_size,
             dpi,
-            max_fps: self.get_max_fps(),
+            max_fps,
             url: self.url.to_string(),
             enable_accelerated_osr: self.enable_accelerated_osr,
             background_color: self.background_color,
             popup_policy: self.popup_policy,
             software_target_texture: None,
             log_prefix: "CefTexture",
         };
-        if let Err(err) = backend::try_create_browser(&mut self.app, &params) {
-            self.app.mark_browser_closed();
+        if let Err(err) = self.with_app_mut(|app| backend::try_create_browser(app, &params)) {
+            self.with_app_mut(|app| app.mark_browser_closed());
             return Err(err);
         }
-        self.app.mark_browser_running();
-        if let Some(state) = self.app.state.as_ref() {
-            let texture = state.render_mode.texture_2d();
+        self.with_app_mut(|app| app.mark_browser_running());
+        if let Some(texture) =
+            self.with_app(|app| app.state.as_ref().map(|s| s.render_mode.texture_2d()))
+        {
             self.base_mut().set_texture(&texture);
         }
 

crates/gdcef/src/cef_texture/ime.rs

@@ -66,7 +66,7 @@ impl CefTexture {
 
     /// Called when the IME proxy LineEdit text changes during composition.
     pub(super) fn on_ime_proxy_text_changed_impl(&mut self, new_text: GString) {
-        let Some(host) = self.app.host() else {
+        let Some(host) = self.with_app(|app| app.host()) else {
             return;
         };
 
@@ -124,7 +124,7 @@ impl CefTexture {
             proxy.grab_focus();
         }
 
-        if let Some(host) = self.app.host() {
+        if let Some(host) = self.with_app(|app| app.host()) {
             host.set_focus(true as _);
         }
 
@@ -159,7 +159,7 @@ impl CefTexture {
         let end = ime_selection.y.max(0) as u32;
 
         // Update the IME composition text
-        if let Some(host) = self.app.host() {
+        if let Some(host) = self.with_app(|app| app.host()) {
             input::ime_set_composition(&host, &ime_text, start, end);
         }
     }