164124 2016-10-28 06:05:41 -0700 New CSS Parser should use Colors not RGBA32s 2016-10-28 11:57:21 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino hyatt webkit-bug-importer oldest_to_newest 1245562 0 dino 2016-10-28 06:05:41 -0700 New CSS Parser should use Colors not RGBA32s 1245563 1 dino 2016-10-28 06:07:38 -0700 <rdar://problem/29000373> 1245564 2 293148 dino 2016-10-28 06:13:44 -0700 Created attachment 293148 Patch 1245667 3 293148 darin 2016-10-28 11:04:15 -0700 Comment on attachment 293148 Patch So annoying how Color is intrinsically optional, and so when a function returns Color you can’t tell whether it’s optional or not. 1245692 4 dino 2016-10-28 11:57:21 -0700 Committed r208060: <http://trac.webkit.org/changeset/208060> 293148 2016-10-28 06:13:44 -0700 2016-10-28 11:04:15 -0700 Patch bug-164124-20161029000950.patch text/plain 8998 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjA4MDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjhmMWI2NmM4OWI0Y2Iy YzFhMDVmN2ZiM2I1NTYwNTVhNjNiODQ4MS4uNjY2NmQ0MTE5ZTU5MmFjNzBiNzRhMTlhZTdjOTAw OTA5ZDZjY2M3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE2LTEwLTI4ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAorICAgICAgICBOZXcgQ1NTIFBhcnNlciBzaG91 bGQgdXNlIENvbG9ycyBub3QgUkdCQTMycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTY0MTI0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTAwMDM3 Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg b2xkIHBhcnNlciBoYXMgbW92ZWQgZnJvbSB1c2luZyBSR0JBMzIgdmFsdWVzIHRvIHVzaW5nCisg ICAgICAgIENvbG9ycyBkaXJlY3RseS4gVGhpcyB3YXMgc28gd2UgY291bGQgc3VwcG9ydCBFeHRl bmRlZENvbG9ycworICAgICAgICB2aWEgdGhlIG5ldyBjb2xvcigpIHN5bnRheC4KKworICAgICAg ICBVcGRhdGUgdGhlIG5ldyBDU1MgcGFyc2VyIHRvIGRvIHRoZSBzYW1lLgorCisgICAgICAgICog Y3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpwYXJzZVJHQlBhcmFtZXRlcnMpOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpwYXJzZUhTTFBhcmFtZXRlcnMp OgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpwYXJzZUhleENv bG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VySGVscGVyczo6cGFyc2VD b2xvckZ1bmN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VySGVscGVy czo6Y29uc3VtZUNvbG9yKToKKworMjAxNi0xMC0yOCAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBs ZS5jb20+CisKICAgICAgICAgQWxsb3cgbmV3IENTUyBwYXJzZXIgdG8gaGFuZGxlIGluc2VydFJ1 bGUsIGV0YyB2aWEgcGFyc2VSdWxlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNjQxMjIKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI5MDAwMTAxPgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhl bHBlcnMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhl bHBlcnMuY3BwCmluZGV4IGFhMGIwYzJmNDAxZDU3NDVjNzIxMTQyZDdjY2EwNDUzZDZhOGVlOWMu LjA1M2Q0YTQ4MTNmOTZiMGQ0ZDAxNGMzNDk2NTczNTc4OGE5MWY3YTUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VySGVscGVycy5jcHAK QEAgLTM4OSw4NCArMzg5LDkzIEBAIHN0YXRpYyBpbnQgY2xhbXBSR0JDb21wb25lbnQoY29uc3Qg Q1NTUHJpbWl0aXZlVmFsdWUmIHZhbHVlKQogICAgIHJldHVybiBjbGFtcFRvPGludD4ocmVzdWx0 LCAwLCAyNTUpOwogfQogCi1zdGF0aWMgYm9vbCBwYXJzZVJHQlBhcmFtZXRlcnMoQ1NTUGFyc2Vy VG9rZW5SYW5nZSYgcmFuZ2UsIFJHQkEzMiYgcmVzdWx0LCBib29sIHBhcnNlQWxwaGEpCitzdGF0 aWMgQ29sb3IgcGFyc2VSR0JQYXJhbWV0ZXJzKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBi b29sIHBhcnNlQWxwaGEpCiB7CiAgICAgQVNTRVJUKHJhbmdlLnBlZWsoKS5mdW5jdGlvbklkKCkg PT0gQ1NTVmFsdWVSZ2IgfHwgcmFuZ2UucGVlaygpLmZ1bmN0aW9uSWQoKSA9PSBDU1NWYWx1ZVJn YmEpOworICAgIENvbG9yIHJlc3VsdDsKICAgICBDU1NQYXJzZXJUb2tlblJhbmdlIGFyZ3MgPSBj b25zdW1lRnVuY3Rpb24ocmFuZ2UpOwogICAgIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29s b3JQYXJhbWV0ZXIgPSBjb25zdW1lSW50ZWdlcihhcmdzKTsKICAgICBpZiAoIWNvbG9yUGFyYW1l dGVyKQogICAgICAgICBjb2xvclBhcmFtZXRlciA9IGNvbnN1bWVQZXJjZW50KGFyZ3MsIFZhbHVl UmFuZ2VBbGwpOwogICAgIGlmICghY29sb3JQYXJhbWV0ZXIpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAgICAgcmV0dXJuIENvbG9yKCk7CiAgICAgY29uc3QgYm9vbCBpc1BlcmNlbnQgPSBj b2xvclBhcmFtZXRlci0+aXNQZXJjZW50YWdlKCk7CiAgICAgaW50IGNvbG9yQXJyYXlbM107CiAg ICAgY29sb3JBcnJheVswXSA9IGNsYW1wUkdCQ29tcG9uZW50KCpjb2xvclBhcmFtZXRlcik7CiAg ICAgZm9yIChpbnQgaSA9IDE7IGkgPCAzOyBpKyspIHsKICAgICAgICAgaWYgKCFjb25zdW1lQ29t bWFJbmNsdWRpbmdXaGl0ZXNwYWNlKGFyZ3MpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgICAgICAgICAgcmV0dXJuIENvbG9yKCk7CiAgICAgICAgIGNvbG9yUGFyYW1ldGVyID0gaXNQ ZXJjZW50ID8gY29uc3VtZVBlcmNlbnQoYXJncywgVmFsdWVSYW5nZUFsbCkgOiBjb25zdW1lSW50 ZWdlcihhcmdzKTsKICAgICAgICAgaWYgKCFjb2xvclBhcmFtZXRlcikKLSAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybiBDb2xvcigpOwogICAgICAgICBjb2xvckFy cmF5W2ldID0gY2xhbXBSR0JDb21wb25lbnQoKmNvbG9yUGFyYW1ldGVyKTsKICAgICB9CiAgICAg aWYgKHBhcnNlQWxwaGEpIHsKICAgICAgICAgaWYgKCFjb25zdW1lQ29tbWFJbmNsdWRpbmdXaGl0 ZXNwYWNlKGFyZ3MpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgcmV0 dXJuIENvbG9yKCk7CiAgICAgICAgIGRvdWJsZSBhbHBoYTsKICAgICAgICAgaWYgKCFjb25zdW1l TnVtYmVyUmF3KGFyZ3MsIGFscGhhKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAg ICAgICAgIHJldHVybiBDb2xvcigpOwogICAgICAgICAvLyBDb252ZXJ0IHRoZSBmbG9hdGluZyBw b2ludGVyIG51bWJlciBvZiBhbHBoYSB0byBhbiBpbnRlZ2VyIGluIHRoZSByYW5nZSBbMCwgMjU2 KSwKICAgICAgICAgLy8gd2l0aCBhbiBlcXVhbCBkaXN0cmlidXRpb24gYWNyb3NzIGFsbCAyNTYg dmFsdWVzLgogICAgICAgICBpbnQgYWxwaGFDb21wb25lbnQgPSBzdGF0aWNfY2FzdDxpbnQ+KGNs YW1wVG88ZG91YmxlPihhbHBoYSwgMC4wLCAxLjApICogbmV4dGFmdGVyKDI1Ni4wLCAwLjApKTsK LSAgICAgICAgcmVzdWx0ID0gbWFrZVJHQkEoY29sb3JBcnJheVswXSwgY29sb3JBcnJheVsxXSwg Y29sb3JBcnJheVsyXSwgYWxwaGFDb21wb25lbnQpOworICAgICAgICByZXN1bHQgPSBDb2xvciht YWtlUkdCQShjb2xvckFycmF5WzBdLCBjb2xvckFycmF5WzFdLCBjb2xvckFycmF5WzJdLCBhbHBo YUNvbXBvbmVudCkpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHJlc3VsdCA9IG1ha2VSR0IoY29s b3JBcnJheVswXSwgY29sb3JBcnJheVsxXSwgY29sb3JBcnJheVsyXSk7CisgICAgICAgIHJlc3Vs dCA9IENvbG9yKG1ha2VSR0IoY29sb3JBcnJheVswXSwgY29sb3JBcnJheVsxXSwgY29sb3JBcnJh eVsyXSkpOwogICAgIH0KLSAgICByZXR1cm4gYXJncy5hdEVuZCgpOworCisgICAgaWYgKCFhcmdz LmF0RW5kKCkpCisgICAgICAgIHJldHVybiBDb2xvcigpOworCisgICAgcmV0dXJuIHJlc3VsdDsK IH0KIAotc3RhdGljIGJvb2wgcGFyc2VIU0xQYXJhbWV0ZXJzKENTU1BhcnNlclRva2VuUmFuZ2Um IHJhbmdlLCBSR0JBMzImIHJlc3VsdCwgYm9vbCBwYXJzZUFscGhhKQorc3RhdGljIENvbG9yIHBh cnNlSFNMUGFyYW1ldGVycyhDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgYm9vbCBwYXJzZUFs cGhhKQogewogICAgIEFTU0VSVChyYW5nZS5wZWVrKCkuZnVuY3Rpb25JZCgpID09IENTU1ZhbHVl SHNsIHx8IHJhbmdlLnBlZWsoKS5mdW5jdGlvbklkKCkgPT0gQ1NTVmFsdWVIc2xhKTsKICAgICBD U1NQYXJzZXJUb2tlblJhbmdlIGFyZ3MgPSBjb25zdW1lRnVuY3Rpb24ocmFuZ2UpOwogICAgIFJl ZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gaHNsVmFsdWUgPSBjb25zdW1lTnVtYmVyKGFyZ3MsIFZh bHVlUmFuZ2VBbGwpOwogICAgIGlmICghaHNsVmFsdWUpCi0gICAgICAgIHJldHVybiBmYWxzZTsK KyAgICAgICAgcmV0dXJuIENvbG9yKCk7CiAgICAgZG91YmxlIGNvbG9yQXJyYXlbM107CiAgICAg Y29sb3JBcnJheVswXSA9ICgoKGhzbFZhbHVlLT5pbnRWYWx1ZSgpICUgMzYwKSArIDM2MCkgJSAz NjApIC8gMzYwLjA7CiAgICAgZm9yIChpbnQgaSA9IDE7IGkgPCAzOyBpKyspIHsKICAgICAgICAg aWYgKCFjb25zdW1lQ29tbWFJbmNsdWRpbmdXaGl0ZXNwYWNlKGFyZ3MpKQotICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIENvbG9yKCk7CiAgICAgICAgIGhzbFZh bHVlID0gY29uc3VtZVBlcmNlbnQoYXJncywgVmFsdWVSYW5nZUFsbCk7CiAgICAgICAgIGlmICgh aHNsVmFsdWUpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4g Q29sb3IoKTsKICAgICAgICAgZG91YmxlIGRvdWJsZVZhbHVlID0gaHNsVmFsdWUtPmRvdWJsZVZh bHVlKCk7CiAgICAgICAgIGNvbG9yQXJyYXlbaV0gPSBjbGFtcFRvPGRvdWJsZT4oZG91YmxlVmFs dWUsIDAuMCwgMTAwLjApIC8gMTAwLjA7IC8vIE5lZWRzIHRvIGJlIHZhbHVlIGJldHdlZW4gMCBh bmQgMS4wLgogICAgIH0KICAgICBkb3VibGUgYWxwaGEgPSAxLjA7CiAgICAgaWYgKHBhcnNlQWxw aGEpIHsKICAgICAgICAgaWYgKCFjb25zdW1lQ29tbWFJbmNsdWRpbmdXaGl0ZXNwYWNlKGFyZ3Mp KQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIENvbG9yKCk7 CiAgICAgICAgIGlmICghY29uc3VtZU51bWJlclJhdyhhcmdzLCBhbHBoYSkpCi0gICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gQ29sb3IoKTsKICAgICAgICAgYWxw aGEgPSBjbGFtcFRvPGRvdWJsZT4oYWxwaGEsIDAuMCwgMS4wKTsKICAgICB9Ci0gICAgcmVzdWx0 ID0gbWFrZVJHQkFGcm9tSFNMQShjb2xvckFycmF5WzBdLCBjb2xvckFycmF5WzFdLCBjb2xvckFy cmF5WzJdLCBhbHBoYSk7Ci0gICAgcmV0dXJuIGFyZ3MuYXRFbmQoKTsKKworICAgIGlmICghYXJn cy5hdEVuZCgpKQorICAgICAgICByZXR1cm4gQ29sb3IoKTsKKworICAgIHJldHVybiBDb2xvciht YWtlUkdCQUZyb21IU0xBKGNvbG9yQXJyYXlbMF0sIGNvbG9yQXJyYXlbMV0sIGNvbG9yQXJyYXlb Ml0sIGFscGhhKSk7CiB9CiAKLXN0YXRpYyBib29sIHBhcnNlSGV4Q29sb3IoQ1NTUGFyc2VyVG9r ZW5SYW5nZSYgcmFuZ2UsIFJHQkEzMiYgcmVzdWx0LCBib29sIGFjY2VwdFF1aXJreUNvbG9ycykK K3N0YXRpYyBDb2xvciBwYXJzZUhleENvbG9yKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBi b29sIGFjY2VwdFF1aXJreUNvbG9ycykKIHsKKyAgICBSR0JBMzIgcmVzdWx0OwogICAgIGNvbnN0 IENTU1BhcnNlclRva2VuJiB0b2tlbiA9IHJhbmdlLnBlZWsoKTsKICAgICBpZiAodG9rZW4udHlw ZSgpID09IEhhc2hUb2tlbikgewogICAgICAgICBpZiAoIUNvbG9yOjpwYXJzZUhleENvbG9yKHRv a2VuLnZhbHVlKCksIHJlc3VsdCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAg ICAgICByZXR1cm4gQ29sb3IoKTsKICAgICB9IGVsc2UgaWYgKGFjY2VwdFF1aXJreUNvbG9ycykg ewogICAgICAgICBTdHJpbmcgY29sb3I7CiAgICAgICAgIGlmICh0b2tlbi50eXBlKCkgPT0gTnVt YmVyVG9rZW4gfHwgdG9rZW4udHlwZSgpID09IERpbWVuc2lvblRva2VuKSB7CiAgICAgICAgICAg ICBpZiAodG9rZW4ubnVtZXJpY1ZhbHVlVHlwZSgpICE9IEludGVnZXJWYWx1ZVR5cGUKICAgICAg ICAgICAgICAgICB8fCB0b2tlbi5udW1lcmljVmFsdWUoKSA8IDAuIHx8IHRva2VuLm51bWVyaWNW YWx1ZSgpID49IDEwMDAwMDAuKQotICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAg ICAgICAgICAgICByZXR1cm4gQ29sb3IoKTsKICAgICAgICAgICAgIGlmICh0b2tlbi50eXBlKCkg PT0gTnVtYmVyVG9rZW4pIC8vIGUuZy4gMTEyMjMzCiAgICAgICAgICAgICAgICAgY29sb3IgPSBT dHJpbmc6OmZvcm1hdCgiJWQiLCBzdGF0aWNfY2FzdDxpbnQ+KHRva2VuLm51bWVyaWNWYWx1ZSgp KSk7CiAgICAgICAgICAgICBlbHNlIC8vIGUuZy4gMDAwMUZGCkBAIC00NzgsMjcgKzQ4NywzOCBA QCBzdGF0aWMgYm9vbCBwYXJzZUhleENvbG9yKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBS R0JBMzImIHJlc3VsdCwgYm9vbCBhY2NlcAogICAgICAgICB9CiAgICAgICAgIHVuc2lnbmVkIGxl bmd0aCA9IGNvbG9yLmxlbmd0aCgpOwogICAgICAgICBpZiAobGVuZ3RoICE9IDMgJiYgbGVuZ3Ro ICE9IDYpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gQ29s b3IoKTsKICAgICAgICAgaWYgKCFDb2xvcjo6cGFyc2VIZXhDb2xvcihjb2xvciwgcmVzdWx0KSkK LSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybiBDb2xvcigpOwog ICAgIH0gZWxzZSB7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuIENvbG9y KCk7CiAgICAgfQogICAgIHJhbmdlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNlKCk7Ci0gICAg cmV0dXJuIHRydWU7CisgICAgcmV0dXJuIENvbG9yKHJlc3VsdCk7CiB9CiAKLXN0YXRpYyBib29s IHBhcnNlQ29sb3JGdW5jdGlvbihDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgUkdCQTMyJiBy ZXN1bHQpCitzdGF0aWMgQ29sb3IgcGFyc2VDb2xvckZ1bmN0aW9uKENTU1BhcnNlclRva2VuUmFu Z2UmIHJhbmdlKQogewotICAgIENTU1ZhbHVlSUQgZnVuY3Rpb25JZCA9IHJhbmdlLnBlZWsoKS5m dW5jdGlvbklkKCk7Ci0gICAgaWYgKGZ1bmN0aW9uSWQgPCBDU1NWYWx1ZVJnYiB8fCBmdW5jdGlv bklkID4gQ1NTVmFsdWVIc2xhKQotICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgQ1NTUGFyc2Vy VG9rZW5SYW5nZSBjb2xvclJhbmdlID0gcmFuZ2U7Ci0gICAgaWYgKChmdW5jdGlvbklkIDw9IENT U1ZhbHVlUmdiYSAmJiAhcGFyc2VSR0JQYXJhbWV0ZXJzKGNvbG9yUmFuZ2UsIHJlc3VsdCwgZnVu Y3Rpb25JZCA9PSBDU1NWYWx1ZVJnYmEpKQotICAgICAgICB8fCAoZnVuY3Rpb25JZCA+PSBDU1NW YWx1ZUhzbCAmJiAhcGFyc2VIU0xQYXJhbWV0ZXJzKGNvbG9yUmFuZ2UsIHJlc3VsdCwgZnVuY3Rp b25JZCA9PSBDU1NWYWx1ZUhzbGEpKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIENTU1Zh bHVlSUQgZnVuY3Rpb25JZCA9IHJhbmdlLnBlZWsoKS5mdW5jdGlvbklkKCk7CisgICAgQ29sb3Ig Y29sb3I7CisgICAgc3dpdGNoIChmdW5jdGlvbklkKSB7CisgICAgY2FzZSBDU1NWYWx1ZVJnYjoK KyAgICBjYXNlIENTU1ZhbHVlUmdiYToKKyAgICAgICAgY29sb3IgPSBwYXJzZVJHQlBhcmFtZXRl cnMoY29sb3JSYW5nZSwgZnVuY3Rpb25JZCA9PSBDU1NWYWx1ZVJnYmEpOworICAgICAgICBicmVh azsKKyAgICBjYXNlIENTU1ZhbHVlSHNsOgorICAgIGNhc2UgQ1NTVmFsdWVIc2xhOgorICAgICAg ICBjb2xvciA9IHBhcnNlSFNMUGFyYW1ldGVycyhjb2xvclJhbmdlLCBmdW5jdGlvbklkID09IENT U1ZhbHVlSHNsYSk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ1NTVmFsdWVDb2xvcjoKKyAg ICAgICAgLy8gRklYTUUtTkVXUEFSU0VSOiBBZGQgc3VwcG9ydCBmb3IgY29sb3IoKS4KKyAgICAg ICAgcmV0dXJuIENvbG9yKCk7CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIENvbG9yKCk7 CisgICAgfQogICAgIHJhbmdlID0gY29sb3JSYW5nZTsKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICBy ZXR1cm4gY29sb3I7CiB9CiAKIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29uc3VtZUNvbG9y KENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBDU1NQYXJzZXJNb2RlIGNzc1BhcnNlck1vZGUs IGJvb2wgYWNjZXB0UXVpcmt5Q29sb3JzKQpAQCAtNTA5LDEwICs1MjksMTIgQEAgUmVmUHRyPENT U1ByaW1pdGl2ZVZhbHVlPiBjb25zdW1lQ29sb3IoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2Us IENTU1BhcnNlck1vZGUKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICByZXR1 cm4gY29uc3VtZUlkZW50KHJhbmdlKTsKICAgICB9Ci0gICAgUkdCQTMyIGNvbG9yID0gQ29sb3I6 OnRyYW5zcGFyZW50OwotICAgIGlmICghcGFyc2VIZXhDb2xvcihyYW5nZSwgY29sb3IsIGFjY2Vw dFF1aXJreUNvbG9ycykgJiYgIXBhcnNlQ29sb3JGdW5jdGlvbihyYW5nZSwgY29sb3IpKQorICAg IENvbG9yIGNvbG9yID0gcGFyc2VIZXhDb2xvcihyYW5nZSwgYWNjZXB0UXVpcmt5Q29sb3JzKTsK KyAgICBpZiAoIWNvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgY29sb3IgPSBwYXJzZUNvbG9yRnVu Y3Rpb24ocmFuZ2UpOworICAgIGlmICghY29sb3IuaXNWYWxpZCgpKQogICAgICAgICByZXR1cm4g bnVsbHB0cjsKLSAgICByZXR1cm4gQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVWYWx1 ZShDb2xvcihjb2xvcikpOworICAgIHJldHVybiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNy ZWF0ZVZhbHVlKGNvbG9yKTsKIH0KIAogc3RhdGljIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4g Y29uc3VtZVBvc2l0aW9uQ29tcG9uZW50KENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBDU1NQ YXJzZXJNb2RlIGNzc1BhcnNlck1vZGUsIFVuaXRsZXNzUXVpcmsgdW5pdGxlc3MpCg==