Skip to content

chore: sync tauri-runtime-cef from upstream feat/cef - #13

Open
github-actions[bot] wants to merge 1 commit into
mainfrom
sync/upstream-20260907
Open

chore: sync tauri-runtime-cef from upstream feat/cef#13
github-actions[bot] wants to merge 1 commit into
mainfrom
sync/upstream-20260907

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 7, 2026

Copy link
Copy Markdown

Automated sync from tauri-apps/tauri feat/cef branch.

If this PR has merge conflicts, the upstream changed runtime.rs or webview.rs in a way that requires manual porting of the overlay modules. Fix conflicts and merge.

Before merging, read the divergence report below. Re-applying fork patches by hand is how upstream fixes get dropped silently — the report is the only place they surface, because the copy overwrites the evidence.

CEF version: check the cef pin in Cargo.toml, bump Sable's src-tauri/Cargo.toml to match.

Note: if syncing from amr/cef-gtk4, the Cargo.toml will reference gtk4 and winit-gtk4, the fork's overlay config may need updating to handle the gtk4 crate name and the winit git dep.


Divergence report

Fork-only files (10)

Not in upstream, so they survive the copy and never show in this PR's diff.

  • examples/stream_probe.rs
  • examples/sw_probe.rs
  • src/compat.rs
  • src/config.rs
  • src/platform/macos/appkit_state.rs
  • src/policy.rs
  • src/streaming.rs
  • src/wayland/mod.rs
  • src/wayland/webview.rs
  • src/wayland/window.rs

Upstream items not present in the fork (108)

Each is either a deliberate fork removal or an upstream fix a previous sync dropped. Deliberate removals in this repo always carry a comment explaining why — an entry you cannot find a rationale for is a regression.

File Kind Item
src/cef_impl/client/life_span.rs fn do_close
src/cef_impl/client/life_span.rs fn on_before_popup_aborted
src/cef_impl/client/life_span.rs fn popup_source_observation_is_available_without_dispatch_and_redacted_from_debug
src/cef_impl/client/life_span.rs mod tests
src/cef_impl/client/life_span.rs type PopupClientFactory
src/cef_impl/client/load.rs fn on_load_error
src/cef_impl/client/load.rs fn on_loading_state_change
src/cef_impl/client/mod.rs fn frame_handler
src/cef_impl/client/mod.rs mod frame
src/cef_impl/client/permission.rs const ALLOY_MEDIA_PERMISSIONS
src/cef_impl/client/permission.rs const AUDIO_CAPTURE
src/cef_impl/client/permission.rs const PERMISSION_CONTENT_SETTINGS
src/cef_impl/client/permission.rs const VIDEO_CAPTURE
src/cef_impl/client/permission.rs fn allow_content_settings
src/cef_impl/client/permission.rs fn alloy_style_host
src/cef_impl/request_handler.rs fn keep_encoding_declaration_first
src/cef_impl/request_handler.rs fn preserves_every_cef_termination_reason
src/cef_impl/request_handler.rs fn termination_reason
src/cef_impl/request_handler.rs mod termination_tests
src/external_message_pump/linux.rs fn deadline
src/external_message_pump/mod.rs fn next_deadline
src/lib.rs mod devtools
src/lib.rs mod dialog
src/lib.rs mod frame
src/lib.rs mod frame_navigation
src/lib.rs mod macros
src/lib.rs mod popup
src/lib.rs mod tauri_ext
src/platform/linux/utils.rs const CURRENT_TIME
src/platform/linux/utils.rs const NET_ACTIVE_WINDOW_SOURCE_PAGER
src/platform/linux/utils.rs fn activate_window
src/platform/linux/webview.rs fn native_parent_matches
src/platform/linux/webview.rs fn native_visible
src/platform/linux/window.rs fn raise_native
src/platform/macos/application.rs fn activate_application
src/platform/macos/utils.rs fn associated_object
src/platform/macos/utils.rs fn set_associated_object
src/platform/macos/webview.rs fn destroy_host_window
src/platform/macos/webview.rs fn native_parent_matches
src/platform/macos/webview.rs fn native_visible
src/platform/macos/webview.rs fn try_nsview
src/platform/macos/window.rs fn handle_window_notification
src/platform/macos/window.rs fn new
src/platform/macos/window.rs fn observe_traffic_light_resets
src/platform/macos/window.rs fn reapply_traffic_light_position
src/platform/macos/window.rs fn reapply_traffic_light_position_after_appearance_change
src/platform/macos/window.rs fn reapply_traffic_light_position_deferred
src/platform/macos/window.rs fn set_traffic_light_observer
src/platform/macos/window.rs fn traffic_light_observer
src/platform/macos/window.rs fn traffic_light_observer_key
src/platform/macos/window.rs static TRAFFIC_LIGHT_OBSERVER_KEY
src/platform/macos/window.rs struct TrafficLightObserver
src/platform/macos/window.rs struct TrafficLightObserverIvars
src/platform/windows/webview.rs const PIN_Z_ORDER_SUBCLASS_ID
src/platform/windows/webview.rs const Z_ORDER_PINNED
src/platform/windows/webview.rs const Z_ORDER_UNPINNED
src/platform/windows/webview.rs fn destroy_host_window
src/platform/windows/webview.rs fn native_parent_matches
src/platform/windows/webview.rs fn native_visible
src/platform/windows/webview.rs fn pin_z_order_subclass_proc
src/platform/windows/webview.rs fn raise_to_top
src/platform/windows/webview.rs fn set_z_order_pinned
src/runtime.rs enum DesktopDeepLinks
src/runtime.rs fn apply_config
src/runtime.rs fn cef_api_version
src/runtime.rs fn command_line_arg
src/runtime.rs fn command_line_args
src/runtime.rs fn custom_scheme_url
src/runtime.rs fn deep_link_schemes
src/runtime.rs fn from
src/runtime.rs fn navigate_first_webview
src/runtime.rs fn root_cache_path
src/runtime.rs fn source_url
src/runtime.rs fn webview_version
src/runtime.rs fn with_settings
src/runtime.rs struct Cef
src/runtime.rs struct NewWindowOpener
src/runtime.rs type RuntimeInitAttrs
src/runtime.rs type RuntimeWebviewAttributes
src/runtime.rs type SettingsCallback
src/runtime.rs type Webview
src/runtime.rs type WindowOpener
src/webview.rs enum RuntimeStyle
src/webview.rs fn fmt
src/webview.rs fn for_document
src/webview.rs fn frame_navigation_state
src/webview.rs fn opener
src/webview.rs fn popups
src/webview.rs fn runs_in_frame
src/webview.rs fn set_opener
src/webview.rs fn snapshot
src/webview.rs fn url_getter_does_not_hold_the_window_lock_while_waiting_for_ui
src/webview.rs mod getter_tests
src/webview.rs struct CefWebviewAttributes
src/webview.rs struct Dispatcher
src/webview.rs struct WebviewSnapshot
src/window.rs const PENDING_ACTIVATION_TIMEOUT
src/window.rs fn activate
src/window.rs fn apply_pending_activations
src/window.rs fn eq
src/window.rs fn fmt
src/window.rs fn max_size_constraint
src/window.rs fn min_size_constraint
src/window.rs fn new
src/window.rs fn references_preserve_one_window_and_reject_replacements
src/window.rs mod native_window_identity_tests
src/window.rs struct NativeWindowToken
src/window_builder.rs fn no_redirection_bitmap

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants