Changeset 207418 in webkit


Ignore:
Timestamp:
Oct 17, 2016 11:26:49 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

[Modern Media Controls] Use modern-media-controls module sources for media controls stylesheet and script injection
​https://bugs.webkit.org/show_bug.cgi?id=163500
<rdar://problem/28792010>

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

Add files from the Modules/modern-media-controls directory to the Xcode project and add a copy phase
to copy those files with their directory stucture as a subdirectory of the WebCore.framework Resources
directory.

Additionally, use the modern-media-controls Module CSS and JS files when concatenating the media controls
scripts and styles in RenderTheme when the runtime flag is on.

  • WebCore.xcodeproj/project.pbxproj:
  • rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::mediaControlsStyleSheet):
(WebCore::RenderThemeMac::mediaControlsScript):

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r207417 r207418  
     12016-10-17  Antoine Quint  <graouts@apple.com>
     2
     3        [Modern Media Controls] Use modern-media-controls module sources for media controls stylesheet and script injection
     4        https://bugs.webkit.org/show_bug.cgi?id=163500
     5        <rdar://problem/28792010>
     6
     7        Reviewed by Darin Adler.
     8
     9        Add files from the Modules/modern-media-controls directory to the Xcode project and add a copy phase
     10        to copy those files with their directory stucture as a subdirectory of the WebCore.framework Resources
     11        directory.
     12
     13        Additionally, use the modern-media-controls Module CSS and JS files when concatenating the media controls
     14        scripts and styles in RenderTheme when the runtime flag is on.
     15
     16        * WebCore.xcodeproj/project.pbxproj:
     17        * rendering/RenderThemeMac.mm:
     18        (WebCore::RenderThemeMac::mediaControlsStyleSheet):
     19        (WebCore::RenderThemeMac::mediaControlsScript):
     20
    1212016-10-17  Simon Fraser  <simon.fraser@apple.com>
    222

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r207379 r207418  
    97219721                715379FF146BD9D6008BD615 /* SVGPathData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathData.h; sourceTree = "<group>"; };
    97229722                7157F061150B6564006EAABD /* SVGAnimatedTransformList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedTransformList.cpp; sourceTree = "<group>"; };
     9723                716FA0D81DB26591007323CC /* airplay-button.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "airplay-button.css"; sourceTree = "<group>"; };
     9724                716FA0D91DB26591007323CC /* airplay-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "airplay-button.js"; sourceTree = "<group>"; };
     9725                716FA0DA1DB26591007323CC /* airplay-placard.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "airplay-placard.js"; sourceTree = "<group>"; };
     9726                716FA0DB1DB26591007323CC /* aspect-ratio-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "aspect-ratio-button.js"; sourceTree = "<group>"; };
     9727                716FA0DC1DB26591007323CC /* button.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = button.css; sourceTree = "<group>"; };
     9728                716FA0DD1DB26591007323CC /* button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = button.js; sourceTree = "<group>"; };
     9729                716FA0DE1DB26591007323CC /* buttons-container.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "buttons-container.css"; sourceTree = "<group>"; };
     9730                716FA0DF1DB26591007323CC /* buttons-container.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "buttons-container.js"; sourceTree = "<group>"; };
     9731                716FA0E01DB26591007323CC /* forward-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "forward-button.js"; sourceTree = "<group>"; };
     9732                716FA0E11DB26591007323CC /* fullscreen-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "fullscreen-button.js"; sourceTree = "<group>"; };
     9733                716FA0E21DB26591007323CC /* icon-button.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "icon-button.css"; sourceTree = "<group>"; };
     9734                716FA0E31DB26591007323CC /* icon-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "icon-button.js"; sourceTree = "<group>"; };
     9735                716FA0E41DB26591007323CC /* icon-service.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "icon-service.js"; sourceTree = "<group>"; };
     9736                716FA0E51DB26591007323CC /* layout-item.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "layout-item.js"; sourceTree = "<group>"; };
     9737                716FA0E61DB26591007323CC /* layout-node.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "layout-node.js"; sourceTree = "<group>"; };
     9738                716FA0E71DB26591007323CC /* macos-inline-media-controls.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "macos-inline-media-controls.css"; sourceTree = "<group>"; };
     9739                716FA0E81DB26591007323CC /* macos-inline-media-controls.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "macos-inline-media-controls.js"; sourceTree = "<group>"; };
     9740                716FA0E91DB26591007323CC /* macos-media-controls.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "macos-media-controls.js"; sourceTree = "<group>"; };
     9741                716FA0EA1DB26591007323CC /* media-controls.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "media-controls.css"; sourceTree = "<group>"; };
     9742                716FA0EB1DB26591007323CC /* media-controls.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "media-controls.js"; sourceTree = "<group>"; };
     9743                716FA0EC1DB26591007323CC /* mute-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "mute-button.js"; sourceTree = "<group>"; };
     9744                716FA0ED1DB26591007323CC /* pip-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "pip-button.js"; sourceTree = "<group>"; };
     9745                716FA0EE1DB26591007323CC /* pip-placard.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "pip-placard.js"; sourceTree = "<group>"; };
     9746                716FA0EF1DB26591007323CC /* placard.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = placard.css; sourceTree = "<group>"; };
     9747                716FA0F01DB26591007323CC /* placard.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = placard.js; sourceTree = "<group>"; };
     9748                716FA0F11DB26591007323CC /* play-pause-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "play-pause-button.js"; sourceTree = "<group>"; };
     9749                716FA0F21DB26591007323CC /* rewind-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "rewind-button.js"; sourceTree = "<group>"; };
     9750                716FA0F31DB26591007323CC /* scheduler.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = scheduler.js; sourceTree = "<group>"; };
     9751                716FA0F41DB26591007323CC /* scrubber.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = scrubber.css; sourceTree = "<group>"; };
     9752                716FA0F51DB26591007323CC /* scrubber.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = scrubber.js; sourceTree = "<group>"; };
     9753                716FA0F61DB26591007323CC /* skip-back-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "skip-back-button.js"; sourceTree = "<group>"; };
     9754                716FA0F71DB26591007323CC /* slider.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = slider.css; sourceTree = "<group>"; };
     9755                716FA0F81DB26591007323CC /* slider.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = slider.js; sourceTree = "<group>"; };
     9756                716FA0F91DB26591007323CC /* start-button.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "start-button.css"; sourceTree = "<group>"; };
     9757                716FA0FA1DB26591007323CC /* start-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "start-button.js"; sourceTree = "<group>"; };
     9758                716FA0FB1DB26591007323CC /* time-control.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "time-control.js"; sourceTree = "<group>"; };
     9759                716FA0FC1DB26591007323CC /* time-label.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "time-label.css"; sourceTree = "<group>"; };
     9760                716FA0FD1DB26591007323CC /* time-label.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "time-label.js"; sourceTree = "<group>"; };
     9761                716FA0FE1DB26591007323CC /* tracks-button.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "tracks-button.js"; sourceTree = "<group>"; };
     9762                716FA0FF1DB26591007323CC /* volume-slider.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "volume-slider.css"; sourceTree = "<group>"; };
     9763                716FA1001DB26591007323CC /* volume-slider.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "volume-slider.js"; sourceTree = "<group>"; };
    97239764                71A57DEF154BE25C0009D120 /* SVGPathUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPathUtilities.cpp; sourceTree = "<group>"; };
    97249765                71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathUtilities.h; sourceTree = "<group>"; };
    … …  
    97279768                71C916071D1483A300ACA47D /* UserInterfaceLayoutDirection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInterfaceLayoutDirection.h; sourceTree = "<group>"; };
    97289769                71CC7A1F152A0BFE009EEAF9 /* SVGAnimatedEnumeration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedEnumeration.cpp; sourceTree = "<group>"; };
     9770                71D6AA711DA4EAF700B23969 /* airplay-placard@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "airplay-placard@1x.png"; sourceTree = "<group>"; };
     9771                71D6AA721DA4EAF700B23969 /* airplay-placard@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "airplay-placard@2x.png"; sourceTree = "<group>"; };
     9772                71D6AA731DA4EAF700B23969 /* airplay-placard@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "airplay-placard@3x.png"; sourceTree = "<group>"; };
     9773                71D6AA741DA4EAF700B23969 /* airplay@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "airplay@1x.png"; sourceTree = "<group>"; };
     9774                71D6AA751DA4EAF700B23969 /* airplay@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "airplay@2x.png"; sourceTree = "<group>"; };
     9775                71D6AA761DA4EAF700B23969 /* enter-fullscreen@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "enter-fullscreen@1x.png"; sourceTree = "<group>"; };
     9776                71D6AA771DA4EAF700B23969 /* enter-fullscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "enter-fullscreen@2x.png"; sourceTree = "<group>"; };
     9777                71D6AA781DA4EAF700B23969 /* enter-fullscreen@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "enter-fullscreen@3x.png"; sourceTree = "<group>"; };
     9778                71D6AA791DA4EAF700B23969 /* interval-skip-back@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "interval-skip-back@1x.png"; sourceTree = "<group>"; };
     9779                71D6AA7A1DA4EAF700B23969 /* interval-skip-back@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "interval-skip-back@2x.png"; sourceTree = "<group>"; };
     9780                71D6AA7B1DA4EAF700B23969 /* interval-skip-back@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "interval-skip-back@3x.png"; sourceTree = "<group>"; };
     9781                71D6AA7F1DA4EAF700B23969 /* pause@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pause@1x.png"; sourceTree = "<group>"; };
     9782                71D6AA801DA4EAF700B23969 /* pause@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pause@2x.png"; sourceTree = "<group>"; };
     9783                71D6AA811DA4EAF700B23969 /* pause@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pause@3x.png"; sourceTree = "<group>"; };
     9784                71D6AA821DA4EAF700B23969 /* pip-in@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pip-in@1x.png"; sourceTree = "<group>"; };
     9785                71D6AA831DA4EAF700B23969 /* pip-in@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pip-in@2x.png"; sourceTree = "<group>"; };
     9786                71D6AA841DA4EAF700B23969 /* pip-in@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pip-in@3x.png"; sourceTree = "<group>"; };
     9787                71D6AA851DA4EAF700B23969 /* pip-placard@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pip-placard@1x.png"; sourceTree = "<group>"; };
     9788                71D6AA861DA4EAF700B23969 /* pip-placard@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pip-placard@2x.png"; sourceTree = "<group>"; };
     9789                71D6AA871DA4EAF700B23969 /* pip-placard@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pip-placard@3x.png"; sourceTree = "<group>"; };
     9790                71D6AA881DA4EAF700B23969 /* play@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "play@1x.png"; sourceTree = "<group>"; };
     9791                71D6AA891DA4EAF700B23969 /* play@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "play@2x.png"; sourceTree = "<group>"; };
     9792                71D6AA8A1DA4EAF700B23969 /* play@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "play@3x.png"; sourceTree = "<group>"; };
     9793                71D6AA8C1DA4EAF700B23969 /* start@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "start@1x.png"; sourceTree = "<group>"; };
     9794                71D6AA8D1DA4EAF700B23969 /* start@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "start@2x.png"; sourceTree = "<group>"; };
     9795                71D6AA8E1DA4EAF700B23969 /* start@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "start@3x.png"; sourceTree = "<group>"; };
     9796                71D6AA901DA4EAF700B23969 /* airplay-fullscreen@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "airplay-fullscreen@1x.png"; sourceTree = "<group>"; };
     9797                71D6AA911DA4EAF700B23969 /* airplay-fullscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "airplay-fullscreen@2x.png"; sourceTree = "<group>"; };
     9798                71D6AA921DA4EAF700B23969 /* airplay-placard@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "airplay-placard@1x.png"; sourceTree = "<group>"; };
     9799                71D6AA931DA4EAF700B23969 /* airplay-placard@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "airplay-placard@2x.png"; sourceTree = "<group>"; };
     9800                71D6AA941DA4EAF700B23969 /* airplay@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "airplay@1x.png"; sourceTree = "<group>"; };
     9801                71D6AA951DA4EAF700B23969 /* airplay@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "airplay@2x.png"; sourceTree = "<group>"; };
     9802                71D6AA961DA4EAF700B23969 /* enter-fullscreen@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "enter-fullscreen@1x.png"; sourceTree = "<group>"; };
     9803                71D6AA971DA4EAF700B23969 /* enter-fullscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "enter-fullscreen@2x.png"; sourceTree = "<group>"; };
     9804                71D6AA981DA4EAF700B23969 /* exit-fullscreen@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "exit-fullscreen@1x.png"; sourceTree = "<group>"; };
     9805                71D6AA991DA4EAF700B23969 /* exit-fullscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "exit-fullscreen@2x.png"; sourceTree = "<group>"; };
     9806                71D6AA9A1DA4EAF700B23969 /* forward@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "forward@1x.png"; sourceTree = "<group>"; };
     9807                71D6AA9B1DA4EAF700B23969 /* forward@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "forward@2x.png"; sourceTree = "<group>"; };
     9808                71D6AA9C1DA4EAF700B23969 /* interval-skip-back@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "interval-skip-back@1x.png"; sourceTree = "<group>"; };
     9809                71D6AA9D1DA4EAF700B23969 /* interval-skip-back@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "interval-skip-back@2x.png"; sourceTree = "<group>"; };
     9810                71D6AA9E1DA4EAF700B23969 /* media-selection-fullscreen@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "media-selection-fullscreen@1x.png"; sourceTree = "<group>"; };
     9811                71D6AA9F1DA4EAF700B23969 /* media-selection-fullscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "media-selection-fullscreen@2x.png"; sourceTree = "<group>"; };
     9812                71D6AAA01DA4EAF700B23969 /* media-selection@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "media-selection@1x.png"; sourceTree = "<group>"; };
     9813                71D6AAA11DA4EAF700B23969 /* media-selection@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "media-selection@2x.png"; sourceTree = "<group>"; };
     9814                71D6AAA41DA4EAF700B23969 /* pause-fullscreen@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pause-fullscreen@1x.png"; sourceTree = "<group>"; };
     9815                71D6AAA51DA4EAF700B23969 /* pause-fullscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pause-fullscreen@2x.png"; sourceTree = "<group>"; };
     9816                71D6AAA61DA4EAF700B23969 /* pause@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pause@1x.png"; sourceTree = "<group>"; };
     9817                71D6AAA71DA4EAF700B23969 /* pause@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pause@2x.png"; sourceTree = "<group>"; };
     9818                71D6AAA81DA4EAF700B23969 /* pip-in@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pip-in@1x.png"; sourceTree = "<group>"; };
     9819                71D6AAA91DA4EAF700B23969 /* pip-in@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pip-in@2x.png"; sourceTree = "<group>"; };
     9820                71D6AAAA1DA4EAF700B23969 /* pip-placard@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pip-placard@1x.png"; sourceTree = "<group>"; };
     9821                71D6AAAB1DA4EAF700B23969 /* pip-placard@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pip-placard@2x.png"; sourceTree = "<group>"; };
     9822                71D6AAAC1DA4EAF700B23969 /* play-fullscreen@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "play-fullscreen@1x.png"; sourceTree = "<group>"; };
     9823                71D6AAAD1DA4EAF700B23969 /* play-fullscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "play-fullscreen@2x.png"; sourceTree = "<group>"; };
     9824                71D6AAAE1DA4EAF700B23969 /* play@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "play@1x.png"; sourceTree = "<group>"; };
     9825                71D6AAAF1DA4EAF700B23969 /* play@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "play@2x.png"; sourceTree = "<group>"; };
     9826                71D6AAB21DA4EAF700B23969 /* rewind@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rewind@1x.png"; sourceTree = "<group>"; };
     9827                71D6AAB31DA4EAF700B23969 /* rewind@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rewind@2x.png"; sourceTree = "<group>"; };
     9828                71D6AAB41DA4EAF700B23969 /* scale-to-fill@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "scale-to-fill@1x.png"; sourceTree = "<group>"; };
     9829                71D6AAB51DA4EAF700B23969 /* scale-to-fill@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "scale-to-fill@2x.png"; sourceTree = "<group>"; };
     9830                71D6AAB61DA4EAF700B23969 /* scale-to-fit@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "scale-to-fit@1x.png"; sourceTree = "<group>"; };
     9831                71D6AAB71DA4EAF700B23969 /* scale-to-fit@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "scale-to-fit@2x.png"; sourceTree = "<group>"; };
     9832                71D6AABC1DA4EAF700B23969 /* start@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "start@1x.png"; sourceTree = "<group>"; };
     9833                71D6AABD1DA4EAF700B23969 /* start@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "start@2x.png"; sourceTree = "<group>"; };
     9834                71D6AABE1DA4EAF700B23969 /* volume-mute@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "volume-mute@1x.png"; sourceTree = "<group>"; };
     9835                71D6AABF1DA4EAF700B23969 /* volume-mute@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "volume-mute@2x.png"; sourceTree = "<group>"; };
     9836                71D6AAC01DA4EAF700B23969 /* volume@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "volume@1x.png"; sourceTree = "<group>"; };
     9837                71D6AAC11DA4EAF700B23969 /* volume@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "volume@2x.png"; sourceTree = "<group>"; };
    97299838                71DCB6FF1568197600862271 /* JSSVGZoomAndPan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGZoomAndPan.cpp; sourceTree = "<group>"; };
    97309839                71DCB7001568197600862271 /* JSSVGZoomAndPan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGZoomAndPan.h; sourceTree = "<group>"; };
    … …  
    1749017599                        usesTabs = 0;
    1749117600                };
     17601                716FA0D71DB26591007323CC /* controls */ = {
     17602                        isa = PBXGroup;
     17603                        children = (
     17604                                716FA0D81DB26591007323CC /* airplay-button.css */,
     17605                                716FA0D91DB26591007323CC /* airplay-button.js */,
     17606                                716FA0DA1DB26591007323CC /* airplay-placard.js */,
     17607                                716FA0DB1DB26591007323CC /* aspect-ratio-button.js */,
     17608                                716FA0DC1DB26591007323CC /* button.css */,
     17609                                716FA0DD1DB26591007323CC /* button.js */,
     17610                                716FA0DE1DB26591007323CC /* buttons-container.css */,
     17611                                716FA0DF1DB26591007323CC /* buttons-container.js */,
     17612                                716FA0E01DB26591007323CC /* forward-button.js */,
     17613                                716FA0E11DB26591007323CC /* fullscreen-button.js */,
     17614                                716FA0E21DB26591007323CC /* icon-button.css */,
     17615                                716FA0E31DB26591007323CC /* icon-button.js */,
     17616                                716FA0E41DB26591007323CC /* icon-service.js */,
     17617                                716FA0E51DB26591007323CC /* layout-item.js */,
     17618                                716FA0E61DB26591007323CC /* layout-node.js */,
     17619                                716FA0E71DB26591007323CC /* macos-inline-media-controls.css */,
     17620                                716FA0E81DB26591007323CC /* macos-inline-media-controls.js */,
     17621                                716FA0E91DB26591007323CC /* macos-media-controls.js */,
     17622                                716FA0EA1DB26591007323CC /* media-controls.css */,
     17623                                716FA0EB1DB26591007323CC /* media-controls.js */,
     17624                                716FA0EC1DB26591007323CC /* mute-button.js */,
     17625                                716FA0ED1DB26591007323CC /* pip-button.js */,
     17626                                716FA0EE1DB26591007323CC /* pip-placard.js */,
     17627                                716FA0EF1DB26591007323CC /* placard.css */,
     17628                                716FA0F01DB26591007323CC /* placard.js */,
     17629                                716FA0F11DB26591007323CC /* play-pause-button.js */,
     17630                                716FA0F21DB26591007323CC /* rewind-button.js */,
     17631                                716FA0F31DB26591007323CC /* scheduler.js */,
     17632                                716FA0F41DB26591007323CC /* scrubber.css */,
     17633                                716FA0F51DB26591007323CC /* scrubber.js */,
     17634                                716FA0F61DB26591007323CC /* skip-back-button.js */,
     17635                                716FA0F71DB26591007323CC /* slider.css */,
     17636                                716FA0F81DB26591007323CC /* slider.js */,
     17637                                716FA0F91DB26591007323CC /* start-button.css */,
     17638                                716FA0FA1DB26591007323CC /* start-button.js */,
     17639                                716FA0FB1DB26591007323CC /* time-control.js */,
     17640                                716FA0FC1DB26591007323CC /* time-label.css */,
     17641                                716FA0FD1DB26591007323CC /* time-label.js */,
     17642                                716FA0FE1DB26591007323CC /* tracks-button.js */,
     17643                                716FA0FF1DB26591007323CC /* volume-slider.css */,
     17644                                716FA1001DB26591007323CC /* volume-slider.js */,
     17645                        );
     17646                        name = controls;
     17647                        path = "Modules/modern-media-controls/controls";
     17648                        sourceTree = SOURCE_ROOT;
     17649                };
     17650                71D6AA391DA4EAF700B23969 /* modern-media-controls */ = {
     17651                        isa = PBXGroup;
     17652                        children = (
     17653                                716FA0D71DB26591007323CC /* controls */,
     17654                                71D6AA6F1DA4EAF700B23969 /* images */,
     17655                        );
     17656                        path = "modern-media-controls";
     17657                        sourceTree = "<group>";
     17658                };
     17659                71D6AA6F1DA4EAF700B23969 /* images */ = {
     17660                        isa = PBXGroup;
     17661                        children = (
     17662                                71D6AA701DA4EAF700B23969 /* iOS */,
     17663                                71D6AA8F1DA4EAF700B23969 /* macOS */,
     17664                        );
     17665                        path = images;
     17666                        sourceTree = "<group>";
     17667                };
     17668                71D6AA701DA4EAF700B23969 /* iOS */ = {
     17669                        isa = PBXGroup;
     17670                        children = (
     17671                                71D6AA711DA4EAF700B23969 /* airplay-placard@1x.png */,
     17672                                71D6AA721DA4EAF700B23969 /* airplay-placard@2x.png */,
     17673                                71D6AA731DA4EAF700B23969 /* airplay-placard@3x.png */,
     17674                                71D6AA741DA4EAF700B23969 /* airplay@1x.png */,
     17675                                71D6AA751DA4EAF700B23969 /* airplay@2x.png */,
     17676                                71D6AA761DA4EAF700B23969 /* enter-fullscreen@1x.png */,
     17677                                71D6AA771DA4EAF700B23969 /* enter-fullscreen@2x.png */,
     17678                                71D6AA781DA4EAF700B23969 /* enter-fullscreen@3x.png */,
     17679                                71D6AA791DA4EAF700B23969 /* interval-skip-back@1x.png */,
     17680                                71D6AA7A1DA4EAF700B23969 /* interval-skip-back@2x.png */,
     17681                                71D6AA7B1DA4EAF700B23969 /* interval-skip-back@3x.png */,
     17682                                71D6AA7F1DA4EAF700B23969 /* pause@1x.png */,
     17683                                71D6AA801DA4EAF700B23969 /* pause@2x.png */,
     17684                                71D6AA811DA4EAF700B23969 /* pause@3x.png */,
     17685                                71D6AA821DA4EAF700B23969 /* pip-in@1x.png */,
     17686                                71D6AA831DA4EAF700B23969 /* pip-in@2x.png */,
     17687                                71D6AA841DA4EAF700B23969 /* pip-in@3x.png */,
     17688                                71D6AA851DA4EAF700B23969 /* pip-placard@1x.png */,
     17689                                71D6AA861DA4EAF700B23969 /* pip-placard@2x.png */,
     17690                                71D6AA871DA4EAF700B23969 /* pip-placard@3x.png */,
     17691                                71D6AA881DA4EAF700B23969 /* play@1x.png */,
     17692                                71D6AA891DA4EAF700B23969 /* play@2x.png */,
     17693                                71D6AA8A1DA4EAF700B23969 /* play@3x.png */,
     17694                                71D6AA8C1DA4EAF700B23969 /* start@1x.png */,
     17695                                71D6AA8D1DA4EAF700B23969 /* start@2x.png */,
     17696                                71D6AA8E1DA4EAF700B23969 /* start@3x.png */,
     17697                        );
     17698                        path = iOS;
     17699                        sourceTree = "<group>";
     17700                };
     17701                71D6AA8F1DA4EAF700B23969 /* macOS */ = {
     17702                        isa = PBXGroup;
     17703                        children = (
     17704                                71D6AA901DA4EAF700B23969 /* airplay-fullscreen@1x.png */,
     17705                                71D6AA911DA4EAF700B23969 /* airplay-fullscreen@2x.png */,
     17706                                71D6AA921DA4EAF700B23969 /* airplay-placard@1x.png */,
     17707                                71D6AA931DA4EAF700B23969 /* airplay-placard@2x.png */,
     17708                                71D6AA941DA4EAF700B23969 /* airplay@1x.png */,
     17709                                71D6AA951DA4EAF700B23969 /* airplay@2x.png */,
     17710                                71D6AA961DA4EAF700B23969 /* enter-fullscreen@1x.png */,
     17711                                71D6AA971DA4EAF700B23969 /* enter-fullscreen@2x.png */,
     17712                                71D6AA981DA4EAF700B23969 /* exit-fullscreen@1x.png */,
     17713                                71D6AA991DA4EAF700B23969 /* exit-fullscreen@2x.png */,
     17714                                71D6AA9A1DA4EAF700B23969 /* forward@1x.png */,
     17715                                71D6AA9B1DA4EAF700B23969 /* forward@2x.png */,
     17716                                71D6AA9C1DA4EAF700B23969 /* interval-skip-back@1x.png */,
     17717                                71D6AA9D1DA4EAF700B23969 /* interval-skip-back@2x.png */,
     17718                                71D6AA9E1DA4EAF700B23969 /* media-selection-fullscreen@1x.png */,
     17719                                71D6AA9F1DA4EAF700B23969 /* media-selection-fullscreen@2x.png */,
     17720                                71D6AAA01DA4EAF700B23969 /* media-selection@1x.png */,
     17721                                71D6AAA11DA4EAF700B23969 /* media-selection@2x.png */,
     17722                                71D6AAA41DA4EAF700B23969 /* pause-fullscreen@1x.png */,
     17723                                71D6AAA51DA4EAF700B23969 /* pause-fullscreen@2x.png */,
     17724                                71D6AAA61DA4EAF700B23969 /* pause@1x.png */,
     17725                                71D6AAA71DA4EAF700B23969 /* pause@2x.png */,
     17726                                71D6AAA81DA4EAF700B23969 /* pip-in@1x.png */,
     17727                                71D6AAA91DA4EAF700B23969 /* pip-in@2x.png */,
     17728                                71D6AAAA1DA4EAF700B23969 /* pip-placard@1x.png */,
     17729                                71D6AAAB1DA4EAF700B23969 /* pip-placard@2x.png */,
     17730                                71D6AAAC1DA4EAF700B23969 /* play-fullscreen@1x.png */,
     17731                                71D6AAAD1DA4EAF700B23969 /* play-fullscreen@2x.png */,
     17732                                71D6AAAE1DA4EAF700B23969 /* play@1x.png */,
     17733                                71D6AAAF1DA4EAF700B23969 /* play@2x.png */,
     17734                                71D6AAB21DA4EAF700B23969 /* rewind@1x.png */,
     17735                                71D6AAB31DA4EAF700B23969 /* rewind@2x.png */,
     17736                                71D6AAB41DA4EAF700B23969 /* scale-to-fill@1x.png */,
     17737                                71D6AAB51DA4EAF700B23969 /* scale-to-fill@2x.png */,
     17738                                71D6AAB61DA4EAF700B23969 /* scale-to-fit@1x.png */,
     17739                                71D6AAB71DA4EAF700B23969 /* scale-to-fit@2x.png */,
     17740                                71D6AABC1DA4EAF700B23969 /* start@1x.png */,
     17741                                71D6AABD1DA4EAF700B23969 /* start@2x.png */,
     17742                                71D6AABE1DA4EAF700B23969 /* volume-mute@1x.png */,
     17743                                71D6AABF1DA4EAF700B23969 /* volume-mute@2x.png */,
     17744                                71D6AAC01DA4EAF700B23969 /* volume@1x.png */,
     17745                                71D6AAC11DA4EAF700B23969 /* volume@2x.png */,
     17746                        );
     17747                        path = macOS;
     17748                        sourceTree = "<group>";
     17749                };
    1749217750                7C3E510718DF8F1200C112F7 /* cocoa */ = {
    1749317751                        isa = PBXGroup;
    … …  
    1833018588                                B1A942DD15B5CE2200D525D1 /* mediasource */,
    1833118589                                07221B4617CEC32700848E51 /* mediastream */,
     18590                                71D6AA391DA4EAF700B23969 /* modern-media-controls */,
    1833218591                                333F703D0FB49C16008E12A6 /* notifications */,
    1833318592                                072AE1DE183C0513000A5988 /* plugins */,
    … …  
    2738627645                                37A1EAA3142699BC0087F425 /* Check For Inappropriate Objective-C Class Names */,
    2738727646                                5DF50887116F3077005202AB /* Check For Inappropriate Files In Framework */,
     27647                                71D6AA381DA4E69400B23969 /* Copy modern media controls code and assets */,
    2738827648                        );
    2738927649                        buildRules = (
    … …  
    2758127841                        shellPath = /bin/sh;
    2758227842                        shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n    exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-files-in-framework ]; then\n    ../../Tools/Scripts/check-for-inappropriate-files-in-framework || exit $?\nfi\n";
     27843                };
     27844                71D6AA381DA4E69400B23969 /* Copy modern media controls code and assets */ = {
     27845                        isa = PBXShellScriptBuildPhase;
     27846                        buildActionMask = 2147483647;
     27847                        files = (
     27848                        );
     27849                        inputPaths = (
     27850                        );
     27851                        name = "Copy modern media controls code and assets";
     27852                        outputPaths = (
     27853                        );
     27854                        runOnlyForDeploymentPostprocessing = 0;
     27855                        shellPath = /bin/sh;
     27856                        shellScript = "rsync -aq --exclude \".svn\" --exclude \".DS_Store\" --exclude \"tests\" \"$SRCROOT/Modules/modern-media-controls\" \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\"";
    2758327857                };
    2758427858                DD041FBD09D9DDBE0010AF2A /* Generate Derived Sources */ = {

  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r205847 r207418  
    6565#import "RenderSnapshottedPlugIn.h"
    6666#import "RenderView.h"
     67#import "RuntimeEnabledFeatures.h"
    6768#import "SharedBuffer.h"
    6869#import "StringTruncator.h"
    … …  
    236237    if (m_mediaControlsStyleSheet.isEmpty()) {
    237238        StringBuilder styleSheetBuilder;
    238         styleSheetBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil]);
     239        if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled()) {
     240            NSArray* paths = @[@"airplay-button", @"button", @"buttons-container", @"icon-button", @"macos-inline-media-controls", @"media-controls", @"placard", @"scrubber", @"slider", @"start-button", @"time-label", @"volume-slider"];
     241            for (NSString* path in paths)
     242                styleSheetBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:path ofType:@"css" inDirectory:@"modern-media-controls/controls"] encoding:NSUTF8StringEncoding error:nil]);
     243        } else
     244            styleSheetBuilder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsApple" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil]);
    239245        m_mediaControlsStyleSheet = styleSheetBuilder.toString();
    240246    }
    … …  
    251257        StringBuilder scriptBuilder;
    252258        NSBundle* bundle = [NSBundle bundleForClass:[WebCoreRenderThemeBundle class]];
    253         scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
    254         scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
     259        if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled()) {
     260            NSArray* controlsPaths = @[@"scheduler", @"layout-node", @"layout-item", @"icon-service", @"time-control", @"time-label", @"slider", @"volume-slider", @"scrubber", @"button", @"start-button", @"icon-button", @"play-pause-button", @"skip-back-button", @"mute-button", @"airplay-button", @"pip-button", @"tracks-button", @"fullscreen-button", @"aspect-ratio-button", @"rewind-button", @"forward-button", @"media-controls", @"macos-media-controls", @"macos-inline-media-controls", @"buttons-container", @"placard", @"airplay-placard", @"pip-placard"];
     261            for (NSString* path in controlsPaths)
     262                scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:path ofType:@"js" inDirectory:@"modern-media-controls/controls"] encoding:NSUTF8StringEncoding error:nil]);
     263        } else {
     264            scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
     265            scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
     266        }
    255267        m_mediaControlsScript = scriptBuilder.toString();
    256268    }
Note: See TracChangeset for help on using the changeset viewer.