185122 2018-04-29 10:49:40 -0700 Make color-filter affect <attachment> 2018-04-29 22:24:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue simon.fraser thorton webkit-bug-importer oldest_to_newest 1418907 0 simon.fraser 2018-04-29 10:49:40 -0700 Make color-filter affect <attachment> 1418908 1 339095 simon.fraser 2018-04-29 10:50:52 -0700 Created attachment 339095 Patch 1418909 2 simon.fraser 2018-04-29 10:51:17 -0700 rdar://problem/39818763 1418948 3 339095 commit-queue 2018-04-29 22:24:16 -0700 Comment on attachment 339095 Patch Clearing flags on attachment: 339095 Committed r231155: <https://trac.webkit.org/changeset/231155> 1418949 4 commit-queue 2018-04-29 22:24:18 -0700 All reviewed patches have been landed. Closing bug. 339095 2018-04-29 10:50:52 -0700 2018-04-29 22:24:16 -0700 Patch bug-185122-20180429105051.patch text/plain 7588 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRmYWNjNDdhMzY5YjE4 MTJmMzVkNzQ4ZGYyZGE2ODg2MTNlYzBkZi4uMjU1MjJjZjI0ZGEyMDZlZjRhMzAyM2NlNmE3MzYz YmJkZDRjNDU3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA0LTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgY29sb3It ZmlsdGVyIGFmZmVjdCA8YXR0YWNobWVudD4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4NTEyMgorICAgICAgICByZGFyOi8vcHJvYmxlbS8zOTgxODc2 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAg ICAgQ29udmVydCB0aGUgY29sb3JzIHVzZWQgdG8gcmVuZGVyIDxhdHRhY2htZW50PiB0aHJvdWdo IGNvbG9yLWZpbHRlciwgZXhjZXB0CisgICAgICAgIGZvciB0aG9zZSBwYXJ0cyB0aGF0IHJlbmRl ciBvdmVyIHRoZSBpY29uIChsaWtlIHRoZSBwcm9ncmVzcyBiYXIpLgorCisgICAgICAgIE5vdCBl YXNpbHkgdGVzdGFibGUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW06 CisgICAgICAgIChXZWJDb3JlOjp0aXRsZVRleHRDb2xvckZvckF0dGFjaG1lbnQpOgorICAgICAg ICAoV2ViQ29yZTo6QXR0YWNobWVudExheW91dDo6bGF5T3V0VGl0bGUpOgorICAgICAgICAoV2Vi Q29yZTo6QXR0YWNobWVudExheW91dDo6bGF5T3V0U3VidGl0bGUpOgorICAgICAgICAoV2ViQ29y ZTo6cGFpbnRBdHRhY2htZW50SWNvbkJhY2tncm91bmQpOgorICAgICAgICAoV2ViQ29yZTo6cGFp bnRBdHRhY2htZW50VGl0bGVCYWNrZ3JvdW5kKToKKyAgICAgICAgKFdlYkNvcmU6OnBhaW50QXR0 YWNobWVudFBsYWNlaG9sZGVyQm9yZGVyKToKKwogMjAxOC0wNC0yOCAgU2ltb24gRnJhc2VyICA8 c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggY29sb3ItZmlsdGVyIHRvIGFw cGx5IHRvIFNWRyBjb2xvcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1h Yy5tbQppbmRleCBjOGJhMmNiMzYwNzNmN2YwYzliOWI3MjU0NDc5YTc3Mjc4Yjk5OGQ0Li4yZmEz ZDQ2OTk0ZTMzYzlmZmExNzg4YWIxYjU4YjFlNGQ2NmIxYzQ0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCkBAIC0yMTY0LDE1ICsyMTY0LDE4IEBAIHByaXZh dGU6CiAgICAgdm9pZCBhZGRUaXRsZUxpbmUoQ1RMaW5lUmVmLCBDR0Zsb2F0JiB5T2Zmc2V0LCBW ZWN0b3I8Q0dQb2ludD4gb3JpZ2lucywgQ0ZJbmRleCBsaW5lSW5kZXgsIGNvbnN0IFJlbmRlckF0 dGFjaG1lbnQmKTsKIH07CiAKLXN0YXRpYyBOU0NvbG9yICp0aXRsZVRleHRDb2xvckZvckF0dGFj aG1lbnQoY29uc3QgUmVuZGVyQXR0YWNobWVudCYgYXR0YWNobWVudCkKK3N0YXRpYyBDb2xvciB0 aXRsZVRleHRDb2xvckZvckF0dGFjaG1lbnQoY29uc3QgUmVuZGVyQXR0YWNobWVudCYgYXR0YWNo bWVudCkKIHsKKyAgICBDb2xvciByZXN1bHQgPSBDb2xvcjo6YmxhY2s7CisgICAgCiAgICAgaWYg KGF0dGFjaG1lbnQuc2VsZWN0aW9uU3RhdGUoKSAhPSBSZW5kZXJPYmplY3Q6OlNlbGVjdGlvbk5v bmUpIHsKICAgICAgICAgaWYgKGF0dGFjaG1lbnQuZnJhbWUoKS5zZWxlY3Rpb24oKS5pc0ZvY3Vz ZWRBbmRBY3RpdmUoKSkKLSAgICAgICAgICAgIHJldHVybiBbTlNDb2xvciBhbHRlcm5hdGVTZWxl Y3RlZENvbnRyb2xUZXh0Q29sb3JdOyAgICAKLSAgICAgICAgcmV0dXJuIChOU0NvbG9yICopY2Fj aGVkQ0dDb2xvcihhdHRhY2htZW50VGl0bGVJbmFjdGl2ZVRleHRDb2xvcigpKTsKKyAgICAgICAg ICAgIHJlc3VsdCA9IGNvbG9yRnJvbU5TQ29sb3IoW05TQ29sb3IgYWx0ZXJuYXRlU2VsZWN0ZWRD b250cm9sVGV4dENvbG9yXSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHJlc3VsdCA9IGF0 dGFjaG1lbnRUaXRsZUluYWN0aXZlVGV4dENvbG9yKCk7CiAgICAgfQogCi0gICAgcmV0dXJuIFtO U0NvbG9yIGJsYWNrQ29sb3JdOworICAgIHJldHVybiBhdHRhY2htZW50LnN0eWxlKCkuY29sb3JC eUFwcGx5aW5nQ29sb3JGaWx0ZXIocmVzdWx0KTsKIH0KIAogdm9pZCBBdHRhY2htZW50TGF5b3V0 OjphZGRUaXRsZUxpbmUoQ1RMaW5lUmVmIGxpbmUsIENHRmxvYXQmIHlPZmZzZXQsIFZlY3RvcjxD R1BvaW50PiBvcmlnaW5zLCBDRkluZGV4IGxpbmVJbmRleCwgY29uc3QgUmVuZGVyQXR0YWNobWVu dCYgYXR0YWNobWVudCkKQEAgLTIyMjEsNyArMjIyNCw3IEBAIHZvaWQgQXR0YWNobWVudExheW91 dDo6bGF5T3V0VGl0bGUoY29uc3QgUmVuZGVyQXR0YWNobWVudCYgYXR0YWNobWVudCkKIAogICAg IE5TRGljdGlvbmFyeSAqdGV4dEF0dHJpYnV0ZXMgPSBAewogICAgICAgICAoaWQpa0NURm9udEF0 dHJpYnV0ZU5hbWU6IChpZClmb250LmdldCgpLAotICAgICAgICAoaWQpa0NURm9yZWdyb3VuZENv bG9yQXR0cmlidXRlTmFtZTogdGl0bGVUZXh0Q29sb3JGb3JBdHRhY2htZW50KGF0dGFjaG1lbnQp CisgICAgICAgIChpZClrQ1RGb3JlZ3JvdW5kQ29sb3JBdHRyaWJ1dGVOYW1lOiAoTlNDb2xvciAq KWNhY2hlZENHQ29sb3IodGl0bGVUZXh0Q29sb3JGb3JBdHRhY2htZW50KGF0dGFjaG1lbnQpKQog ICAgIH07CiAgICAgUmV0YWluUHRyPE5TQXR0cmlidXRlZFN0cmluZz4gYXR0cmlidXRlZFRpdGxl ID0gYWRvcHROUyhbW05TQXR0cmlidXRlZFN0cmluZyBhbGxvY10gaW5pdFdpdGhTdHJpbmc6dGl0 bGUgYXR0cmlidXRlczp0ZXh0QXR0cmlidXRlc10pOwogICAgIFJldGFpblB0cjxDVEZyYW1lc2V0 dGVyUmVmPiB0aXRsZUZyYW1lc2V0dGVyID0gYWRvcHRDRihDVEZyYW1lc2V0dGVyQ3JlYXRlV2l0 aEF0dHJpYnV0ZWRTdHJpbmcoKENGQXR0cmlidXRlZFN0cmluZ1JlZilhdHRyaWJ1dGVkVGl0bGUu Z2V0KCkpKTsKQEAgLTIyNzQsMTEgKzIyNzcsMTIgQEAgdm9pZCBBdHRhY2htZW50TGF5b3V0Ojps YXlPdXRTdWJ0aXRsZShjb25zdCBSZW5kZXJBdHRhY2htZW50JiBhdHRhY2htZW50KQogICAgIGlm IChzdWJ0aXRsZVRleHQuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKKyAgICBDb2xvciBz dWJ0aXRsZUNvbG9yID0gYXR0YWNobWVudC5zdHlsZSgpLmNvbG9yQnlBcHBseWluZ0NvbG9yRmls dGVyKGF0dGFjaG1lbnRTdWJ0aXRsZVRleHRDb2xvcigpKTsKICAgICBDRlN0cmluZ1JlZiBsYW5n dWFnZSA9IDA7IC8vIEJ5IG5vdCBzcGVjaWZ5aW5nIGEgbGFuZ3VhZ2Ugd2UgdXNlIHRoZSBzeXN0 ZW0gbGFuZ3VhZ2UuCiAgICAgUmV0YWluUHRyPENURm9udFJlZj4gZm9udCA9IGFkb3B0Q0YoQ1RG b250Q3JlYXRlVUlGb250Rm9yTGFuZ3VhZ2Uoa0NURm9udFVJRm9udFN5c3RlbSwgYXR0YWNobWVu dFN1YnRpdGxlRm9udFNpemUsIGxhbmd1YWdlKSk7CiAgICAgTlNEaWN0aW9uYXJ5ICp0ZXh0QXR0 cmlidXRlcyA9IEB7CiAgICAgICAgIChpZClrQ1RGb250QXR0cmlidXRlTmFtZTogKGlkKWZvbnQu Z2V0KCksCi0gICAgICAgIChpZClrQ1RGb3JlZ3JvdW5kQ29sb3JBdHRyaWJ1dGVOYW1lOiAoTlND b2xvciAqKWNhY2hlZENHQ29sb3IoYXR0YWNobWVudFN1YnRpdGxlVGV4dENvbG9yKCkpCisgICAg ICAgIChpZClrQ1RGb3JlZ3JvdW5kQ29sb3JBdHRyaWJ1dGVOYW1lOiAoTlNDb2xvciAqKWNhY2hl ZENHQ29sb3Ioc3VidGl0bGVDb2xvcikKICAgICB9OwogICAgIFJldGFpblB0cjxOU0F0dHJpYnV0 ZWRTdHJpbmc+IGF0dHJpYnV0ZWRTdWJ0aXRsZVRleHQgPSBhZG9wdE5TKFtbTlNBdHRyaWJ1dGVk U3RyaW5nIGFsbG9jXSBpbml0V2l0aFN0cmluZzpzdWJ0aXRsZVRleHQgYXR0cmlidXRlczp0ZXh0 QXR0cmlidXRlc10pOwogICAgIHN1YnRpdGxlTGluZSA9IGFkb3B0Q0YoQ1RMaW5lQ3JlYXRlV2l0 aEF0dHJpYnV0ZWRTdHJpbmcoKENGQXR0cmlidXRlZFN0cmluZ1JlZilhdHRyaWJ1dGVkU3VidGl0 bGVUZXh0LmdldCgpKSk7CkBAIC0yMzMzLDcgKzIzMzcsNyBAQCBpbnQgUmVuZGVyVGhlbWVNYWM6 OmF0dGFjaG1lbnRCYXNlbGluZShjb25zdCBSZW5kZXJBdHRhY2htZW50JiBhdHRhY2htZW50KSBj b25zdAogICAgIHJldHVybiBsYXlvdXQuYmFzZWxpbmU7CiB9CiAKLXN0YXRpYyB2b2lkIHBhaW50 QXR0YWNobWVudEljb25CYWNrZ3JvdW5kKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQmLCBHcmFwaGlj c0NvbnRleHQmIGNvbnRleHQsIEF0dGFjaG1lbnRMYXlvdXQmIGxheW91dCkKK3N0YXRpYyB2b2lk IHBhaW50QXR0YWNobWVudEljb25CYWNrZ3JvdW5kKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQmIGF0 dGFjaG1lbnQsIEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgQXR0YWNobWVudExheW91dCYgbGF5 b3V0KQogewogICAgIC8vIEZJWE1FOiBGaW5kZXIgaGFzIGEgZGlzY29udGludW91cyBiZWhhdmlv ciBoZXJlIHdoZW4geW91IGhhdmUgYSBiYWNrZ3JvdW5kIGNvbG9yIG90aGVyIHRoYW4gd2hpdGUs CiAgICAgLy8gd2hlcmUgaXQgc3dpdGNoZXMgaW50byAnYm9yZGVyZWQgbW9kZScgYW5kIHRoZSBi b3JkZXIgcG9wcyBpbiBvbiB0b3Agb2YgdGhlIGJhY2tncm91bmQuCkBAIC0yMzQzLDcgKzIzNDcs OCBAQCBzdGF0aWMgdm9pZCBwYWludEF0dGFjaG1lbnRJY29uQmFja2dyb3VuZChjb25zdCBSZW5k ZXJBdHRhY2htZW50JiwgR3JhcGhpY3NDb250ZQogICAgIGlmIChwYWludEJvcmRlcikKICAgICAg ICAgYmFja2dyb3VuZFJlY3QuaW5mbGF0ZSgtYXR0YWNobWVudEljb25TZWxlY3Rpb25Cb3JkZXJU aGlja25lc3MpOwogCi0gICAgY29udGV4dC5maWxsUm91bmRlZFJlY3QoRmxvYXRSb3VuZGVkUmVj dChiYWNrZ3JvdW5kUmVjdCwgRmxvYXRSb3VuZGVkUmVjdDo6UmFkaWkoYXR0YWNobWVudEljb25C YWNrZ3JvdW5kUmFkaXVzKSksIGF0dGFjaG1lbnRJY29uQmFja2dyb3VuZENvbG9yKCkpOworICAg IENvbG9yIGJhY2tncm91bmRDb2xvciA9IGF0dGFjaG1lbnQuc3R5bGUoKS5jb2xvckJ5QXBwbHlp bmdDb2xvckZpbHRlcihhdHRhY2htZW50SWNvbkJhY2tncm91bmRDb2xvcigpKTsKKyAgICBjb250 ZXh0LmZpbGxSb3VuZGVkUmVjdChGbG9hdFJvdW5kZWRSZWN0KGJhY2tncm91bmRSZWN0LCBGbG9h dFJvdW5kZWRSZWN0OjpSYWRpaShhdHRhY2htZW50SWNvbkJhY2tncm91bmRSYWRpdXMpKSwgYmFj a2dyb3VuZENvbG9yKTsKIAogICAgIGlmIChwYWludEJvcmRlcikgewogICAgICAgICBGbG9hdFJl Y3QgYm9yZGVyUmVjdCA9IGxheW91dC5pY29uQmFja2dyb3VuZFJlY3Q7CkBAIC0yMzUyLDcgKzIz NTcsOSBAQCBzdGF0aWMgdm9pZCBwYWludEF0dGFjaG1lbnRJY29uQmFja2dyb3VuZChjb25zdCBS ZW5kZXJBdHRhY2htZW50JiwgR3JhcGhpY3NDb250ZQogICAgICAgICBGbG9hdFNpemUgaWNvbkJh Y2tncm91bmRSYWRpdXNTaXplKGF0dGFjaG1lbnRJY29uQmFja2dyb3VuZFJhZGl1cywgYXR0YWNo bWVudEljb25CYWNrZ3JvdW5kUmFkaXVzKTsKICAgICAgICAgUGF0aCBib3JkZXJQYXRoOwogICAg ICAgICBib3JkZXJQYXRoLmFkZFJvdW5kZWRSZWN0KGJvcmRlclJlY3QsIGljb25CYWNrZ3JvdW5k UmFkaXVzU2l6ZSk7Ci0gICAgICAgIGNvbnRleHQuc2V0U3Ryb2tlQ29sb3IoYXR0YWNobWVudElj b25Cb3JkZXJDb2xvcigpKTsKKworICAgICAgICBDb2xvciBib3JkZXJDb2xvciA9IGF0dGFjaG1l bnQuc3R5bGUoKS5jb2xvckJ5QXBwbHlpbmdDb2xvckZpbHRlcihhdHRhY2htZW50SWNvbkJvcmRl ckNvbG9yKCkpOworICAgICAgICBjb250ZXh0LnNldFN0cm9rZUNvbG9yKGJvcmRlckNvbG9yKTsK ICAgICAgICAgY29udGV4dC5zZXRTdHJva2VUaGlja25lc3MoYXR0YWNobWVudEljb25TZWxlY3Rp b25Cb3JkZXJUaGlja25lc3MpOwogICAgICAgICBjb250ZXh0LnN0cm9rZVBhdGgoYm9yZGVyUGF0 aCk7CiAgICAgfQpAQCAtMjQzNCw2ICsyNDQxLDcgQEAgc3RhdGljIHZvaWQgcGFpbnRBdHRhY2ht ZW50VGl0bGVCYWNrZ3JvdW5kKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQmIGF0dGFjaG1lbnQsIEcK ICAgICBlbHNlCiAgICAgICAgIGJhY2tncm91bmRDb2xvciA9IGF0dGFjaG1lbnRUaXRsZUluYWN0 aXZlQmFja2dyb3VuZENvbG9yKCk7CiAKKyAgICBiYWNrZ3JvdW5kQ29sb3IgPSBhdHRhY2htZW50 LnN0eWxlKCkuY29sb3JCeUFwcGx5aW5nQ29sb3JGaWx0ZXIoYmFja2dyb3VuZENvbG9yKTsKICAg ICBjb250ZXh0LnNldEZpbGxDb2xvcihiYWNrZ3JvdW5kQ29sb3IpOwogCiAgICAgUGF0aCBiYWNr Z3JvdW5kUGF0aCA9IFBhdGhVdGlsaXRpZXM6OnBhdGhXaXRoU2hyaW5rV3JhcHBlZFJlY3RzKGJh Y2tncm91bmRSZWN0cywgYXR0YWNobWVudFRpdGxlQmFja2dyb3VuZFJhZGl1cyk7CkBAIC0yNDk3 LDExICsyNTA1LDEzIEBAIHN0YXRpYyB2b2lkIHBhaW50QXR0YWNobWVudFByb2dyZXNzKGNvbnN0 IFJlbmRlckF0dGFjaG1lbnQmIGF0dGFjaG1lbnQsIEdyYXBoaWNzCiAgICAgY29udGV4dC5zdHJv a2VQYXRoKGJvcmRlclBhdGgpOwogfQogCi1zdGF0aWMgdm9pZCBwYWludEF0dGFjaG1lbnRQbGFj ZWhvbGRlckJvcmRlcihjb25zdCBSZW5kZXJBdHRhY2htZW50JiwgR3JhcGhpY3NDb250ZXh0JiBj b250ZXh0LCBBdHRhY2htZW50TGF5b3V0JiBsYXlvdXQpCitzdGF0aWMgdm9pZCBwYWludEF0dGFj aG1lbnRQbGFjZWhvbGRlckJvcmRlcihjb25zdCBSZW5kZXJBdHRhY2htZW50JiBhdHRhY2htZW50 LCBHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIEF0dGFjaG1lbnRMYXlvdXQmIGxheW91dCkKIHsK ICAgICBQYXRoIGJvcmRlclBhdGg7CiAgICAgYm9yZGVyUGF0aC5hZGRSb3VuZGVkUmVjdChsYXlv dXQuYXR0YWNobWVudFJlY3QsIEZsb2F0U2l6ZShhdHRhY2htZW50UGxhY2Vob2xkZXJCb3JkZXJS YWRpdXMsIGF0dGFjaG1lbnRQbGFjZWhvbGRlckJvcmRlclJhZGl1cykpOwotICAgIGNvbnRleHQu c2V0U3Ryb2tlQ29sb3IoYXR0YWNobWVudFBsYWNlaG9sZGVyQm9yZGVyQ29sb3IoKSk7CisKKyAg ICBDb2xvciBwbGFjZWhvbGRlckJvcmRlckNvbG9yID0gYXR0YWNobWVudC5zdHlsZSgpLmNvbG9y QnlBcHBseWluZ0NvbG9yRmlsdGVyKGF0dGFjaG1lbnRQbGFjZWhvbGRlckJvcmRlckNvbG9yKCkp OworICAgIGNvbnRleHQuc2V0U3Ryb2tlQ29sb3IocGxhY2Vob2xkZXJCb3JkZXJDb2xvcik7CiAg ICAgY29udGV4dC5zZXRTdHJva2VUaGlja25lc3MoYXR0YWNobWVudFBsYWNlaG9sZGVyQm9yZGVy V2lkdGgpOwogICAgIGNvbnRleHQuc2V0U3Ryb2tlU3R5bGUoRGFzaGVkU3Ryb2tlKTsKICAgICBj b250ZXh0LnNldExpbmVEYXNoKHthdHRhY2htZW50UGxhY2Vob2xkZXJCb3JkZXJEYXNoTGVuZ3Ro fSwgMCk7Cg==