Created
July 3, 2022 01:28
-
-
Save cttipton/01fe4ade27de8275556be28b6f3550ce to your computer and use it in GitHub Desktop.
Working patch set for chromium main as of June 10, gtk4 plus wayland hw decode. Also GN arg-list
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
use_system_zlib=true | |
use_system_lcms2=true | |
v8_symbol_level=0 | |
blink_symbol_level=0 | |
build_dawn_tests=false | |
build_libsrtp_tests=false | |
bundle_widevine_cdm=true | |
cast_is_debug=false | |
is_debug=false | |
#disable cc_wrapper if you don't know that your have ccache enabled | |
cc_wrapper="ccache" | |
host_cpu="x64" | |
target_cpu="x64" | |
current_cpu="x64" | |
target_os="linux" | |
current_os="linux" | |
enable_cast_renderer=true | |
enable_chromium_runtime_cast_renderer=true | |
enable_expensive_dchecks=false | |
enable_nacl=false | |
enable_nocompile_tests=false | |
enable_platform_encrypted_hevc=true | |
enable_platform_hevc=true | |
enable_platform_hevc_decoding=true | |
enable_platform_mpeg_h_audio=true | |
enable_widevine=true | |
exclude_unwind_tables=true | |
ffmpeg_branding="Chrome" | |
is_clang=true | |
is_debug=false | |
is_official_build=true | |
perfetto_force_dcheck="off" | |
rtc_enable_protobuf=false | |
strip_debug_info=true | |
proprietary_codecs=true | |
rtc_build_examples=false | |
supports_subzero=true | |
symbol_level=0 | |
thin_lto_enable_optimizations=true | |
treat_warnings_as_errors=false | |
use_lld=true | |
enable_profiling = false | |
is_component_build=false | |
disable_fieldtrial_testing_config=true | |
enable_vr=false | |
enable_perfetto_unittests=false | |
enable_perfetto_integration_tests=false | |
tests_have_location_tags=false | |
use_system_wayland_scanner=true | |
use_libinput=true | |
use_bundled_weston=false | |
use_base_test_suite=false | |
optimize_webui=true | |
link_pulseaudio=true | |
gtk_version=4 | |
enable_stripping=true | |
optional_trace_events_enabled=false | |
rtc_disable_metrics=true | |
rtc_disable_trace_events=true | |
rtc_disable_logging=true | |
rtc_disable_check_msg=true | |
symbol_level=0 | |
enable_perfetto_platform_services=false | |
enable_playready=true | |
use_sysroot=false | |
ignore_missing_widevine_signing_cert=true | |
optional_trace_events_enabled=false | |
ozone_auto_platforms=true | |
use_ozone=true | |
use_system_minigbm=true | |
use_system_libdrm=true | |
use_xkbcommon=true | |
use_glib=true | |
use_gtk=true | |
ozone_platform_drm=true | |
rtc_exclude_field_trial_default=true | |
rtc_link_pipewire=true | |
rtc_use_pipewire=true | |
use_libinput=true | |
mojo_media_services=["video_decoder", "cdm", "renderer"] | |
angle_enable_vulkan_system_info=true | |
enable_remoting=false | |
is_cfi=false | |
skia_use_dawn=true | |
enable_browser_speech_service=false | |
enable_screen_ai_service=true | |
enable_speech_service=false | |
use_lto_in_rustc_linking=true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ui/ozone/platform/wayland/ozone_platform_wayland.cc b/ui/ozone/platform/wayland/ozone_platform_wayland.cc | |
index b8f90a13a04bc..7a4489fc8bd42 100644 | |
--- a/ui/ozone/platform/wayland/ozone_platform_wayland.cc | |
+++ b/ui/ozone/platform/wayland/ozone_platform_wayland.cc | |
@@ -288,6 +288,9 @@ class OzonePlatformWayland : public OzonePlatform, | |
// their position on screens and always assume they are located at some | |
// arbitrary position. | |
properties->supports_global_screen_coordinates = false; | |
+ | |
+ // support vaapi | |
+ properties->supports_vaapi = true; | |
initialised = true; | |
} | |
diff --git a/ui/gtk/gtk_util.cc b/ui/gtk/gtk_util.cc | |
index 54b8dd6641649..65aef4a01e0ec 100644 | |
--- a/ui/gtk/gtk_util.cc | |
+++ b/ui/gtk/gtk_util.cc | |
@@ -691,7 +691,7 @@ GdkTexture* GetTextureFromRenderNode(GskRenderNode* node) { | |
DCHECK(GtkCheckVersion(4)); | |
struct { | |
GskRenderNodeType node_type; | |
- GskRenderNode* (*get_child)(GskRenderNode*); | |
+ GskRenderNode* (*get_child)(const GskRenderNode*); | |
} constexpr simple_getters[] = { | |
{GSK_TRANSFORM_NODE, gsk_transform_node_get_child}, | |
{GSK_OPACITY_NODE, gsk_opacity_node_get_child}, | |
@@ -705,8 +705,8 @@ GdkTexture* GetTextureFromRenderNode(GskRenderNode* node) { | |
}; | |
struct { | |
GskRenderNodeType node_type; | |
- guint (*get_n_children)(GskRenderNode*); | |
- GskRenderNode* (*get_child)(GskRenderNode*, guint); | |
+ guint (*get_n_children)(const GskRenderNode*); | |
+ GskRenderNode* (*get_child)(const GskRenderNode*, guint); | |
} constexpr container_getters[] = { | |
{GSK_CONTAINER_NODE, gsk_container_node_get_n_children, | |
gsk_container_node_get_child}, | |
diff --git a/ui/gtk/gsk.sigs b/ui/gtk/gsk.sigs | |
index 4f3a8650fb715..f362dabafcf4b 100644 | |
--- a/ui/gtk/gsk.sigs | |
+++ b/ui/gtk/gsk.sigs | |
@@ -1,16 +1,16 @@ | |
-GskRenderNodeType gsk_render_node_get_node_type(GskRenderNode* node); | |
+GskRenderNodeType gsk_render_node_get_node_type(const GskRenderNode* node); | |
void gsk_render_node_unref(GskRenderNode* node); | |
-GskRenderNode* gsk_transform_node_get_child(GskRenderNode* node); | |
-GskRenderNode* gsk_opacity_node_get_child(GskRenderNode* node); | |
-GskRenderNode* gsk_color_matrix_node_get_child(GskRenderNode* node); | |
-GskRenderNode* gsk_repeat_node_get_child(GskRenderNode* node); | |
-GskRenderNode* gsk_clip_node_get_child(GskRenderNode* node); | |
-GskRenderNode* gsk_rounded_clip_node_get_child(GskRenderNode* node); | |
-GskRenderNode* gsk_shadow_node_get_child(GskRenderNode* node); | |
-GskRenderNode* gsk_blur_node_get_child(GskRenderNode* node); | |
-GskRenderNode* gsk_debug_node_get_child(GskRenderNode* node); | |
-GskRenderNode* gsk_container_node_get_child(GskRenderNode* node, guint idx); | |
-GskRenderNode* gsk_gl_shader_node_get_child(GskRenderNode* node, guint idx); | |
-guint gsk_container_node_get_n_children(GskRenderNode* node); | |
-guint gsk_gl_shader_node_get_n_children(GskRenderNode* node); | |
-GdkTexture* gsk_texture_node_get_texture(GskRenderNode* node); | |
+GskRenderNode* gsk_transform_node_get_child(const GskRenderNode* node); | |
+GskRenderNode* gsk_opacity_node_get_child(const GskRenderNode* node); | |
+GskRenderNode* gsk_color_matrix_node_get_child(const GskRenderNode* node); | |
+GskRenderNode* gsk_repeat_node_get_child(const GskRenderNode* node); | |
+GskRenderNode* gsk_clip_node_get_child(const GskRenderNode* node); | |
+GskRenderNode* gsk_rounded_clip_node_get_child(const GskRenderNode* node); | |
+GskRenderNode* gsk_shadow_node_get_child(const GskRenderNode* node); | |
+GskRenderNode* gsk_blur_node_get_child(const GskRenderNode* node); | |
+GskRenderNode* gsk_debug_node_get_child(const GskRenderNode* node); | |
+GskRenderNode* gsk_container_node_get_child(const GskRenderNode* node, guint idx); | |
+GskRenderNode* gsk_gl_shader_node_get_child(const GskRenderNode* node, guint idx); | |
+guint gsk_container_node_get_n_children(const GskRenderNode* node); | |
+guint gsk_gl_shader_node_get_n_children(const GskRenderNode* node); | |
+GdkTexture* gsk_texture_node_get_texture(const GskRenderNode* node); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment