187144 2018-06-28 10:40:17 -0700 Focus ring color does not honor dark mode or system accent color 2018-06-28 11:51:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy bfulgham commit-queue dino simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1437410 0 timothy 2018-06-28 10:40:17 -0700 The focus ring color is always light blue. It should match the system. <rdar://problem/41105081> 1437411 1 timothy 2018-06-28 10:40:35 -0700 <rdar://problem/41105081> 1437413 2 343816 timothy 2018-06-28 10:42:36 -0700 Created attachment 343816 Patch 1437450 3 343816 commit-queue 2018-06-28 11:51:14 -0700 Comment on attachment 343816 Patch Clearing flags on attachment: 343816 Committed r233315: <https://trac.webkit.org/changeset/233315> 1437451 4 commit-queue 2018-06-28 11:51:16 -0700 All reviewed patches have been landed. Closing bug. 343816 2018-06-28 10:42:36 -0700 2018-06-28 11:51:14 -0700 Patch bug-187144-20180628104233.patch text/plain 10930 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGM0MmU0MmI3YWJiNjUx MmY4MzFjYzk2YTk0YjFmYTA0NDk4ZjRhYS4uZDYzOWY2N2Y0ZGNjN2Y2YjExYzI0YTJiNmJiNzlm NWZkMTU5NTAxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTA2LTI4ICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBGb2N1cyByaW5nIGNv bG9yIGRvZXMgbm90IGhvbm9yIGRhcmsgbW9kZSBvciBzeXN0ZW0gYWNjZW50IGNvbG9yLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MTQ0CisgICAg ICAgIHJkYXI6Ly9wcm9ibGVtLzQxMTA1MDgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUGFzcyB0aGUgZm9jdXMgcmluZyBjb2xvciB0aHJvdWdoIHRv IHRoZSBHcmFwaGljc0NvbnRleHQgbWV0aG9kcyB0aGF0IGRyYXcgaXQuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6 OmRyYXdGb2N1c1JpbmdBdFRpbWUpOgorICAgICAgICAoV2ViQ29yZTo6ZHJhd0ZvY3VzUmluZyk6 CisgICAgICAgIChXZWJDb3JlOjpkcmF3Rm9jdXNSaW5nVG9Db250ZXh0KToKKyAgICAgICAgKFdl YkNvcmU6OmRyYXdGb2N1c1JpbmdUb0NvbnRleHRBdFRpbWUpOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzQ29udGV4dDo6Zm9jdXNSaW5nQ29sb3IpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3Jt L21hYy9UaGVtZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmRyYXdDZWxsRm9jdXNSaW5nV2l0 aEZyYW1lQXRUaW1lKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjpwYWludEZvY3VzUmluZyk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcklt YWdlOjpwYWludEFyZWFFbGVtZW50Rm9jdXNSaW5nKToKKwogMjAxOC0wNi0yNyAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIEFsaWduIGluRmxvd05vblJl cGxhY2VkSGVpZ2h0QW5kTWFyZ2luKCkgc3R5bGUgd2l0aCB0aGUgcmVzdCBvZiB0aGUgY29tcHV0 ZSBmdW5jdGlvbnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5oCmluZGV4IDQwYTk2OTFmYjY0MTc2NDc5MmJkNGNiODAzZTc3YjIzMGFi OWZhNDcuLmQ2YWM4MWQ0ZDFiZTgxZmFjMGZmNTFmOWJjYTVjMzkzZjFkZTlkZTcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCkBA IC00NDIsOSArNDQyLDggQEAgcHVibGljOgogICAgIHZvaWQgZHJhd0ZvY3VzUmluZyhjb25zdCBW ZWN0b3I8RmxvYXRSZWN0PiYsIGZsb2F0IHdpZHRoLCBmbG9hdCBvZmZzZXQsIGNvbnN0IENvbG9y Jik7CiAgICAgdm9pZCBkcmF3Rm9jdXNSaW5nKGNvbnN0IFBhdGgmLCBmbG9hdCB3aWR0aCwgZmxv YXQgb2Zmc2V0LCBjb25zdCBDb2xvciYpOwogI2lmIFBMQVRGT1JNKE1BQykKLSAgICB2b2lkIGRy YXdGb2N1c1JpbmcoY29uc3QgUGF0aCYsIGRvdWJsZSB0aW1lT2Zmc2V0LCBib29sJiBuZWVkc1Jl ZHJhdyk7Ci0gICAgdm9pZCBkcmF3Rm9jdXNSaW5nKGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+Jiwg ZG91YmxlIHRpbWVPZmZzZXQsIGJvb2wmIG5lZWRzUmVkcmF3KTsKLSAgICBzdGF0aWMgQ0dDb2xv clJlZiBmb2N1c1JpbmdDb2xvcigpOworICAgIHZvaWQgZHJhd0ZvY3VzUmluZyhjb25zdCBQYXRo JiwgZG91YmxlIHRpbWVPZmZzZXQsIGJvb2wmIG5lZWRzUmVkcmF3LCBjb25zdCBDb2xvciYpOwor ICAgIHZvaWQgZHJhd0ZvY3VzUmluZyhjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYsIGRvdWJsZSB0 aW1lT2Zmc2V0LCBib29sJiBuZWVkc1JlZHJhdywgY29uc3QgQ29sb3ImKTsKICNlbmRpZgogCiAg ICAgdm9pZCBzZXRMaW5lQ2FwKExpbmVDYXApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvR3JhcGhpY3NDb250ZXh0Q29jb2EubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbQpp bmRleCA1YThlYjM0Y2M5YWZhNTc2MWZiZDQ2NWY4MDA4ZmM4MDI2NDA4YTE1Li4zZmUyMDgxZDVh YjZmYTAwNTUyZmI5ZDNhODdhZGIyNWM1N2E1YjE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbQorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2Nv YS5tbQpAQCAtNjAsMTYgKzYwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAjaWYgUExBVEZP Uk0oTUFDKQogCi1DR0NvbG9yUmVmIEdyYXBoaWNzQ29udGV4dDo6Zm9jdXNSaW5nQ29sb3IoKQot ewotICAgIHN0YXRpYyBDR0NvbG9yUmVmIGNvbG9yID0gW10gewotICAgICAgICBDR0Zsb2F0IGNv bG9yQ29tcG9uZW50c1tdID0geyAwLjUsIDAuNzUsIDEuMCwgMS4wIH07Ci0gICAgICAgIHJldHVy biBDR0NvbG9yQ3JlYXRlKHNSR0JDb2xvclNwYWNlUmVmKCksIGNvbG9yQ29tcG9uZW50cyk7Ci0g ICAgfSgpOwotICAgIHJldHVybiBjb2xvcjsKLX0KLQotc3RhdGljIGJvb2wgZHJhd0ZvY3VzUmlu Z0F0VGltZShDR0NvbnRleHRSZWYgY29udGV4dCwgTlNUaW1lSW50ZXJ2YWwgdGltZU9mZnNldCkK K3N0YXRpYyBib29sIGRyYXdGb2N1c1JpbmdBdFRpbWUoQ0dDb250ZXh0UmVmIGNvbnRleHQsIE5T VGltZUludGVydmFsIHRpbWVPZmZzZXQsIGNvbnN0IENvbG9yJiBjb2xvcikKIHsKICAgICBDR0Zv Y3VzUmluZ1N0eWxlIGZvY3VzUmluZ1N0eWxlOwogICAgIEJPT0wgbmVlZHNSZXBhaW50ID0gTlNJ bml0aWFsaXplQ0dGb2N1c1JpbmdTdHlsZUZvclRpbWUoTlNGb2N1c1JpbmdPbmx5LCAmZm9jdXNS aW5nU3R5bGUsIHRpbWVPZmZzZXQpOwpAQCAtNzksNyArNzAsNyBAQCBzdGF0aWMgYm9vbCBkcmF3 Rm9jdXNSaW5nQXRUaW1lKENHQ29udGV4dFJlZiBjb250ZXh0LCBOU1RpbWVJbnRlcnZhbCB0aW1l T2Zmc2V0KQogICAgIC8vIC0xLiBBY2NvcmRpbmcgdG8gQ29yZUdyYXBoaWNzLCB0aGUgcmVhc29u aW5nIGZvciB0aGlzIGJlaGF2aW9yIGhhcyBiZWVuCiAgICAgLy8gbG9zdCBpbiB0aW1lLgogICAg IGZvY3VzUmluZ1N0eWxlLmFjY3VtdWxhdGUgPSAtMTsKLSAgICBhdXRvIHN0eWxlID0gYWRvcHRD RihDR1N0eWxlQ3JlYXRlRm9jdXNSaW5nV2l0aENvbG9yKCZmb2N1c1JpbmdTdHlsZSwgR3JhcGhp Y3NDb250ZXh0Ojpmb2N1c1JpbmdDb2xvcigpKSk7CisgICAgYXV0byBzdHlsZSA9IGFkb3B0Q0Yo Q0dTdHlsZUNyZWF0ZUZvY3VzUmluZ1dpdGhDb2xvcigmZm9jdXNSaW5nU3R5bGUsIGNhY2hlZENH Q29sb3IoY29sb3IpKSk7CiAKICAgICBDR0NvbnRleHRTYXZlR1N0YXRlKGNvbnRleHQpOwogICAg IENHQ29udGV4dFNldFN0eWxlKGNvbnRleHQsIHN0eWxlLmdldCgpKTsKQEAgLTg5LDI0ICs4MCwy NCBAQCBzdGF0aWMgYm9vbCBkcmF3Rm9jdXNSaW5nQXRUaW1lKENHQ29udGV4dFJlZiBjb250ZXh0 LCBOU1RpbWVJbnRlcnZhbCB0aW1lT2Zmc2V0KQogICAgIHJldHVybiBuZWVkc1JlcGFpbnQ7CiB9 CiAKLXN0YXRpYyB2b2lkIGRyYXdGb2N1c1JpbmcoQ0dDb250ZXh0UmVmIGNvbnRleHQpCitzdGF0 aWMgdm9pZCBkcmF3Rm9jdXNSaW5nKENHQ29udGV4dFJlZiBjb250ZXh0LCBjb25zdCBDb2xvciYg Y29sb3IpCiB7Ci0gICAgZHJhd0ZvY3VzUmluZ0F0VGltZShjb250ZXh0LCBzdGQ6Om51bWVyaWNf bGltaXRzPGRvdWJsZT46Om1heCgpKTsKKyAgICBkcmF3Rm9jdXNSaW5nQXRUaW1lKGNvbnRleHQs IHN0ZDo6bnVtZXJpY19saW1pdHM8ZG91YmxlPjo6bWF4KCksIGNvbG9yKTsKIH0KIAotc3RhdGlj IHZvaWQgZHJhd0ZvY3VzUmluZ1RvQ29udGV4dChDR0NvbnRleHRSZWYgY29udGV4dCwgQ0dQYXRo UmVmIGZvY3VzUmluZ1BhdGgpCitzdGF0aWMgdm9pZCBkcmF3Rm9jdXNSaW5nVG9Db250ZXh0KENH Q29udGV4dFJlZiBjb250ZXh0LCBDR1BhdGhSZWYgZm9jdXNSaW5nUGF0aCwgY29uc3QgQ29sb3Im IGNvbG9yKQogewogICAgIENHQ29udGV4dEJlZ2luUGF0aChjb250ZXh0KTsKICAgICBDR0NvbnRl eHRBZGRQYXRoKGNvbnRleHQsIGZvY3VzUmluZ1BhdGgpOwotICAgIGRyYXdGb2N1c1JpbmcoY29u dGV4dCk7CisgICAgZHJhd0ZvY3VzUmluZyhjb250ZXh0LCBjb2xvcik7CiB9CiAKLXN0YXRpYyBi b29sIGRyYXdGb2N1c1JpbmdUb0NvbnRleHRBdFRpbWUoQ0dDb250ZXh0UmVmIGNvbnRleHQsIENH UGF0aFJlZiBmb2N1c1JpbmdQYXRoLCBkb3VibGUgdGltZU9mZnNldCkKK3N0YXRpYyBib29sIGRy YXdGb2N1c1JpbmdUb0NvbnRleHRBdFRpbWUoQ0dDb250ZXh0UmVmIGNvbnRleHQsIENHUGF0aFJl ZiBmb2N1c1JpbmdQYXRoLCBkb3VibGUgdGltZU9mZnNldCwgY29uc3QgQ29sb3ImIGNvbG9yKQog ewogICAgIFVOVVNFRF9QQVJBTSh0aW1lT2Zmc2V0KTsKICAgICBDR0NvbnRleHRCZWdpblBhdGgo Y29udGV4dCk7CiAgICAgQ0dDb250ZXh0QWRkUGF0aChjb250ZXh0LCBmb2N1c1JpbmdQYXRoKTsK LSAgICByZXR1cm4gZHJhd0ZvY3VzUmluZ0F0VGltZShjb250ZXh0LCBzdGQ6Om51bWVyaWNfbGlt aXRzPGRvdWJsZT46Om1heCgpKTsKKyAgICByZXR1cm4gZHJhd0ZvY3VzUmluZ0F0VGltZShjb250 ZXh0LCBzdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46Om1heCgpLCBjb2xvcik7CiB9CiAKICNl bmRpZiAvLyBQTEFURk9STShNQUMpCkBAIC0xMjIsNyArMTEzLDcgQEAgdm9pZCBHcmFwaGljc0Nv bnRleHQ6OmRyYXdGb2N1c1JpbmcoY29uc3QgUGF0aCYgcGF0aCwgZmxvYXQgd2lkdGgsIGZsb2F0 IG9mZnNldCwKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGRyYXdGb2N1c1JpbmdUb0Nv bnRleHQocGxhdGZvcm1Db250ZXh0KCksIHBhdGgucGxhdGZvcm1QYXRoKCkpOworICAgIGRyYXdG b2N1c1JpbmdUb0NvbnRleHQocGxhdGZvcm1Db250ZXh0KCksIHBhdGgucGxhdGZvcm1QYXRoKCks IGNvbG9yKTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKHBhdGgpOwogICAgIFVOVVNFRF9QQVJB TSh3aWR0aCk7CkBAIC0xMzIsNyArMTIzLDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdG b2N1c1JpbmcoY29uc3QgUGF0aCYgcGF0aCwgZmxvYXQgd2lkdGgsIGZsb2F0IG9mZnNldCwKIH0K IAogI2lmIFBMQVRGT1JNKE1BQykKLXZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5n KGNvbnN0IFBhdGgmIHBhdGgsIGRvdWJsZSB0aW1lT2Zmc2V0LCBib29sJiBuZWVkc1JlZHJhdykK K3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnN0IFBhdGgmIHBhdGgsIGRv dWJsZSB0aW1lT2Zmc2V0LCBib29sJiBuZWVkc1JlZHJhdywgY29uc3QgQ29sb3ImIGNvbG9yKQog ewogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkgfHwgcGF0aC5pc051bGwoKSkKICAgICAgICAg cmV0dXJuOwpAQCAtMTQwLDEwICsxMzEsMTAgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdG b2N1c1JpbmcoY29uc3QgUGF0aCYgcGF0aCwgZG91YmxlIHRpbWVPZmZzZXQsIGJvb2wmIG4KICAg ICBpZiAobV9pbXBsKSAvLyBGSVhNRTogaW1wbGVtZW50IGFuaW1hdGVkIGZvY3VzIHJpbmcgZHJh d2luZy4KICAgICAgICAgcmV0dXJuOwogCi0gICAgbmVlZHNSZWRyYXcgPSBkcmF3Rm9jdXNSaW5n VG9Db250ZXh0QXRUaW1lKHBsYXRmb3JtQ29udGV4dCgpLCBwYXRoLnBsYXRmb3JtUGF0aCgpLCB0 aW1lT2Zmc2V0KTsKKyAgICBuZWVkc1JlZHJhdyA9IGRyYXdGb2N1c1JpbmdUb0NvbnRleHRBdFRp bWUocGxhdGZvcm1Db250ZXh0KCksIHBhdGgucGxhdGZvcm1QYXRoKCksIHRpbWVPZmZzZXQsIGNv bG9yKTsKIH0KIAotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1JpbmcoY29uc3QgVmVj dG9yPEZsb2F0UmVjdD4mIHJlY3RzLCBkb3VibGUgdGltZU9mZnNldCwgYm9vbCYgbmVlZHNSZWRy YXcpCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmluZyhjb25zdCBWZWN0b3I8Rmxv YXRSZWN0PiYgcmVjdHMsIGRvdWJsZSB0aW1lT2Zmc2V0LCBib29sJiBuZWVkc1JlZHJhdywgY29u c3QgQ29sb3ImIGNvbG9yKQogewogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAg IHJldHVybjsKQEAgLTE1NSw3ICsxNDYsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0Zv Y3VzUmluZyhjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYgcmVjdHMsIGRvdWJsZSB0aW1lTwogICAg IGZvciAoY29uc3QgYXV0byYgcmVjdCA6IHJlY3RzKQogICAgICAgICBDR1BhdGhBZGRSZWN0KGZv Y3VzUmluZ1BhdGguZ2V0KCksIDAsIENHUmVjdChyZWN0KSk7CiAKLSAgICBuZWVkc1JlZHJhdyA9 IGRyYXdGb2N1c1JpbmdUb0NvbnRleHRBdFRpbWUocGxhdGZvcm1Db250ZXh0KCksIGZvY3VzUmlu Z1BhdGguZ2V0KCksIHRpbWVPZmZzZXQpOworICAgIG5lZWRzUmVkcmF3ID0gZHJhd0ZvY3VzUmlu Z1RvQ29udGV4dEF0VGltZShwbGF0Zm9ybUNvbnRleHQoKSwgZm9jdXNSaW5nUGF0aC5nZXQoKSwg dGltZU9mZnNldCwgY29sb3IpOwogfQogI2VuZGlmCiAKQEAgLTE3NCw3ICsxNjUsNyBAQCB2b2lk IEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmluZyhjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYg cmVjdHMsIGZsb2F0IHdpZHRoLAogICAgIGZvciAoYXV0byYgcmVjdCA6IHJlY3RzKQogICAgICAg ICBDR1BhdGhBZGRSZWN0KGZvY3VzUmluZ1BhdGguZ2V0KCksIDAsIENHUmVjdEluc2V0KHJlY3Qs IC1vZmZzZXQsIC1vZmZzZXQpKTsKIAotICAgIGRyYXdGb2N1c1JpbmdUb0NvbnRleHQocGxhdGZv cm1Db250ZXh0KCksIGZvY3VzUmluZ1BhdGguZ2V0KCkpOworICAgIGRyYXdGb2N1c1JpbmdUb0Nv bnRleHQocGxhdGZvcm1Db250ZXh0KCksIGZvY3VzUmluZ1BhdGguZ2V0KCksIGNvbG9yKTsKICNl bHNlCiAgICAgVU5VU0VEX1BBUkFNKHJlY3RzKTsKICAgICBVTlVTRURfUEFSQU0od2lkdGgpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1RoZW1lTWFjLm1tIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1RoZW1lTWFjLm1tCmluZGV4IGNmN2Q2ZmI0MWZlNmFj OTQwMDNlNTczMmM2NjlkMzc3MzNmMzkzZWQuLmIxOTBjNzM1ZWM3MDUyYTYzNmNjYWEyZGM1MDlm NTZkZWE1NzFlNzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9UaGVt ZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvVGhlbWVNYWMubW0KQEAg LTM2MiwxMiArMzYyLDE1IEBAIHN0YXRpYyBib29sIGRyYXdDZWxsRm9jdXNSaW5nV2l0aEZyYW1l QXRUaW1lKE5TQ2VsbCAqY2VsbCwgTlNSZWN0IGNlbGxGcmFtZSwgTlNWCiAKICAgICBDR0ZvY3Vz UmluZ1N0eWxlIGZvY3VzUmluZ1N0eWxlOwogICAgIGJvb2wgbmVlZHNSZXBhaW50ID0gTlNJbml0 aWFsaXplQ0dGb2N1c1JpbmdTdHlsZUZvclRpbWUoTlNGb2N1c1JpbmdPbmx5LCAmZm9jdXNSaW5n U3R5bGUsIHRpbWVPZmZzZXQpOworCiAgICAgLy8gV2Ugd2FudCB0byByZXNwZWN0IHRoZSBDR0Nv bnRleHQgY2xpcHBpbmcgYW5kIGFsc28gbm90IG92ZXJwYWludCBhbnkKICAgICAvLyBleGlzdGlu ZyBmb2N1cyByaW5nLiBUaGUgd2F5IHRvIGRvIHRoaXMgaXMgc2V0IGFjY3VtdWxhdGUgdG8KICAg ICAvLyAtMS4gQWNjb3JkaW5nIHRvIENvcmVHcmFwaGljcywgdGhlIHJlYXNvbmluZyBmb3IgdGhp cyBiZWhhdmlvciBoYXMgYmVlbgogICAgIC8vIGxvc3QgaW4gdGltZS4KICAgICBmb2N1c1JpbmdT dHlsZS5hY2N1bXVsYXRlID0gLTE7Ci0gICAgYXV0byBzdHlsZSA9IGFkb3B0Q0YoQ0dTdHlsZUNy ZWF0ZUZvY3VzUmluZ1dpdGhDb2xvcigmZm9jdXNSaW5nU3R5bGUsIEdyYXBoaWNzQ29udGV4dDo6 Zm9jdXNSaW5nQ29sb3IoKSkpOworCisgICAgLy8gRklYTUU6IFRoaXMgY29sb3Igc2hvdWxkIGJl IHNoYXJlZCB3aXRoIFJlbmRlclRoZW1lTWFjLiBGb3Igbm93IGp1c3QgdXNlIHRoZSBzYW1lIE5T Q29sb3IgY29sb3IuCisgICAgYXV0byBzdHlsZSA9IGFkb3B0Q0YoQ0dTdHlsZUNyZWF0ZUZvY3Vz UmluZ1dpdGhDb2xvcigmZm9jdXNSaW5nU3R5bGUsIFtOU0NvbG9yIGtleWJvYXJkRm9jdXNJbmRp Y2F0b3JDb2xvcl0uQ0dDb2xvcikpOwogICAgIENHQ29udGV4dFNldFN0eWxlKGNnQ29udGV4dCwg c3R5bGUuZ2V0KCkpOwogCiAgICAgQ0dDb250ZXh0QmVnaW5UcmFuc3BhcmVuY3lMYXllcldpdGhS ZWN0KGNnQ29udGV4dCwgTlNSZWN0VG9DR1JlY3QoY2VsbEZyYW1lKSwgbnVsbHB0cik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXggNTk4M2IwZGFkOTNh NjgxNzJjODIwM2VmNTZkZjQ0MGEyNzE1NjE1YS4uNzVhNGY3NThiOGNlZTdkZGFjZTA0ZDg5Yjhk ZDY3MjA0YTllNjM2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50 LmNwcApAQCAtMTgzNiw5ICsxODM2LDkgQEAgdm9pZCBSZW5kZXJFbGVtZW50OjpwYWludEZvY3Vz UmluZyhQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWwKICAgICAg ICAgICAgIGZvciAoYXV0byByZWN0IDogcGl4ZWxTbmFwcGVkRm9jdXNSaW5nUmVjdHMpCiAgICAg ICAgICAgICAgICAgcGF0aC5hZGRSZWN0KHJlY3QpOwogICAgICAgICB9Ci0gICAgICAgIHBhaW50 SW5mby5jb250ZXh0KCkuZHJhd0ZvY3VzUmluZyhwYXRoLCBwYWdlKCkuZm9jdXNDb250cm9sbGVy KCkudGltZVNpbmNlRm9jdXNXYXNTZXQoKS5zZWNvbmRzKCksIG5lZWRzUmVwYWludCk7CisgICAg ICAgIHBhaW50SW5mby5jb250ZXh0KCkuZHJhd0ZvY3VzUmluZyhwYXRoLCBwYWdlKCkuZm9jdXND b250cm9sbGVyKCkudGltZVNpbmNlRm9jdXNXYXNTZXQoKS5zZWNvbmRzKCksIG5lZWRzUmVwYWlu dCwgUmVuZGVyVGhlbWU6OmZvY3VzUmluZ0NvbG9yKGRvY3VtZW50KCkuc3R5bGVDb2xvck9wdGlv bnMoKSkpOwogICAgIH0gZWxzZQotICAgICAgICBwYWludEluZm8uY29udGV4dCgpLmRyYXdGb2N1 c1JpbmcocGl4ZWxTbmFwcGVkRm9jdXNSaW5nUmVjdHMsIHBhZ2UoKS5mb2N1c0NvbnRyb2xsZXIo KS50aW1lU2luY2VGb2N1c1dhc1NldCgpLnNlY29uZHMoKSwgbmVlZHNSZXBhaW50KTsKKyAgICAg ICAgcGFpbnRJbmZvLmNvbnRleHQoKS5kcmF3Rm9jdXNSaW5nKHBpeGVsU25hcHBlZEZvY3VzUmlu Z1JlY3RzLCBwYWdlKCkuZm9jdXNDb250cm9sbGVyKCkudGltZVNpbmNlRm9jdXNXYXNTZXQoKS5z ZWNvbmRzKCksIG5lZWRzUmVwYWludCwgUmVuZGVyVGhlbWU6OmZvY3VzUmluZ0NvbG9yKGRvY3Vt ZW50KCkuc3R5bGVDb2xvck9wdGlvbnMoKSkpOwogICAgIGlmIChuZWVkc1JlcGFpbnQpCiAgICAg ICAgIHBhZ2UoKS5mb2N1c0NvbnRyb2xsZXIoKS5zZXRGb2N1c2VkRWxlbWVudE5lZWRzUmVwYWlu dCgpOwogI2Vsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJ bWFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwCmluZGV4 IDA0YWE3YjgwZTRiYzJlOTliNTY1N2EzYTIzNjUwNTA2Yjc5NDBiMGUuLjQ2N2MzZGUyYzAyMmFj M2I2NTk3NDVjNjQzNDFiYTBlZTA3MTBhNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckltYWdlLmNwcApAQCAtNTY3LDcgKzU2Nyw3IEBAIHZvaWQgUmVuZGVySW1hZ2U6OnBhaW50 QXJlYUVsZW1lbnRGb2N1c1JpbmcoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBv CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgYm9vbCBuZWVkc1JlcGFpbnQ7Ci0gICAgcGFpbnRJ bmZvLmNvbnRleHQoKS5kcmF3Rm9jdXNSaW5nKHBhdGgsIHBhZ2UoKS5mb2N1c0NvbnRyb2xsZXIo KS50aW1lU2luY2VGb2N1c1dhc1NldCgpLnNlY29uZHMoKSwgbmVlZHNSZXBhaW50KTsKKyAgICBw YWludEluZm8uY29udGV4dCgpLmRyYXdGb2N1c1JpbmcocGF0aCwgcGFnZSgpLmZvY3VzQ29udHJv bGxlcigpLnRpbWVTaW5jZUZvY3VzV2FzU2V0KCkuc2Vjb25kcygpLCBuZWVkc1JlcGFpbnQsIFJl bmRlclRoZW1lOjpmb2N1c1JpbmdDb2xvcihkb2N1bWVudCgpLnN0eWxlQ29sb3JPcHRpb25zKCkp KTsKICAgICBpZiAobmVlZHNSZXBhaW50KQogICAgICAgICBwYWdlKCkuZm9jdXNDb250cm9sbGVy KCkuc2V0Rm9jdXNlZEVsZW1lbnROZWVkc1JlcGFpbnQoKTsKICNlbHNlCg==