Changeset 207421 in webkit

Timestamp:

Oct 17, 2016 12:11:20 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[Modern Media Controls] Add a MediaControlsHost API to retrieve the shadow root CSS
​https://bugs.webkit.org/show_bug.cgi?id=163501
<rdar://problem/28792014>

Patch by Antoine Quint <Antoine Quint> on 2016-10-17
Reviewed by Darin Adler.

Add a new shadowRootCSSText property to MediaControlsHost so that we may obtain the
concatenated CSS sources for the media controls shadow root via JS. Actually using this
API will be done in a later patch. We also no longer inject those styles as a user-agent
stylesheet when the runtime flag is on since it will no longer be necessary.

• Modules/mediacontrols/MediaControlsHost.cpp:

(WebCore::MediaControlsHost::shadowRootCSSText):

• Modules/mediacontrols/MediaControlsHost.h:
• Modules/mediacontrols/MediaControlsHost.idl:
• css/CSSDefaultStyleSheets.cpp:

(WebCore::CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediacontrols/MediaControlsHost.cpp (modified) (2 diffs)
• Modules/mediacontrols/MediaControlsHost.h (modified) (1 diff)
• Modules/mediacontrols/MediaControlsHost.idl (modified) (1 diff)
• css/CSSDefaultStyleSheets.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-17  Antoine Quint  <graouts@apple.com>
+
+        [Modern Media Controls] Add a MediaControlsHost API to retrieve the shadow root CSS
+        https://bugs.webkit.org/show_bug.cgi?id=163501
+        <rdar://problem/28792014>
+
+        Reviewed by Darin Adler.
+
+        Add a new `shadowRootCSSText` property to MediaControlsHost so that we may obtain the
+        concatenated CSS sources for the media controls shadow root via JS. Actually using this
+        API will be done in a later patch. We also no longer inject those styles as a user-agent
+        stylesheet when the runtime flag is on since it will no longer be necessary.
+
+        * Modules/mediacontrols/MediaControlsHost.cpp:
+        (WebCore::MediaControlsHost::shadowRootCSSText):
+        * Modules/mediacontrols/MediaControlsHost.h:
+        * Modules/mediacontrols/MediaControlsHost.idl:
+        * css/CSSDefaultStyleSheets.cpp:
+        (WebCore::CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement):
+
 2016-10-17  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -37 +37 @@
 #include "Page.h"
 #include "PageGroup.h"
+#include "RenderTheme.h"
 #include "TextTrack.h"
 #include "TextTrackList.h"
@@ -284 +285 @@
 }
 
+String MediaControlsHost::shadowRootCSSText() const
+{
+    Page* page = m_mediaElement->document().page();
+    if (!page)
+        return emptyString();
+    return RenderTheme::themeForPage(page)->mediaControlsStyleSheet();
+}
+
 }
 

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

@@ -83 +83 @@
     String generateUUID() const;
 
+    String shadowRootCSSText() const;
+
 private:
     MediaControlsHost(HTMLMediaElement*);

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

@@ -60 +60 @@
 
     DOMString generateUUID();
+
+    [EnabledAtRuntime=ModernMediaControls] readonly attribute DOMString shadowRootCSSText;
 };

trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp

@@ -47 +47 @@
 #include "RenderTheme.h"
 #include "RuleSet.h"
+#include "RuntimeEnabledFeatures.h"
 #include "SVGElement.h"
 #include "StyleSheetContents.h"
@@ -182 +183 @@
         else if (is<HTMLMediaElement>(element)) {
             if (!mediaControlsStyleSheet) {
-                String mediaRules = RenderTheme::themeForPage(element.document().page())->mediaControlsStyleSheet();
-                if (mediaRules.isEmpty())
-                    mediaRules = String(mediaControlsUserAgentStyleSheet, sizeof(mediaControlsUserAgentStyleSheet)) + RenderTheme::themeForPage(element.document().page())->extraMediaControlsStyleSheet();
+                String mediaRules;
+                if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled())
+                    mediaRules = emptyString();
+                else {
+                    mediaRules = RenderTheme::themeForPage(element.document().page())->mediaControlsStyleSheet();
+                    if (mediaRules.isEmpty())
+                        mediaRules = String(mediaControlsUserAgentStyleSheet, sizeof(mediaControlsUserAgentStyleSheet)) + RenderTheme::themeForPage(element.document().page())->extraMediaControlsStyleSheet();
+                }
                 mediaControlsStyleSheet = parseUASheet(mediaRules);
                 defaultStyle->addRulesFromSheet(*mediaControlsStyleSheet, screenEval());