Title: [279346] trunk/Source/WebCore
- Revision
- 279346
- Author
- [email protected]
- Date
- 2021-06-28 12:56:01 -0700 (Mon, 28 Jun 2021)
Log Message
[Modern Media Controls] Support customizing the media controls via WebKitAdditions
https://bugs.webkit.org/show_bug.cgi?id=227433
Reviewed by Eric Carlson.
- Support adding additional style sheets and scripts to the media controls
via ADDITIONAL_MODERN_MEDIA_CONTROLS_STYLE_SHEETS and ADDITIONAL_MODERN_MEDIA_CONTROLS_SCRIPTS
variables in DerivedSources.make
- Support overriding default layout traits object class name in MediaControlsHost.
* DerivedSources.make:
* Modules/mediacontrols/MediaControlsHost.cpp:
(WebCore::MediaControlsHost::layoutTraitsClassName const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (279345 => 279346)
--- trunk/Source/WebCore/ChangeLog 2021-06-28 19:11:31 UTC (rev 279345)
+++ trunk/Source/WebCore/ChangeLog 2021-06-28 19:56:01 UTC (rev 279346)
@@ -1,3 +1,19 @@
+2021-06-28 Sam Weinig <[email protected]>
+
+ [Modern Media Controls] Support customizing the media controls via WebKitAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=227433
+
+ Reviewed by Eric Carlson.
+
+ - Support adding additional style sheets and scripts to the media controls
+ via ADDITIONAL_MODERN_MEDIA_CONTROLS_STYLE_SHEETS and ADDITIONAL_MODERN_MEDIA_CONTROLS_SCRIPTS
+ variables in DerivedSources.make
+ - Support overriding default layout traits object class name in MediaControlsHost.
+
+ * DerivedSources.make:
+ * Modules/mediacontrols/MediaControlsHost.cpp:
+ (WebCore::MediaControlsHost::layoutTraitsClassName const):
+
2021-06-28 Jean-Yves Avenard <[email protected]>
Not all uses of AudioToolbox framework use soft linking
Modified: trunk/Source/WebCore/DerivedSources.make (279345 => 279346)
--- trunk/Source/WebCore/DerivedSources.make 2021-06-28 19:11:31 UTC (rev 279345)
+++ trunk/Source/WebCore/DerivedSources.make 2021-06-28 19:56:01 UTC (rev 279346)
@@ -1532,6 +1532,15 @@
# modern media controls
+POSSIBLE_ADDITIONAL_MODERN_MEDIA_CONTROLS_STYLE_SHEETS = \
+ $(foreach \
+ STYLE_SHEET, \
+ $(ADDITIONAL_MODERN_MEDIA_CONTROLS_STYLE_SHEETS), \
+ $(firstword $(realpath $(foreach \
+ ADDITIONS_PATH, \
+ $(ADDITIONS_PATHS), \
+ $(ADDITIONS_PATH)/$(STYLE_SHEET)))))
+
MODERN_MEDIA_CONTROLS_STYLE_SHEETS = \
$(WebCore)/Modules/modern-media-controls/controls/activity-indicator.css \
$(WebCore)/Modules/modern-media-controls/controls/airplay-button.css \
@@ -1551,6 +1560,7 @@
$(WebCore)/Modules/modern-media-controls/controls/time-label.css \
$(WebCore)/Modules/modern-media-controls/controls/watchos-activity-indicator.css \
$(WebCore)/Modules/modern-media-controls/controls/watchos-media-controls.css \
+ $(POSSIBLE_ADDITIONAL_MODERN_MEDIA_CONTROLS_STYLE_SHEETS) \
#
all : ModernMediaControls.css
@@ -1583,6 +1593,15 @@
# modern media controls
+POSSIBLE_ADDITIONAL_MODERN_MEDIA_CONTROLS_SCRIPTS = \
+ $(foreach \
+ SCRIPT, \
+ $(ADDITIONAL_MODERN_MEDIA_CONTROLS_SCRIPTS), \
+ $(firstword $(realpath $(foreach \
+ ADDITIONS_PATH, \
+ $(ADDITIONS_PATHS), \
+ $(ADDITIONS_PATH)/$(SCRIPT)))))
+
MODERN_MEDIA_CONTROLS_SCRIPTS = \
$(WebCore)/Modules/modern-media-controls/main.js \
$(WebCore)/Modules/modern-media-controls/gesture-recognizers/gesture-recognizer.js \
@@ -1653,6 +1672,7 @@
$(WebCore)/Modules/modern-media-controls/media/media-document-controller.js \
$(WebCore)/Modules/modern-media-controls/media/watchos-media-controls-support.js \
$(WebCore)/Modules/modern-media-controls/media/media-controller.js \
+ $(POSSIBLE_ADDITIONAL_MODERN_MEDIA_CONTROLS_SCRIPTS) \
#
all : ModernMediaControls.js
Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (279345 => 279346)
--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2021-06-28 19:11:31 UTC (rev 279345)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2021-06-28 19:56:01 UTC (rev 279346)
@@ -67,6 +67,10 @@
#include <wtf/UUID.h>
#include <wtf/Variant.h>
+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/MediaControlsHostAdditions.h>
+#endif
+
namespace WebCore {
const AtomString& MediaControlsHost::automaticKeyword()
@@ -113,6 +117,9 @@
String MediaControlsHost::layoutTraitsClassName() const
{
+#if defined(MEDIA_CONTROLS_HOST_LAYOUT_TRAITS_CLASS_NAME_OVERRIDE)
+ return MEDIA_CONTROLS_HOST_LAYOUT_TRAITS_CLASS_NAME_OVERRIDE;
+#else
#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
return "MacOSLayoutTraits";
#elif PLATFORM(IOS)
@@ -123,6 +130,7 @@
ASSERT_NOT_REACHED();
return nullString();
#endif
+#endif
}
Vector<RefPtr<TextTrack>> MediaControlsHost::sortedTrackListForMenu(TextTrackList& trackList)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
