Skip to content

Commit

Permalink
Fix build with legacy media controls
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=261878

Reviewed by Michael Catanzaro.

Build failed with ENABLE_MODERN_MEDIA_CONTROLS disabled, because
css/mediaControls.css was not added in WebCore_USER_AGENT_STYLE_SHEETS,
since 255715@main.

* Source/WebCore/PlatformPlayStation.cmake:
* Source/WebCore/platform/Adwaita.cmake:

Canonical link: https://commits.webkit.org/268355@main
  • Loading branch information
blino committed Sep 23, 2023
1 parent 318e176 commit cd2d810
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
1 change: 0 additions & 1 deletion Source/WebCore/PlatformPlayStation.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ list(APPEND WebCore_SOURCES

list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsBase.css
${WEBCORE_DIR}/css/mediaControls.css
)

set(WebCore_USER_AGENT_SCRIPTS
Expand Down
18 changes: 12 additions & 6 deletions Source/WebCore/platform/Adwaita.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,19 @@ list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
${WEBCORE_DIR}/css/themeAdwaita.css
)

list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
${WebCore_DERIVED_SOURCES_DIR}/ModernMediaControls.css
)
if (ENABLE_MODERN_MEDIA_CONTROLS)
list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
${WebCore_DERIVED_SOURCES_DIR}/ModernMediaControls.css
)

list(APPEND WebCore_USER_AGENT_SCRIPTS
${WebCore_DERIVED_SOURCES_DIR}/ModernMediaControls.js
)
list(APPEND WebCore_USER_AGENT_SCRIPTS
${WebCore_DERIVED_SOURCES_DIR}/ModernMediaControls.js
)
else ()
list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
${WEBCORE_DIR}/css/mediaControls.css
)
endif ()

set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/rendering/RenderThemeAdwaita.cpp)

Expand Down

0 comments on commit cd2d810

Please sign in to comment.