<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>163871</bug_id>
          
          <creation_ts>2016-10-23 10:29:36 -0700</creation_ts>
          <short_desc>[Cocoa] Both modern-media-controls/images/iOS modern-media-controls/images/macOS are installed on both platforms</short_desc>
          <delta_ts>2017-01-05 12:16:28 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Media</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter>mitz</reporter>
          <assigned_to name="Antoine Quint">graouts</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>eric.carlson</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1243525</commentid>
    <comment_count>0</comment_count>
    <who name="">mitz</who>
    <bug_when>2016-10-23 10:29:36 -0700</bug_when>
    <thetext>The media controls images for both macOS and iOS platforms are installed on both platforms.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1243526</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2016-10-23 10:40:23 -0700</bug_when>
    <thetext>&lt;rdar://problem/28908164&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1243719</commentid>
    <comment_count>2</comment_count>
    <who name="Antoine Quint">graouts</who>
    <bug_when>2016-10-24 09:14:16 -0700</bug_when>
    <thetext>Mitz, do you know how not to do that?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1243720</commentid>
    <comment_count>3</comment_count>
    <who name="">mitz</who>
    <bug_when>2016-10-24 09:24:04 -0700</bug_when>
    <thetext>(In reply to comment #2)
&gt; Mitz, do you know how not to do that?

Since these are being copied by a script build phase, the script could be changed to exclude the directory for the non-current platform.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1264114</commentid>
    <comment_count>4</comment_count>
      <attachid>298101</attachid>
    <who name="Antoine Quint">graouts</who>
    <bug_when>2017-01-05 07:36:30 -0800</bug_when>
    <thetext>Created attachment 298101
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1264121</commentid>
    <comment_count>5</comment_count>
      <attachid>298101</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2017-01-05 07:57:51 -0800</bug_when>
    <thetext>Comment on attachment 298101
Patch

You can simplify this by only setting a variable to the platform-specific image directory inside of the &quot;if&quot; blocks, and only having the mkdir and rsync lines once.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1264172</commentid>
    <comment_count>6</comment_count>
      <attachid>298117</attachid>
    <who name="Antoine Quint">graouts</who>
    <bug_when>2017-01-05 11:39:17 -0800</bug_when>
    <thetext>Created attachment 298117
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1264188</commentid>
    <comment_count>7</comment_count>
      <attachid>298117</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2017-01-05 12:16:25 -0800</bug_when>
    <thetext>Comment on attachment 298117
Patch for landing

Clearing flags on attachment: 298117

Committed r210368: &lt;http://trac.webkit.org/changeset/210368&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1264189</commentid>
    <comment_count>8</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2017-01-05 12:16:28 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>298101</attachid>
            <date>2017-01-05 07:36:30 -0800</date>
            <delta_ts>2017-01-05 11:39:11 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-163871-20170105163501.patch</filename>
            <type>text/plain</type>
            <size>2583</size>
            <attacher name="Antoine Quint">graouts</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwMzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWIwMjc5NmRmMGVhYWEw
MmY2NzE3NWYyMTllNGY0M2Q4MDM0OTc5Ni4uYTYzZmIxMGY5YTI3OTdhYjA5MWU2MTFlNTM1NWJm
Y2RjNDRhMDdhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE3LTAxLTA1ICBBbnRv
aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBCb3RoIG1v
ZGVybi1tZWRpYS1jb250cm9scy9pbWFnZXMvaU9TIG1vZGVybi1tZWRpYS1jb250cm9scy9pbWFn
ZXMvbWFjT1MgYXJlIGluc3RhbGxlZCBvbiBib3RoIHBsYXRmb3JtcworICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzODcxCisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugbm93IG9ubHkgY29weSBtb2Rlcm4g
bWVkaWEgY29udHJvbHMgaW1hZ2VzLCBpZiBhbnksIGZvciB0aGUgY3VycmVudCBwbGF0Zm9ybS4K
KworICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAxNy0w
MS0wNSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIFBh
c3NSZWZQdHIgdXNlIGZyb20gImJpbmRpbmdzL3NjcmlwdHMiLCAic3ZnIiwgInRlc3RpbmciLCBh
bmQgIndvcmtlcnMiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJv
ai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q
ZWN0LnBieHByb2oKaW5kZXggNmI5NTVjMGQyZjA0ZTJjODVmYzI3ODg4NWY0YTRlMjVjZjVjMDY0
My4uOWExZWE4MmY3NjIxOTQwMGI4ZDZhNWVjZWYwMWVkYWUyYzJkZmNhZiAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMjg2NTks
NyArMjg2NTksNyBAQAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3Np
bmcgPSAwOwogCQkJc2hlbGxQYXRoID0gL2Jpbi9zaDsKLQkJCXNoZWxsU2NyaXB0ID0gInJzeW5j
IC1hcSAtLWV4Y2x1ZGUgXCIuc3ZuXCIgLS1leGNsdWRlIFwiLkRTX1N0b3JlXCIgXCIkU1JDUk9P
VC9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9pbWFnZXNcIiBcIiRCVUlMVF9QUk9EVUNU
U19ESVIvJFVOTE9DQUxJWkVEX1JFU09VUkNFU19GT0xERVJfUEFUSC9tb2Rlcm4tbWVkaWEtY29u
dHJvbHNcIlxuY2QgXCIkU1JDUk9PVC9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9sc1wiXG5j
YXQgY29udHJvbHMvKi5jc3MgPiBcIiRCVUlMVF9QUk9EVUNUU19ESVIvJFVOTE9DQUxJWkVEX1JF
U09VUkNFU19GT0xERVJfUEFUSC9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbW9kZXJuLW1lZGlhLWNv
bnRyb2xzLmNzc1wiXG5jYXQgYGNhdCBqcy1maWxlc2AgPiBcIiRCVUlMVF9QUk9EVUNUU19ESVIv
JFVOTE9DQUxJWkVEX1JFU09VUkNFU19GT0xERVJfUEFUSC9tb2Rlcm4tbWVkaWEtY29udHJvbHMv
bW9kZXJuLW1lZGlhLWNvbnRyb2xzLmpzXCIiOworCQkJc2hlbGxTY3JpcHQgPSAiU1JDX0RJUj1c
IiRTUkNST09UL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzXCJcbkRTVF9ESVI9XCIkQlVJ
TFRfUFJPRFVDVFNfRElSLyRVTkxPQ0FMSVpFRF9SRVNPVVJDRVNfRk9MREVSX1BBVEgvbW9kZXJu
LW1lZGlhLWNvbnRyb2xzXCJcblxuaWYgWyBcIiR7UExBVEZPUk1fTkFNRX1cIiA9PSBcIm1hY29z
eFwiIF07IHRoZW5cbiAgICBta2RpciAtcCBcIiREU1RfRElSL2ltYWdlc1wiXG4gICAgcnN5bmMg
LWFxIC0tZXhjbHVkZSBcIi5zdm5cIiAtLWV4Y2x1ZGUgXCIuRFNfU3RvcmVcIiBcIiRTUkNfRElS
L2ltYWdlcy9tYWNPU1wiIFwiJERTVF9ESVIvaW1hZ2VzXCJcbmZpXG5cbmlmIFsgXCIke1BMQVRG
T1JNX05BTUV9XCIgPT0gXCJpcGhvbmVvc1wiIF0gfHwgWyBcIiR7UExBVEZPUk1fTkFNRX1cIiA9
PSBcImlwaG9uZXNpbXVsYXRvclwiIF07IHRoZW5cbiAgICBta2RpciAtcCBcIiREU1RfRElSL2lt
YWdlc1wiXG4gICAgcnN5bmMgLWFxIC0tZXhjbHVkZSBcIi5zdm5cIiAtLWV4Y2x1ZGUgXCIuRFNf
U3RvcmVcIiBcIiRTUkNfRElSL2ltYWdlcy9pT1NcIiBcIiREU1RfRElSL2ltYWdlc1wiXG5maVxu
XG5jZCBcIiRTUkNfRElSXCJcbmNhdCBjb250cm9scy8qLmNzcyA+IFwiJERTVF9ESVIvbW9kZXJu
LW1lZGlhLWNvbnRyb2xzLmNzc1wiXG5jYXQgYGNhdCBqcy1maWxlc2AgPiBcIiREU1RfRElSL21v
ZGVybi1tZWRpYS1jb250cm9scy5qc1wiIjsKIAkJfTsKIAkJREQwNDFGQkQwOUQ5RERCRTAwMTBB
RjJBIC8qIEdlbmVyYXRlIERlcml2ZWQgU291cmNlcyAqLyA9IHsKIAkJCWlzYSA9IFBCWFNoZWxs
U2NyaXB0QnVpbGRQaGFzZTsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>298117</attachid>
            <date>2017-01-05 11:39:17 -0800</date>
            <delta_ts>2017-01-05 12:16:25 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-163871-20170105203748.patch</filename>
            <type>text/plain</type>
            <size>2577</size>
            <attacher name="Antoine Quint">graouts</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwMzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWIwMjc5NmRmMGVhYWEw
MmY2NzE3NWYyMTllNGY0M2Q4MDM0OTc5Ni4uMTg1YjY3ZDU5YzdkMzhlZjEyNzI2NmFlMWVkOWQ3
NjQzMTkzZTQ5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE3LTAxLTA1ICBBbnRv
aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBCb3RoIG1v
ZGVybi1tZWRpYS1jb250cm9scy9pbWFnZXMvaU9TIG1vZGVybi1tZWRpYS1jb250cm9scy9pbWFn
ZXMvbWFjT1MgYXJlIGluc3RhbGxlZCBvbiBib3RoIHBsYXRmb3JtcworICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzODcxCisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIFdlIG5vdyBvbmx5IGNvcHkgbW9kZXJuIG1l
ZGlhIGNvbnRyb2xzIGltYWdlcywgaWYgYW55LCBmb3IgdGhlIGN1cnJlbnQgcGxhdGZvcm0uCisK
KyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKIDIwMTctMDEt
MDUgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBQYXNz
UmVmUHRyIHVzZSBmcm9tICJiaW5kaW5ncy9zY3JpcHRzIiwgInN2ZyIsICJ0ZXN0aW5nIiwgYW5k
ICJ3b3JrZXJzIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ov
cHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVj
dC5wYnhwcm9qCmluZGV4IDZiOTU1YzBkMmYwNGUyYzg1ZmMyNzg4ODVmNGE0ZTI1Y2Y1YzA2NDMu
LmNmNTEyNTRiNDE2NjYxYjhhY2I3NzlhYzI5ZWUyZTQ3OTVjZjBlMDkgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTI4NjU5LDcg
KzI4NjU5LDcgQEAKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5n
ID0gMDsKIAkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7Ci0JCQlzaGVsbFNjcmlwdCA9ICJyc3luYyAt
YXEgLS1leGNsdWRlIFwiLnN2blwiIC0tZXhjbHVkZSBcIi5EU19TdG9yZVwiIFwiJFNSQ1JPT1Qv
TW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvaW1hZ2VzXCIgXCIkQlVJTFRfUFJPRFVDVFNf
RElSLyRVTkxPQ0FMSVpFRF9SRVNPVVJDRVNfRk9MREVSX1BBVEgvbW9kZXJuLW1lZGlhLWNvbnRy
b2xzXCJcbmNkIFwiJFNSQ1JPT1QvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHNcIlxuY2F0
IGNvbnRyb2xzLyouY3NzID4gXCIkQlVJTFRfUFJPRFVDVFNfRElSLyRVTkxPQ0FMSVpFRF9SRVNP
VVJDRVNfRk9MREVSX1BBVEgvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21vZGVybi1tZWRpYS1jb250
cm9scy5jc3NcIlxuY2F0IGBjYXQganMtZmlsZXNgID4gXCIkQlVJTFRfUFJPRFVDVFNfRElSLyRV
TkxPQ0FMSVpFRF9SRVNPVVJDRVNfRk9MREVSX1BBVEgvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21v
ZGVybi1tZWRpYS1jb250cm9scy5qc1wiIjsKKwkJCXNoZWxsU2NyaXB0ID0gIlNSQ19ESVI9XCIk
U1JDUk9PVC9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9sc1wiXG5EU1RfRElSPVwiJEJVSUxU
X1BST0RVQ1RTX0RJUi8kVU5MT0NBTElaRURfUkVTT1VSQ0VTX0ZPTERFUl9QQVRIL21vZGVybi1t
ZWRpYS1jb250cm9sc1wiXG5cbm1rZGlyIC1wIFwiJERTVF9ESVJcIlxuXG5pZiBbIFwiJHtQTEFU
Rk9STV9OQU1FfVwiID09IFwibWFjb3N4XCIgXTsgdGhlblxuICAgIElNR19PU19QUkVGSVg9XCJt
YWNPU1wiXG5maVxuXG5pZiBbIFwiJHtQTEFURk9STV9OQU1FfVwiID09IFwiaXBob25lb3NcIiBd
IHx8IFsgXCIke1BMQVRGT1JNX05BTUV9XCIgPT0gXCJpcGhvbmVzaW11bGF0b3JcIiBdOyB0aGVu
XG4gICAgSU1HX09TX1BSRUZJWD1cImlPU1wiXG5maVxuXG5pZiBbIC1uIFwiJElNR19PU19QUkVG
SVhcIiBdOyB0aGVuXG4gICAgbWtkaXIgLXAgXCIkRFNUX0RJUi9pbWFnZXNcIlxuICAgIHJzeW5j
IC1hcSAtLWV4Y2x1ZGUgXCIuc3ZuXCIgLS1leGNsdWRlIFwiLkRTX1N0b3JlXCIgXCIkU1JDX0RJ
Ui9pbWFnZXMvJElNR19PU19QUkVGSVhcIiBcIiREU1RfRElSL2ltYWdlc1wiXG5maVxuXG5jZCBc
IiRTUkNfRElSXCJcbmNhdCBjb250cm9scy8qLmNzcyA+IFwiJERTVF9ESVIvbW9kZXJuLW1lZGlh
LWNvbnRyb2xzLmNzc1wiXG5jYXQgYGNhdCBqcy1maWxlc2AgPiBcIiREU1RfRElSL21vZGVybi1t
ZWRpYS1jb250cm9scy5qc1wiIjsKIAkJfTsKIAkJREQwNDFGQkQwOUQ5RERCRTAwMTBBRjJBIC8q
IEdlbmVyYXRlIERlcml2ZWQgU291cmNlcyAqLyA9IHsKIAkJCWlzYSA9IFBCWFNoZWxsU2NyaXB0
QnVpbGRQaGFzZTsK
</data>

          </attachment>
      

    </bug>

</bugzilla>