[Modern Media Controls] iOS may attempt to load fullscreen icon variants

https://bugs.webkit.org/show_bug.cgi?id=169608
<rdar://problem/31037369>

Patch by Antoine Quint <[email protected]> on 2017-03-14
Reviewed by Eric Carlson.

Source/WebCore:

Only return fullscreen or compact variants for macOS.

* Modules/modern-media-controls/controls/icon-service.js:
(const.iconService.new.IconService.prototype._fileNameAndPlatformForIconNameAndLayoutTraits):
(const.iconService.new.IconService):

LayoutTests:

Amend an existing test to check that we disregard fullscreen and compact variants on iOS.

* media/modern-media-controls/icon-service/icon-service-expected.txt:
* media/modern-media-controls/icon-service/icon-service.html:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@213900 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

LayoutTests/ChangeLog

@@ -1,3 +1,16 @@
+2017-03-14  Antoine Quint  <[email protected]>
+
+        [Modern Media Controls] iOS may attempt to load fullscreen icon variants
+        https://bugs.webkit.org/show_bug.cgi?id=169608
+        <rdar://problem/31037369>
+
+        Reviewed by Eric Carlson.
+
+        Amend an existing test to check that we disregard fullscreen and compact variants on iOS.
+
+        * media/modern-media-controls/icon-service/icon-service-expected.txt:
+        * media/modern-media-controls/icon-service/icon-service.html:
+
 2017-03-14  Antoine Quint  <[email protected]>
 
         [Modern Media Controls] Controls are laid out incorrectly with RTL languages

LayoutTests/media/modern-media-controls/icon-service/icon-service-expected.txt

@@ -8,6 +8,10 @@ PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS
 PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS).src.includes("iOS/pause@") is true
 PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS | LayoutTraits.Fullscreen).src.includes("macOS/pause-fullscreen@") is true
 
+Checking fullscreen or compact layout traits are ignored on iOS
+PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS | LayoutTraits.Fullscreen) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS) is true
+PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS | LayoutTraits.Compact) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS) is true
+
 Checking requested images are cached
 PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS) is true
 PASS successfullyParsed is true

LayoutTests/media/modern-media-controls/icon-service/icon-service.html

@@ -14,6 +14,11 @@
 shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS).src.includes("iOS/pause@")');
 shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS | LayoutTraits.Fullscreen).src.includes("macOS/pause-fullscreen@")');
 
+debug("");
+debug("Checking fullscreen or compact layout traits are ignored on iOS");
+shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS | LayoutTraits.Fullscreen) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS)');
+shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS | LayoutTraits.Compact) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.iOS)');
+
 debug("");
 debug("Checking requested images are cached");
 shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause, LayoutTraits.macOS)');

Source/WebCore/ChangeLog

@@ -1,3 +1,17 @@
+2017-03-14  Antoine Quint  <[email protected]>
+
+        [Modern Media Controls] iOS may attempt to load fullscreen icon variants
+        https://bugs.webkit.org/show_bug.cgi?id=169608
+        <rdar://problem/31037369>
+
+        Reviewed by Eric Carlson.
+
+        Only return fullscreen or compact variants for macOS.
+
+        * Modules/modern-media-controls/controls/icon-service.js:
+        (const.iconService.new.IconService.prototype._fileNameAndPlatformForIconNameAndLayoutTraits):
+        (const.iconService.new.IconService):
+
 2017-03-14  Antoine Quint  <[email protected]>
 
         [Modern Media Controls] Controls are laid out incorrectly with RTL languages

Source/WebCore/Modules/modern-media-controls/controls/icon-service.js

@@ -89,10 +89,12 @@ const iconService = new class IconService {
         else
             throw "Could not identify icon's platform from layout traits.";
 
-        if (layoutTraits & LayoutTraits.Fullscreen && IconsWithFullscreenVariants.includes(iconName))
-            iconName += "-fullscreen";
-        else if (layoutTraits & LayoutTraits.Compact && IconsWithCompactVariants.includes(iconName))
-            iconName += "-compact";
+        if (layoutTraits & LayoutTraits.macOS) {
+            if (layoutTraits & LayoutTraits.Fullscreen && IconsWithFullscreenVariants.includes(iconName))
+                iconName += "-fullscreen";
+            else if (layoutTraits & LayoutTraits.Compact && IconsWithCompactVariants.includes(iconName))
+                iconName += "-compact";
+        }
 
         const fileName = `${iconName}@${window.devicePixelRatio}x`;