170992 2017-04-19 07:01:30 -0700 [Modern Media Controls] Allow non-PNG resources 2017-04-19 08:07:14 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts dino webkit-bug-importer oldest_to_newest 1298670 0 graouts 2017-04-19 07:01:30 -0700 Right now we assume all resources are PNG, but we should allow other resources to be loaded (such as SVG) in the future. 1298671 1 webkit-bug-importer 2017-04-19 07:02:33 -0700 <rdar://problem/31706590> 1298672 2 307478 graouts 2017-04-19 07:06:33 -0700 Created attachment 307478 Patch 1298678 3 graouts 2017-04-19 08:07:14 -0700 Committed r215509: <http://trac.webkit.org/changeset/215509> 307478 2017-04-19 07:06:33 -0700 2017-04-19 07:07:54 -0700 Patch bug-170992-20170419160632.patch text/plain 12974 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1MjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjgwMzZmNThlNjUwNTQ1 MGVlYjNmNTY2Mzg4NjRlYjgzZDliMmY2Yy4uMTlmZDI5YzhmMDFlYjJkNDllNWRkOWU2ZTA3ZjZh OWIwY2IxYWExZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE3LTA0LTE5ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gQWxsb3cgbm9uLVBORyByZXNvdXJjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDk5MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MzE3MDY1OTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW5zdGVhZCBvZiBwYXNzaW5nIGluIGEgbmFtZSBhbmQgYSBwbGF0Zm9ybSB0byBNZWRpYUNv bnRyb2xzSG9zdDo6YmFzZTY0U3RyaW5nRm9ySWNvbkFuZFBsYXRmb3JtKCksCisgICAgICAgIHdl IG5vdyBwYXNzIGluIGEgbmFtZSBhbmQgYSB0eXBlIHRvIE1lZGlhQ29udHJvbHNIb3N0OjpiYXNl NjRTdHJpbmdGb3JJY29uTmFtZUFuZFR5cGUoKS4gV2UndmUgcmVtb3ZlZAorICAgICAgICB0aGUg bmVlZCB0byBwcm92aWRlIGEgcGxhdGZvcm0gYnkgY29weWluZyB0aGUgcmVzb3VyY2VzIGRpcmVj dGx5IHVuZGVyICJSZXNvdXJjZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzIgorICAgICAgICBpbnN0 ZWQgb2YgIlJlc291cmNlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvcGxhdGZvcm0tbmFtZS1oZXJl IiwgYW5kIG5vdyB3ZSBwcm92aWRlIGEgdHlwZSBzbyB0aGF0IGl0CisgICAgICAgIG1heSBiZSBw YXNzZWQgZG93biB0byAtW05TQnVuZGxlIHBhdGhGb3JSZXNvdXJjZTpvZlR5cGU6aW5EaXJlY3Rv cnk6XS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9z dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xzSG9zdDo6YmFzZTY0U3RyaW5n Rm9ySWNvbk5hbWVBbmRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0 OjpiYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0pOiBEZWxldGVkLgorICAgICAgICAqIE1v ZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5oOgorICAgICAgICAqIE1vZHVs ZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGw6CisgICAgICAgICogTW9kdWxl cy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvaWNvbi1zZXJ2aWNlLmpzOgorICAgICAg ICAoY29uc3QuaWNvblNlcnZpY2UubmV3Lkljb25TZXJ2aWNlLnByb3RvdHlwZS5pbWFnZUZvcklj b25OYW1lQW5kTGF5b3V0VHJhaXRzKToKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2o6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmg6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6bWVkaWFDb250cm9sc0Jhc2U2NFN0cmluZ0Zvckljb25O YW1lQW5kVHlwZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6bWVkaWFDb250cm9s c0Jhc2U2NFN0cmluZ0Zvckljb25BbmRQbGF0Zm9ybSk6IERlbGV0ZWQuCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlclRoZW1lSU9TLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1l SU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVJT1M6Om1lZGlhQ29udHJvbHNC YXNlNjRTdHJpbmdGb3JJY29uTmFtZUFuZFR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVJT1M6Om1lZGlhQ29udHJvbHNCYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0pOiBE ZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRo ZW1lTWFjOjptZWRpYUNvbnRyb2xzQmFzZTY0U3RyaW5nRm9ySWNvbk5hbWVBbmRUeXBlKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lTWFjOjptZWRpYUNvbnRyb2xzQmFzZTY0U3RyaW5n Rm9ySWNvbkFuZFBsYXRmb3JtKTogRGVsZXRlZC4KKwogMjAxNy0wNC0xMiAgUGVyIEFybmUgVm9s bGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IHN0cm9rZS1jb2xv ciBDU1MgcHJvcGVydHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh Y29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcAppbmRleCBjNDk5NjllYjBjMzE5NjVi MjY3Y2Y2NGE4MGVkNzhkNTVhNDk0MWZmLi5lZWVhZDBkNDkxZmMwZjlkZWJlYmYxYzUxMjY2NTA1 ZWZmNDcwZTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJv bHMvTWVkaWFDb250cm9sc0hvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHAKQEAgLTI4NiwxMiArMjg2LDEyIEBAIFN0 cmluZyBNZWRpYUNvbnRyb2xzSG9zdDo6c2hhZG93Um9vdENTU1RleHQoKSBjb25zdAogICAgIHJl dHVybiBSZW5kZXJUaGVtZTo6dGhlbWVGb3JQYWdlKHBhZ2UpLT5tb2Rlcm5NZWRpYUNvbnRyb2xz U3R5bGVTaGVldCgpOwogfQogCi1TdHJpbmcgTWVkaWFDb250cm9sc0hvc3Q6OmJhc2U2NFN0cmlu Z0Zvckljb25BbmRQbGF0Zm9ybShjb25zdCBTdHJpbmcmIGljb25OYW1lLCBjb25zdCBTdHJpbmcm IHBsYXRmb3JtKSBjb25zdAorU3RyaW5nIE1lZGlhQ29udHJvbHNIb3N0OjpiYXNlNjRTdHJpbmdG b3JJY29uTmFtZUFuZFR5cGUoY29uc3QgU3RyaW5nJiBpY29uTmFtZSwgY29uc3QgU3RyaW5nJiBp Y29uVHlwZSkgY29uc3QKIHsKICAgICBQYWdlKiBwYWdlID0gbV9tZWRpYUVsZW1lbnQtPmRvY3Vt ZW50KCkucGFnZSgpOwogICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5n KCk7Ci0gICAgcmV0dXJuIFJlbmRlclRoZW1lOjp0aGVtZUZvclBhZ2UocGFnZSktPm1lZGlhQ29u dHJvbHNCYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0oaWNvbk5hbWUsIHBsYXRmb3JtKTsK KyAgICByZXR1cm4gUmVuZGVyVGhlbWU6OnRoZW1lRm9yUGFnZShwYWdlKS0+bWVkaWFDb250cm9s c0Jhc2U2NFN0cmluZ0Zvckljb25OYW1lQW5kVHlwZShpY29uTmFtZSwgaWNvblR5cGUpOwogfQog CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVk aWFDb250cm9sc0hvc3QuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9N ZWRpYUNvbnRyb2xzSG9zdC5oCmluZGV4IDc0MWYyZjc1ODQ4OWVhOGJiZjlhZTdmOGYzNmQ3OTQx ZjkwNDBiOTkuLmViZTJlZDA0Mjg5OTU3YmVjYmRmMTMxZTAyZGExYjJjYzAyNjY1OGUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xz SG9zdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNv bnRyb2xzSG9zdC5oCkBAIC04OCw3ICs4OCw3IEBAIHB1YmxpYzoKICAgICBTdHJpbmcgZ2VuZXJh dGVVVUlEKCkgY29uc3Q7CiAKICAgICBTdHJpbmcgc2hhZG93Um9vdENTU1RleHQoKSBjb25zdDsK LSAgICBTdHJpbmcgYmFzZTY0U3RyaW5nRm9ySWNvbkFuZFBsYXRmb3JtKGNvbnN0IFN0cmluZyYg aWNvbk5hbWUsIGNvbnN0IFN0cmluZyYgcGxhdGZvcm0pIGNvbnN0OworICAgIFN0cmluZyBiYXNl NjRTdHJpbmdGb3JJY29uTmFtZUFuZFR5cGUoY29uc3QgU3RyaW5nJiBpY29uTmFtZSwgY29uc3Qg U3RyaW5nJiBpY29uVHlwZSkgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgTWVkaWFDb250cm9sc0hv c3QoSFRNTE1lZGlhRWxlbWVudCopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbCBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGwKaW5kZXggYTg3YmRhNGUy ZmExYjc0MzhiMTJiZmNhZDdkZTEyNzRiODY4YWQ5MC4uZmJiZDRlODNkZThlMjk0YjJhMDljMjEy NmVlMTA2MGRiN2FmZWYzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaWRsCkBAIC02Miw1ICs2Miw1IEBA IGVudW0gRGV2aWNlVHlwZSB7CiAgICAgRE9NU3RyaW5nIGdlbmVyYXRlVVVJRCgpOwogCiAgICAg W0VuYWJsZWRBdFJ1bnRpbWU9TW9kZXJuTWVkaWFDb250cm9sc10gcmVhZG9ubHkgYXR0cmlidXRl IERPTVN0cmluZyBzaGFkb3dSb290Q1NTVGV4dDsKLSAgICBbRW5hYmxlZEF0UnVudGltZT1Nb2Rl cm5NZWRpYUNvbnRyb2xzXSBET01TdHJpbmcgYmFzZTY0U3RyaW5nRm9ySWNvbkFuZFBsYXRmb3Jt KERPTVN0cmluZyBpY29uTmFtZSwgRE9NU3RyaW5nIHBsYXRmb3JtKTsKKyAgICBbRW5hYmxlZEF0 UnVudGltZT1Nb2Rlcm5NZWRpYUNvbnRyb2xzXSBET01TdHJpbmcgYmFzZTY0U3RyaW5nRm9ySWNv bk5hbWVBbmRUeXBlKERPTVN0cmluZyBpY29uTmFtZSwgRE9NU3RyaW5nIGljb25UeXBlKTsKIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9s cy9jb250cm9scy9pY29uLXNlcnZpY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVy bi1tZWRpYS1jb250cm9scy9jb250cm9scy9pY29uLXNlcnZpY2UuanMKaW5kZXggZGEwMGE2MWU4 ZmE5NzRkNTExMmViOWZhYzNjM2EwYTNmYzk0YThhMC4uMTZlMjA1NmYwOTZmNTI2M2RiZGMxYjBl NDQ3NjdiNjVhMjFkMDc5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rl cm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvaWNvbi1zZXJ2aWNlLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2ljb24tc2Vydmlj ZS5qcwpAQCAtNzAsNyArNzAsNyBAQCBjb25zdCBpY29uU2VydmljZSA9IG5ldyBjbGFzcyBJY29u U2VydmljZSB7CiAgICAgICAgIGltYWdlID0gdGhpcy5pbWFnZXNbcGF0aF0gPSBuZXcgSW1hZ2U7 CiAKICAgICAgICAgaWYgKHRoaXMubWVkaWFDb250cm9sc0hvc3QpCi0gICAgICAgICAgICBpbWFn ZS5zcmMgPSAiZGF0YTppbWFnZS9wbmc7YmFzZTY0LCIgKyB0aGlzLm1lZGlhQ29udHJvbHNIb3N0 LmJhc2U2NFN0cmluZ0Zvckljb25BbmRQbGF0Zm9ybShmaWxlTmFtZSwgcGxhdGZvcm0pOworICAg ICAgICAgICAgaW1hZ2Uuc3JjID0gImRhdGE6aW1hZ2UvcG5nO2Jhc2U2NCwiICsgdGhpcy5tZWRp YUNvbnRyb2xzSG9zdC5iYXNlNjRTdHJpbmdGb3JJY29uTmFtZUFuZFR5cGUoZmlsZU5hbWUsICJw bmciKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgaW1hZ2Uuc3JjID0gYCR7dGhpcy5kaXJl Y3RvcnlQYXRofS8ke3BhdGh9YDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDRiMTVmOTQ4OTI2Nzg3YmZjMmIwMGNkNDY3ZjYw ZDRjZmQwZDQ5YjUuLjZmNGZjOTliOTliMzFjYjAwYmM2NjE3MDk5NGFlOTEzNzc2ODE1ZjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oK QEAgLTMwMjYxLDcgKzMwMjYxLDcgQEAKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBv c3Rwcm9jZXNzaW5nID0gMDsKIAkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7Ci0JCQlzaGVsbFNjcmlw dCA9ICJXS0FfRElSPVwiJEJVSUxUX1BST0RVQ1RTX0RJUi91c3IvbG9jYWwvaW5jbHVkZS9XZWJL aXRBZGRpdGlvbnMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzXCJcblNSQ19ESVI9XCIkU1JDUk9PVC9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9sc1wiXG5EU1RfRElSPVwiJEJVSUxUX1BST0RVQ1RT X0RJUi8kVU5MT0NBTElaRURfUkVTT1VSQ0VTX0ZPTERFUl9QQVRIL21vZGVybi1tZWRpYS1jb250 cm9sc1wiXG5cbmlmIFsgLWQgXCIkV0tBX0RJUlwiIF07IHRoZW5cbiAgICBNTUNfRElSPSRXS0Ff RElSO1xuZWxzZVxuICAgIE1NQ19ESVI9JFNSQ19ESVJcbmZpXG5cbm1rZGlyIC1wIFwiJERTVF9E SVJcIlxuXG5pZiBbIFwiJHtQTEFURk9STV9OQU1FfVwiID09IFwibWFjb3N4XCIgXTsgdGhlblxu ICAgIElNR19PU19QUkVGSVg9XCJtYWNPU1wiXG5maVxuXG5pZiBbIFwiJHtQTEFURk9STV9OQU1F fVwiID09IFwiaXBob25lb3NcIiBdIHx8IFsgXCIke1BMQVRGT1JNX05BTUV9XCIgPT0gXCJpcGhv bmVzaW11bGF0b3JcIiBdOyB0aGVuXG4gICAgSU1HX09TX1BSRUZJWD1cImlPU1wiXG5maVxuXG5p ZiBbIC1uIFwiJElNR19PU19QUkVGSVhcIiBdOyB0aGVuXG4gICAgbWtkaXIgLXAgXCIkRFNUX0RJ Ui9pbWFnZXNcIlxuICAgIHJzeW5jIC1hcSAtLWV4Y2x1ZGUgXCIuc3ZuXCIgLS1leGNsdWRlIFwi LkRTX1N0b3JlXCIgXCIkTU1DX0RJUi9pbWFnZXMvJElNR19PU19QUkVGSVhcIiBcIiREU1RfRElS L2ltYWdlc1wiXG5maVxuXG5jZCBcIiRNTUNfRElSXCJcbmNhdCBjb250cm9scy8qLmNzcyA+IFwi JERTVF9ESVIvbW9kZXJuLW1lZGlhLWNvbnRyb2xzLmNzc1wiXG5jYXQgYGNhdCBqcy1maWxlc2Ag PiBcIiREU1RfRElSL21vZGVybi1tZWRpYS1jb250cm9scy5qc1wiIjsKKwkJCXNoZWxsU2NyaXB0 ID0gIldLQV9ESVI9XCIkQlVJTFRfUFJPRFVDVFNfRElSL3Vzci9sb2NhbC9pbmNsdWRlL1dlYktp dEFkZGl0aW9ucy9tb2Rlcm4tbWVkaWEtY29udHJvbHNcIlxuU1JDX0RJUj1cIiRTUkNST09UL01v ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzXCJcbkRTVF9ESVI9XCIkQlVJTFRfUFJPRFVDVFNf RElSLyRVTkxPQ0FMSVpFRF9SRVNPVVJDRVNfRk9MREVSX1BBVEgvbW9kZXJuLW1lZGlhLWNvbnRy b2xzXCJcblxuaWYgWyAtZCBcIiRXS0FfRElSXCIgXTsgdGhlblxuICAgIE1NQ19ESVI9JFdLQV9E SVI7XG5lbHNlXG4gICAgTU1DX0RJUj0kU1JDX0RJUlxuZmlcblxubWtkaXIgLXAgXCIkRFNUX0RJ UlwiXG5cbmlmIFsgXCIke1BMQVRGT1JNX05BTUV9XCIgPT0gXCJtYWNvc3hcIiBdOyB0aGVuXG4g ICAgSU1HX09TX1BSRUZJWD1cIm1hY09TXCJcbmZpXG5cbmlmIFsgXCIke1BMQVRGT1JNX05BTUV9 XCIgPT0gXCJpcGhvbmVvc1wiIF0gfHwgWyBcIiR7UExBVEZPUk1fTkFNRX1cIiA9PSBcImlwaG9u ZXNpbXVsYXRvclwiIF07IHRoZW5cbiAgICBJTUdfT1NfUFJFRklYPVwiaU9TXCJcbmZpXG5cbmlm IFsgLW4gXCIkSU1HX09TX1BSRUZJWFwiIF07IHRoZW5cbiAgICByc3luYyAtYXEgLS1leGNsdWRl IFwiLnN2blwiIC0tZXhjbHVkZSBcIi5EU19TdG9yZVwiIFwiJE1NQ19ESVIvaW1hZ2VzLyRJTUdf T1NfUFJFRklYL1wiIFwiJERTVF9ESVIvaW1hZ2VzXCJcbmZpXG5cbmNkIFwiJE1NQ19ESVJcIlxu Y2F0IGNvbnRyb2xzLyouY3NzID4gXCIkRFNUX0RJUi9tb2Rlcm4tbWVkaWEtY29udHJvbHMuY3Nz XCJcbmNhdCBgY2F0IGpzLWZpbGVzYCA+IFwiJERTVF9ESVIvbW9kZXJuLW1lZGlhLWNvbnRyb2xz LmpzXCIiOwogCQl9OwogCQlBNUU3OUNFQzFFNjdGMkNGMDBGQjgxNTMgLyogTWFrZSBGcmFtZXdv cmtzIFN5bWJvbGljIExpbmsgKi8gPSB7CiAJCQlpc2EgPSBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhh c2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCmluZGV4IDYxN2NhZGIxY2E2 OTIzNzZjZjViM2U1NzY0ZWI5NzdhNDZjMTNjZjAuLjg3M2MxYjBkYmE5OTNhNzg1NWM5ZjQ4ZWFk YTNjN2VmOTE3NWRkODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUaGVtZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCkBA IC0xMDEsNyArMTAxLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgU3RyaW5nIG1vZGVybk1lZGlh Q29udHJvbHNTdHlsZVNoZWV0KCkgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAgICB2aXJ0dWFsIFN0 cmluZyBleHRyYU1lZGlhQ29udHJvbHNTdHlsZVNoZWV0KCkgeyByZXR1cm4gU3RyaW5nKCk7IH0K ICAgICB2aXJ0dWFsIFN0cmluZyBtZWRpYUNvbnRyb2xzU2NyaXB0KCkgeyByZXR1cm4gU3RyaW5n KCk7IH0KLSAgICB2aXJ0dWFsIFN0cmluZyBtZWRpYUNvbnRyb2xzQmFzZTY0U3RyaW5nRm9ySWNv bkFuZFBsYXRmb3JtKGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpIHsgcmV0dXJuIFN0cmlu ZygpOyB9CisgICAgdmlydHVhbCBTdHJpbmcgbWVkaWFDb250cm9sc0Jhc2U2NFN0cmluZ0Zvcklj b25OYW1lQW5kVHlwZShjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmKSB7IHJldHVybiBTdHJp bmcoKTsgfQogI2VuZGlmCiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQogICAgIHZpcnR1YWwg U3RyaW5nIGV4dHJhRnVsbFNjcmVlblN0eWxlU2hlZXQoKSB7IHJldHVybiBTdHJpbmcoKTsgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MuaAppbmRleCAwYjFlNTQ1MTA3 ZWJlYTc5ZTc0NDg0OGU4N2Y2NmEzNDNjY2QwNTY2Li5iN2ZkOTg1MTkwZWI1ZGI0OWI2MDBlYjkz Y2Q5ZGViODRkNjBkZjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVJT1MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJ T1MuaApAQCAtMTA5LDcgKzEwOSw3IEBAIHByb3RlY3RlZDoKICAgICBTdHJpbmcgbWVkaWFDb250 cm9sc1N0eWxlU2hlZXQoKSBvdmVycmlkZTsKICAgICBTdHJpbmcgbW9kZXJuTWVkaWFDb250cm9s c1N0eWxlU2hlZXQoKSBvdmVycmlkZTsKICAgICBTdHJpbmcgbWVkaWFDb250cm9sc1NjcmlwdCgp IG92ZXJyaWRlOwotICAgIFN0cmluZyBtZWRpYUNvbnRyb2xzQmFzZTY0U3RyaW5nRm9ySWNvbkFu ZFBsYXRmb3JtKGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpIG92ZXJyaWRlOworICAgIFN0 cmluZyBtZWRpYUNvbnRyb2xzQmFzZTY0U3RyaW5nRm9ySWNvbk5hbWVBbmRUeXBlKGNvbnN0IFN0 cmluZyYsIGNvbnN0IFN0cmluZyYpIG92ZXJyaWRlOwogI2VuZGlmCiAKICNpZiBFTkFCTEUoQVRU QUNITUVOVF9FTEVNRU5UKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRoZW1lSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9T Lm1tCmluZGV4IGQ5ZjRmNzc5Yzk4MzMxYjUwZmJhMzVmMTQ0NTNjZGJiZTA1YWZmNzkuLmUwYzhl NDA3MDViYTQ1NzBhZThmOGViMTAyOGIyNzIzZGEwMzQ1NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KQEAgLTEzNzIsMTUgKzEzNzIsMTUgQEAgU3RyaW5n IFJlbmRlclRoZW1lSU9TOjptZWRpYUNvbnRyb2xzU2NyaXB0KCkKICNlbmRpZgogfQogCi1TdHJp bmcgUmVuZGVyVGhlbWVJT1M6Om1lZGlhQ29udHJvbHNCYXNlNjRTdHJpbmdGb3JJY29uQW5kUGxh dGZvcm0oY29uc3QgU3RyaW5nJiBpY29uTmFtZSwgY29uc3QgU3RyaW5nJiBwbGF0Zm9ybSkKK1N0 cmluZyBSZW5kZXJUaGVtZUlPUzo6bWVkaWFDb250cm9sc0Jhc2U2NFN0cmluZ0Zvckljb25OYW1l QW5kVHlwZShjb25zdCBTdHJpbmcmIGljb25OYW1lLCBjb25zdCBTdHJpbmcmIGljb25UeXBlKQog ewogI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCiAgICAgaWYgKCFSdW50aW1lRW5h YmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLm1vZGVybk1lZGlhQ29udHJvbHNFbmFibGVk KCkpCiAgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwogCi0gICAgU3RyaW5nIGRpcmVjdG9y eSA9ICJtb2Rlcm4tbWVkaWEtY29udHJvbHMvaW1hZ2VzLyIgKyBwbGF0Zm9ybTsKKyAgICBTdHJp bmcgZGlyZWN0b3J5ID0gIm1vZGVybi1tZWRpYS1jb250cm9scy9pbWFnZXMiOwogICAgIE5TQnVu ZGxlICpidW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6W1dlYkNvcmVSZW5kZXJUaGVt ZUJ1bmRsZSBjbGFzc11dOwotICAgIHJldHVybiBbW05TRGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZG aWxlOltidW5kbGUgcGF0aEZvclJlc291cmNlOmljb25OYW1lIG9mVHlwZTpAInBuZyIgaW5EaXJl Y3Rvcnk6ZGlyZWN0b3J5XV0gYmFzZTY0RW5jb2RlZFN0cmluZ1dpdGhPcHRpb25zOjBdOworICAg IHJldHVybiBbW05TRGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZGaWxlOltidW5kbGUgcGF0aEZvclJl c291cmNlOmljb25OYW1lIG9mVHlwZTppY29uVHlwZSBpbkRpcmVjdG9yeTpkaXJlY3RvcnldXSBi YXNlNjRFbmNvZGVkU3RyaW5nV2l0aE9wdGlvbnM6MF07CiAjZWxzZQogICAgIHJldHVybiBlbXB0 eVN0cmluZygpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVNYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1h Yy5oCmluZGV4IGYzOTAwYTAwM2ZlNDgwNmNmNDU1MTJjYWI0YzZhZjJjMTBjMjkyZmUuLjFkNDUz MmQ5MjRlYTE1ZDA2M2QwMDg3MTBjNDNkMzEwZjExZDhmYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oCkBAIC0xMDksNyArMTA5LDcgQEAgcHJvdGVjdGVkOgog ICAgIFN0cmluZyBtZWRpYUNvbnRyb2xzU3R5bGVTaGVldCgpIG92ZXJyaWRlOwogICAgIFN0cmlu ZyBtb2Rlcm5NZWRpYUNvbnRyb2xzU3R5bGVTaGVldCgpIG92ZXJyaWRlOwogICAgIFN0cmluZyBt ZWRpYUNvbnRyb2xzU2NyaXB0KCkgb3ZlcnJpZGU7Ci0gICAgU3RyaW5nIG1lZGlhQ29udHJvbHNC YXNlNjRTdHJpbmdGb3JJY29uQW5kUGxhdGZvcm0oY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5n Jikgb3ZlcnJpZGU7CisgICAgU3RyaW5nIG1lZGlhQ29udHJvbHNCYXNlNjRTdHJpbmdGb3JJY29u TmFtZUFuZFR5cGUoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJikgb3ZlcnJpZGU7CiAjZW5k aWYKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lTWFjLm1tCmluZGV4IDliNTVlZjZmNzk2ZjhlN2M4NzcwOTVkYjI5MjQy NWY0ZTc0YTgyNjMuLmVmYzk4ZjBiOTdhNGU4ODEwMDJmYmFmYjQ2YTczODIxMjkwZTE3OTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KQEAgLTI5MiwxNSAr MjkyLDE1IEBAIFN0cmluZyBSZW5kZXJUaGVtZU1hYzo6bWVkaWFDb250cm9sc1NjcmlwdCgpCiAj ZW5kaWYKIH0KIAotU3RyaW5nIFJlbmRlclRoZW1lTWFjOjptZWRpYUNvbnRyb2xzQmFzZTY0U3Ry aW5nRm9ySWNvbkFuZFBsYXRmb3JtKGNvbnN0IFN0cmluZyYgaWNvbk5hbWUsIGNvbnN0IFN0cmlu ZyYgcGxhdGZvcm0pCitTdHJpbmcgUmVuZGVyVGhlbWVNYWM6Om1lZGlhQ29udHJvbHNCYXNlNjRT dHJpbmdGb3JJY29uTmFtZUFuZFR5cGUoY29uc3QgU3RyaW5nJiBpY29uTmFtZSwgY29uc3QgU3Ry aW5nJiBpY29uVHlwZSkKIHsKICNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQogICAg IGlmICghUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5tb2Rlcm5NZWRp YUNvbnRyb2xzRW5hYmxlZCgpKQogICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKIAotICAg IFN0cmluZyBkaXJlY3RvcnkgPSAibW9kZXJuLW1lZGlhLWNvbnRyb2xzL2ltYWdlcy8iICsgcGxh dGZvcm07CisgICAgU3RyaW5nIGRpcmVjdG9yeSA9ICJtb2Rlcm4tbWVkaWEtY29udHJvbHMvaW1h Z2VzIjsKICAgICBOU0J1bmRsZSAqYnVuZGxlID0gW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOltX ZWJDb3JlUmVuZGVyVGhlbWVCdW5kbGUgY2xhc3NdXTsKLSAgICByZXR1cm4gW1tOU0RhdGEgZGF0 YVdpdGhDb250ZW50c09mRmlsZTpbYnVuZGxlIHBhdGhGb3JSZXNvdXJjZTppY29uTmFtZSBvZlR5 cGU6QCJwbmciIGluRGlyZWN0b3J5OmRpcmVjdG9yeV1dIGJhc2U2NEVuY29kZWRTdHJpbmdXaXRo T3B0aW9uczowXTsKKyAgICByZXR1cm4gW1tOU0RhdGEgZGF0YVdpdGhDb250ZW50c09mRmlsZTpb YnVuZGxlIHBhdGhGb3JSZXNvdXJjZTppY29uTmFtZSBvZlR5cGU6aWNvblR5cGUgaW5EaXJlY3Rv cnk6ZGlyZWN0b3J5XV0gYmFzZTY0RW5jb2RlZFN0cmluZ1dpdGhPcHRpb25zOjBdOwogI2Vsc2UK ICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKICNlbmRpZgo=