Changeset 279346 in webkit

Timestamp:

Jun 28, 2021, 12:56:01 PM (5 years ago)

Author:

weinig@apple.com

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• DerivedSources.make (modified) (4 diffs)
• Modules/mediacontrols/MediaControlsHost.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-28  Sam Weinig  <weinig@apple.com>
+
+        [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  <jya@apple.com>
 

trunk/Source/WebCore/DerivedSources.make

@@ -1533 +1533 @@
 # 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 \
@@ -1552 +1561 @@
     $(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) \
 #
 
@@ -1583 +1593 @@
 
 # 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 = \
@@ -1654 +1673 @@
     $(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) \
 #
 

trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp

@@ -68 +68 @@
 #include <wtf/Variant.h>
 
+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/MediaControlsHostAdditions.h>
+#endif
+
 namespace WebCore {
 
@@ -114 +118 @@
 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";
@@ -123 +130 @@
     ASSERT_NOT_REACHED();
     return nullString();
+#endif
 #endif
 }