220854 2021-01-22 02:38:08 -0800 Remove individual settings accessors from WorkerGlobalScope and add Settings::Values accessor 2021-01-22 04:12:14 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 202793 1 clord clord cdumez changseok dino eric.carlson esprehn+autocc ews-watchlist gyuyoung.kim kbr sam webkit-bug-importer youennf oldest_to_newest 1721536 0 clord 2021-01-22 02:38:08 -0800 Currently, some individual settings are accessible via WorkerGlobalScope, but this isn't really a tenable way to do things long-term. I suggest removing these and just making the Settings::Values accessible. This is useful for OffscreenCanvas which requires a bunch of font-related settings that would be tedious to write a bunch of new accessors for. 1721538 1 418127 clord 2021-01-22 02:42:04 -0800 Created attachment 418127 Patch 1721549 2 418132 clord 2021-01-22 03:26:37 -0800 Created attachment 418132 Patch 1721556 3 ews-feeder 2021-01-22 04:11:43 -0800 Committed r271743: <https://trac.webkit.org/changeset/271743> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418132. 1721557 4 webkit-bug-importer 2021-01-22 04:12:14 -0800 <rdar://problem/73493954> 418127 2021-01-22 02:42:04 -0800 2021-01-22 03:26:33 -0800 Patch bug-220854-20210122104203.patch text/plain 4678 clord U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2QyMThkM2UzMmQyOWQy ZGJjMWMyNGNlODI0ZDRlOTNkMTFlMTk5Zi4uZTQ3Y2E2YWM1ZWFjZTlhZTY5NTJlOWQ1MTFjMWIw ZmYzMTk3ODljNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAxLTIyICBDaHJp cyBMb3JkICA8Y2xvcmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSZW1vdmUgaW5kaXZpZHVhbCBz ZXR0aW5ncyBhY2Nlc3NvcnMgZnJvbSBXb3JrZXJHbG9iYWxTY29wZSBhbmQgYWRkIFNldHRpbmdz OjpWYWx1ZXMgYWNjZXNzb3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyMDg1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlbW92ZSBpbmRpdmlkdWFsIHNldHRpbmdzIGFjY2Vzc29ycyBmcm9tIFdvcmtl ckdsb2JhbFNjb3BlIGFuZCBtYWtlCisgICAgICAgIFNldHRpbmdzOjpWYWx1ZXMgYWNjZXNzb3Ig cHVibGljLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisg ICAgICAgICogaHRtbC9PZmZzY3JlZW5DYW52YXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6T2Zm c2NyZWVuQ2FudmFzOjpjcmVhdGVDb250ZXh0V2ViR0wpOgorICAgICAgICAqIHdvcmtlcnMvV29y a2VyQW5pbWF0aW9uQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJBbmlt YXRpb25Db250cm9sbGVyOjpzY2hlZHVsZUFuaW1hdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpX b3JrZXJBbmltYXRpb25Db250cm9sbGVyOjpzZXJ2aWNlUmVxdWVzdEFuaW1hdGlvbkZyYW1lQ2Fs bGJhY2tzKToKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlckdsb2JhbFNjb3BlLmg6CisKIDIwMjEt MDEtMjEgIENocmlzIExvcmQgIDxjbG9yZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIE1vdmUgRm9u dEdlbmVyaWNGYW1pbGllcyBzdG9yYWdlIGZyb20gU2V0dGluZ3NCYXNlIHRvIFNldHRpbmdzOjpW YWx1ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvT2Zmc2NyZWVuQ2FudmFzLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvT2Zmc2NyZWVuQ2FudmFzLmNwcAppbmRleCA2MzI3ZmEz MmNiMWEzNjI4OTRlMDViMTA5ODlkMzhjZmMyNTRkZjdjLi44N2I3N2RkZTM5NTIwYmU0MTkzZmE2 NWI2M2NlNWY5NzBhYzhkYWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL09mZnNj cmVlbkNhbnZhcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9PZmZzY3JlZW5DYW52YXMu Y3BwCkBAIC0xODIsNyArMTgyLDcgQEAgdm9pZCBPZmZzY3JlZW5DYW52YXM6OmNyZWF0ZUNvbnRl eHRXZWJHTChSZW5kZXJpbmdDb250ZXh0VHlwZSBjb250ZXh0VHlwZSwgV2ViR0wKICAgICBhdXRv IHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQgPSB0aGlzLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCk7 CiAgICAgaWYgKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPmlzV29ya2VyR2xvYmFsU2NvcGUoKSkg ewogICAgICAgICBXb3JrZXJHbG9iYWxTY29wZSYgd29ya2VyR2xvYmFsU2NvcGUgPSBkb3duY2Fz dDxXb3JrZXJHbG9iYWxTY29wZT4oKnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQpOwotICAgICAgICBp ZiAoIXNob3VsZEVuYWJsZVdlYkdMKHdvcmtlckdsb2JhbFNjb3BlLndlYkdMRW5hYmxlZCgpLCB3 b3JrZXJHbG9iYWxTY29wZS5hY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCgpKSkKKyAgICAg ICAgaWYgKCFzaG91bGRFbmFibGVXZWJHTCh3b3JrZXJHbG9iYWxTY29wZS5zZXR0aW5nc1ZhbHVl cygpLndlYkdMRW5hYmxlZCwgd29ya2VyR2xvYmFsU2NvcGUuc2V0dGluZ3NWYWx1ZXMoKS5hY2Nl bGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCkpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgfSBl bHNlIGlmIChzY3JpcHRFeGVjdXRpb25Db250ZXh0LT5pc0RvY3VtZW50KCkpIHsKICAgICAgICAg YXV0byYgc2V0dGluZ3MgPSBkb3duY2FzdDxEb2N1bWVudD4oKnNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQpLnNldHRpbmdzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtl ckFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJB bmltYXRpb25Db250cm9sbGVyLmNwcAppbmRleCBhNTljNTcyYjc1OGE3MzBlYWFkN2QzNjg3Mjcz NjVjMTcxMDlhNWQxLi5lYmViOWZlYTkyZDY0MDk4NTM0YzMxMWVmYjY1ZGMxYzY4MjQwMDhiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckFuaW1hdGlvbkNvbnRyb2xs ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyQW5pbWF0aW9uQ29udHJv bGxlci5jcHAKQEAgLTExMSw3ICsxMTEsNyBAQCB2b2lkIFdvcmtlckFuaW1hdGlvbkNvbnRyb2xs ZXI6OmNhbmNlbEFuaW1hdGlvbkZyYW1lKENhbGxiYWNrSWQgY2FsbGJhY2tJZCkKIAogdm9pZCBX b3JrZXJBbmltYXRpb25Db250cm9sbGVyOjpzY2hlZHVsZUFuaW1hdGlvbigpCiB7Ci0gICAgaWYg KCFtX3dvcmtlckdsb2JhbFNjb3BlLnJlcXVlc3RBbmltYXRpb25GcmFtZUVuYWJsZWQoKSkKKyAg ICBpZiAoIW1fd29ya2VyR2xvYmFsU2NvcGUuc2V0dGluZ3NWYWx1ZXMoKS5yZXF1ZXN0QW5pbWF0 aW9uRnJhbWVFbmFibGVkKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAobV9hbmltYXRpb25U aW1lci5pc0FjdGl2ZSgpKQpAQCAtMTMxLDcgKzEzMSw3IEBAIHZvaWQgV29ya2VyQW5pbWF0aW9u Q29udHJvbGxlcjo6YW5pbWF0aW9uVGltZXJGaXJlZCgpCiAKIHZvaWQgV29ya2VyQW5pbWF0aW9u Q29udHJvbGxlcjo6c2VydmljZVJlcXVlc3RBbmltYXRpb25GcmFtZUNhbGxiYWNrcyhET01IaWdo UmVzVGltZVN0YW1wIHRpbWVzdGFtcCkKIHsKLSAgICBpZiAoIW1fYW5pbWF0aW9uQ2FsbGJhY2tz LnNpemUoKSB8fCAhbV93b3JrZXJHbG9iYWxTY29wZS5yZXF1ZXN0QW5pbWF0aW9uRnJhbWVFbmFi bGVkKCkpCisgICAgaWYgKCFtX2FuaW1hdGlvbkNhbGxiYWNrcy5zaXplKCkgfHwgIW1fd29ya2Vy R2xvYmFsU2NvcGUuc2V0dGluZ3NWYWx1ZXMoKS5yZXF1ZXN0QW5pbWF0aW9uRnJhbWVFbmFibGVk KQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBGaXJzdCwgZ2VuZXJhdGUgYSBsaXN0IG9mIGNh bGxiYWNrcyB0byBjb25zaWRlci4gQ2FsbGJhY2tzIHJlZ2lzdGVyZWQgZnJvbSB0aGlzIHBvaW50 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckdsb2JhbFNjb3BlLmgg Yi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckdsb2JhbFNjb3BlLmgKaW5kZXggMDljZTlk MzZkMzA5YjAwN2MwZWRiN2Q2ZGIyZjU2OGZkNGRhZGE4YS4uNDZkNDlkOTRjNTIzOGU0Njg4ZDM5 NWQ4N2MyMDYzZWI1NzIwZDFiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9X b3JrZXJHbG9iYWxTY29wZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyR2xv YmFsU2NvcGUuaApAQCAtMTIxLDkgKzEyMSw3IEBAIHB1YmxpYzoKIAogICAgIFJlZmVycmVyUG9s aWN5IHJlZmVycmVyUG9saWN5KCkgY29uc3QgZmluYWw7CiAKLSAgICBib29sIHJlcXVlc3RBbmlt YXRpb25GcmFtZUVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX3NldHRpbmdzVmFsdWVzLnJlcXVl c3RBbmltYXRpb25GcmFtZUVuYWJsZWQ7IH0KLSAgICBib29sIGFjY2VsZXJhdGVkQ29tcG9zaXRp bmdFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9zZXR0aW5nc1ZhbHVlcy5hY2NlbGVyYXRlZENv bXBvc2l0aW5nRW5hYmxlZDsgfQotICAgIGJvb2wgd2ViR0xFbmFibGVkKCkgY29uc3QgeyByZXR1 cm4gbV9zZXR0aW5nc1ZhbHVlcy53ZWJHTEVuYWJsZWQ7IH0KKyAgICBjb25zdCBTZXR0aW5nczo6 VmFsdWVzJiBzZXR0aW5nc1ZhbHVlcygpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIG1fc2V0dGluZ3NW YWx1ZXM7IH0KIAogcHJvdGVjdGVkOgogICAgIFdvcmtlckdsb2JhbFNjb3BlKFdvcmtlclRocmVh ZFR5cGUsIGNvbnN0IFdvcmtlclBhcmFtZXRlcnMmLCBSZWY8U2VjdXJpdHlPcmlnaW4+JiYsIFdv cmtlclRocmVhZCYsIFJlZjxTZWN1cml0eU9yaWdpbj4mJiB0b3BPcmlnaW4sIElEQkNsaWVudDo6 SURCQ29ubmVjdGlvblByb3h5KiwgU29ja2V0UHJvdmlkZXIqKTsKQEAgLTE0Miw3ICsxNDAsNiBA QCBwcml2YXRlOgogCiAgICAgVVJMIGNvbXBsZXRlVVJMKGNvbnN0IFN0cmluZyYsIEZvcmNlVVRG OCA9IEZvcmNlVVRGODo6Tm8pIGNvbnN0IGZpbmFsOwogICAgIFN0cmluZyB1c2VyQWdlbnQoY29u c3QgVVJMJikgY29uc3QgZmluYWw7Ci0gICAgY29uc3QgU2V0dGluZ3M6OlZhbHVlcyYgc2V0dGlu Z3NWYWx1ZXMoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX3NldHRpbmdzVmFsdWVzOyB9CiAKICAg ICBFdmVudFRhcmdldCogZXJyb3JFdmVudFRhcmdldCgpIGZpbmFsOwogICAgIFN0cmluZyByZXNv dXJjZVJlcXVlc3RJZGVudGlmaWVyKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9pZGVudGlmaWVy OyB9Cg== 418132 2021-01-22 03:26:37 -0800 2021-01-22 04:11:45 -0800 Patch bug-220854-20210122112636.patch text/plain 4677 clord U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2QyMThkM2UzMmQyOWQy ZGJjMWMyNGNlODI0ZDRlOTNkMTFlMTk5Zi4uNjRlZjljYTNmNTk3MjA0ZTllN2JlNGU5MmQ3YThm YmEyNjhiOGVhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAxLTIyICBDaHJp cyBMb3JkICA8Y2xvcmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSZW1vdmUgaW5kaXZpZHVhbCBz ZXR0aW5ncyBhY2Nlc3NvcnMgZnJvbSBXb3JrZXJHbG9iYWxTY29wZSBhbmQgYWRkIFNldHRpbmdz OjpWYWx1ZXMgYWNjZXNzb3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyMDg1NAorCisgICAgICAgIFJldmlld2VkIGJ5IFlvdWVubiBGYWJsZXQuCisK KyAgICAgICAgUmVtb3ZlIGluZGl2aWR1YWwgc2V0dGluZ3MgYWNjZXNzb3JzIGZyb20gV29ya2Vy R2xvYmFsU2NvcGUgYW5kIG1ha2UKKyAgICAgICAgU2V0dGluZ3M6OlZhbHVlcyBhY2Nlc3NvciBw dWJsaWMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAg ICAgICAgKiBodG1sL09mZnNjcmVlbkNhbnZhcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpPZmZz Y3JlZW5DYW52YXM6OmNyZWF0ZUNvbnRleHRXZWJHTCk6CisgICAgICAgICogd29ya2Vycy9Xb3Jr ZXJBbmltYXRpb25Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlckFuaW1h dGlvbkNvbnRyb2xsZXI6OnNjaGVkdWxlQW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Oldv cmtlckFuaW1hdGlvbkNvbnRyb2xsZXI6OnNlcnZpY2VSZXF1ZXN0QW5pbWF0aW9uRnJhbWVDYWxs YmFja3MpOgorICAgICAgICAqIHdvcmtlcnMvV29ya2VyR2xvYmFsU2NvcGUuaDoKKwogMjAyMS0w MS0yMSAgQ2hyaXMgTG9yZCAgPGNsb3JkQGlnYWxpYS5jb20+CiAKICAgICAgICAgTW92ZSBGb250 R2VuZXJpY0ZhbWlsaWVzIHN0b3JhZ2UgZnJvbSBTZXR0aW5nc0Jhc2UgdG8gU2V0dGluZ3M6OlZh bHVlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9PZmZzY3JlZW5DYW52YXMuY3Bw IGIvU291cmNlL1dlYkNvcmUvaHRtbC9PZmZzY3JlZW5DYW52YXMuY3BwCmluZGV4IDYzMjdmYTMy Y2IxYTM2Mjg5NGUwNWIxMDk4OWQzOGNmYzI1NGRmN2MuLjg3Yjc3ZGRlMzk1MjBiZTQxOTNmYTY1 YjYzY2U1Zjk3MGFjOGRhZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvT2Zmc2Ny ZWVuQ2FudmFzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL09mZnNjcmVlbkNhbnZhcy5j cHAKQEAgLTE4Miw3ICsxODIsNyBAQCB2b2lkIE9mZnNjcmVlbkNhbnZhczo6Y3JlYXRlQ29udGV4 dFdlYkdMKFJlbmRlcmluZ0NvbnRleHRUeXBlIGNvbnRleHRUeXBlLCBXZWJHTAogICAgIGF1dG8g c2NyaXB0RXhlY3V0aW9uQ29udGV4dCA9IHRoaXMtPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsK ICAgICBpZiAoc2NyaXB0RXhlY3V0aW9uQ29udGV4dC0+aXNXb3JrZXJHbG9iYWxTY29wZSgpKSB7 CiAgICAgICAgIFdvcmtlckdsb2JhbFNjb3BlJiB3b3JrZXJHbG9iYWxTY29wZSA9IGRvd25jYXN0 PFdvcmtlckdsb2JhbFNjb3BlPigqc2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7Ci0gICAgICAgIGlm ICghc2hvdWxkRW5hYmxlV2ViR0wod29ya2VyR2xvYmFsU2NvcGUud2ViR0xFbmFibGVkKCksIHdv cmtlckdsb2JhbFNjb3BlLmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKCkpKQorICAgICAg ICBpZiAoIXNob3VsZEVuYWJsZVdlYkdMKHdvcmtlckdsb2JhbFNjb3BlLnNldHRpbmdzVmFsdWVz KCkud2ViR0xFbmFibGVkLCB3b3JrZXJHbG9iYWxTY29wZS5zZXR0aW5nc1ZhbHVlcygpLmFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICB9IGVs c2UgaWYgKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPmlzRG9jdW1lbnQoKSkgewogICAgICAgICBh dXRvJiBzZXR0aW5ncyA9IGRvd25jYXN0PERvY3VtZW50Pigqc2NyaXB0RXhlY3V0aW9uQ29udGV4 dCkuc2V0dGluZ3MoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2Vy QW5pbWF0aW9uQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckFu aW1hdGlvbkNvbnRyb2xsZXIuY3BwCmluZGV4IGE1OWM1NzJiNzU4YTczMGVhYWQ3ZDM2ODcyNzM2 NWMxNzEwOWE1ZDEuLmViZWI5ZmVhOTJkNjQwOTg1MzRjMzExZWZiNjVkYzFjNjgyNDAwOGIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyQW5pbWF0aW9uQ29udHJvbGxl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJBbmltYXRpb25Db250cm9s bGVyLmNwcApAQCAtMTExLDcgKzExMSw3IEBAIHZvaWQgV29ya2VyQW5pbWF0aW9uQ29udHJvbGxl cjo6Y2FuY2VsQW5pbWF0aW9uRnJhbWUoQ2FsbGJhY2tJZCBjYWxsYmFja0lkKQogCiB2b2lkIFdv cmtlckFuaW1hdGlvbkNvbnRyb2xsZXI6OnNjaGVkdWxlQW5pbWF0aW9uKCkKIHsKLSAgICBpZiAo IW1fd29ya2VyR2xvYmFsU2NvcGUucmVxdWVzdEFuaW1hdGlvbkZyYW1lRW5hYmxlZCgpKQorICAg IGlmICghbV93b3JrZXJHbG9iYWxTY29wZS5zZXR0aW5nc1ZhbHVlcygpLnJlcXVlc3RBbmltYXRp b25GcmFtZUVuYWJsZWQpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChtX2FuaW1hdGlvblRp bWVyLmlzQWN0aXZlKCkpCkBAIC0xMzEsNyArMTMxLDcgQEAgdm9pZCBXb3JrZXJBbmltYXRpb25D b250cm9sbGVyOjphbmltYXRpb25UaW1lckZpcmVkKCkKIAogdm9pZCBXb3JrZXJBbmltYXRpb25D b250cm9sbGVyOjpzZXJ2aWNlUmVxdWVzdEFuaW1hdGlvbkZyYW1lQ2FsbGJhY2tzKERPTUhpZ2hS ZXNUaW1lU3RhbXAgdGltZXN0YW1wKQogewotICAgIGlmICghbV9hbmltYXRpb25DYWxsYmFja3Mu c2l6ZSgpIHx8ICFtX3dvcmtlckdsb2JhbFNjb3BlLnJlcXVlc3RBbmltYXRpb25GcmFtZUVuYWJs ZWQoKSkKKyAgICBpZiAoIW1fYW5pbWF0aW9uQ2FsbGJhY2tzLnNpemUoKSB8fCAhbV93b3JrZXJH bG9iYWxTY29wZS5zZXR0aW5nc1ZhbHVlcygpLnJlcXVlc3RBbmltYXRpb25GcmFtZUVuYWJsZWQp CiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIEZpcnN0LCBnZW5lcmF0ZSBhIGxpc3Qgb2YgY2Fs bGJhY2tzIHRvIGNvbnNpZGVyLiBDYWxsYmFja3MgcmVnaXN0ZXJlZCBmcm9tIHRoaXMgcG9pbnQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyR2xvYmFsU2NvcGUuaCBi L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyR2xvYmFsU2NvcGUuaAppbmRleCAwOWNlOWQz NmQzMDliMDA3YzBlZGI3ZDZkYjJmNTY4ZmQ0ZGFkYThhLi40NmQ0OWQ5NGM1MjM4ZTQ2ODhkMzk1 ZDg3YzIwNjNlYjU3MjBkMWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dv cmtlckdsb2JhbFNjb3BlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJHbG9i YWxTY29wZS5oCkBAIC0xMjEsOSArMTIxLDcgQEAgcHVibGljOgogCiAgICAgUmVmZXJyZXJQb2xp Y3kgcmVmZXJyZXJQb2xpY3koKSBjb25zdCBmaW5hbDsKIAotICAgIGJvb2wgcmVxdWVzdEFuaW1h dGlvbkZyYW1lRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fc2V0dGluZ3NWYWx1ZXMucmVxdWVz dEFuaW1hdGlvbkZyYW1lRW5hYmxlZDsgfQotICAgIGJvb2wgYWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX3NldHRpbmdzVmFsdWVzLmFjY2VsZXJhdGVkQ29t cG9zaXRpbmdFbmFibGVkOyB9Ci0gICAgYm9vbCB3ZWJHTEVuYWJsZWQoKSBjb25zdCB7IHJldHVy biBtX3NldHRpbmdzVmFsdWVzLndlYkdMRW5hYmxlZDsgfQorICAgIGNvbnN0IFNldHRpbmdzOjpW YWx1ZXMmIHNldHRpbmdzVmFsdWVzKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9zZXR0aW5nc1Zh bHVlczsgfQogCiBwcm90ZWN0ZWQ6CiAgICAgV29ya2VyR2xvYmFsU2NvcGUoV29ya2VyVGhyZWFk VHlwZSwgY29uc3QgV29ya2VyUGFyYW1ldGVycyYsIFJlZjxTZWN1cml0eU9yaWdpbj4mJiwgV29y a2VyVGhyZWFkJiwgUmVmPFNlY3VyaXR5T3JpZ2luPiYmIHRvcE9yaWdpbiwgSURCQ2xpZW50OjpJ REJDb25uZWN0aW9uUHJveHkqLCBTb2NrZXRQcm92aWRlciopOwpAQCAtMTQyLDcgKzE0MCw2IEBA IHByaXZhdGU6CiAKICAgICBVUkwgY29tcGxldGVVUkwoY29uc3QgU3RyaW5nJiwgRm9yY2VVVEY4 ID0gRm9yY2VVVEY4OjpObykgY29uc3QgZmluYWw7CiAgICAgU3RyaW5nIHVzZXJBZ2VudChjb25z dCBVUkwmKSBjb25zdCBmaW5hbDsKLSAgICBjb25zdCBTZXR0aW5nczo6VmFsdWVzJiBzZXR0aW5n c1ZhbHVlcygpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIG1fc2V0dGluZ3NWYWx1ZXM7IH0KIAogICAg IEV2ZW50VGFyZ2V0KiBlcnJvckV2ZW50VGFyZ2V0KCkgZmluYWw7CiAgICAgU3RyaW5nIHJlc291 cmNlUmVxdWVzdElkZW50aWZpZXIoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2lkZW50aWZpZXI7 IH0K