192639 2018-12-12 14:32:25 -0800 REGRESSION (r230064): Focus rings on webpages are fainter than in native UI 2018-12-13 11:56:53 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified macOS 10.14 RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy bdakin commit-queue thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1487334 0 timothy 2018-12-12 14:32:25 -0800 Focus ring color is expected to be opaque, since opacity used a paint time. We we getting this by accident before when the old RenderThemeMac::systemColor() used convertNSColorToColor(), which ignored alpha on NSColor. 1487336 1 timothy 2018-12-12 14:32:36 -0800 <rdar://problem/42669297> 1487337 2 webkit-bug-importer 2018-12-12 14:33:34 -0800 <rdar://problem/46675739> 1487339 3 timothy 2018-12-12 14:38:03 -0800 <rdar://problem/42669297> 1487628 4 357239 timothy 2018-12-13 10:59:41 -0800 Created attachment 357239 Patch 1487648 5 commit-queue 2018-12-13 11:56:07 -0800 The commit-queue encountered the following flaky tests while processing attachment 357239: imported/w3c/web-platform-tests/FileAPI/idlharness.worker.html bug 192673 The commit-queue is continuing to process your patch. 1487650 6 357239 commit-queue 2018-12-13 11:56:52 -0800 Comment on attachment 357239 Patch Clearing flags on attachment: 357239 Committed r239173: <https://trac.webkit.org/changeset/239173> 1487651 7 commit-queue 2018-12-13 11:56:53 -0800 All reviewed patches have been landed. Closing bug. 357239 2018-12-13 10:59:41 -0800 2018-12-13 11:56:52 -0800 Patch bug-192639-20181213105941.patch text/plain 13531 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5MDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmJjMzMzODRlMDVlMzVj ZmJhNGI2MjgyN2I1MWFjODdlMGY4ZDYwNi4uMWMxMDVmZGI5MmZkMDFlNTFhNzg3MjY3N2NiYTE3 ZDJjM2Y2ODE4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE4LTEyLTEzICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChy MjMwMDY0KTogRm9jdXMgcmluZ3Mgb24gd2VicGFnZXMgYXJlIGZhaW50ZXIgdGhhbiBpbiBuYXRp dmUgVUkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTI2MzkKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNDI2NjkyOTcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZm9jdXMgcmluZyBjb2xvciBwYXNz ZWQgdG8gQ29yZUdyYXBoaWNzIGlzIGV4cGVjdGVkIHRvIGJlIG9wYXF1ZSwgc2luY2UgdGhleQor ICAgICAgICB3aWxsIGFwcGx5IG9wYWNpdHkgd2hlbiBkcmF3aW5nIChiZWNhdXNlIG9wYWNpdHkg aXMgbm9ybWFsbHkgYW5pbWF0ZWQpLgorICAgICAgICBXZSB3ZXJlIGdldHRpbmcgdGhpcyBieSBh Y2NpZGVudCBiZWZvcmUgd2hlbiB0aGUgb2xkIGBSZW5kZXJUaGVtZU1hYzo6c3lzdGVtQ29sb3Io KWAKKyAgICAgICAgdXNlZCB0aGUgb2xkIGBjb252ZXJ0TlNDb2xvclRvQ29sb3IoKWAsIHdoaWNo IGlnbm9yZWQgYWxwaGEgb24gTlNDb2xvci4KKyAgICAgICAgRXhpc3RpbmcgdGVzdHMgdXNlIGZp eGVkIHRlc3QgZm9jdXMgcmluZyBjb2xvci4KKworICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmNvbG9yRnJvbVByaW1pdGl2 ZVZhbHVlIGNvbnN0KTogVXNlIFJlbmRlclRoZW1lIHNpbmdsZXRvbiBmb3IgYGZvY3VzUmluZ0Nv bG9yKClgLgorICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdGb2N1 c0lmTmVlZGVkSW50ZXJuYWwpOiBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OmRyYXdGb2N1 c1JpbmdBdFRpbWUpOiBVc2UgYENHQ29udGV4dFN0YXRlU2F2ZXJgLgorICAgICAgICAqIHBsYXRm b3JtL21hYy9UaGVtZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmRyYXdDZWxsRm9jdXNSaW5n V2l0aEZyYW1lQXRUaW1lKTogRm9yY2UgYWxwaGEgdG8gMSBvbiB0aGUgZm9jdXMgcmluZyBjb2xv ci4gVXNlIGBDR0NvbnRleHRTdGF0ZVNhdmVyYC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjpwYWludEZvY3Vz UmluZyk6IFVzZSBSZW5kZXJUaGVtZSBzaW5nbGV0b24gZm9yIGBmb2N1c1JpbmdDb2xvcigpYC4K KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVySW1hZ2U6OnBhaW50QXJlYUVsZW1lbnRGb2N1c1JpbmcpOiBEaXR0by4KKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhl bWU6OmZvY3VzUmluZ0NvbG9yIGNvbnN0KTogTWFkZSBjb25zdC4gQ2FjaGUgdGhlIHJlc3VsdCBv ZiBgcGxhdGZvcm1Gb2N1c1JpbmdDb2xvcigpYC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy VGhlbWUuaDogTWFkZSBgZm9jdXNSaW5nQ29sb3IoKWAgYSBtZW1iZXIgZnVuY3Rpb24gaW5zdGVh ZCBvZiBzdGF0aWMuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6OnBsYXRmb3JtRm9jdXNSaW5nQ29sb3IgY29u c3QpOiBGb3JjZSBhbHBoYSB0byAxIG9uIHRoZSBmb2N1cyByaW5nIGNvbG9yLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6OnN5c3RlbUNvbG9yIGNvbnN0KTogVXNlIGBmb2N1c1Jp bmdDb2xvcigpYCwgaW5zdGVhZCBvZiBjYWNoaW5nIGNvbG9yIGhlcmUuCisKIDIwMTgtMTItMTAg IEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgU1ZHVmlld1Nw ZWMgb2JqZWN0cyBzaG91bGQgbWFyayByZWxldmFudCBTVkcgZWxlbWVudHMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCBlY2ZhNGM1NjBmYWMzY2MwZDJlMDRiMzlmNzVlMjE2 M2U3OTQzMTIzLi43NGZhM2Y1Mzk4ZmU2ZmJlNDI0NmNlNmMxMGQzOGQ1OWY4ZTJiM2E2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0xODY1LDcgKzE4NjUsNyBAQCBDb2xv ciBTdHlsZVJlc29sdmVyOjpjb2xvckZyb21QcmltaXRpdmVWYWx1ZShjb25zdCBDU1NQcmltaXRp dmVWYWx1ZSYgdmFsdWUsIGJvbwogICAgIGNhc2UgQ1NTVmFsdWVXZWJraXRBY3RpdmVsaW5rOgog ICAgICAgICByZXR1cm4gZG9jdW1lbnQoKS5hY3RpdmVMaW5rQ29sb3IoKTsKICAgICBjYXNlIENT U1ZhbHVlV2Via2l0Rm9jdXNSaW5nQ29sb3I6Ci0gICAgICAgIHJldHVybiBSZW5kZXJUaGVtZTo6 Zm9jdXNSaW5nQ29sb3IoZG9jdW1lbnQoKS5zdHlsZUNvbG9yT3B0aW9ucyhtX3N0YXRlLnN0eWxl KCkpKTsKKyAgICAgICAgcmV0dXJuIFJlbmRlclRoZW1lOjpzaW5nbGV0b24oKS5mb2N1c1JpbmdD b2xvcihkb2N1bWVudCgpLnN0eWxlQ29sb3JPcHRpb25zKG1fc3RhdGUuc3R5bGUoKSkpOwogICAg IGNhc2UgQ1NTVmFsdWVDdXJyZW50Y29sb3I6CiAgICAgICAgIC8vIENvbG9yIGlzIGFuIGluaGVy aXRlZCBwcm9wZXJ0eSBzbyBkZXBlbmRpbmcgb24gaXQgZWZmZWN0aXZlbHkgbWFrZXMgdGhlIHBy b3BlcnR5IGluaGVyaXRlZC4KICAgICAgICAgLy8gRklYTUU6IFNldHRpbmcgdGhlIGZsYWcgYXMg YSBzaWRlIGVmZmVjdCBvZiBjYWxsaW5nIHRoaXMgZnVuY3Rpb24gaXMgYSBiaXQgb2JsaXF1ZS4g Q2FuIHdlIGRvIGJldHRlcj8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFz L0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh cy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCmluZGV4IGRhMWM4MGZkMmZkODExMGQ5ZjU4 YzczMjEzYmRjODNiZWJkMDJmN2YuLjI4NjM4YzZjODNhNWRkY2ExYzNhZmQwYmZjNjA2ZDE0YmEw MTg4NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRl cmluZ0NvbnRleHQyRC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJELmNwcApAQCAtODYsNyArODYsNyBAQCB2b2lkIENhbnZhc1JlbmRl cmluZ0NvbnRleHQyRDo6ZHJhd0ZvY3VzSWZOZWVkZWRJbnRlcm5hbChjb25zdCBQYXRoJiBwYXRo LCBFbGVtZQogICAgIGF1dG8qIGNvbnRleHQgPSBkcmF3aW5nQ29udGV4dCgpOwogICAgIGlmICgh ZWxlbWVudC5mb2N1c2VkKCkgfHwgIXN0YXRlKCkuaGFzSW52ZXJ0aWJsZVRyYW5zZm9ybSB8fCBw YXRoLmlzRW1wdHkoKSB8fCAhZWxlbWVudC5pc0Rlc2NlbmRhbnRPZihjYW52YXMoKSkgfHwgIWNv bnRleHQpCiAgICAgICAgIHJldHVybjsKLSAgICBjb250ZXh0LT5kcmF3Rm9jdXNSaW5nKHBhdGgs IDEsIDEsIFJlbmRlclRoZW1lOjpmb2N1c1JpbmdDb2xvcihlbGVtZW50LmRvY3VtZW50KCkuc3R5 bGVDb2xvck9wdGlvbnMoY2FudmFzKCkuY29tcHV0ZWRTdHlsZSgpKSkpOworICAgIGNvbnRleHQt PmRyYXdGb2N1c1JpbmcocGF0aCwgMSwgMSwgUmVuZGVyVGhlbWU6OnNpbmdsZXRvbigpLmZvY3Vz UmluZ0NvbG9yKGVsZW1lbnQuZG9jdW1lbnQoKS5zdHlsZUNvbG9yT3B0aW9ucyhjYW52YXMoKS5j b21wdXRlZFN0eWxlKCkpKSk7CiB9CiAKIFN0cmluZyBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6 OmZvbnQoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvR3JhcGhpY3NDb250ZXh0Q29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbQppbmRleCBiZjVlOGIxZDhh Mjc5OWQ3YTMwYTU4ZWI1ZWZmOGU2MDEyMzMzNWQ1Li4wNjhhZWZhMGFiNWFkOTgzMDFhMGMxZWM0 Y2QxNGIxMzU3MWUxNzllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbQpAQCAtNzMsMTAg KzczLDEwIEBAIHN0YXRpYyBib29sIGRyYXdGb2N1c1JpbmdBdFRpbWUoQ0dDb250ZXh0UmVmIGNv bnRleHQsIE5TVGltZUludGVydmFsIHRpbWVPZmZzZXQsCiAgICAgZm9jdXNSaW5nU3R5bGUuYWNj dW11bGF0ZSA9IC0xOwogICAgIGF1dG8gc3R5bGUgPSBhZG9wdENGKENHU3R5bGVDcmVhdGVGb2N1 c1JpbmdXaXRoQ29sb3IoJmZvY3VzUmluZ1N0eWxlLCBjYWNoZWRDR0NvbG9yKGNvbG9yKSkpOwog Ci0gICAgQ0dDb250ZXh0U2F2ZUdTdGF0ZShjb250ZXh0KTsKKyAgICBDR0NvbnRleHRTdGF0ZVNh dmVyIHN0YXRlU2F2ZXIoY29udGV4dCk7CisKICAgICBDR0NvbnRleHRTZXRTdHlsZShjb250ZXh0 LCBzdHlsZS5nZXQoKSk7CiAgICAgQ0dDb250ZXh0RmlsbFBhdGgoY29udGV4dCk7Ci0gICAgQ0dD b250ZXh0UmVzdG9yZUdTdGF0ZShjb250ZXh0KTsKIAogICAgIHJldHVybiBuZWVkc1JlcGFpbnQ7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvVGhlbWVNYWMubW0g Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvVGhlbWVNYWMubW0KaW5kZXggOTU1ZDY5M2U5 MjM1MjU2ODljY2NhM2ZiMjk4ZjY4Njc0NmUyZGRjZi4uNWUzZWFlMGJkZTNmMDdjM2IwYWIyYzQ3 MDAxMTdiODMwNTBhNDk0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj L1RoZW1lTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9UaGVtZU1hYy5t bQpAQCAtMjksOCArMjksMTAgQEAKICNpZiBQTEFURk9STShNQUMpCiAKICNpbXBvcnQgIkFYT2Jq ZWN0Q2FjaGUuaCIKKyNpbXBvcnQgIkNvbG9yTWFjLmgiCiAjaW1wb3J0ICJDb250cm9sU3RhdGVz LmgiCiAjaW1wb3J0ICJHcmFwaGljc0NvbnRleHQuaCIKKyNpbXBvcnQgIkdyYXBoaWNzQ29udGV4 dENHLmgiCiAjaW1wb3J0ICJJbWFnZUJ1ZmZlci5oIgogI2ltcG9ydCAiTGVuZ3RoU2l6ZS5oIgog I2ltcG9ydCAiTG9jYWxDdXJyZW50R3JhcGhpY3NDb250ZXh0LmgiCkBAIC0zNjEsNyArMzYzLDgg QEAgc3RhdGljIGJvb2wgZHJhd0NlbGxGb2N1c1JpbmdXaXRoRnJhbWVBdFRpbWUoTlNDZWxsICpj ZWxsLCBOU1JlY3QgY2VsbEZyYW1lLCBOU1YKICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFU SU9OU19CRUdJTgogICAgIENHQ29udGV4dFJlZiBjZ0NvbnRleHQgPSAoQ0dDb250ZXh0UmVmKVtb TlNHcmFwaGljc0NvbnRleHQgY3VycmVudENvbnRleHRdIGdyYXBoaWNzUG9ydF07CiAgICAgQUxM T1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECi0gICAgQ0dDb250ZXh0U2F2ZUdTdGF0ZShj Z0NvbnRleHQpOworCisgICAgQ0dDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGNnQ29udGV4 dCk7CiAKICAgICBDR0ZvY3VzUmluZ1N0eWxlIGZvY3VzUmluZ1N0eWxlOwogICAgIGJvb2wgbmVl ZHNSZXBhaW50ID0gTlNJbml0aWFsaXplQ0dGb2N1c1JpbmdTdHlsZUZvclRpbWUoTlNGb2N1c1Jp bmdPbmx5LCAmZm9jdXNSaW5nU3R5bGUsIHRpbWVPZmZzZXQpOwpAQCAtMzczLDEzICszNzYsMTQg QEAgc3RhdGljIGJvb2wgZHJhd0NlbGxGb2N1c1JpbmdXaXRoRnJhbWVBdFRpbWUoTlNDZWxsICpj ZWxsLCBOU1JlY3QgY2VsbEZyYW1lLCBOU1YKICAgICBmb2N1c1JpbmdTdHlsZS5hY2N1bXVsYXRl ID0gLTE7CiAKICAgICAvLyBGSVhNRTogVGhpcyBjb2xvciBzaG91bGQgYmUgc2hhcmVkIHdpdGgg UmVuZGVyVGhlbWVNYWMuIEZvciBub3cganVzdCB1c2UgdGhlIHNhbWUgTlNDb2xvciBjb2xvci4K LSAgICBhdXRvIHN0eWxlID0gYWRvcHRDRihDR1N0eWxlQ3JlYXRlRm9jdXNSaW5nV2l0aENvbG9y KCZmb2N1c1JpbmdTdHlsZSwgW05TQ29sb3Iga2V5Ym9hcmRGb2N1c0luZGljYXRvckNvbG9yXS5D R0NvbG9yKSk7CisgICAgLy8gVGhlIGNvbG9yIGlzIGV4cGVjdGVkIHRvIGJlIG9wYXF1ZSwgc2lu Y2UgQ29yZUdyYXBoaWNzIHdpbGwgYXBwbHkgb3BhY2l0eSB3aGVuIGRyYXdpbmcgKGJlY2F1c2Ug b3BhY2l0eSBpcyBub3JtYWxseSBhbmltYXRlZCkuCisgICAgYXV0byBjb2xvciA9IGNvbG9yV2l0 aE92ZXJyaWRlQWxwaGEoY29sb3JGcm9tTlNDb2xvcihbTlNDb2xvciBrZXlib2FyZEZvY3VzSW5k aWNhdG9yQ29sb3JdKS5yZ2IoKSwgMSk7CisgICAgYXV0byBzdHlsZSA9IGFkb3B0Q0YoQ0dTdHls ZUNyZWF0ZUZvY3VzUmluZ1dpdGhDb2xvcigmZm9jdXNSaW5nU3R5bGUsIGNhY2hlZENHQ29sb3Io Y29sb3IpKSk7CiAgICAgQ0dDb250ZXh0U2V0U3R5bGUoY2dDb250ZXh0LCBzdHlsZS5nZXQoKSk7 CiAKICAgICBDR0NvbnRleHRCZWdpblRyYW5zcGFyZW5jeUxheWVyV2l0aFJlY3QoY2dDb250ZXh0 LCBOU1JlY3RUb0NHUmVjdChjZWxsRnJhbWUpLCBudWxscHRyKTsKICAgICBbY2VsbCBkcmF3Rm9j dXNSaW5nTWFza1dpdGhGcmFtZTpjZWxsRnJhbWUgaW5WaWV3OmNvbnRyb2xWaWV3XTsKICAgICBD R0NvbnRleHRFbmRUcmFuc3BhcmVuY3lMYXllcihjZ0NvbnRleHQpOwotICAgIENHQ29udGV4dFJl c3RvcmVHU3RhdGUoY2dDb250ZXh0KTsKIAogICAgIHJldHVybiBuZWVkc1JlcGFpbnQ7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXggMWRiNTZjMTdl ZDZlMjhiYTZhNDQwODRkZTQzZWM5N2E1OGVlYmI3Yy4uYzliOTVkODIzODk5MDdkNjkxM2JkM2M1 M2E1ZjZmMGM3MGVkNTVkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVt ZW50LmNwcApAQCAtMTgzMiw5ICsxODMyLDkgQEAgdm9pZCBSZW5kZXJFbGVtZW50OjpwYWludEZv Y3VzUmluZyhQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWwKICAg ICAgICAgICAgIGZvciAoYXV0byByZWN0IDogcGl4ZWxTbmFwcGVkRm9jdXNSaW5nUmVjdHMpCiAg ICAgICAgICAgICAgICAgcGF0aC5hZGRSZWN0KHJlY3QpOwogICAgICAgICB9Ci0gICAgICAgIHBh aW50SW5mby5jb250ZXh0KCkuZHJhd0ZvY3VzUmluZyhwYXRoLCBwYWdlKCkuZm9jdXNDb250cm9s bGVyKCkudGltZVNpbmNlRm9jdXNXYXNTZXQoKS5zZWNvbmRzKCksIG5lZWRzUmVwYWludCwgUmVu ZGVyVGhlbWU6OmZvY3VzUmluZ0NvbG9yKHN0eWxlQ29sb3JPcHRpb25zKCkpKTsKKyAgICAgICAg cGFpbnRJbmZvLmNvbnRleHQoKS5kcmF3Rm9jdXNSaW5nKHBhdGgsIHBhZ2UoKS5mb2N1c0NvbnRy b2xsZXIoKS50aW1lU2luY2VGb2N1c1dhc1NldCgpLnNlY29uZHMoKSwgbmVlZHNSZXBhaW50LCBS ZW5kZXJUaGVtZTo6c2luZ2xldG9uKCkuZm9jdXNSaW5nQ29sb3Ioc3R5bGVDb2xvck9wdGlvbnMo KSkpOwogICAgIH0gZWxzZQotICAgICAgICBwYWludEluZm8uY29udGV4dCgpLmRyYXdGb2N1c1Jp bmcocGl4ZWxTbmFwcGVkRm9jdXNSaW5nUmVjdHMsIHBhZ2UoKS5mb2N1c0NvbnRyb2xsZXIoKS50 aW1lU2luY2VGb2N1c1dhc1NldCgpLnNlY29uZHMoKSwgbmVlZHNSZXBhaW50LCBSZW5kZXJUaGVt ZTo6Zm9jdXNSaW5nQ29sb3Ioc3R5bGVDb2xvck9wdGlvbnMoKSkpOworICAgICAgICBwYWludElu Zm8uY29udGV4dCgpLmRyYXdGb2N1c1JpbmcocGl4ZWxTbmFwcGVkRm9jdXNSaW5nUmVjdHMsIHBh Z2UoKS5mb2N1c0NvbnRyb2xsZXIoKS50aW1lU2luY2VGb2N1c1dhc1NldCgpLnNlY29uZHMoKSwg bmVlZHNSZXBhaW50LCBSZW5kZXJUaGVtZTo6c2luZ2xldG9uKCkuZm9jdXNSaW5nQ29sb3Ioc3R5 bGVDb2xvck9wdGlvbnMoKSkpOwogICAgIGlmIChuZWVkc1JlcGFpbnQpCiAgICAgICAgIHBhZ2Uo KS5mb2N1c0NvbnRyb2xsZXIoKS5zZXRGb2N1c2VkRWxlbWVudE5lZWRzUmVwYWludCgpOwogI2Vs c2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwCmluZGV4IDQ0YTZlMGVm NjA2NGI5MWRiOTBhMzIzZTg5N2FmOTFkNTU1YzRhMWUuLjg1YTEwMWRjODZjNTYzYjUxYzVlMzE1 MGQzODY4NTYxOTE0YmFhOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJJbWFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdl LmNwcApAQCAtNTkyLDcgKzU5Miw3IEBAIHZvaWQgUmVuZGVySW1hZ2U6OnBhaW50QXJlYUVsZW1l bnRGb2N1c1JpbmcoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvCiAKICNpZiBQ TEFURk9STShNQUMpCiAgICAgYm9vbCBuZWVkc1JlcGFpbnQ7Ci0gICAgcGFpbnRJbmZvLmNvbnRl eHQoKS5kcmF3Rm9jdXNSaW5nKHBhdGgsIHBhZ2UoKS5mb2N1c0NvbnRyb2xsZXIoKS50aW1lU2lu Y2VGb2N1c1dhc1NldCgpLnNlY29uZHMoKSwgbmVlZHNSZXBhaW50LCBSZW5kZXJUaGVtZTo6Zm9j dXNSaW5nQ29sb3Ioc3R5bGVDb2xvck9wdGlvbnMoKSkpOworICAgIHBhaW50SW5mby5jb250ZXh0 KCkuZHJhd0ZvY3VzUmluZyhwYXRoLCBwYWdlKCkuZm9jdXNDb250cm9sbGVyKCkudGltZVNpbmNl Rm9jdXNXYXNTZXQoKS5zZWNvbmRzKCksIG5lZWRzUmVwYWludCwgUmVuZGVyVGhlbWU6OnNpbmds ZXRvbigpLmZvY3VzUmluZ0NvbG9yKHN0eWxlQ29sb3JPcHRpb25zKCkpKTsKICAgICBpZiAobmVl ZHNSZXBhaW50KQogICAgICAgICBwYWdlKCkuZm9jdXNDb250cm9sbGVyKCkuc2V0Rm9jdXNlZEVs ZW1lbnROZWVkc1JlcGFpbnQoKTsKICNlbHNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lLmNwcAppbmRleCBkNjVhNThkYWE5Njk0OGYyYjhmYzA0NWQ1MjllMzg3NjZhODJjOTg3 Li43NmM5YzVjNzhkNTZkM2U4ZDk3ZDQyMWY0ZGZhYTRhYjFiZDllY2MwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKQEAgLTE0MTEsOSArMTQxMSwxNSBAQCB2b2lk IFJlbmRlclRoZW1lOjpzZXRDdXN0b21Gb2N1c1JpbmdDb2xvcihjb25zdCBDb2xvciYgY29sb3Ip CiAgICAgY3VzdG9tRm9jdXNSaW5nQ29sb3IoKSA9IGNvbG9yOwogfQogCi1Db2xvciBSZW5kZXJU aGVtZTo6Zm9jdXNSaW5nQ29sb3IoT3B0aW9uU2V0PFN0eWxlQ29sb3I6Ok9wdGlvbnM+IG9wdGlv bnMpCitDb2xvciBSZW5kZXJUaGVtZTo6Zm9jdXNSaW5nQ29sb3IoT3B0aW9uU2V0PFN0eWxlQ29s b3I6Ok9wdGlvbnM+IG9wdGlvbnMpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGN1c3RvbUZvY3VzUmlu Z0NvbG9yKCkuaXNWYWxpZCgpID8gY3VzdG9tRm9jdXNSaW5nQ29sb3IoKSA6IFJlbmRlclRoZW1l OjpzaW5nbGV0b24oKS5wbGF0Zm9ybUZvY3VzUmluZ0NvbG9yKG9wdGlvbnMpOworICAgIGlmIChj dXN0b21Gb2N1c1JpbmdDb2xvcigpLmlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuIGN1c3RvbUZv Y3VzUmluZ0NvbG9yKCk7CisKKyAgICBhdXRvJiBjYWNoZSA9IGNvbG9yQ2FjaGUob3B0aW9ucyk7 CisgICAgaWYgKCFjYWNoZS5zeXN0ZW1Gb2N1c1JpbmdDb2xvci5pc1ZhbGlkKCkpCisgICAgICAg IGNhY2hlLnN5c3RlbUZvY3VzUmluZ0NvbG9yID0gcGxhdGZvcm1Gb2N1c1JpbmdDb2xvcihvcHRp b25zKTsKKyAgICByZXR1cm4gY2FjaGUuc3lzdGVtRm9jdXNSaW5nQ29sb3I7CiB9CiAKIFN0cmlu ZyBSZW5kZXJUaGVtZTo6ZmlsZUxpc3REZWZhdWx0TGFiZWwoYm9vbCBtdWx0aXBsZUZpbGVzQWxs b3dlZCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKaW5kZXggMTMy YTZlNDlmMDk2NmQ3ZDUwMzdjYjVjNmEwMzY0ZjgzOTg5OTliOS4uYTYyOTJhNDM3YzlmOTM1MmRk ZTBiNmIyNWJjYTgxNzU4OTZhOTA5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lLmgKQEAgLTE2MSw3ICsxNjEsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIENvbG9yIGRp c2FibGVkVGV4dENvbG9yKGNvbnN0IENvbG9yJiB0ZXh0Q29sb3IsIGNvbnN0IENvbG9yJiBiYWNr Z3JvdW5kQ29sb3IpIGNvbnN0OwogCi0gICAgc3RhdGljIENvbG9yIGZvY3VzUmluZ0NvbG9yKE9w dGlvblNldDxTdHlsZUNvbG9yOjpPcHRpb25zPik7CisgICAgQ29sb3IgZm9jdXNSaW5nQ29sb3Io T3B0aW9uU2V0PFN0eWxlQ29sb3I6Ok9wdGlvbnM+KSBjb25zdDsKICAgICB2aXJ0dWFsIENvbG9y IHBsYXRmb3JtRm9jdXNSaW5nQ29sb3IoT3B0aW9uU2V0PFN0eWxlQ29sb3I6Ok9wdGlvbnM+KSBj b25zdCB7IHJldHVybiBDb2xvcigwLCAwLCAwKTsgfQogICAgIHN0YXRpYyB2b2lkIHNldEN1c3Rv bUZvY3VzUmluZ0NvbG9yKGNvbnN0IENvbG9yJik7CiAgICAgc3RhdGljIGZsb2F0IHBsYXRmb3Jt Rm9jdXNSaW5nV2lkdGgoKSB7IHJldHVybiAzOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVNYWMubW0KaW5kZXggNDIzZTI5MzBlNmVhNDgzZjU3NTVlMDEyMWE5NGViZDc0 ZjFjYTMzMS4uYWE4YjY4YjUyZGM0OWM3NmVlOWI3ZGU5NDJmMGUyMzlhMGY2MmQ5OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQpAQCAtNDg5LDcgKzQ4OSw5 IEBAIENvbG9yIFJlbmRlclRoZW1lTWFjOjpwbGF0Zm9ybUZvY3VzUmluZ0NvbG9yKE9wdGlvblNl dDxTdHlsZUNvbG9yOjpPcHRpb25zPiBvcHRpCiB7CiAgICAgaWYgKHVzZXNUZXN0TW9kZUZvY3Vz UmluZ0NvbG9yKCkpCiAgICAgICAgIHJldHVybiBvbGRBcXVhRm9jdXNSaW5nQ29sb3IoKTsKLSAg ICByZXR1cm4gc3lzdGVtQ29sb3IoQ1NTVmFsdWVXZWJraXRGb2N1c1JpbmdDb2xvciwgb3B0aW9u cyk7CisgICAgTG9jYWxEZWZhdWx0U3lzdGVtQXBwZWFyYW5jZSBsb2NhbEFwcGVhcmFuY2Uob3B0 aW9ucy5jb250YWlucyhTdHlsZUNvbG9yOjpPcHRpb25zOjpVc2VEYXJrQXBwZWFyYW5jZSkpOwor ICAgIC8vIFRoZSBjb2xvciBpcyBleHBlY3RlZCB0byBiZSBvcGFxdWUsIHNpbmNlIENvcmVHcmFw aGljcyB3aWxsIGFwcGx5IG9wYWNpdHkgd2hlbiBkcmF3aW5nIChiZWNhdXNlIG9wYWNpdHkgaXMg bm9ybWFsbHkgYW5pbWF0ZWQpLgorICAgIHJldHVybiBjb2xvcldpdGhPdmVycmlkZUFscGhhKGNv bG9yRnJvbU5TQ29sb3IoW05TQ29sb3Iga2V5Ym9hcmRGb2N1c0luZGljYXRvckNvbG9yXSkucmdi KCksIDEpOwogfQogCiBDb2xvciBSZW5kZXJUaGVtZU1hYzo6cGxhdGZvcm1BY3RpdmVUZXh0U2Vh cmNoSGlnaGxpZ2h0Q29sb3IoT3B0aW9uU2V0PFN0eWxlQ29sb3I6Ok9wdGlvbnM+IG9wdGlvbnMp IGNvbnN0CkBAIC02NTQsNyArNjU2LDcgQEAgQ29sb3IgUmVuZGVyVGhlbWVNYWM6OnN5c3RlbUNv bG9yKENTU1ZhbHVlSUQgY3NzVmFsdWVJRCwgT3B0aW9uU2V0PFN0eWxlQ29sb3I6Ok8KICAgICAg ICAgLy8gVGhlc2Ugc2hvdWxkIG9ubHkgYmUgYXZhaWxhYmxlIHdoZW4gdGhlIHdlYiB2aWV3IGlz IHdhbnRpbmcgdGhlIHN5c3RlbSBhcHBlYXJhbmNlLgogICAgICAgICBjYXNlIENTU1ZhbHVlV2Vi a2l0Rm9jdXNSaW5nQ29sb3I6CiAgICAgICAgIGNhc2UgQ1NTVmFsdWVBY3RpdmVib3JkZXI6Ci0g ICAgICAgICAgICByZXR1cm4gc3lzdGVtQXBwZWFyYW5jZUNvbG9yKGNhY2hlLnN5c3RlbUZvY3Vz UmluZ0NvbG9yLCBAc2VsZWN0b3Ioa2V5Ym9hcmRGb2N1c0luZGljYXRvckNvbG9yKSk7CisgICAg ICAgICAgICByZXR1cm4gZm9jdXNSaW5nQ29sb3Iob3B0aW9ucyk7CiAKICAgICAgICAgY2FzZSBD U1NWYWx1ZUFwcGxlU3lzdGVtQ29udHJvbEFjY2VudDoKICNpZiBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEwMTQwMApAQCAtODQxLDggKzg0Myw4IEBAIENvbG9yIFJlbmRlclRo ZW1lTWFjOjpzeXN0ZW1Db2xvcihDU1NWYWx1ZUlEIGNzc1ZhbHVlSUQsIE9wdGlvblNldDxTdHls ZUNvbG9yOjpPCiAgICAgICAgIGNhc2UgQ1NTVmFsdWVBY3RpdmVib3JkZXI6CiAgICAgICAgICAg ICAvLyBIYXJkY29kZWQgdG8gYXZvaWQgZXhwb3NpbmcgYSB1c2VyIGFwcGVhcmFuY2UgcHJlZmVy ZW5jZSB0byB0aGUgd2ViIGZvciBmaW5nZXJwcmludGluZy4KICAgICAgICAgICAgIGlmIChsb2Nh bEFwcGVhcmFuY2UudXNpbmdEYXJrQXBwZWFyYW5jZSgpKQotICAgICAgICAgICAgICAgIHJldHVy biBDb2xvcigweDRDMUFBOUZGLCBDb2xvcjo6U2VtYW50aWMpOwotICAgICAgICAgICAgcmV0dXJu IENvbG9yKDB4M0YwMDY3RjQsIENvbG9yOjpTZW1hbnRpYyk7CisgICAgICAgICAgICAgICAgcmV0 dXJuIENvbG9yKDB4RkYxQUE5RkYsIENvbG9yOjpTZW1hbnRpYyk7CisgICAgICAgICAgICByZXR1 cm4gQ29sb3IoMHhGRjAwNjdGNCwgQ29sb3I6OlNlbWFudGljKTsKIAogICAgICAgICBjYXNlIENT U1ZhbHVlQXBwbGVTeXN0ZW1Db250cm9sQWNjZW50OgogICAgICAgICAgICAgLy8gSGFyZGNvZGVk IHRvIGF2b2lkIGV4cG9zaW5nIGEgdXNlciBhcHBlYXJhbmNlIHByZWZlcmVuY2UgdG8gdGhlIHdl YiBmb3IgZmluZ2VycHJpbnRpbmcuCg==