Skip to content

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

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

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

Conversation

@github-actions

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 (233)

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/context_menu.rs const BROWSER_ONLY_COMMANDS
src/cef_impl/client/context_menu.rs const DEVTOOLS_COMMANDS
src/cef_impl/client/context_menu.rs const UNKNOWN_COMMAND_ID
src/cef_impl/client/context_menu.rs fn command_ids
src/cef_impl/client/context_menu.rs fn remove_redundant_separators
src/cef_impl/client/context_menu.rs fn resolve_command_ids
src/cef_impl/client/context_menu.rs static COMMAND_IDS
src/cef_impl/client/context_menu.rs struct CommandIds
src/cef_impl/client/display.rs fn on_console_message
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 command_handler
src/cef_impl/client/mod.rs fn frame_handler
src/cef_impl/client/mod.rs mod command
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 DESKTOP_AUDIO_CAPTURE
src/cef_impl/client/permission.rs const DESKTOP_CAPTURE
src/cef_impl/client/permission.rs const DESKTOP_VIDEO_CAPTURE
src/cef_impl/client/permission.rs const MEDIA_PERMISSION_KINDS
src/cef_impl/client/permission.rs const PERMISSION_KINDS
src/cef_impl/client/permission.rs const VIDEO_CAPTURE
src/cef_impl/client/permission.rs enum AppDecision
src/cef_impl/client/permission.rs fn allow_content_settings
src/cef_impl/client/permission.rs fn browser_host
src/cef_impl/client/permission.rs fn decide
src/cef_impl/client/permission.rs fn grants_desktop_capture
src/cef_impl/client/permission.rs fn is_alloy_style
src/cef_impl/client/permission.rs fn lookup_permission_kind
src/cef_impl/client/permission.rs fn media_content_settings
src/cef_impl/client/permission.rs fn media_permission_kind
src/cef_impl/client/permission.rs fn permission_kind
src/cef_impl/client/permission.rs fn requested_permissions
src/cef_impl/client/permission.rs type PermissionRequestHandler
src/cef_impl/mod.rs mod preferences
src/cef_impl/request_handler.rs fn keep_encoding_declaration_first
src/cef_impl/request_handler.rs fn on_certificate_error
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/lib.rs mod devtools
src/lib.rs mod dialog
src/lib.rs mod environment
src/lib.rs mod frame
src/lib.rs mod frame_navigation
src/lib.rs mod locale
src/lib.rs mod macros
src/lib.rs mod popup
src/lib.rs mod sandbox
src/lib.rs mod switches
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 apply_transient_for
src/platform/linux/window.rs fn background_color_class
src/platform/linux/window.rs fn cef_host_handle
src/platform/linux/window.rs fn create_cef_container
src/platform/linux/window.rs fn default_vbox
src/platform/linux/window.rs fn drop
src/platform/linux/window.rs fn new
src/platform/linux/window.rs fn raise_native
src/platform/linux/window.rs fn set_background_color_provider
src/platform/linux/window.rs fn set_cef_container_bounds
src/platform/linux/window.rs fn size
src/platform/linux/window.rs fn take_background_color_provider
src/platform/linux/window.rs fn take_needs_relayout
src/platform/linux/window.rs fn window_xid
src/platform/linux/window.rs struct CefX11Host
src/platform/linux/window.rs struct HostGeometry
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 cef_host_handle
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/platform/windows/window.rs fn cef_host_handle
src/runtime.rs enum AutoplayPolicy
src/runtime.rs enum CertificateErrorPolicy
src/runtime.rs enum DesktopDeepLinks
src/runtime.rs enum DevToolsPolicy
src/runtime.rs enum ProxyConfig
src/runtime.rs enum RemoteDebugging
src/runtime.rs enum SandboxPolicy
src/runtime.rs enum SecretStorage
src/runtime.rs enum WebRtcIpHandling
src/runtime.rs fn a_fixed_proxy_is_spelled_the_way_chromium_spells_it
src/runtime.rs fn a_fixed_proxy_without_a_bypass_list_omits_the_key
src/runtime.rs fn a_later_preference_wins_over_an_earlier_one
src/runtime.rs fn a_typed_option_is_just_a_preference
src/runtime.rs fn accept_language_list
src/runtime.rs fn allow_chromium_command_line_args
src/runtime.rs fn an_empty_scheme_list_keeps_nothing
src/runtime.rs fn append_command_line_args
src/runtime.rs fn apply_config
src/runtime.rs fn as_switch_value
src/runtime.rs fn autoplay
src/runtime.rs fn cef_api_version
src/runtime.rs fn certificate_errors
src/runtime.rs fn chrome_policy_id
src/runtime.rs fn command_line_arg
src/runtime.rs fn command_line_args
src/runtime.rs fn component_updates
src/runtime.rs fn custom_scheme_url
src/runtime.rs fn debug_environment
src/runtime.rs fn deep_link_arguments
src/runtime.rs fn deep_link_schemes
src/runtime.rs fn default_content_setting
src/runtime.rs fn devtools
src/runtime.rs fn disable_features
src/runtime.rs fn dispatches_run_event
src/runtime.rs fn drops_everything_that_is_not_a_configured_deep_link
src/runtime.rs fn enable_features
src/runtime.rs fn filter
src/runtime.rs fn from
src/runtime.rs fn global_preference
src/runtime.rs fn javascript_flags
src/runtime.rs fn keeps_configured_deep_links_in_order
src/runtime.rs fn locale
src/runtime.rs fn log_file
src/runtime.rs fn log_items
src/runtime.rs fn log_severity
src/runtime.rs fn navigate_first_webview
src/runtime.rs fn pending_native_drag_drop
src/runtime.rs fn pending_native_drag_enter
src/runtime.rs fn persist_session_cookies
src/runtime.rs fn position
src/runtime.rs fn profile_preference
src/runtime.rs fn profile_preference_value
src/runtime.rs fn proxy
src/runtime.rs fn remote_debugging
src/runtime.rs fn remote_debugging_is_off_by_default
src/runtime.rs fn request_native_drag_paths
src/runtime.rs fn root_cache_path
src/runtime.rs fn safe_browsing
src/runtime.rs fn sandbox
src/runtime.rs fn scheme_matching_is_exact
src/runtime.rs fn schemes
src/runtime.rs fn secret_storage
src/runtime.rs fn source_url
src/runtime.rs fn spell_checking
src/runtime.rs fn the_default_policies_append_no_switch_at_all
src/runtime.rs fn the_defaults_are_the_conservative_ones
src/runtime.rs fn the_modeless_proxy_configurations_carry_only_a_mode
src/runtime.rs fn the_named_policies_use_chromiums_own_spelling
src/runtime.rs fn to_preference
src/runtime.rs fn user_agent
src/runtime.rs fn user_agent_product
src/runtime.rs fn webrtc_ip_handling
src/runtime.rs fn webview_version
src/runtime.rs fn with_settings
src/runtime.rs mod configuration_tests
src/runtime.rs mod deep_link_argument_tests
src/runtime.rs struct Cef
src/runtime.rs struct NewWindowOpener
src/runtime.rs struct WinitDragDropState
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 const ALL
src/webview.rs enum ChromeCommandGroup
src/webview.rs enum ConsoleMessageLevel
src/webview.rs enum RuntimeStyle
src/webview.rs fn apply_user_agent_override
src/webview.rs fn fmt
src/webview.rs fn for_document
src/webview.rs fn frame_navigation_state
src/webview.rs fn from_cef
src/webview.rs fn handle_window_dependent_webview_message
src/webview.rs fn handle_window_independent_webview_message
src/webview.rs fn is_alloy_style
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 ConsoleMessage
src/webview.rs struct Dispatcher
src/webview.rs struct WebviewSnapshot
src/webview.rs type BrowserSettingsCallback
src/webview.rs type ConsoleMessageHandler
src/window.rs const PENDING_ACTIVATION_TIMEOUT
src/window.rs fn activate
src/window.rs fn apply_pending_activations
src/window.rs fn apply_pending_host_layouts
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 fn safe_surface_size
src/window.rs mod native_window_identity_tests
src/window.rs struct NativeWindowToken
src/window.rs struct SendGtkBox
src/window.rs struct SendGtkWindow
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