216958 2020-09-24 21:58:22 -0700 WebKitLegacy should call Page::finalizeRenderingUpdate() 2020-09-27 20:00:36 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=217044 InRadar P2 Normal --- 216726 1 simon.fraser simon.fraser cdumez rniwa simon.fraser thorton webkit-bug-importer oldest_to_newest 1691767 0 simon.fraser 2020-09-24 21:58:22 -0700 WebKitLegacy should call Page::finalizeRenderingUpdate() 1691770 1 409656 simon.fraser 2020-09-24 22:06:06 -0700 Created attachment 409656 Patch 1691787 2 409659 simon.fraser 2020-09-24 23:10:43 -0700 Created attachment 409659 Patch 1691987 3 409721 simon.fraser 2020-09-25 12:27:02 -0700 Created attachment 409721 Patch 1692009 4 409729 simon.fraser 2020-09-25 13:30:11 -0700 Created attachment 409729 Patch 1692048 5 409729 thorton 2020-09-25 14:51:07 -0700 Comment on attachment 409729 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=409729&action=review > Source/WebCore/page/Page.cpp:1510 > + page->isolatedUpdateRendering(); Hmm. There's not really "isolation" of any sort. It affects the real world. Is it "out of band"? I don't know what to call it. "updateRenderingWithout..."? 1692442 6 409857 simon.fraser 2020-09-27 13:14:47 -0700 Created attachment 409857 Patch 1692460 7 ews-feeder 2020-09-27 16:14:11 -0700 ChangeLog entry in Source/WebKitLegacy/mac/ChangeLog contains OOPS!. 1692462 8 simon.fraser 2020-09-27 17:24:18 -0700 https://trac.webkit.org/changeset/267688/webkit 1692463 9 webkit-bug-importer 2020-09-27 17:25:18 -0700 <rdar://problem/69669472> 409656 2020-09-24 22:06:06 -0700 2020-09-24 23:10:42 -0700 Patch bug-216958-20200924220605.patch text/plain 10497 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI1ZWY4MmYxNzgxMDM3 NmFjYzU2Y2EwMzc3MGM2NTcyNmE0NjUyYS4uZWEzNjFmZTBiOTlmNTgzYzFhNWFjMzlmMjgwMzcx NTlkZjZkN2YxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA5LTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFdlYktpdExlZ2Fj eSBzaG91bGQgY2FsbCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY5NTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb252ZXJ0IFBhZ2U6Om1faW5V cGRhdGVSZW5kZXJpbmcgdG8gYW4gZW51bSB3aGljaCB0cmFja3MgdGhlIHBoYXNlLCB3aGljaCB3 aWxsIGJlCisgICAgICAgIHVzZWQgaW4gYSBsYXRlciBwYXRjaCB0byBwcmV2ZW50IGV4dHJhIHVw ZGF0ZSBzY2hlZHVsaW5nICh3ZWJraXQub3JnL2IvMjE2NzI2KS4KKyAgICAgICAgCisgICAgICAg IERSVC9XVFIgY2FuIHRyaWdnZXIgUGFnZTo6dXBkYXRlUmVuZGVyaW5nKCkgcmUtZW50cmFuY3ks IHNvIHRoZXJlJ3MgYSBiaXQgb2YgdWdsaW5lc3MKKyAgICAgICAgdGhhdCBkZWFscyB3aXRoIHRo YXQuCisKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6 dXBkYXRlUmVuZGVyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmRvQWZ0ZXJVcGRhdGVS ZW5kZXJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRh dGUpOgorICAgICAgICAqIHBhZ2UvUGFnZS5oOgorCiAyMDIwLTA5LTIwICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkMgRGlzcGxheV0gQWRkIHRo ZSBiZWdpbm5pbmdzIG9mIGEgQ1NTIGRpc3BsYXkgYm94IGhpZXJhcmNoeSBhbmQgQ1NTIHBhaW50 ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwppbmRleCBkYmZhYzI2NzU2ZTY3ZjE2ODNlYTNk OGEyMzU3Njc4M2VkZjljZDQ0Li5jNWFhMjgwYzFkZDM2NjdhNGJjY2RkOTRlNWIwN2I3YmQ2MDIz ZTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjAt MDktMjQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAg V2ViS2l0TGVnYWN5IHNob3VsZCBjYWxsIFBhZ2U6OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjk1OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMg YSBwcmVjdXJzb3IgdG8gZml4aW5nIHdlYmtpdC5vcmcvYi8yMTY3MjYuIFBhZ2UgbmVlZHMgdG8g dHJhY2sgdGhlIHBoYXNlCisgICAgICAgIG9mIHVwZGF0ZVJlbmRlcmluZyB0aGF0IHdlIGFyZSBp biwgYW5kIHRvIGVhc2UgdGhpcyB0cmFja2luZywgV2ViS2l0TGVnYWN5IG5lZWRzIHRvIGNhbGwK KyAgICAgICAgUGFnZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKSBzbyB0aGUgc3RhdGUgaXMg dHJhY2tlZC4KKyAgICAgICAgCisgICAgICAgIFJlbmFtZSAtX3ZpZXdXaWxsRHJhd0ludGVybmFs IHRvIC1fdXBkYXRlUmVuZGVyaW5nLCBhbmQgaGF2ZSBpdCBjYWxsIHVwZGF0ZVJlbmRlcmluZygp CisgICAgICAgIGFuZCBmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpLiBXZSBjYW4gYWxzbyBtb3Zl IGluIHRoZSBjYWxsIHRvIC1fc3luY2hyb25pemVDdXN0b21GaXhlZFBvc2l0aW9uTGF5b3V0UmVj dAorICAgICAgICB3aGljaCBib3RoIGNhbGwgc2l0ZXMgZG8uCisgICAgICAgIAorICAgICAgICBT aW5jZSB1cGRhdGVSZW5kZXJpbmcoKSBpcyBndWFyYW50ZWVkIHRvIHVwZGF0ZSBsYXlvdXQsIHdl IGtub3cgLV9mbHVzaENvbXBvc2l0aW5nQ2hhbmdlcyB3b3VsZCBoYXZlCisgICAgICAgIG5ldmVy IHJldHVybmVkIE5PIGhlcmUsIHNvIHdlIGNhbiByZW1vdmUgdGhlIGNvbmRpdGlvbiBpbiBMYXll ckZsdXNoQ29udHJvbGxlcjo6Zmx1c2hMYXllcnMoKS4KKyAgICAgICAgCisgICAgICAgIC1bV2Vi SFRNTFZpZXcgdmlld1dpbGxEcmF3XSBhbHNvIGRvZXMgYSBzaW1pbGFyIC1fd2ViX3VwZGF0ZUxh eW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmUKKyAgICAgICAgdGhlbiAtX2ZsdXNoQ29tcG9z aXRpbmdDaGFuZ2VzIGJ1dCB0aGlzIGlzIGNhbGxlZCBmcm9tIEFwcEtpdCB3aXRoIGEgdGltaW5n IHRoYXQgd2UgZG9uJ3QgY29udHJvbDsKKyAgICAgICAgaXQgbWF5IGJlIHJlZHVuZGFudCB3aXRo IC1bV2ViVmlldyBfdXBkYXRlUmVuZGVyaW5nXSBidXQgSSBsZWF2ZSB0aGF0IGJlaGF2aW9yIHVu Y2hhbmdlZC4KKworICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2Vi VmlldyBfdXBkYXRlUmVuZGVyaW5nXSk6CisgICAgICAgICgtW1dlYlZpZXcgX2ZvcmNlUmVwYWlu dEZvclRlc3RpbmddKToKKyAgICAgICAgKExheWVyRmx1c2hDb250cm9sbGVyOjpmbHVzaExheWVy cyk6CisgICAgICAgICgtW1dlYlZpZXcgX3ZpZXdXaWxsRHJhd0ludGVybmFsXSk6IERlbGV0ZWQu CisKIDIwMjAtMDktMjMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAg ICBUdXJuIG9mZiB0aGUgbGVnYWN5IHByZWZpeGVkIFdlYkF1ZGlvIEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5j cHAKaW5kZXggMGZlYmQ0YjUyMGVlMjAyNjViYzljYjFhNWY3NzkyZDMxMWJlYTU4Ni4uYzI5NmUy NmI4MWQ5Zjk3YzNlOGM2NWEyZWM1ZGUyNjY3NGUyOWNjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBA IC0xNDM2LDEyICsxNDM2LDEyIEBAIHVuc2lnbmVkIFBhZ2U6OnJlbmRlcmluZ1VwZGF0ZUNvdW50 KCkgY29uc3QKIHZvaWQgUGFnZTo6dXBkYXRlUmVuZGVyaW5nKCkKIHsKICAgICAvLyBUaGlzIGZ1 bmN0aW9uIGlzIG5vdCByZWVudHJhbnQsIGUuZy4gYSByQUYgY2FsbGJhY2sgbWF5IGZvcmNlIHJl cGFpbnQuCi0gICAgaWYgKG1faW5VcGRhdGVSZW5kZXJpbmcpIHsKKyAgICBpZiAobV91cGRhdGVS ZW5kZXJpbmdQaGFzZSA9PSBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJpbmcp IHsKICAgICAgICAgbGF5b3V0SWZOZWVkZWQoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot ICAgIFNldEZvclNjb3BlPGJvb2w+IGluVXBkYXRlUmVuZGVyaW5nKG1faW5VcGRhdGVSZW5kZXJp bmcsIHRydWUpOworICAgIG1fdXBkYXRlUmVuZGVyaW5nUGhhc2UgPSBSZW5kZXJpbmdVcGRhdGVQ aGFzZTo6SW5VcGRhdGVSZW5kZXJpbmc7CiAgICAgbV9sYXN0UmVuZGVyaW5nVXBkYXRlVGltZXN0 YW1wID0gTW9ub3RvbmljVGltZTo6bm93KCk7CiAKICAgICBib29sIGlzU1ZHSW1hZ2VQYWdlID0g Y2hyb21lKCkuY2xpZW50KCkuaXNTVkdJbWFnZUNocm9tZUNsaWVudCgpOwpAQCAtMTQ2OCwxMCAr MTQ2OCwxNCBAQCB2b2lkIFBhZ2U6OnVwZGF0ZVJlbmRlcmluZygpCiAgICAgICAgIGRvY3VtZW50 LnJ1blJlc2l6ZVN0ZXBzKCk7CiAgICAgfSk7CiAKKyAgICBBU1NFUlQobV91cGRhdGVSZW5kZXJp bmdQaGFzZSA9PSBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJpbmcpOworCiAg ICAgZm9yRWFjaERvY3VtZW50KFtdIChEb2N1bWVudCYgZG9jdW1lbnQpIHsKICAgICAgICAgZG9j dW1lbnQucnVuU2Nyb2xsU3RlcHMoKTsKICAgICB9KTsKIAorICAgIEFTU0VSVChtX3VwZGF0ZVJl bmRlcmluZ1BoYXNlID09IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpJblVwZGF0ZVJlbmRlcmluZyk7 CisKICAgICBmb3JFYWNoRG9jdW1lbnQoW10gKERvY3VtZW50JiBkb2N1bWVudCkgewogICAgICAg ICBkb2N1bWVudC5ldmFsdWF0ZU1lZGlhUXVlcmllc0FuZFJlcG9ydENoYW5nZXMoKTsgICAgICAg IAogICAgIH0pOwpAQCAtMTUxNSw2ICsxNTE5LDEwIEBAIHZvaWQgUGFnZTo6dXBkYXRlUmVuZGVy aW5nKCkKICAgICBpZiAoVU5MSUtFTFkoaXNNb25pdG9yaW5nV2hlZWxFdmVudHMoKSkpCiAgICAg ICAgIHdoZWVsRXZlbnRUZXN0TW9uaXRvcigpLT5jaGVja1Nob3VsZEZpcmVDYWxsYmFja3MoKTsK IAorICAgIC8vIEFueSBvZiB0aGUgYWJvdmUgc3RlcHMgY291bGQgaGF2ZSBydW4gc2NyaXB0IGFu ZCB0cmlnZ2VyZWQgYSByZS1lbnRyYW50IGNhbGwgdG8gdXBkYXRlUmVuZGVyaW5nKCkKKyAgICAv LyBhbmQgYSBjYWxsIHRvIGZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCkgLSB0aGlzIGhhcHBlbnMg aW4gdGVzdGluZy4gU28gcmVzZXQgdGhlIHN0YXRlIGhlcmUuCisgICAgbV91cGRhdGVSZW5kZXJp bmdQaGFzZSA9IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpJblVwZGF0ZVJlbmRlcmluZzsKKwogICAg IGlmIChtX2lzVHJhY2tpbmdSZW5kZXJpbmdVcGRhdGVzKQogICAgICAgICArK21fcmVuZGVyaW5n VXBkYXRlQ291bnQ7CiAKQEAgLTE1MjMsMTAgKzE1MzEsMTQgQEAgdm9pZCBQYWdlOjp1cGRhdGVS ZW5kZXJpbmcoKQogCiAgICAgaWYgKCFpc1NWR0ltYWdlUGFnZSkKICAgICAgICAgdHJhY2VQb2lu dChSZW5kZXJpbmdVcGRhdGVFbmQpOworCisgICAgQVNTRVJUKG1fdXBkYXRlUmVuZGVyaW5nUGhh c2UgPT0gUmVuZGVyaW5nVXBkYXRlUGhhc2U6OkluVXBkYXRlUmVuZGVyaW5nKTsKIH0KIAogdm9p ZCBQYWdlOjpkb0FmdGVyVXBkYXRlUmVuZGVyaW5nKCkKIHsKKyAgICBBU1NFUlQobV91cGRhdGVS ZW5kZXJpbmdQaGFzZSA9PSBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJpbmcp OworCiAgICAgLy8gQ29kZSBoZXJlIHNob3VsZCBkbyBvbmNlLXBlci1mcmFtZSB3b3JrIHRoYXQg bmVlZHMgdG8gYmUgZG9uZSBiZWZvcmUgcGFpbnRpbmcsIGFuZCByZXF1aXJlcwogICAgIC8vIGxh eW91dCB0byBiZSB1cC10by1kYXRlLiBJdCBzaG91bGQgbm90IHJ1biBzY3JpcHQsIHRyaWdnZXIg bGF5b3V0LCBvciBkaXJ0eSBsYXlvdXQuCiAKQEAgLTE1ODAsNiArMTU5Miw4IEBAIHZvaWQgUGFn ZTo6ZG9BZnRlclVwZGF0ZVJlbmRlcmluZygpCiAgICAgICAgIEFTU0VSVCghZnJhbWVWaWV3IHx8 ICFmcmFtZVZpZXctPm5lZWRzTGF5b3V0KCkpOwogICAgIH0KICNlbmRpZgorCisgICAgQVNTRVJU KG1fdXBkYXRlUmVuZGVyaW5nUGhhc2UgPT0gUmVuZGVyaW5nVXBkYXRlUGhhc2U6OkluVXBkYXRl UmVuZGVyaW5nKTsKIH0KIAogdm9pZCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZShPcHRp b25TZXQ8RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4gZmxhZ3MpCkBAIC0xNTkxLDggKzE2 MDUsMTIgQEAgdm9pZCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZShPcHRpb25TZXQ8Rmlu YWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4gZmxhZ3MKICAgICBpZiAoZmxhZ3MuY29udGFpbnMo RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFnczo6SW52YWxpZGF0ZUltYWdlc1dpdGhBc3luY0Rl Y29kZXMpKQogICAgICAgICB2aWV3LT5pbnZhbGlkYXRlSW1hZ2VzV2l0aEFzeW5jRGVjb2Rlcygp OwogCisgICAgbV91cGRhdGVSZW5kZXJpbmdQaGFzZSA9IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpM YXllckZsdXNoaW5nOworCiAgICAgdmlldy0+Zmx1c2hDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5n U3ViZnJhbWVzKCk7CiAKKyAgICBtX3VwZGF0ZVJlbmRlcmluZ1BoYXNlID0gUmVuZGVyaW5nVXBk YXRlUGhhc2U6OlBvc3RMYXllckZsdXNoOworCiAjaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElORykK ICAgICBpZiAoYXV0byogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSB0aGlzLT5zY3JvbGxpbmdDb29y ZGluYXRvcigpKSB7CiAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5jb21taXRUcmVlU3Rh dGVJZk5lZWRlZCgpOwpAQCAtMTYwMiw2ICsxNjIwLDggQEAgdm9pZCBQYWdlOjpmaW5hbGl6ZVJl bmRlcmluZ1VwZGF0ZShPcHRpb25TZXQ8RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4gZmxh Z3MKICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmRpZENvbXBsZXRlUmVuZGVyaW5nVXBk YXRlKCk7CiAgICAgfQogI2VuZGlmCisKKyAgICBtX3VwZGF0ZVJlbmRlcmluZ1BoYXNlID0gUmVu ZGVyaW5nVXBkYXRlUGhhc2U6Ok91dHNpZGU7CiB9CiAKIHZvaWQgUGFnZTo6c3VzcGVuZFNjcmlw dGVkQW5pbWF0aW9ucygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4IGFkZjkwNjJjYjBhMmE5Njg5OTQyN2I0 YmJiYTM2MWU4MTE3ZDk5NzAuLjAwNTViYjA0OGU0ZmUwYTY4OWNhMTM5M2RiZDRhZWZmNDMwNzE4 MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC03NzgsNiArNzc4LDEzIEBAIHB1YmxpYzoKICAgICBNb25v dG9uaWNUaW1lIGxhc3RSZW5kZXJpbmdVcGRhdGVUaW1lc3RhbXAoKSBjb25zdCB7IHJldHVybiBt X2xhc3RSZW5kZXJpbmdVcGRhdGVUaW1lc3RhbXA7IH0KIAogcHJpdmF0ZToKKyAgICBlbnVtIGNs YXNzIFJlbmRlcmluZ1VwZGF0ZVBoYXNlIDogdWludDhfdCB7CisgICAgICAgIE91dHNpZGUsCisg ICAgICAgIEluVXBkYXRlUmVuZGVyaW5nLAorICAgICAgICBMYXllckZsdXNoaW5nLAorICAgICAg ICBQb3N0TGF5ZXJGbHVzaAorICAgIH07CisKICAgICBzdHJ1Y3QgTmF2aWdhdGlvbiB7CiAgICAg ICAgIFJlZ2lzdHJhYmxlRG9tYWluIGRvbWFpbjsKICAgICAgICAgRnJhbWVMb2FkVHlwZSB0eXBl OwpAQCAtMTAxMyw3ICsxMDIwLDYgQEAgcHJpdmF0ZToKICAgICBib29sIG1fc2hvdWxkRW5hYmxl SUNFQ2FuZGlkYXRlRmlsdGVyaW5nQnlEZWZhdWx0IHsgdHJ1ZSB9OwogICAgIGJvb2wgbV9tZWRp YVBsYXliYWNrSXNTdXNwZW5kZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9tZWRpYUJ1ZmZlcmlu Z0lzU3VzcGVuZGVkIHsgZmFsc2UgfTsKLSAgICBib29sIG1faW5VcGRhdGVSZW5kZXJpbmcgeyBm YWxzZSB9OwogICAgIGJvb2wgbV9oYXNSZXNvdXJjZUxvYWRDbGllbnQgeyBmYWxzZSB9OwogICAg IGJvb2wgbV9kZWxlZ2F0ZXNTY2FsaW5nIHsgZmFsc2UgfTsKIApAQCAtMTAyMSw2ICsxMDI3LDgg QEAgcHJpdmF0ZToKICAgICBib29sIG1faXNFZGl0YWJsZVJlZ2lvbkVuYWJsZWQgeyBmYWxzZSB9 OwogI2VuZGlmCiAKKyAgICBSZW5kZXJpbmdVcGRhdGVQaGFzZSBtX3VwZGF0ZVJlbmRlcmluZ1Bo YXNlIHsgUmVuZGVyaW5nVXBkYXRlUGhhc2U6Ok91dHNpZGUgfTsKKwogICAgIFVzZXJJbnRlcmZh Y2VMYXlvdXREaXJlY3Rpb24gbV91c2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uIHsgVXNlcklu dGVyZmFjZUxheW91dERpcmVjdGlvbjo6TFRSIH07CiAgICAgCiAgICAgLy8gRm9yIHRlc3Rpbmcu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0g Yi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KaW5kZXggZWU0Y2M2 NzQ0ODZhMTkyNjBjZWFmNzk4NDlhYjIyYmQwODdjNGQ0Mi4uMTFhMmQzMTA1MzFlMTE0ZWQ0ZmU3 MTk1NzQzMDg2ZTQ2ZjliNmQxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMv V2ViVmlldy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcv V2ViVmlldy5tbQpAQCAtMTc4OSwxMCArMTc4OSwxNyBAQCAtIChpZClfaW5pdFdpdGhGcmFtZToo TlNSZWN0KWYgZnJhbWVOYW1lOihOU1N0cmluZyAqKWZyYW1lTmFtZSBncm91cE5hbWU6KE5TU3Ry aQogICAgIHJldHVybiBzZWxmOwogfQogCi0tICh2b2lkKV92aWV3V2lsbERyYXdJbnRlcm5hbAor LSAodm9pZClfdXBkYXRlUmVuZGVyaW5nCiB7Ci0gICAgaWYgKF9wcml2YXRlLT5wYWdlKQorI2lm IFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgLy8gRW5zdXJlIGZpeGVkIHBvc2l0aW9ucyBsYXll cnMgYXJlIHdoZXJlIHRoZXkgc2hvdWxkIGJlLgorICAgIFttX3dlYlZpZXcgX3N5bmNocm9uaXpl Q3VzdG9tRml4ZWRQb3NpdGlvbkxheW91dFJlY3RdOworI2VuZGlmCisKKyAgICBpZiAoX3ByaXZh dGUtPnBhZ2UpIHsKICAgICAgICAgX3ByaXZhdGUtPnBhZ2UtPnVwZGF0ZVJlbmRlcmluZygpOwor ICAgICAgICBfcHJpdmF0ZS0+cGFnZS0+ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoeyB9KTsKKyAg ICB9CiB9CiAKICsgKE5TQXJyYXkgKilfc3VwcG9ydGVkTUlNRVR5cGVzCkBAIC00OTAyLDEzICs0 OTA5LDcgQEAgKyAodm9pZClfcmVtb3ZlQWxsVXNlckNvbnRlbnRGcm9tR3JvdXA6KE5TU3RyaW5n ICopZ3JvdXBOYW1lCiAKIC0gKHZvaWQpX2ZvcmNlUmVwYWludEZvclRlc3RpbmcKIHsKLSNpZiBQ TEFURk9STShJT1NfRkFNSUxZKQotICAgIC8vIEVuc3VyZSBmaXhlZCBwb3NpdGlvbnMgbGF5ZXJz IGFyZSB3aGVyZSB0aGV5IHNob3VsZCBiZS4KLSAgICBbc2VsZiBfc3luY2hyb25pemVDdXN0b21G aXhlZFBvc2l0aW9uTGF5b3V0UmVjdF07Ci0jZW5kaWYKLQotICAgIFtzZWxmIF92aWV3V2lsbERy YXdJbnRlcm5hbF07Ci0gICAgW3NlbGYgX2ZsdXNoQ29tcG9zaXRpbmdDaGFuZ2VzXTsKKyAgICBb c2VsZiBfdXBkYXRlUmVuZGVyaW5nXTsKICAgICBbQ0FUcmFuc2FjdGlvbiBmbHVzaF07CiAgICAg W0NBVHJhbnNhY3Rpb24gc3luY2hyb25pemVdOwogfQpAQCAtOTM0NiwyOCArOTM0NywxOSBAQCBi b29sIExheWVyRmx1c2hDb250cm9sbGVyOjpmbHVzaExheWVycygpCiAgICAgTlNXaW5kb3cgKndp bmRvdyA9IFttX3dlYlZpZXcgd2luZG93XTsKICNlbmRpZiAvLyBQTEFURk9STShNQUMpCiAKLSNp ZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIC8vIEVuc3VyZSBmaXhlZCBwb3NpdGlvbnMgbGF5 ZXJzIGFyZSB3aGVyZSB0aGV5IHNob3VsZCBiZS4KLSAgICBbbV93ZWJWaWV3IF9zeW5jaHJvbml6 ZUN1c3RvbUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0XTsKLSNlbmRpZgotCi0gICAgW21fd2ViVmll dyBfdmlld1dpbGxEcmF3SW50ZXJuYWxdOworICAgIFttX3dlYlZpZXcgX3VwZGF0ZVJlbmRlcmlu Z107CiAKLSAgICBpZiAoW21fd2ViVmlldyBfZmx1c2hDb21wb3NpdGluZ0NoYW5nZXNdKSB7CiAj aWYgUExBVEZPUk0oTUFDKQotICAgICAgICAvLyBBcHBLaXQgbWF5IGhhdmUgZGlzYWJsZWQgc2Ny ZWVuIHVwZGF0ZXMsIHRoaW5raW5nIGFuIHVwY29taW5nIHdpbmRvdyBmbHVzaCB3aWxsIHJlLWVu YWJsZSB0aGVtLgotICAgICAgICAvLyBJbiBjYXNlIHNldE5lZWRzRGlzcGxheUluUmVjdCgpIGhh cyBwcmV2ZW50ZWQgdGhlIHdpbmRvdyBmcm9tIG5lZWRpbmcgdG8gYmUgZmx1c2hlZCwgcmUtZW5h YmxlIHNjcmVlbgotICAgICAgICAvLyB1cGRhdGVzIGhlcmUuCi0gICAgICAgIEFMTE9XX0RFUFJF Q0FURURfREVDTEFSQVRJT05TX0JFR0lOCi0gICAgICAgIGlmICghW3dpbmRvdyBpc0ZsdXNoV2lu ZG93RGlzYWJsZWRdKQotICAgICAgICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNf RU5ECi0gICAgICAgICAgICBbd2luZG93IF9lbmFibGVTY3JlZW5VcGRhdGVzSWZOZWVkZWRdOwor ICAgIC8vIEFwcEtpdCBtYXkgaGF2ZSBkaXNhYmxlZCBzY3JlZW4gdXBkYXRlcywgdGhpbmtpbmcg YW4gdXBjb21pbmcgd2luZG93IGZsdXNoIHdpbGwgcmUtZW5hYmxlIHRoZW0uCisgICAgLy8gSW4g Y2FzZSBzZXROZWVkc0Rpc3BsYXlJblJlY3QoKSBoYXMgcHJldmVudGVkIHRoZSB3aW5kb3cgZnJv bSBuZWVkaW5nIHRvIGJlIGZsdXNoZWQsIHJlLWVuYWJsZSBzY3JlZW4KKyAgICAvLyB1cGRhdGVz IGhlcmUuCisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KKyAgICBpZiAo IVt3aW5kb3cgaXNGbHVzaFdpbmRvd0Rpc2FibGVkXSkKKyAgICAgICAgW3dpbmRvdyBfZW5hYmxl U2NyZWVuVXBkYXRlc0lmTmVlZGVkXTsKKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9O U19FTkQKICNlbmRpZgogCi0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLQotICAgIHJldHVy biBmYWxzZTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogLSAodm9pZClfc2NoZWR1bGVVcGRhdGVS ZW5kZXJpbmcK 409659 2020-09-24 23:10:43 -0700 2020-09-25 12:27:01 -0700 Patch bug-216958-20200924231043.patch text/plain 10492 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI1ZWY4MmYxNzgxMDM3 NmFjYzU2Y2EwMzc3MGM2NTcyNmE0NjUyYS4uZWEzNjFmZTBiOTlmNTgzYzFhNWFjMzlmMjgwMzcx NTlkZjZkN2YxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA5LTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFdlYktpdExlZ2Fj eSBzaG91bGQgY2FsbCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY5NTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb252ZXJ0IFBhZ2U6Om1faW5V cGRhdGVSZW5kZXJpbmcgdG8gYW4gZW51bSB3aGljaCB0cmFja3MgdGhlIHBoYXNlLCB3aGljaCB3 aWxsIGJlCisgICAgICAgIHVzZWQgaW4gYSBsYXRlciBwYXRjaCB0byBwcmV2ZW50IGV4dHJhIHVw ZGF0ZSBzY2hlZHVsaW5nICh3ZWJraXQub3JnL2IvMjE2NzI2KS4KKyAgICAgICAgCisgICAgICAg IERSVC9XVFIgY2FuIHRyaWdnZXIgUGFnZTo6dXBkYXRlUmVuZGVyaW5nKCkgcmUtZW50cmFuY3ks IHNvIHRoZXJlJ3MgYSBiaXQgb2YgdWdsaW5lc3MKKyAgICAgICAgdGhhdCBkZWFscyB3aXRoIHRo YXQuCisKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6 dXBkYXRlUmVuZGVyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmRvQWZ0ZXJVcGRhdGVS ZW5kZXJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRh dGUpOgorICAgICAgICAqIHBhZ2UvUGFnZS5oOgorCiAyMDIwLTA5LTIwICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkMgRGlzcGxheV0gQWRkIHRo ZSBiZWdpbm5pbmdzIG9mIGEgQ1NTIGRpc3BsYXkgYm94IGhpZXJhcmNoeSBhbmQgQ1NTIHBhaW50 ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwppbmRleCBkYmZhYzI2NzU2ZTY3ZjE2ODNlYTNk OGEyMzU3Njc4M2VkZjljZDQ0Li5jNWFhMjgwYzFkZDM2NjdhNGJjY2RkOTRlNWIwN2I3YmQ2MDIz ZTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjAt MDktMjQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAg V2ViS2l0TGVnYWN5IHNob3VsZCBjYWxsIFBhZ2U6OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjk1OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMg YSBwcmVjdXJzb3IgdG8gZml4aW5nIHdlYmtpdC5vcmcvYi8yMTY3MjYuIFBhZ2UgbmVlZHMgdG8g dHJhY2sgdGhlIHBoYXNlCisgICAgICAgIG9mIHVwZGF0ZVJlbmRlcmluZyB0aGF0IHdlIGFyZSBp biwgYW5kIHRvIGVhc2UgdGhpcyB0cmFja2luZywgV2ViS2l0TGVnYWN5IG5lZWRzIHRvIGNhbGwK KyAgICAgICAgUGFnZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKSBzbyB0aGUgc3RhdGUgaXMg dHJhY2tlZC4KKyAgICAgICAgCisgICAgICAgIFJlbmFtZSAtX3ZpZXdXaWxsRHJhd0ludGVybmFs IHRvIC1fdXBkYXRlUmVuZGVyaW5nLCBhbmQgaGF2ZSBpdCBjYWxsIHVwZGF0ZVJlbmRlcmluZygp CisgICAgICAgIGFuZCBmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpLiBXZSBjYW4gYWxzbyBtb3Zl IGluIHRoZSBjYWxsIHRvIC1fc3luY2hyb25pemVDdXN0b21GaXhlZFBvc2l0aW9uTGF5b3V0UmVj dAorICAgICAgICB3aGljaCBib3RoIGNhbGwgc2l0ZXMgZG8uCisgICAgICAgIAorICAgICAgICBT aW5jZSB1cGRhdGVSZW5kZXJpbmcoKSBpcyBndWFyYW50ZWVkIHRvIHVwZGF0ZSBsYXlvdXQsIHdl IGtub3cgLV9mbHVzaENvbXBvc2l0aW5nQ2hhbmdlcyB3b3VsZCBoYXZlCisgICAgICAgIG5ldmVy IHJldHVybmVkIE5PIGhlcmUsIHNvIHdlIGNhbiByZW1vdmUgdGhlIGNvbmRpdGlvbiBpbiBMYXll ckZsdXNoQ29udHJvbGxlcjo6Zmx1c2hMYXllcnMoKS4KKyAgICAgICAgCisgICAgICAgIC1bV2Vi SFRNTFZpZXcgdmlld1dpbGxEcmF3XSBhbHNvIGRvZXMgYSBzaW1pbGFyIC1fd2ViX3VwZGF0ZUxh eW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmUKKyAgICAgICAgdGhlbiAtX2ZsdXNoQ29tcG9z aXRpbmdDaGFuZ2VzIGJ1dCB0aGlzIGlzIGNhbGxlZCBmcm9tIEFwcEtpdCB3aXRoIGEgdGltaW5n IHRoYXQgd2UgZG9uJ3QgY29udHJvbDsKKyAgICAgICAgaXQgbWF5IGJlIHJlZHVuZGFudCB3aXRo IC1bV2ViVmlldyBfdXBkYXRlUmVuZGVyaW5nXSBidXQgSSBsZWF2ZSB0aGF0IGJlaGF2aW9yIHVu Y2hhbmdlZC4KKworICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2Vi VmlldyBfdXBkYXRlUmVuZGVyaW5nXSk6CisgICAgICAgICgtW1dlYlZpZXcgX2ZvcmNlUmVwYWlu dEZvclRlc3RpbmddKToKKyAgICAgICAgKExheWVyRmx1c2hDb250cm9sbGVyOjpmbHVzaExheWVy cyk6CisgICAgICAgICgtW1dlYlZpZXcgX3ZpZXdXaWxsRHJhd0ludGVybmFsXSk6IERlbGV0ZWQu CisKIDIwMjAtMDktMjMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAg ICBUdXJuIG9mZiB0aGUgbGVnYWN5IHByZWZpeGVkIFdlYkF1ZGlvIEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5j cHAKaW5kZXggMGZlYmQ0YjUyMGVlMjAyNjViYzljYjFhNWY3NzkyZDMxMWJlYTU4Ni4uYzI5NmUy NmI4MWQ5Zjk3YzNlOGM2NWEyZWM1ZGUyNjY3NGUyOWNjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBA IC0xNDM2LDEyICsxNDM2LDEyIEBAIHVuc2lnbmVkIFBhZ2U6OnJlbmRlcmluZ1VwZGF0ZUNvdW50 KCkgY29uc3QKIHZvaWQgUGFnZTo6dXBkYXRlUmVuZGVyaW5nKCkKIHsKICAgICAvLyBUaGlzIGZ1 bmN0aW9uIGlzIG5vdCByZWVudHJhbnQsIGUuZy4gYSByQUYgY2FsbGJhY2sgbWF5IGZvcmNlIHJl cGFpbnQuCi0gICAgaWYgKG1faW5VcGRhdGVSZW5kZXJpbmcpIHsKKyAgICBpZiAobV91cGRhdGVS ZW5kZXJpbmdQaGFzZSA9PSBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJpbmcp IHsKICAgICAgICAgbGF5b3V0SWZOZWVkZWQoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot ICAgIFNldEZvclNjb3BlPGJvb2w+IGluVXBkYXRlUmVuZGVyaW5nKG1faW5VcGRhdGVSZW5kZXJp bmcsIHRydWUpOworICAgIG1fdXBkYXRlUmVuZGVyaW5nUGhhc2UgPSBSZW5kZXJpbmdVcGRhdGVQ aGFzZTo6SW5VcGRhdGVSZW5kZXJpbmc7CiAgICAgbV9sYXN0UmVuZGVyaW5nVXBkYXRlVGltZXN0 YW1wID0gTW9ub3RvbmljVGltZTo6bm93KCk7CiAKICAgICBib29sIGlzU1ZHSW1hZ2VQYWdlID0g Y2hyb21lKCkuY2xpZW50KCkuaXNTVkdJbWFnZUNocm9tZUNsaWVudCgpOwpAQCAtMTQ2OCwxMCAr MTQ2OCwxNCBAQCB2b2lkIFBhZ2U6OnVwZGF0ZVJlbmRlcmluZygpCiAgICAgICAgIGRvY3VtZW50 LnJ1blJlc2l6ZVN0ZXBzKCk7CiAgICAgfSk7CiAKKyAgICBBU1NFUlQobV91cGRhdGVSZW5kZXJp bmdQaGFzZSA9PSBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJpbmcpOworCiAg ICAgZm9yRWFjaERvY3VtZW50KFtdIChEb2N1bWVudCYgZG9jdW1lbnQpIHsKICAgICAgICAgZG9j dW1lbnQucnVuU2Nyb2xsU3RlcHMoKTsKICAgICB9KTsKIAorICAgIEFTU0VSVChtX3VwZGF0ZVJl bmRlcmluZ1BoYXNlID09IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpJblVwZGF0ZVJlbmRlcmluZyk7 CisKICAgICBmb3JFYWNoRG9jdW1lbnQoW10gKERvY3VtZW50JiBkb2N1bWVudCkgewogICAgICAg ICBkb2N1bWVudC5ldmFsdWF0ZU1lZGlhUXVlcmllc0FuZFJlcG9ydENoYW5nZXMoKTsgICAgICAg IAogICAgIH0pOwpAQCAtMTUxNSw2ICsxNTE5LDEwIEBAIHZvaWQgUGFnZTo6dXBkYXRlUmVuZGVy aW5nKCkKICAgICBpZiAoVU5MSUtFTFkoaXNNb25pdG9yaW5nV2hlZWxFdmVudHMoKSkpCiAgICAg ICAgIHdoZWVsRXZlbnRUZXN0TW9uaXRvcigpLT5jaGVja1Nob3VsZEZpcmVDYWxsYmFja3MoKTsK IAorICAgIC8vIEFueSBvZiB0aGUgYWJvdmUgc3RlcHMgY291bGQgaGF2ZSBydW4gc2NyaXB0IGFu ZCB0cmlnZ2VyZWQgYSByZS1lbnRyYW50IGNhbGwgdG8gdXBkYXRlUmVuZGVyaW5nKCkKKyAgICAv LyBhbmQgYSBjYWxsIHRvIGZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCkgLSB0aGlzIGhhcHBlbnMg aW4gdGVzdGluZy4gU28gcmVzZXQgdGhlIHN0YXRlIGhlcmUuCisgICAgbV91cGRhdGVSZW5kZXJp bmdQaGFzZSA9IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpJblVwZGF0ZVJlbmRlcmluZzsKKwogICAg IGlmIChtX2lzVHJhY2tpbmdSZW5kZXJpbmdVcGRhdGVzKQogICAgICAgICArK21fcmVuZGVyaW5n VXBkYXRlQ291bnQ7CiAKQEAgLTE1MjMsMTAgKzE1MzEsMTQgQEAgdm9pZCBQYWdlOjp1cGRhdGVS ZW5kZXJpbmcoKQogCiAgICAgaWYgKCFpc1NWR0ltYWdlUGFnZSkKICAgICAgICAgdHJhY2VQb2lu dChSZW5kZXJpbmdVcGRhdGVFbmQpOworCisgICAgQVNTRVJUKG1fdXBkYXRlUmVuZGVyaW5nUGhh c2UgPT0gUmVuZGVyaW5nVXBkYXRlUGhhc2U6OkluVXBkYXRlUmVuZGVyaW5nKTsKIH0KIAogdm9p ZCBQYWdlOjpkb0FmdGVyVXBkYXRlUmVuZGVyaW5nKCkKIHsKKyAgICBBU1NFUlQobV91cGRhdGVS ZW5kZXJpbmdQaGFzZSA9PSBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJpbmcp OworCiAgICAgLy8gQ29kZSBoZXJlIHNob3VsZCBkbyBvbmNlLXBlci1mcmFtZSB3b3JrIHRoYXQg bmVlZHMgdG8gYmUgZG9uZSBiZWZvcmUgcGFpbnRpbmcsIGFuZCByZXF1aXJlcwogICAgIC8vIGxh eW91dCB0byBiZSB1cC10by1kYXRlLiBJdCBzaG91bGQgbm90IHJ1biBzY3JpcHQsIHRyaWdnZXIg bGF5b3V0LCBvciBkaXJ0eSBsYXlvdXQuCiAKQEAgLTE1ODAsNiArMTU5Miw4IEBAIHZvaWQgUGFn ZTo6ZG9BZnRlclVwZGF0ZVJlbmRlcmluZygpCiAgICAgICAgIEFTU0VSVCghZnJhbWVWaWV3IHx8 ICFmcmFtZVZpZXctPm5lZWRzTGF5b3V0KCkpOwogICAgIH0KICNlbmRpZgorCisgICAgQVNTRVJU KG1fdXBkYXRlUmVuZGVyaW5nUGhhc2UgPT0gUmVuZGVyaW5nVXBkYXRlUGhhc2U6OkluVXBkYXRl UmVuZGVyaW5nKTsKIH0KIAogdm9pZCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZShPcHRp b25TZXQ8RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4gZmxhZ3MpCkBAIC0xNTkxLDggKzE2 MDUsMTIgQEAgdm9pZCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZShPcHRpb25TZXQ8Rmlu YWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4gZmxhZ3MKICAgICBpZiAoZmxhZ3MuY29udGFpbnMo RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFnczo6SW52YWxpZGF0ZUltYWdlc1dpdGhBc3luY0Rl Y29kZXMpKQogICAgICAgICB2aWV3LT5pbnZhbGlkYXRlSW1hZ2VzV2l0aEFzeW5jRGVjb2Rlcygp OwogCisgICAgbV91cGRhdGVSZW5kZXJpbmdQaGFzZSA9IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpM YXllckZsdXNoaW5nOworCiAgICAgdmlldy0+Zmx1c2hDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5n U3ViZnJhbWVzKCk7CiAKKyAgICBtX3VwZGF0ZVJlbmRlcmluZ1BoYXNlID0gUmVuZGVyaW5nVXBk YXRlUGhhc2U6OlBvc3RMYXllckZsdXNoOworCiAjaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElORykK ICAgICBpZiAoYXV0byogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSB0aGlzLT5zY3JvbGxpbmdDb29y ZGluYXRvcigpKSB7CiAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5jb21taXRUcmVlU3Rh dGVJZk5lZWRlZCgpOwpAQCAtMTYwMiw2ICsxNjIwLDggQEAgdm9pZCBQYWdlOjpmaW5hbGl6ZVJl bmRlcmluZ1VwZGF0ZShPcHRpb25TZXQ8RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4gZmxh Z3MKICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmRpZENvbXBsZXRlUmVuZGVyaW5nVXBk YXRlKCk7CiAgICAgfQogI2VuZGlmCisKKyAgICBtX3VwZGF0ZVJlbmRlcmluZ1BoYXNlID0gUmVu ZGVyaW5nVXBkYXRlUGhhc2U6Ok91dHNpZGU7CiB9CiAKIHZvaWQgUGFnZTo6c3VzcGVuZFNjcmlw dGVkQW5pbWF0aW9ucygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4IGFkZjkwNjJjYjBhMmE5Njg5OTQyN2I0 YmJiYTM2MWU4MTE3ZDk5NzAuLjAwNTViYjA0OGU0ZmUwYTY4OWNhMTM5M2RiZDRhZWZmNDMwNzE4 MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC03NzgsNiArNzc4LDEzIEBAIHB1YmxpYzoKICAgICBNb25v dG9uaWNUaW1lIGxhc3RSZW5kZXJpbmdVcGRhdGVUaW1lc3RhbXAoKSBjb25zdCB7IHJldHVybiBt X2xhc3RSZW5kZXJpbmdVcGRhdGVUaW1lc3RhbXA7IH0KIAogcHJpdmF0ZToKKyAgICBlbnVtIGNs YXNzIFJlbmRlcmluZ1VwZGF0ZVBoYXNlIDogdWludDhfdCB7CisgICAgICAgIE91dHNpZGUsCisg ICAgICAgIEluVXBkYXRlUmVuZGVyaW5nLAorICAgICAgICBMYXllckZsdXNoaW5nLAorICAgICAg ICBQb3N0TGF5ZXJGbHVzaAorICAgIH07CisKICAgICBzdHJ1Y3QgTmF2aWdhdGlvbiB7CiAgICAg ICAgIFJlZ2lzdHJhYmxlRG9tYWluIGRvbWFpbjsKICAgICAgICAgRnJhbWVMb2FkVHlwZSB0eXBl OwpAQCAtMTAxMyw3ICsxMDIwLDYgQEAgcHJpdmF0ZToKICAgICBib29sIG1fc2hvdWxkRW5hYmxl SUNFQ2FuZGlkYXRlRmlsdGVyaW5nQnlEZWZhdWx0IHsgdHJ1ZSB9OwogICAgIGJvb2wgbV9tZWRp YVBsYXliYWNrSXNTdXNwZW5kZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9tZWRpYUJ1ZmZlcmlu Z0lzU3VzcGVuZGVkIHsgZmFsc2UgfTsKLSAgICBib29sIG1faW5VcGRhdGVSZW5kZXJpbmcgeyBm YWxzZSB9OwogICAgIGJvb2wgbV9oYXNSZXNvdXJjZUxvYWRDbGllbnQgeyBmYWxzZSB9OwogICAg IGJvb2wgbV9kZWxlZ2F0ZXNTY2FsaW5nIHsgZmFsc2UgfTsKIApAQCAtMTAyMSw2ICsxMDI3LDgg QEAgcHJpdmF0ZToKICAgICBib29sIG1faXNFZGl0YWJsZVJlZ2lvbkVuYWJsZWQgeyBmYWxzZSB9 OwogI2VuZGlmCiAKKyAgICBSZW5kZXJpbmdVcGRhdGVQaGFzZSBtX3VwZGF0ZVJlbmRlcmluZ1Bo YXNlIHsgUmVuZGVyaW5nVXBkYXRlUGhhc2U6Ok91dHNpZGUgfTsKKwogICAgIFVzZXJJbnRlcmZh Y2VMYXlvdXREaXJlY3Rpb24gbV91c2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uIHsgVXNlcklu dGVyZmFjZUxheW91dERpcmVjdGlvbjo6TFRSIH07CiAgICAgCiAgICAgLy8gRm9yIHRlc3Rpbmcu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0g Yi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KaW5kZXggZWU0Y2M2 NzQ0ODZhMTkyNjBjZWFmNzk4NDlhYjIyYmQwODdjNGQ0Mi4uYTI3NzhjYTEyODA1MGMxZGIxMzNh ZDllYmM3OTgyY2FlMDM0MTBlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMv V2ViVmlldy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcv V2ViVmlldy5tbQpAQCAtMTc4OSwxMCArMTc4OSwxNyBAQCAtIChpZClfaW5pdFdpdGhGcmFtZToo TlNSZWN0KWYgZnJhbWVOYW1lOihOU1N0cmluZyAqKWZyYW1lTmFtZSBncm91cE5hbWU6KE5TU3Ry aQogICAgIHJldHVybiBzZWxmOwogfQogCi0tICh2b2lkKV92aWV3V2lsbERyYXdJbnRlcm5hbAor LSAodm9pZClfdXBkYXRlUmVuZGVyaW5nCiB7Ci0gICAgaWYgKF9wcml2YXRlLT5wYWdlKQorI2lm IFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgLy8gRW5zdXJlIGZpeGVkIHBvc2l0aW9ucyBsYXll cnMgYXJlIHdoZXJlIHRoZXkgc2hvdWxkIGJlLgorICAgIFtzZWxmIF9zeW5jaHJvbml6ZUN1c3Rv bUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0XTsKKyNlbmRpZgorCisgICAgaWYgKF9wcml2YXRlLT5w YWdlKSB7CiAgICAgICAgIF9wcml2YXRlLT5wYWdlLT51cGRhdGVSZW5kZXJpbmcoKTsKKyAgICAg ICAgX3ByaXZhdGUtPnBhZ2UtPmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKHsgfSk7CisgICAgfQog fQogCiArIChOU0FycmF5ICopX3N1cHBvcnRlZE1JTUVUeXBlcwpAQCAtNDkwMiwxMyArNDkwOSw3 IEBAICsgKHZvaWQpX3JlbW92ZUFsbFVzZXJDb250ZW50RnJvbUdyb3VwOihOU1N0cmluZyAqKWdy b3VwTmFtZQogCiAtICh2b2lkKV9mb3JjZVJlcGFpbnRGb3JUZXN0aW5nCiB7Ci0jaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKLSAgICAvLyBFbnN1cmUgZml4ZWQgcG9zaXRpb25zIGxheWVycyBhcmUg d2hlcmUgdGhleSBzaG91bGQgYmUuCi0gICAgW3NlbGYgX3N5bmNocm9uaXplQ3VzdG9tRml4ZWRQ b3NpdGlvbkxheW91dFJlY3RdOwotI2VuZGlmCi0KLSAgICBbc2VsZiBfdmlld1dpbGxEcmF3SW50 ZXJuYWxdOwotICAgIFtzZWxmIF9mbHVzaENvbXBvc2l0aW5nQ2hhbmdlc107CisgICAgW3NlbGYg X3VwZGF0ZVJlbmRlcmluZ107CiAgICAgW0NBVHJhbnNhY3Rpb24gZmx1c2hdOwogICAgIFtDQVRy YW5zYWN0aW9uIHN5bmNocm9uaXplXTsKIH0KQEAgLTkzNDYsMjggKzkzNDcsMTkgQEAgYm9vbCBM YXllckZsdXNoQ29udHJvbGxlcjo6Zmx1c2hMYXllcnMoKQogICAgIE5TV2luZG93ICp3aW5kb3cg PSBbbV93ZWJWaWV3IHdpbmRvd107CiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKQogCi0jaWYgUExB VEZPUk0oSU9TX0ZBTUlMWSkKLSAgICAvLyBFbnN1cmUgZml4ZWQgcG9zaXRpb25zIGxheWVycyBh cmUgd2hlcmUgdGhleSBzaG91bGQgYmUuCi0gICAgW21fd2ViVmlldyBfc3luY2hyb25pemVDdXN0 b21GaXhlZFBvc2l0aW9uTGF5b3V0UmVjdF07Ci0jZW5kaWYKLQotICAgIFttX3dlYlZpZXcgX3Zp ZXdXaWxsRHJhd0ludGVybmFsXTsKKyAgICBbbV93ZWJWaWV3IF91cGRhdGVSZW5kZXJpbmddOwog Ci0gICAgaWYgKFttX3dlYlZpZXcgX2ZsdXNoQ29tcG9zaXRpbmdDaGFuZ2VzXSkgewogI2lmIFBM QVRGT1JNKE1BQykKLSAgICAgICAgLy8gQXBwS2l0IG1heSBoYXZlIGRpc2FibGVkIHNjcmVlbiB1 cGRhdGVzLCB0aGlua2luZyBhbiB1cGNvbWluZyB3aW5kb3cgZmx1c2ggd2lsbCByZS1lbmFibGUg dGhlbS4KLSAgICAgICAgLy8gSW4gY2FzZSBzZXROZWVkc0Rpc3BsYXlJblJlY3QoKSBoYXMgcHJl dmVudGVkIHRoZSB3aW5kb3cgZnJvbSBuZWVkaW5nIHRvIGJlIGZsdXNoZWQsIHJlLWVuYWJsZSBz Y3JlZW4KLSAgICAgICAgLy8gdXBkYXRlcyBoZXJlLgotICAgICAgICBBTExPV19ERVBSRUNBVEVE X0RFQ0xBUkFUSU9OU19CRUdJTgotICAgICAgICBpZiAoIVt3aW5kb3cgaXNGbHVzaFdpbmRvd0Rp c2FibGVkXSkKLSAgICAgICAgICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAot ICAgICAgICAgICAgW3dpbmRvdyBfZW5hYmxlU2NyZWVuVXBkYXRlc0lmTmVlZGVkXTsKKyAgICAv LyBBcHBLaXQgbWF5IGhhdmUgZGlzYWJsZWQgc2NyZWVuIHVwZGF0ZXMsIHRoaW5raW5nIGFuIHVw Y29taW5nIHdpbmRvdyBmbHVzaCB3aWxsIHJlLWVuYWJsZSB0aGVtLgorICAgIC8vIEluIGNhc2Ug c2V0TmVlZHNEaXNwbGF5SW5SZWN0KCkgaGFzIHByZXZlbnRlZCB0aGUgd2luZG93IGZyb20gbmVl ZGluZyB0byBiZSBmbHVzaGVkLCByZS1lbmFibGUgc2NyZWVuCisgICAgLy8gdXBkYXRlcyBoZXJl LgorICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCisgICAgaWYgKCFbd2lu ZG93IGlzRmx1c2hXaW5kb3dEaXNhYmxlZF0pCisgICAgICAgIFt3aW5kb3cgX2VuYWJsZVNjcmVl blVwZGF0ZXNJZk5lZWRlZF07CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5E CiAjZW5kaWYKIAotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0KLSAgICByZXR1cm4gZmFs c2U7CisgICAgcmV0dXJuIHRydWU7CiB9CiAKIC0gKHZvaWQpX3NjaGVkdWxlVXBkYXRlUmVuZGVy aW5nCg== 409721 2020-09-25 12:27:02 -0700 2020-09-25 13:30:09 -0700 Patch bug-216958-20200925122702.patch text/plain 13084 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI1ZWY4MmYxNzgxMDM3 NmFjYzU2Y2EwMzc3MGM2NTcyNmE0NjUyYS4uZGVlZDk2MGUwODQyNWI2NzhhOTMwZDQwMDc5YmEz OTJhZDY1NDZhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA5LTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFdlYktpdExlZ2Fj eSBzaG91bGQgY2FsbCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY5NTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb252ZXJ0IFBhZ2U6Om1faW5V cGRhdGVSZW5kZXJpbmcgdG8gYW4gZW51bSB3aGljaCB0cmFja3MgdGhlIHBoYXNlLCB3aGljaCB3 aWxsIGJlCisgICAgICAgIHVzZWQgaW4gYSBsYXRlciBwYXRjaCB0byBwcmV2ZW50IGV4dHJhIHVw ZGF0ZSBzY2hlZHVsaW5nICh3ZWJraXQub3JnL2IvMjE2NzI2KS4KKworICAgICAgICBBZGQgaXNv bGF0ZWRVcGRhdGVSZW5kZXJpbmcoKSwgd2hpY2ggaXMgZm9yIGNhbGxlcnMgd2hvIGFyZW4ndCBn b2luZyB0byBjYWxsIGZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCksCisgICAgICAgIGFuZCB1c2Ug aXQgZm9yIFNWR0ltYWdlIHVwZGF0ZXMuCisKKyAgICAgICAgRFJUL1dUUiBjYW4gdHJpZ2dlciBQ YWdlOjp1cGRhdGVSZW5kZXJpbmcoKSByZS1lbnRyYW5jeSwgc28gdGhlcmUncyBhIGJpdCBvZiB1 Z2xpbmVzcworICAgICAgICB0aGF0IGRlYWxzIHdpdGggdGhhdC4KKworICAgICAgICAqIHBhZ2Uv UGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjp1cGRhdGVSZW5kZXJpbmcpOgorICAg ICAgICAoV2ViQ29yZTo6UGFnZTo6aXNvbGF0ZWRVcGRhdGVSZW5kZXJpbmcpOgorICAgICAgICAo V2ViQ29yZTo6UGFnZTo6ZG9BZnRlclVwZGF0ZVJlbmRlcmluZyk6CisgICAgICAgIChXZWJDb3Jl OjpQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSk6CisgICAgICAgICogcGFnZS9QYWdlLmg6 CisKIDIwMjAtMDktMjAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQyBEaXNwbGF5XSBBZGQgdGhlIGJlZ2lubmluZ3Mgb2YgYSBDU1MgZGlzcGxh eSBib3ggaGllcmFyY2h5IGFuZCBDU1MgcGFpbnRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA5MGFiODczYTYwZTRl MzE0MzAzNmU1Y2I2Y2U5YmU2YjZhZmY1ZjExLi5iOTEzZmNlZmEzM2VjNWFiN2M2MTU5ODA1MjQ5 MmYwOWU5ZjQ0MjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA5LTI1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFdlYktpdExlZ2Fj eSBzaG91bGQgY2FsbCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY5NTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIGR5bmFtaWNWaWV3 cG9ydFNpemVVcGRhdGUoKSBuZWVkcyB0byBjYWxsIGlzb2xhdGVkVXBkYXRlUmVuZGVyaW5nKCkg YmVjYXVzZSBpdCBpc24ndCBmb2xsb3dlZAorICAgICAgICBieSBhIGZpbmFsaXplUmVuZGVyaW5n VXBkYXRlKCkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1Mu bW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUp OgorCiAyMDIwLTA5LTIzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgVHVybiBvZmYgdGhlIGxlZ2FjeSBwcmVmaXhlZCBXZWJBdWRpbyBBUEkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kv bWFjL0NoYW5nZUxvZwppbmRleCBkYmZhYzI2NzU2ZTY3ZjE2ODNlYTNkOGEyMzU3Njc4M2VkZjlj ZDQ0Li5jNWFhMjgwYzFkZDM2NjdhNGJjY2RkOTRlNWIwN2I3YmQ2MDIzZTVhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExl Z2FjeS9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjAtMDktMjQgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0TGVnYWN5IHNo b3VsZCBjYWxsIFBhZ2U6OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjk1OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYSBwcmVjdXJzb3IgdG8g Zml4aW5nIHdlYmtpdC5vcmcvYi8yMTY3MjYuIFBhZ2UgbmVlZHMgdG8gdHJhY2sgdGhlIHBoYXNl CisgICAgICAgIG9mIHVwZGF0ZVJlbmRlcmluZyB0aGF0IHdlIGFyZSBpbiwgYW5kIHRvIGVhc2Ug dGhpcyB0cmFja2luZywgV2ViS2l0TGVnYWN5IG5lZWRzIHRvIGNhbGwKKyAgICAgICAgUGFnZTo6 ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKSBzbyB0aGUgc3RhdGUgaXMgdHJhY2tlZC4KKyAgICAg ICAgCisgICAgICAgIFJlbmFtZSAtX3ZpZXdXaWxsRHJhd0ludGVybmFsIHRvIC1fdXBkYXRlUmVu ZGVyaW5nLCBhbmQgaGF2ZSBpdCBjYWxsIHVwZGF0ZVJlbmRlcmluZygpCisgICAgICAgIGFuZCBm aW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpLiBXZSBjYW4gYWxzbyBtb3ZlIGluIHRoZSBjYWxsIHRv IC1fc3luY2hyb25pemVDdXN0b21GaXhlZFBvc2l0aW9uTGF5b3V0UmVjdAorICAgICAgICB3aGlj aCBib3RoIGNhbGwgc2l0ZXMgZG8uCisgICAgICAgIAorICAgICAgICBTaW5jZSB1cGRhdGVSZW5k ZXJpbmcoKSBpcyBndWFyYW50ZWVkIHRvIHVwZGF0ZSBsYXlvdXQsIHdlIGtub3cgLV9mbHVzaENv bXBvc2l0aW5nQ2hhbmdlcyB3b3VsZCBoYXZlCisgICAgICAgIG5ldmVyIHJldHVybmVkIE5PIGhl cmUsIHNvIHdlIGNhbiByZW1vdmUgdGhlIGNvbmRpdGlvbiBpbiBMYXllckZsdXNoQ29udHJvbGxl cjo6Zmx1c2hMYXllcnMoKS4KKyAgICAgICAgCisgICAgICAgIC1bV2ViSFRNTFZpZXcgdmlld1dp bGxEcmF3XSBhbHNvIGRvZXMgYSBzaW1pbGFyIC1fd2ViX3VwZGF0ZUxheW91dEFuZFN0eWxlSWZO ZWVkZWRSZWN1cnNpdmUKKyAgICAgICAgdGhlbiAtX2ZsdXNoQ29tcG9zaXRpbmdDaGFuZ2VzIGJ1 dCB0aGlzIGlzIGNhbGxlZCBmcm9tIEFwcEtpdCB3aXRoIGEgdGltaW5nIHRoYXQgd2UgZG9uJ3Qg Y29udHJvbDsKKyAgICAgICAgaXQgbWF5IGJlIHJlZHVuZGFudCB3aXRoIC1bV2ViVmlldyBfdXBk YXRlUmVuZGVyaW5nXSBidXQgSSBsZWF2ZSB0aGF0IGJlaGF2aW9yIHVuY2hhbmdlZC4KKworICAg ICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfdXBkYXRlUmVu ZGVyaW5nXSk6CisgICAgICAgICgtW1dlYlZpZXcgX2ZvcmNlUmVwYWludEZvclRlc3RpbmddKToK KyAgICAgICAgKExheWVyRmx1c2hDb250cm9sbGVyOjpmbHVzaExheWVycyk6CisgICAgICAgICgt W1dlYlZpZXcgX3ZpZXdXaWxsRHJhd0ludGVybmFsXSk6IERlbGV0ZWQuCisKIDIwMjAtMDktMjMg IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBUdXJuIG9mZiB0aGUg bGVnYWN5IHByZWZpeGVkIFdlYkF1ZGlvIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggMGZlYmQ0 YjUyMGVlMjAyNjViYzljYjFhNWY3NzkyZDMxMWJlYTU4Ni4uZmIzMWQxODY5OTlkNWE5YjY1MGRh ZDhlZDgzNmQ1YjhiMTM5ODc5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC0xNDM2LDEyICsxNDM2 LDEyIEBAIHVuc2lnbmVkIFBhZ2U6OnJlbmRlcmluZ1VwZGF0ZUNvdW50KCkgY29uc3QKIHZvaWQg UGFnZTo6dXBkYXRlUmVuZGVyaW5nKCkKIHsKICAgICAvLyBUaGlzIGZ1bmN0aW9uIGlzIG5vdCBy ZWVudHJhbnQsIGUuZy4gYSByQUYgY2FsbGJhY2sgbWF5IGZvcmNlIHJlcGFpbnQuCi0gICAgaWYg KG1faW5VcGRhdGVSZW5kZXJpbmcpIHsKKyAgICBpZiAobV91cGRhdGVSZW5kZXJpbmdQaGFzZSA9 PSBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJpbmcpIHsKICAgICAgICAgbGF5 b3V0SWZOZWVkZWQoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIFNldEZvclNjb3Bl PGJvb2w+IGluVXBkYXRlUmVuZGVyaW5nKG1faW5VcGRhdGVSZW5kZXJpbmcsIHRydWUpOworICAg IG1fdXBkYXRlUmVuZGVyaW5nUGhhc2UgPSBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVS ZW5kZXJpbmc7CiAgICAgbV9sYXN0UmVuZGVyaW5nVXBkYXRlVGltZXN0YW1wID0gTW9ub3Rvbmlj VGltZTo6bm93KCk7CiAKICAgICBib29sIGlzU1ZHSW1hZ2VQYWdlID0gY2hyb21lKCkuY2xpZW50 KCkuaXNTVkdJbWFnZUNocm9tZUNsaWVudCgpOwpAQCAtMTQ2OCwxMCArMTQ2OCwxNCBAQCB2b2lk IFBhZ2U6OnVwZGF0ZVJlbmRlcmluZygpCiAgICAgICAgIGRvY3VtZW50LnJ1blJlc2l6ZVN0ZXBz KCk7CiAgICAgfSk7CiAKKyAgICBBU1NFUlQobV91cGRhdGVSZW5kZXJpbmdQaGFzZSA9PSBSZW5k ZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJpbmcpOworCiAgICAgZm9yRWFjaERvY3Vt ZW50KFtdIChEb2N1bWVudCYgZG9jdW1lbnQpIHsKICAgICAgICAgZG9jdW1lbnQucnVuU2Nyb2xs U3RlcHMoKTsKICAgICB9KTsKIAorICAgIEFTU0VSVChtX3VwZGF0ZVJlbmRlcmluZ1BoYXNlID09 IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpJblVwZGF0ZVJlbmRlcmluZyk7CisKICAgICBmb3JFYWNo RG9jdW1lbnQoW10gKERvY3VtZW50JiBkb2N1bWVudCkgewogICAgICAgICBkb2N1bWVudC5ldmFs dWF0ZU1lZGlhUXVlcmllc0FuZFJlcG9ydENoYW5nZXMoKTsgICAgICAgIAogICAgIH0pOwpAQCAt MTUwMyw3ICsxNTA3LDcgQEAgdm9pZCBQYWdlOjp1cGRhdGVSZW5kZXJpbmcoKQogICAgIGZvckVh Y2hEb2N1bWVudChbXSAoRG9jdW1lbnQmIGRvY3VtZW50KSB7CiAgICAgICAgIGZvciAoYXV0byYg aW1hZ2UgOiBkb2N1bWVudC5jYWNoZWRSZXNvdXJjZUxvYWRlcigpLmFsbENhY2hlZFNWR0ltYWdl cygpKSB7CiAgICAgICAgICAgICBpZiAoYXV0byogcGFnZSA9IGltYWdlLT5pbnRlcm5hbFBhZ2Uo KSkKLSAgICAgICAgICAgICAgICBwYWdlLT51cGRhdGVSZW5kZXJpbmcoKTsKKyAgICAgICAgICAg ICAgICBwYWdlLT5pc29sYXRlZFVwZGF0ZVJlbmRlcmluZygpOwogICAgICAgICB9CiAgICAgfSk7 CiAKQEAgLTE1MTUsNiArMTUxOSwxMCBAQCB2b2lkIFBhZ2U6OnVwZGF0ZVJlbmRlcmluZygpCiAg ICAgaWYgKFVOTElLRUxZKGlzTW9uaXRvcmluZ1doZWVsRXZlbnRzKCkpKQogICAgICAgICB3aGVl bEV2ZW50VGVzdE1vbml0b3IoKS0+Y2hlY2tTaG91bGRGaXJlQ2FsbGJhY2tzKCk7CiAKKyAgICAv LyBBbnkgb2YgdGhlIGFib3ZlIHN0ZXBzIGNvdWxkIGhhdmUgcnVuIHNjcmlwdCBhbmQgdHJpZ2dl cmVkIGEgcmUtZW50cmFudCBjYWxsIHRvIHVwZGF0ZVJlbmRlcmluZygpCisgICAgLy8gYW5kIGEg Y2FsbCB0byBmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpIC0gdGhpcyBoYXBwZW5zIGluIHRlc3Rp bmcuIFNvIHJlc2V0IHRoZSBzdGF0ZSBoZXJlLgorICAgIG1fdXBkYXRlUmVuZGVyaW5nUGhhc2Ug PSBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJpbmc7CisKICAgICBpZiAobV9p c1RyYWNraW5nUmVuZGVyaW5nVXBkYXRlcykKICAgICAgICAgKyttX3JlbmRlcmluZ1VwZGF0ZUNv dW50OwogCkBAIC0xNTIzLDEwICsxNTMxLDIwIEBAIHZvaWQgUGFnZTo6dXBkYXRlUmVuZGVyaW5n KCkKIAogICAgIGlmICghaXNTVkdJbWFnZVBhZ2UpCiAgICAgICAgIHRyYWNlUG9pbnQoUmVuZGVy aW5nVXBkYXRlRW5kKTsKKworICAgIEFTU0VSVChtX3VwZGF0ZVJlbmRlcmluZ1BoYXNlID09IFJl bmRlcmluZ1VwZGF0ZVBoYXNlOjpJblVwZGF0ZVJlbmRlcmluZyk7Cit9CisKK3ZvaWQgUGFnZTo6 aXNvbGF0ZWRVcGRhdGVSZW5kZXJpbmcoKQoreworICAgIHVwZGF0ZVJlbmRlcmluZygpOworICAg IG1fdXBkYXRlUmVuZGVyaW5nUGhhc2UgPSBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6T3V0c2lkZTsK IH0KIAogdm9pZCBQYWdlOjpkb0FmdGVyVXBkYXRlUmVuZGVyaW5nKCkKIHsKKyAgICBBU1NFUlQo bV91cGRhdGVSZW5kZXJpbmdQaGFzZSA9PSBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVS ZW5kZXJpbmcpOworCiAgICAgLy8gQ29kZSBoZXJlIHNob3VsZCBkbyBvbmNlLXBlci1mcmFtZSB3 b3JrIHRoYXQgbmVlZHMgdG8gYmUgZG9uZSBiZWZvcmUgcGFpbnRpbmcsIGFuZCByZXF1aXJlcwog ICAgIC8vIGxheW91dCB0byBiZSB1cC10by1kYXRlLiBJdCBzaG91bGQgbm90IHJ1biBzY3JpcHQs IHRyaWdnZXIgbGF5b3V0LCBvciBkaXJ0eSBsYXlvdXQuCiAKQEAgLTE1ODAsNiArMTU5OCw4IEBA IHZvaWQgUGFnZTo6ZG9BZnRlclVwZGF0ZVJlbmRlcmluZygpCiAgICAgICAgIEFTU0VSVCghZnJh bWVWaWV3IHx8ICFmcmFtZVZpZXctPm5lZWRzTGF5b3V0KCkpOwogICAgIH0KICNlbmRpZgorCisg ICAgQVNTRVJUKG1fdXBkYXRlUmVuZGVyaW5nUGhhc2UgPT0gUmVuZGVyaW5nVXBkYXRlUGhhc2U6 OkluVXBkYXRlUmVuZGVyaW5nKTsKIH0KIAogdm9pZCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1Vw ZGF0ZShPcHRpb25TZXQ8RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4gZmxhZ3MpCkBAIC0x NTkxLDggKzE2MTEsMTIgQEAgdm9pZCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZShPcHRp b25TZXQ8RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4gZmxhZ3MKICAgICBpZiAoZmxhZ3Mu Y29udGFpbnMoRmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFnczo6SW52YWxpZGF0ZUltYWdlc1dp dGhBc3luY0RlY29kZXMpKQogICAgICAgICB2aWV3LT5pbnZhbGlkYXRlSW1hZ2VzV2l0aEFzeW5j RGVjb2RlcygpOwogCisgICAgbV91cGRhdGVSZW5kZXJpbmdQaGFzZSA9IFJlbmRlcmluZ1VwZGF0 ZVBoYXNlOjpMYXllckZsdXNoaW5nOworCiAgICAgdmlldy0+Zmx1c2hDb21wb3NpdGluZ1N0YXRl SW5jbHVkaW5nU3ViZnJhbWVzKCk7CiAKKyAgICBtX3VwZGF0ZVJlbmRlcmluZ1BoYXNlID0gUmVu ZGVyaW5nVXBkYXRlUGhhc2U6OlBvc3RMYXllckZsdXNoOworCiAjaWYgRU5BQkxFKEFTWU5DX1ND Uk9MTElORykKICAgICBpZiAoYXV0byogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSB0aGlzLT5zY3Jv bGxpbmdDb29yZGluYXRvcigpKSB7CiAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5jb21t aXRUcmVlU3RhdGVJZk5lZWRlZCgpOwpAQCAtMTYwMiw2ICsxNjI2LDggQEAgdm9pZCBQYWdlOjpm aW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZShPcHRpb25TZXQ8RmluYWxpemVSZW5kZXJpbmdVcGRhdGVG bGFncz4gZmxhZ3MKICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmRpZENvbXBsZXRlUmVu ZGVyaW5nVXBkYXRlKCk7CiAgICAgfQogI2VuZGlmCisKKyAgICBtX3VwZGF0ZVJlbmRlcmluZ1Bo YXNlID0gUmVuZGVyaW5nVXBkYXRlUGhhc2U6Ok91dHNpZGU7CiB9CiAKIHZvaWQgUGFnZTo6c3Vz cGVuZFNjcmlwdGVkQW5pbWF0aW9ucygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4IGFkZjkwNjJjYjBhMmE5 Njg5OTQyN2I0YmJiYTM2MWU4MTE3ZDk5NzAuLjY0ODg3MDExZDY3ODZjZGU4MzMwMGZmNzA4MTM1 OWJmYjVlOWZiMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC00OTAsNyArNDkwLDggQEAgcHVibGljOgog CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBsYXlvdXRJZk5lZWRlZCgpOwogICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgdXBkYXRlUmVuZGVyaW5nKCk7Ci0gICAgCisgICAgLy8gQSBjYWxsIHRvIHVw ZGF0ZVJlbmRlcmluZygpIHRoYXQgaXMgbm90IGZvbGxvd2VkIGJ5IGEgY2FsbCB0byBmaW5hbGl6 ZVJlbmRlcmluZ1VwZGF0ZSgpLgorICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgaXNvbGF0ZWRVcGRh dGVSZW5kZXJpbmcoKTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGZpbmFsaXplUmVuZGVyaW5n VXBkYXRlKE9wdGlvblNldDxGaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZUZsYWdzPik7CiAgICAgCiAg ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzY2hlZHVsZVJlbmRlcmluZ1VwZGF0ZSgpOwpAQCAtNzc4 LDYgKzc3OSwxMyBAQCBwdWJsaWM6CiAgICAgTW9ub3RvbmljVGltZSBsYXN0UmVuZGVyaW5nVXBk YXRlVGltZXN0YW1wKCkgY29uc3QgeyByZXR1cm4gbV9sYXN0UmVuZGVyaW5nVXBkYXRlVGltZXN0 YW1wOyB9CiAKIHByaXZhdGU6CisgICAgZW51bSBjbGFzcyBSZW5kZXJpbmdVcGRhdGVQaGFzZSA6 IHVpbnQ4X3QgeworICAgICAgICBPdXRzaWRlLAorICAgICAgICBJblVwZGF0ZVJlbmRlcmluZywK KyAgICAgICAgTGF5ZXJGbHVzaGluZywKKyAgICAgICAgUG9zdExheWVyRmx1c2gKKyAgICB9Owor CiAgICAgc3RydWN0IE5hdmlnYXRpb24gewogICAgICAgICBSZWdpc3RyYWJsZURvbWFpbiBkb21h aW47CiAgICAgICAgIEZyYW1lTG9hZFR5cGUgdHlwZTsKQEAgLTEwMTMsNyArMTAyMSw2IEBAIHBy aXZhdGU6CiAgICAgYm9vbCBtX3Nob3VsZEVuYWJsZUlDRUNhbmRpZGF0ZUZpbHRlcmluZ0J5RGVm YXVsdCB7IHRydWUgfTsKICAgICBib29sIG1fbWVkaWFQbGF5YmFja0lzU3VzcGVuZGVkIHsgZmFs c2UgfTsKICAgICBib29sIG1fbWVkaWFCdWZmZXJpbmdJc1N1c3BlbmRlZCB7IGZhbHNlIH07Ci0g ICAgYm9vbCBtX2luVXBkYXRlUmVuZGVyaW5nIHsgZmFsc2UgfTsKICAgICBib29sIG1faGFzUmVz b3VyY2VMb2FkQ2xpZW50IHsgZmFsc2UgfTsKICAgICBib29sIG1fZGVsZWdhdGVzU2NhbGluZyB7 IGZhbHNlIH07CiAKQEAgLTEwMjEsNiArMTAyOCw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lz RWRpdGFibGVSZWdpb25FbmFibGVkIHsgZmFsc2UgfTsKICNlbmRpZgogCisgICAgUmVuZGVyaW5n VXBkYXRlUGhhc2UgbV91cGRhdGVSZW5kZXJpbmdQaGFzZSB7IFJlbmRlcmluZ1VwZGF0ZVBoYXNl OjpPdXRzaWRlIH07CisKICAgICBVc2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uIG1fdXNlcklu dGVyZmFjZUxheW91dERpcmVjdGlvbiB7IFVzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb246OkxU UiB9OwogICAgIAogICAgIC8vIEZvciB0ZXN0aW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCAwYWRjZDc3YmY1ZDcxNjc5 YjM0ZGM1YzgzOTZmOWU5MjljYTNkOTFkLi5kZGM3ZTc2MWVhZjE0MmI3OTkyMzZjZTEyMmZmZjQy NDcxZGEyYjcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9p b3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9p b3MvV2ViUGFnZUlPUy5tbQpAQCAtMzQ0MSw3ICszNDQxLDcgQEAgdm9pZCBXZWJQYWdlOjpkeW5h bWljVmlld3BvcnRTaXplVXBkYXRlKGNvbnN0IEZsb2F0U2l6ZSYgdmlld0xheW91dFNpemUsIGNv bnN0IFcKICAgICBzZXREZXZpY2VPcmllbnRhdGlvbihkZXZpY2VPcmllbnRhdGlvbik7CiAgICAg ZnJhbWVWaWV3LnNldFNjcm9sbE9mZnNldChyb3VuZGVkVW5vYnNjdXJlZENvbnRlbnRSZWN0UG9z aXRpb24pOwogCi0gICAgbV9wYWdlLT51cGRhdGVSZW5kZXJpbmcoKTsKKyAgICBtX3BhZ2UtPmlz b2xhdGVkVXBkYXRlUmVuZGVyaW5nKCk7CiAKICNpZiBFTkFCTEUoVklFV1BPUlRfUkVTSVpJTkcp CiAgICAgc2hyaW5rVG9GaXRDb250ZW50KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVn YWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJW aWV3L1dlYlZpZXcubW0KaW5kZXggZWU0Y2M2NzQ0ODZhMTkyNjBjZWFmNzk4NDlhYjIyYmQwODdj NGQ0Mi4uYTI3NzhjYTEyODA1MGMxZGIxMzNhZDllYmM3OTgyY2FlMDM0MTBlZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJj ZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtMTc4OSwxMCArMTc4OSwx NyBAQCAtIChpZClfaW5pdFdpdGhGcmFtZTooTlNSZWN0KWYgZnJhbWVOYW1lOihOU1N0cmluZyAq KWZyYW1lTmFtZSBncm91cE5hbWU6KE5TU3RyaQogICAgIHJldHVybiBzZWxmOwogfQogCi0tICh2 b2lkKV92aWV3V2lsbERyYXdJbnRlcm5hbAorLSAodm9pZClfdXBkYXRlUmVuZGVyaW5nCiB7Ci0g ICAgaWYgKF9wcml2YXRlLT5wYWdlKQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgLy8g RW5zdXJlIGZpeGVkIHBvc2l0aW9ucyBsYXllcnMgYXJlIHdoZXJlIHRoZXkgc2hvdWxkIGJlLgor ICAgIFtzZWxmIF9zeW5jaHJvbml6ZUN1c3RvbUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0XTsKKyNl bmRpZgorCisgICAgaWYgKF9wcml2YXRlLT5wYWdlKSB7CiAgICAgICAgIF9wcml2YXRlLT5wYWdl LT51cGRhdGVSZW5kZXJpbmcoKTsKKyAgICAgICAgX3ByaXZhdGUtPnBhZ2UtPmZpbmFsaXplUmVu ZGVyaW5nVXBkYXRlKHsgfSk7CisgICAgfQogfQogCiArIChOU0FycmF5ICopX3N1cHBvcnRlZE1J TUVUeXBlcwpAQCAtNDkwMiwxMyArNDkwOSw3IEBAICsgKHZvaWQpX3JlbW92ZUFsbFVzZXJDb250 ZW50RnJvbUdyb3VwOihOU1N0cmluZyAqKWdyb3VwTmFtZQogCiAtICh2b2lkKV9mb3JjZVJlcGFp bnRGb3JUZXN0aW5nCiB7Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICAvLyBFbnN1cmUg Zml4ZWQgcG9zaXRpb25zIGxheWVycyBhcmUgd2hlcmUgdGhleSBzaG91bGQgYmUuCi0gICAgW3Nl bGYgX3N5bmNocm9uaXplQ3VzdG9tRml4ZWRQb3NpdGlvbkxheW91dFJlY3RdOwotI2VuZGlmCi0K LSAgICBbc2VsZiBfdmlld1dpbGxEcmF3SW50ZXJuYWxdOwotICAgIFtzZWxmIF9mbHVzaENvbXBv c2l0aW5nQ2hhbmdlc107CisgICAgW3NlbGYgX3VwZGF0ZVJlbmRlcmluZ107CiAgICAgW0NBVHJh bnNhY3Rpb24gZmx1c2hdOwogICAgIFtDQVRyYW5zYWN0aW9uIHN5bmNocm9uaXplXTsKIH0KQEAg LTkzNDYsMjggKzkzNDcsMTkgQEAgYm9vbCBMYXllckZsdXNoQ29udHJvbGxlcjo6Zmx1c2hMYXll cnMoKQogICAgIE5TV2luZG93ICp3aW5kb3cgPSBbbV93ZWJWaWV3IHdpbmRvd107CiAjZW5kaWYg Ly8gUExBVEZPUk0oTUFDKQogCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICAvLyBFbnN1 cmUgZml4ZWQgcG9zaXRpb25zIGxheWVycyBhcmUgd2hlcmUgdGhleSBzaG91bGQgYmUuCi0gICAg W21fd2ViVmlldyBfc3luY2hyb25pemVDdXN0b21GaXhlZFBvc2l0aW9uTGF5b3V0UmVjdF07Ci0j ZW5kaWYKLQotICAgIFttX3dlYlZpZXcgX3ZpZXdXaWxsRHJhd0ludGVybmFsXTsKKyAgICBbbV93 ZWJWaWV3IF91cGRhdGVSZW5kZXJpbmddOwogCi0gICAgaWYgKFttX3dlYlZpZXcgX2ZsdXNoQ29t cG9zaXRpbmdDaGFuZ2VzXSkgewogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgLy8gQXBwS2l0 IG1heSBoYXZlIGRpc2FibGVkIHNjcmVlbiB1cGRhdGVzLCB0aGlua2luZyBhbiB1cGNvbWluZyB3 aW5kb3cgZmx1c2ggd2lsbCByZS1lbmFibGUgdGhlbS4KLSAgICAgICAgLy8gSW4gY2FzZSBzZXRO ZWVkc0Rpc3BsYXlJblJlY3QoKSBoYXMgcHJldmVudGVkIHRoZSB3aW5kb3cgZnJvbSBuZWVkaW5n IHRvIGJlIGZsdXNoZWQsIHJlLWVuYWJsZSBzY3JlZW4KLSAgICAgICAgLy8gdXBkYXRlcyBoZXJl LgotICAgICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgotICAgICAgICBp ZiAoIVt3aW5kb3cgaXNGbHVzaFdpbmRvd0Rpc2FibGVkXSkKLSAgICAgICAgICAgIEFMTE9XX0RF UFJFQ0FURURfREVDTEFSQVRJT05TX0VORAotICAgICAgICAgICAgW3dpbmRvdyBfZW5hYmxlU2Ny ZWVuVXBkYXRlc0lmTmVlZGVkXTsKKyAgICAvLyBBcHBLaXQgbWF5IGhhdmUgZGlzYWJsZWQgc2Ny ZWVuIHVwZGF0ZXMsIHRoaW5raW5nIGFuIHVwY29taW5nIHdpbmRvdyBmbHVzaCB3aWxsIHJlLWVu YWJsZSB0aGVtLgorICAgIC8vIEluIGNhc2Ugc2V0TmVlZHNEaXNwbGF5SW5SZWN0KCkgaGFzIHBy ZXZlbnRlZCB0aGUgd2luZG93IGZyb20gbmVlZGluZyB0byBiZSBmbHVzaGVkLCByZS1lbmFibGUg c2NyZWVuCisgICAgLy8gdXBkYXRlcyBoZXJlLgorICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFS QVRJT05TX0JFR0lOCisgICAgaWYgKCFbd2luZG93IGlzRmx1c2hXaW5kb3dEaXNhYmxlZF0pCisg ICAgICAgIFt3aW5kb3cgX2VuYWJsZVNjcmVlblVwZGF0ZXNJZk5lZWRlZF07CisgICAgQUxMT1df REVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAjZW5kaWYKIAotICAgICAgICByZXR1cm4gdHJ1 ZTsKLSAgICB9Ci0KLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHRydWU7CiB9CiAKIC0g KHZvaWQpX3NjaGVkdWxlVXBkYXRlUmVuZGVyaW5nCg== 409729 2020-09-25 13:30:11 -0700 2020-09-25 16:35:20 -0700 Patch bug-216958-20200925133010.patch text/plain 16120 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI1ZWY4MmYxNzgxMDM3 NmFjYzU2Y2EwMzc3MGM2NTcyNmE0NjUyYS4uZGVlZDk2MGUwODQyNWI2NzhhOTMwZDQwMDc5YmEz OTJhZDY1NDZhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA5LTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFdlYktpdExlZ2Fj eSBzaG91bGQgY2FsbCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY5NTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb252ZXJ0IFBhZ2U6Om1faW5V cGRhdGVSZW5kZXJpbmcgdG8gYW4gZW51bSB3aGljaCB0cmFja3MgdGhlIHBoYXNlLCB3aGljaCB3 aWxsIGJlCisgICAgICAgIHVzZWQgaW4gYSBsYXRlciBwYXRjaCB0byBwcmV2ZW50IGV4dHJhIHVw ZGF0ZSBzY2hlZHVsaW5nICh3ZWJraXQub3JnL2IvMjE2NzI2KS4KKworICAgICAgICBBZGQgaXNv bGF0ZWRVcGRhdGVSZW5kZXJpbmcoKSwgd2hpY2ggaXMgZm9yIGNhbGxlcnMgd2hvIGFyZW4ndCBn b2luZyB0byBjYWxsIGZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCksCisgICAgICAgIGFuZCB1c2Ug aXQgZm9yIFNWR0ltYWdlIHVwZGF0ZXMuCisKKyAgICAgICAgRFJUL1dUUiBjYW4gdHJpZ2dlciBQ YWdlOjp1cGRhdGVSZW5kZXJpbmcoKSByZS1lbnRyYW5jeSwgc28gdGhlcmUncyBhIGJpdCBvZiB1 Z2xpbmVzcworICAgICAgICB0aGF0IGRlYWxzIHdpdGggdGhhdC4KKworICAgICAgICAqIHBhZ2Uv UGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjp1cGRhdGVSZW5kZXJpbmcpOgorICAg ICAgICAoV2ViQ29yZTo6UGFnZTo6aXNvbGF0ZWRVcGRhdGVSZW5kZXJpbmcpOgorICAgICAgICAo V2ViQ29yZTo6UGFnZTo6ZG9BZnRlclVwZGF0ZVJlbmRlcmluZyk6CisgICAgICAgIChXZWJDb3Jl OjpQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSk6CisgICAgICAgICogcGFnZS9QYWdlLmg6 CisKIDIwMjAtMDktMjAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQyBEaXNwbGF5XSBBZGQgdGhlIGJlZ2lubmluZ3Mgb2YgYSBDU1MgZGlzcGxh eSBib3ggaGllcmFyY2h5IGFuZCBDU1MgcGFpbnRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA5MGFiODczYTYwZTRl MzE0MzAzNmU1Y2I2Y2U5YmU2YjZhZmY1ZjExLi5iOTEzZmNlZmEzM2VjNWFiN2M2MTU5ODA1MjQ5 MmYwOWU5ZjQ0MjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA5LTI1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFdlYktpdExlZ2Fj eSBzaG91bGQgY2FsbCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY5NTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIGR5bmFtaWNWaWV3 cG9ydFNpemVVcGRhdGUoKSBuZWVkcyB0byBjYWxsIGlzb2xhdGVkVXBkYXRlUmVuZGVyaW5nKCkg YmVjYXVzZSBpdCBpc24ndCBmb2xsb3dlZAorICAgICAgICBieSBhIGZpbmFsaXplUmVuZGVyaW5n VXBkYXRlKCkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1Mu bW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUp OgorCiAyMDIwLTA5LTIzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgVHVybiBvZmYgdGhlIGxlZ2FjeSBwcmVmaXhlZCBXZWJBdWRpbyBBUEkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kv bWFjL0NoYW5nZUxvZwppbmRleCBkYmZhYzI2NzU2ZTY3ZjE2ODNlYTNkOGEyMzU3Njc4M2VkZjlj ZDQ0Li5jNWFhMjgwYzFkZDM2NjdhNGJjY2RkOTRlNWIwN2I3YmQ2MDIzZTVhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExl Z2FjeS9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjAtMDktMjQgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0TGVnYWN5IHNo b3VsZCBjYWxsIFBhZ2U6OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjk1OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYSBwcmVjdXJzb3IgdG8g Zml4aW5nIHdlYmtpdC5vcmcvYi8yMTY3MjYuIFBhZ2UgbmVlZHMgdG8gdHJhY2sgdGhlIHBoYXNl CisgICAgICAgIG9mIHVwZGF0ZVJlbmRlcmluZyB0aGF0IHdlIGFyZSBpbiwgYW5kIHRvIGVhc2Ug dGhpcyB0cmFja2luZywgV2ViS2l0TGVnYWN5IG5lZWRzIHRvIGNhbGwKKyAgICAgICAgUGFnZTo6 ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKSBzbyB0aGUgc3RhdGUgaXMgdHJhY2tlZC4KKyAgICAg ICAgCisgICAgICAgIFJlbmFtZSAtX3ZpZXdXaWxsRHJhd0ludGVybmFsIHRvIC1fdXBkYXRlUmVu ZGVyaW5nLCBhbmQgaGF2ZSBpdCBjYWxsIHVwZGF0ZVJlbmRlcmluZygpCisgICAgICAgIGFuZCBm aW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpLiBXZSBjYW4gYWxzbyBtb3ZlIGluIHRoZSBjYWxsIHRv IC1fc3luY2hyb25pemVDdXN0b21GaXhlZFBvc2l0aW9uTGF5b3V0UmVjdAorICAgICAgICB3aGlj aCBib3RoIGNhbGwgc2l0ZXMgZG8uCisgICAgICAgIAorICAgICAgICBTaW5jZSB1cGRhdGVSZW5k ZXJpbmcoKSBpcyBndWFyYW50ZWVkIHRvIHVwZGF0ZSBsYXlvdXQsIHdlIGtub3cgLV9mbHVzaENv bXBvc2l0aW5nQ2hhbmdlcyB3b3VsZCBoYXZlCisgICAgICAgIG5ldmVyIHJldHVybmVkIE5PIGhl cmUsIHNvIHdlIGNhbiByZW1vdmUgdGhlIGNvbmRpdGlvbiBpbiBMYXllckZsdXNoQ29udHJvbGxl cjo6Zmx1c2hMYXllcnMoKS4KKyAgICAgICAgCisgICAgICAgIC1bV2ViSFRNTFZpZXcgdmlld1dp bGxEcmF3XSBhbHNvIGRvZXMgYSBzaW1pbGFyIC1fd2ViX3VwZGF0ZUxheW91dEFuZFN0eWxlSWZO ZWVkZWRSZWN1cnNpdmUKKyAgICAgICAgdGhlbiAtX2ZsdXNoQ29tcG9zaXRpbmdDaGFuZ2VzIGJ1 dCB0aGlzIGlzIGNhbGxlZCBmcm9tIEFwcEtpdCB3aXRoIGEgdGltaW5nIHRoYXQgd2UgZG9uJ3Qg Y29udHJvbDsKKyAgICAgICAgaXQgbWF5IGJlIHJlZHVuZGFudCB3aXRoIC1bV2ViVmlldyBfdXBk YXRlUmVuZGVyaW5nXSBidXQgSSBsZWF2ZSB0aGF0IGJlaGF2aW9yIHVuY2hhbmdlZC4KKworICAg ICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfdXBkYXRlUmVu ZGVyaW5nXSk6CisgICAgICAgICgtW1dlYlZpZXcgX2ZvcmNlUmVwYWludEZvclRlc3RpbmddKToK KyAgICAgICAgKExheWVyRmx1c2hDb250cm9sbGVyOjpmbHVzaExheWVycyk6CisgICAgICAgICgt W1dlYlZpZXcgX3ZpZXdXaWxsRHJhd0ludGVybmFsXSk6IERlbGV0ZWQuCisKIDIwMjAtMDktMjMg IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBUdXJuIG9mZiB0aGUg bGVnYWN5IHByZWZpeGVkIFdlYkF1ZGlvIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExl Z2FjeS93aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCmlu ZGV4IDgzMDI3MThiNDczMGU1YTQ3MWJjZGMwMTBhY2YwODFiYTg2ZjM4ZTYuLjRmZDhkYTMyNjg1 MTk0OGQ2ZjNiYjk1ODM4ZWFhYjc2ODFiNDFjNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRM ZWdhY3kvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMC0wOS0yNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXRMZWdhY3kgc2hvdWxkIGNhbGwgUGFnZTo6 ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE2OTU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2luZG93cyBkb2Vzbid0IGNhbGwgZmluYWxpemVSZW5kZXJpbmdV cGRhdGUoKSBzbyBuZWVkcyB0byB1c2UgaXNvbGF0ZWRVcGRhdGVSZW5kZXJpbmcoKS4KKworICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0LmNwcDoK KyAgICAgICAgKEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpmbHVzaEFuZFJlbmRlckxh eWVycyk6CisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3OjpwYWludCk6 CisgICAgICAgIChXZWJWaWV3OjpmbHVzaFBlbmRpbmdHcmFwaGljc0xheWVyQ2hhbmdlc1Nvb24p OgorICAgICAgICAoV2ViVmlldzo6Zmx1c2hQZW5kaW5nR3JhcGhpY3NMYXllckNoYW5nZXMpOgor CiAyMDIwLTA5LTE3ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZW1vdmUgcnVudGltZSBzZXR0aW5nIGZvciBlbmFibGluZy9kaXNhYmxpbmcgdGhlIFVzZXJUaW1p bmcgYW5kIFJlc291cmNlVGltaW5nIEFQSXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCmluZGV4IDBmZWJkNGI1 MjBlZTIwMjY1YmM5Y2IxYTVmNzc5MmQzMTFiZWE1ODYuLmZiMzFkMTg2OTk5ZDVhOWI2NTBkYWQ4 ZWQ4MzZkNWI4YjEzOTg3OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAtMTQzNiwxMiArMTQzNiwx MiBAQCB1bnNpZ25lZCBQYWdlOjpyZW5kZXJpbmdVcGRhdGVDb3VudCgpIGNvbnN0CiB2b2lkIFBh Z2U6OnVwZGF0ZVJlbmRlcmluZygpCiB7CiAgICAgLy8gVGhpcyBmdW5jdGlvbiBpcyBub3QgcmVl bnRyYW50LCBlLmcuIGEgckFGIGNhbGxiYWNrIG1heSBmb3JjZSByZXBhaW50LgotICAgIGlmICht X2luVXBkYXRlUmVuZGVyaW5nKSB7CisgICAgaWYgKG1fdXBkYXRlUmVuZGVyaW5nUGhhc2UgPT0g UmVuZGVyaW5nVXBkYXRlUGhhc2U6OkluVXBkYXRlUmVuZGVyaW5nKSB7CiAgICAgICAgIGxheW91 dElmTmVlZGVkKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBTZXRGb3JTY29wZTxi b29sPiBpblVwZGF0ZVJlbmRlcmluZyhtX2luVXBkYXRlUmVuZGVyaW5nLCB0cnVlKTsKKyAgICBt X3VwZGF0ZVJlbmRlcmluZ1BoYXNlID0gUmVuZGVyaW5nVXBkYXRlUGhhc2U6OkluVXBkYXRlUmVu ZGVyaW5nOwogICAgIG1fbGFzdFJlbmRlcmluZ1VwZGF0ZVRpbWVzdGFtcCA9IE1vbm90b25pY1Rp bWU6Om5vdygpOwogCiAgICAgYm9vbCBpc1NWR0ltYWdlUGFnZSA9IGNocm9tZSgpLmNsaWVudCgp LmlzU1ZHSW1hZ2VDaHJvbWVDbGllbnQoKTsKQEAgLTE0NjgsMTAgKzE0NjgsMTQgQEAgdm9pZCBQ YWdlOjp1cGRhdGVSZW5kZXJpbmcoKQogICAgICAgICBkb2N1bWVudC5ydW5SZXNpemVTdGVwcygp OwogICAgIH0pOwogCisgICAgQVNTRVJUKG1fdXBkYXRlUmVuZGVyaW5nUGhhc2UgPT0gUmVuZGVy aW5nVXBkYXRlUGhhc2U6OkluVXBkYXRlUmVuZGVyaW5nKTsKKwogICAgIGZvckVhY2hEb2N1bWVu dChbXSAoRG9jdW1lbnQmIGRvY3VtZW50KSB7CiAgICAgICAgIGRvY3VtZW50LnJ1blNjcm9sbFN0 ZXBzKCk7CiAgICAgfSk7CiAKKyAgICBBU1NFUlQobV91cGRhdGVSZW5kZXJpbmdQaGFzZSA9PSBS ZW5kZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJpbmcpOworCiAgICAgZm9yRWFjaERv Y3VtZW50KFtdIChEb2N1bWVudCYgZG9jdW1lbnQpIHsKICAgICAgICAgZG9jdW1lbnQuZXZhbHVh dGVNZWRpYVF1ZXJpZXNBbmRSZXBvcnRDaGFuZ2VzKCk7ICAgICAgICAKICAgICB9KTsKQEAgLTE1 MDMsNyArMTUwNyw3IEBAIHZvaWQgUGFnZTo6dXBkYXRlUmVuZGVyaW5nKCkKICAgICBmb3JFYWNo RG9jdW1lbnQoW10gKERvY3VtZW50JiBkb2N1bWVudCkgewogICAgICAgICBmb3IgKGF1dG8mIGlt YWdlIDogZG9jdW1lbnQuY2FjaGVkUmVzb3VyY2VMb2FkZXIoKS5hbGxDYWNoZWRTVkdJbWFnZXMo KSkgewogICAgICAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBpbWFnZS0+aW50ZXJuYWxQYWdlKCkp Ci0gICAgICAgICAgICAgICAgcGFnZS0+dXBkYXRlUmVuZGVyaW5nKCk7CisgICAgICAgICAgICAg ICAgcGFnZS0+aXNvbGF0ZWRVcGRhdGVSZW5kZXJpbmcoKTsKICAgICAgICAgfQogICAgIH0pOwog CkBAIC0xNTE1LDYgKzE1MTksMTAgQEAgdm9pZCBQYWdlOjp1cGRhdGVSZW5kZXJpbmcoKQogICAg IGlmIChVTkxJS0VMWShpc01vbml0b3JpbmdXaGVlbEV2ZW50cygpKSkKICAgICAgICAgd2hlZWxF dmVudFRlc3RNb25pdG9yKCktPmNoZWNrU2hvdWxkRmlyZUNhbGxiYWNrcygpOwogCisgICAgLy8g QW55IG9mIHRoZSBhYm92ZSBzdGVwcyBjb3VsZCBoYXZlIHJ1biBzY3JpcHQgYW5kIHRyaWdnZXJl ZCBhIHJlLWVudHJhbnQgY2FsbCB0byB1cGRhdGVSZW5kZXJpbmcoKQorICAgIC8vIGFuZCBhIGNh bGwgdG8gZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKSAtIHRoaXMgaGFwcGVucyBpbiB0ZXN0aW5n LiBTbyByZXNldCB0aGUgc3RhdGUgaGVyZS4KKyAgICBtX3VwZGF0ZVJlbmRlcmluZ1BoYXNlID0g UmVuZGVyaW5nVXBkYXRlUGhhc2U6OkluVXBkYXRlUmVuZGVyaW5nOworCiAgICAgaWYgKG1faXNU cmFja2luZ1JlbmRlcmluZ1VwZGF0ZXMpCiAgICAgICAgICsrbV9yZW5kZXJpbmdVcGRhdGVDb3Vu dDsKIApAQCAtMTUyMywxMCArMTUzMSwyMCBAQCB2b2lkIFBhZ2U6OnVwZGF0ZVJlbmRlcmluZygp CiAKICAgICBpZiAoIWlzU1ZHSW1hZ2VQYWdlKQogICAgICAgICB0cmFjZVBvaW50KFJlbmRlcmlu Z1VwZGF0ZUVuZCk7CisKKyAgICBBU1NFUlQobV91cGRhdGVSZW5kZXJpbmdQaGFzZSA9PSBSZW5k ZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJpbmcpOworfQorCit2b2lkIFBhZ2U6Omlz b2xhdGVkVXBkYXRlUmVuZGVyaW5nKCkKK3sKKyAgICB1cGRhdGVSZW5kZXJpbmcoKTsKKyAgICBt X3VwZGF0ZVJlbmRlcmluZ1BoYXNlID0gUmVuZGVyaW5nVXBkYXRlUGhhc2U6Ok91dHNpZGU7CiB9 CiAKIHZvaWQgUGFnZTo6ZG9BZnRlclVwZGF0ZVJlbmRlcmluZygpCiB7CisgICAgQVNTRVJUKG1f dXBkYXRlUmVuZGVyaW5nUGhhc2UgPT0gUmVuZGVyaW5nVXBkYXRlUGhhc2U6OkluVXBkYXRlUmVu ZGVyaW5nKTsKKwogICAgIC8vIENvZGUgaGVyZSBzaG91bGQgZG8gb25jZS1wZXItZnJhbWUgd29y ayB0aGF0IG5lZWRzIHRvIGJlIGRvbmUgYmVmb3JlIHBhaW50aW5nLCBhbmQgcmVxdWlyZXMKICAg ICAvLyBsYXlvdXQgdG8gYmUgdXAtdG8tZGF0ZS4gSXQgc2hvdWxkIG5vdCBydW4gc2NyaXB0LCB0 cmlnZ2VyIGxheW91dCwgb3IgZGlydHkgbGF5b3V0LgogCkBAIC0xNTgwLDYgKzE1OTgsOCBAQCB2 b2lkIFBhZ2U6OmRvQWZ0ZXJVcGRhdGVSZW5kZXJpbmcoKQogICAgICAgICBBU1NFUlQoIWZyYW1l VmlldyB8fCAhZnJhbWVWaWV3LT5uZWVkc0xheW91dCgpKTsKICAgICB9CiAjZW5kaWYKKworICAg IEFTU0VSVChtX3VwZGF0ZVJlbmRlcmluZ1BoYXNlID09IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpJ blVwZGF0ZVJlbmRlcmluZyk7CiB9CiAKIHZvaWQgUGFnZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRh dGUoT3B0aW9uU2V0PEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxhZ3M+IGZsYWdzKQpAQCAtMTU5 MSw4ICsxNjExLDEyIEBAIHZvaWQgUGFnZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoT3B0aW9u U2V0PEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxhZ3M+IGZsYWdzCiAgICAgaWYgKGZsYWdzLmNv bnRhaW5zKEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxhZ3M6OkludmFsaWRhdGVJbWFnZXNXaXRo QXN5bmNEZWNvZGVzKSkKICAgICAgICAgdmlldy0+aW52YWxpZGF0ZUltYWdlc1dpdGhBc3luY0Rl Y29kZXMoKTsKIAorICAgIG1fdXBkYXRlUmVuZGVyaW5nUGhhc2UgPSBSZW5kZXJpbmdVcGRhdGVQ aGFzZTo6TGF5ZXJGbHVzaGluZzsKKwogICAgIHZpZXctPmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUlu Y2x1ZGluZ1N1YmZyYW1lcygpOwogCisgICAgbV91cGRhdGVSZW5kZXJpbmdQaGFzZSA9IFJlbmRl cmluZ1VwZGF0ZVBoYXNlOjpQb3N0TGF5ZXJGbHVzaDsKKwogI2lmIEVOQUJMRShBU1lOQ19TQ1JP TExJTkcpCiAgICAgaWYgKGF1dG8qIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gdGhpcy0+c2Nyb2xs aW5nQ29vcmRpbmF0b3IoKSkgewogICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+Y29tbWl0 VHJlZVN0YXRlSWZOZWVkZWQoKTsKQEAgLTE2MDIsNiArMTYyNiw4IEBAIHZvaWQgUGFnZTo6Zmlu YWxpemVSZW5kZXJpbmdVcGRhdGUoT3B0aW9uU2V0PEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxh Z3M+IGZsYWdzCiAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5kaWRDb21wbGV0ZVJlbmRl cmluZ1VwZGF0ZSgpOwogICAgIH0KICNlbmRpZgorCisgICAgbV91cGRhdGVSZW5kZXJpbmdQaGFz ZSA9IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpPdXRzaWRlOwogfQogCiB2b2lkIFBhZ2U6OnN1c3Bl bmRTY3JpcHRlZEFuaW1hdGlvbnMoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAppbmRleCBhZGY5MDYyY2IwYTJhOTY4 OTk0MjdiNGJiYmEzNjFlODExN2Q5OTcwLi42NDg4NzAxMWQ2Nzg2Y2RlODMzMDBmZjcwODEzNTli ZmI1ZTlmYjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaApAQCAtNDkwLDcgKzQ5MCw4IEBAIHB1YmxpYzoKIAog ICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgbGF5b3V0SWZOZWVkZWQoKTsKICAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIHVwZGF0ZVJlbmRlcmluZygpOwotICAgIAorICAgIC8vIEEgY2FsbCB0byB1cGRh dGVSZW5kZXJpbmcoKSB0aGF0IGlzIG5vdCBmb2xsb3dlZCBieSBhIGNhbGwgdG8gZmluYWxpemVS ZW5kZXJpbmdVcGRhdGUoKS4KKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGlzb2xhdGVkVXBkYXRl UmVuZGVyaW5nKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBmaW5hbGl6ZVJlbmRlcmluZ1Vw ZGF0ZShPcHRpb25TZXQ8RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4pOwogICAgIAogICAg IFdFQkNPUkVfRVhQT1JUIHZvaWQgc2NoZWR1bGVSZW5kZXJpbmdVcGRhdGUoKTsKQEAgLTc3OCw2 ICs3NzksMTMgQEAgcHVibGljOgogICAgIE1vbm90b25pY1RpbWUgbGFzdFJlbmRlcmluZ1VwZGF0 ZVRpbWVzdGFtcCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFzdFJlbmRlcmluZ1VwZGF0ZVRpbWVzdGFt cDsgfQogCiBwcml2YXRlOgorICAgIGVudW0gY2xhc3MgUmVuZGVyaW5nVXBkYXRlUGhhc2UgOiB1 aW50OF90IHsKKyAgICAgICAgT3V0c2lkZSwKKyAgICAgICAgSW5VcGRhdGVSZW5kZXJpbmcsCisg ICAgICAgIExheWVyRmx1c2hpbmcsCisgICAgICAgIFBvc3RMYXllckZsdXNoCisgICAgfTsKKwog ICAgIHN0cnVjdCBOYXZpZ2F0aW9uIHsKICAgICAgICAgUmVnaXN0cmFibGVEb21haW4gZG9tYWlu OwogICAgICAgICBGcmFtZUxvYWRUeXBlIHR5cGU7CkBAIC0xMDEzLDcgKzEwMjEsNiBAQCBwcml2 YXRlOgogICAgIGJvb2wgbV9zaG91bGRFbmFibGVJQ0VDYW5kaWRhdGVGaWx0ZXJpbmdCeURlZmF1 bHQgeyB0cnVlIH07CiAgICAgYm9vbCBtX21lZGlhUGxheWJhY2tJc1N1c3BlbmRlZCB7IGZhbHNl IH07CiAgICAgYm9vbCBtX21lZGlhQnVmZmVyaW5nSXNTdXNwZW5kZWQgeyBmYWxzZSB9OwotICAg IGJvb2wgbV9pblVwZGF0ZVJlbmRlcmluZyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc1Jlc291 cmNlTG9hZENsaWVudCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2RlbGVnYXRlc1NjYWxpbmcgeyBm YWxzZSB9OwogCkBAIC0xMDIxLDYgKzEwMjgsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9pc0Vk aXRhYmxlUmVnaW9uRW5hYmxlZCB7IGZhbHNlIH07CiAjZW5kaWYKIAorICAgIFJlbmRlcmluZ1Vw ZGF0ZVBoYXNlIG1fdXBkYXRlUmVuZGVyaW5nUGhhc2UgeyBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6 T3V0c2lkZSB9OworCiAgICAgVXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbiBtX3VzZXJJbnRl cmZhY2VMYXlvdXREaXJlY3Rpb24geyBVc2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uOjpMVFIg fTsKICAgICAKICAgICAvLyBGb3IgdGVzdGluZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggMGFkY2Q3N2JmNWQ3MTY3OWIz NGRjNWM4Mzk2ZjllOTI5Y2EzZDkxZC4uZGRjN2U3NjFlYWYxNDJiNzk5MjM2Y2UxMjJmZmY0MjQ3 MWRhMmI3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9z L1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9z L1dlYlBhZ2VJT1MubW0KQEAgLTM0NDEsNyArMzQ0MSw3IEBAIHZvaWQgV2ViUGFnZTo6ZHluYW1p Y1ZpZXdwb3J0U2l6ZVVwZGF0ZShjb25zdCBGbG9hdFNpemUmIHZpZXdMYXlvdXRTaXplLCBjb25z dCBXCiAgICAgc2V0RGV2aWNlT3JpZW50YXRpb24oZGV2aWNlT3JpZW50YXRpb24pOwogICAgIGZy YW1lVmlldy5zZXRTY3JvbGxPZmZzZXQocm91bmRlZFVub2JzY3VyZWRDb250ZW50UmVjdFBvc2l0 aW9uKTsKIAotICAgIG1fcGFnZS0+dXBkYXRlUmVuZGVyaW5nKCk7CisgICAgbV9wYWdlLT5pc29s YXRlZFVwZGF0ZVJlbmRlcmluZygpOwogCiAjaWYgRU5BQkxFKFZJRVdQT1JUX1JFU0laSU5HKQog ICAgIHNocmlua1RvRml0Q29udGVudCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2Fj eS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmll dy9XZWJWaWV3Lm1tCmluZGV4IGVlNGNjNjc0NDg2YTE5MjYwY2VhZjc5ODQ5YWIyMmJkMDg3YzRk NDIuLmEyNzc4Y2ExMjgwNTBjMWRiMTMzYWQ5ZWJjNzk4MmNhZTAzNDEwZWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTE3ODksMTAgKzE3ODksMTcg QEAgLSAoaWQpX2luaXRXaXRoRnJhbWU6KE5TUmVjdClmIGZyYW1lTmFtZTooTlNTdHJpbmcgKilm cmFtZU5hbWUgZ3JvdXBOYW1lOihOU1N0cmkKICAgICByZXR1cm4gc2VsZjsKIH0KIAotLSAodm9p ZClfdmlld1dpbGxEcmF3SW50ZXJuYWwKKy0gKHZvaWQpX3VwZGF0ZVJlbmRlcmluZwogewotICAg IGlmIChfcHJpdmF0ZS0+cGFnZSkKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIC8vIEVu c3VyZSBmaXhlZCBwb3NpdGlvbnMgbGF5ZXJzIGFyZSB3aGVyZSB0aGV5IHNob3VsZCBiZS4KKyAg ICBbc2VsZiBfc3luY2hyb25pemVDdXN0b21GaXhlZFBvc2l0aW9uTGF5b3V0UmVjdF07CisjZW5k aWYKKworICAgIGlmIChfcHJpdmF0ZS0+cGFnZSkgewogICAgICAgICBfcHJpdmF0ZS0+cGFnZS0+ dXBkYXRlUmVuZGVyaW5nKCk7CisgICAgICAgIF9wcml2YXRlLT5wYWdlLT5maW5hbGl6ZVJlbmRl cmluZ1VwZGF0ZSh7IH0pOworICAgIH0KIH0KIAogKyAoTlNBcnJheSAqKV9zdXBwb3J0ZWRNSU1F VHlwZXMKQEAgLTQ5MDIsMTMgKzQ5MDksNyBAQCArICh2b2lkKV9yZW1vdmVBbGxVc2VyQ29udGVu dEZyb21Hcm91cDooTlNTdHJpbmcgKilncm91cE5hbWUKIAogLSAodm9pZClfZm9yY2VSZXBhaW50 Rm9yVGVzdGluZwogewotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgLy8gRW5zdXJlIGZp eGVkIHBvc2l0aW9ucyBsYXllcnMgYXJlIHdoZXJlIHRoZXkgc2hvdWxkIGJlLgotICAgIFtzZWxm IF9zeW5jaHJvbml6ZUN1c3RvbUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0XTsKLSNlbmRpZgotCi0g ICAgW3NlbGYgX3ZpZXdXaWxsRHJhd0ludGVybmFsXTsKLSAgICBbc2VsZiBfZmx1c2hDb21wb3Np dGluZ0NoYW5nZXNdOworICAgIFtzZWxmIF91cGRhdGVSZW5kZXJpbmddOwogICAgIFtDQVRyYW5z YWN0aW9uIGZsdXNoXTsKICAgICBbQ0FUcmFuc2FjdGlvbiBzeW5jaHJvbml6ZV07CiB9CkBAIC05 MzQ2LDI4ICs5MzQ3LDE5IEBAIGJvb2wgTGF5ZXJGbHVzaENvbnRyb2xsZXI6OmZsdXNoTGF5ZXJz KCkKICAgICBOU1dpbmRvdyAqd2luZG93ID0gW21fd2ViVmlldyB3aW5kb3ddOwogI2VuZGlmIC8v IFBMQVRGT1JNKE1BQykKIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgLy8gRW5zdXJl IGZpeGVkIHBvc2l0aW9ucyBsYXllcnMgYXJlIHdoZXJlIHRoZXkgc2hvdWxkIGJlLgotICAgIFtt X3dlYlZpZXcgX3N5bmNocm9uaXplQ3VzdG9tRml4ZWRQb3NpdGlvbkxheW91dFJlY3RdOwotI2Vu ZGlmCi0KLSAgICBbbV93ZWJWaWV3IF92aWV3V2lsbERyYXdJbnRlcm5hbF07CisgICAgW21fd2Vi VmlldyBfdXBkYXRlUmVuZGVyaW5nXTsKIAotICAgIGlmIChbbV93ZWJWaWV3IF9mbHVzaENvbXBv c2l0aW5nQ2hhbmdlc10pIHsKICNpZiBQTEFURk9STShNQUMpCi0gICAgICAgIC8vIEFwcEtpdCBt YXkgaGF2ZSBkaXNhYmxlZCBzY3JlZW4gdXBkYXRlcywgdGhpbmtpbmcgYW4gdXBjb21pbmcgd2lu ZG93IGZsdXNoIHdpbGwgcmUtZW5hYmxlIHRoZW0uCi0gICAgICAgIC8vIEluIGNhc2Ugc2V0TmVl ZHNEaXNwbGF5SW5SZWN0KCkgaGFzIHByZXZlbnRlZCB0aGUgd2luZG93IGZyb20gbmVlZGluZyB0 byBiZSBmbHVzaGVkLCByZS1lbmFibGUgc2NyZWVuCi0gICAgICAgIC8vIHVwZGF0ZXMgaGVyZS4K LSAgICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KLSAgICAgICAgaWYg KCFbd2luZG93IGlzRmx1c2hXaW5kb3dEaXNhYmxlZF0pCi0gICAgICAgICAgICBBTExPV19ERVBS RUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKLSAgICAgICAgICAgIFt3aW5kb3cgX2VuYWJsZVNjcmVl blVwZGF0ZXNJZk5lZWRlZF07CisgICAgLy8gQXBwS2l0IG1heSBoYXZlIGRpc2FibGVkIHNjcmVl biB1cGRhdGVzLCB0aGlua2luZyBhbiB1cGNvbWluZyB3aW5kb3cgZmx1c2ggd2lsbCByZS1lbmFi bGUgdGhlbS4KKyAgICAvLyBJbiBjYXNlIHNldE5lZWRzRGlzcGxheUluUmVjdCgpIGhhcyBwcmV2 ZW50ZWQgdGhlIHdpbmRvdyBmcm9tIG5lZWRpbmcgdG8gYmUgZmx1c2hlZCwgcmUtZW5hYmxlIHNj cmVlbgorICAgIC8vIHVwZGF0ZXMgaGVyZS4KKyAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFU SU9OU19CRUdJTgorICAgIGlmICghW3dpbmRvdyBpc0ZsdXNoV2luZG93RGlzYWJsZWRdKQorICAg ICAgICBbd2luZG93IF9lbmFibGVTY3JlZW5VcGRhdGVzSWZOZWVkZWRdOworICAgIEFMTE9XX0RF UFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogI2VuZGlmCiAKLSAgICAgICAgcmV0dXJuIHRydWU7 Ci0gICAgfQotCi0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiB0cnVlOwogfQogCiAtICh2 b2lkKV9zY2hlZHVsZVVwZGF0ZVJlbmRlcmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExl Z2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQuY3Bw IGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0NvbnRleHQuY3BwCmluZGV4IGM3MWZmNDdhMDM0NjM4ZjI0MmUwODlkMzYzM2JmMmZh ZjdjMGQ3NTMuLmIwNGRiYjQzZDdjNDBkMGU1YjhhMGM3ZjQ0MmRhODE3ODRjZGYyNjcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVk Q29tcG9zaXRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJD b3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dC5jcHAKQEAgLTI5Nyw3ICsy OTcsNyBAQCB2b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpmbHVzaEFuZFJlbmRl ckxheWVycygpCiAgICAgaWYgKCFlbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGNv cmUoJm1fd2ViVmlldyktPnVwZGF0ZVJlbmRlcmluZygpOworICAgIGNvcmUoJm1fd2ViVmlldykt Pmlzb2xhdGVkVXBkYXRlUmVuZGVyaW5nKCk7CiAKICAgICBpZiAoIWVuYWJsZWQoKSkKICAgICAg ICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViVmlldy5j cHAgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJWaWV3LmNwcAppbmRleCA5OWZkYjI2YjNm NThiOTk4MDA0ZWQ2MjBhNzQ5MmEzYzEyZGJiN2IxLi5lMTI0MzQ2YzQzNGIyZDAyMTY2YmE2ZTE4 MGM4Zjc5NzY2ZTk4OTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJW aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJWaWV3LmNwcApAQCAtMTI4 NSw3ICsxMjg1LDcgQEAgdm9pZCBXZWJWaWV3OjpwYWludChIREMgZGMsIExQQVJBTSBvcHRpb25z KQogewogICAgIExPQ0FMX0dESV9DT1VOVEVSKDAsIF9fRlVOQ1RJT05fXyk7CiAKLSAgICBtX3Bh Z2UtPnVwZGF0ZVJlbmRlcmluZygpOworICAgIG1fcGFnZS0+aXNvbGF0ZWRVcGRhdGVSZW5kZXJp bmcoKTsKIAogICAgIGlmIChwYWludENvbXBvc2l0ZWRDb250ZW50VG9IREMoZGMpKSB7CiAgICAg ICAgIDo6VmFsaWRhdGVSZWN0KG1fdmlld1dpbmRvdywgbnVsbHB0cik7CkBAIC03MjA2LDEzICs3 MjA2LDEzIEBAIHZvaWQgV2ViVmlldzo6Zmx1c2hQZW5kaW5nR3JhcGhpY3NMYXllckNoYW5nZXNT b29uKCkKIHsKICNpZiBVU0UoQ0EpCiAgICAgaWYgKCFtX2xheWVyVHJlZUhvc3QpIHsKLSAgICAg ICAgbV9wYWdlLT51cGRhdGVSZW5kZXJpbmcoKTsKKyAgICAgICAgbV9wYWdlLT5pc29sYXRlZFVw ZGF0ZVJlbmRlcmluZygpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIG1fbGF5ZXJUcmVl SG9zdC0+Zmx1c2hQZW5kaW5nR3JhcGhpY3NMYXllckNoYW5nZXNTb29uKCk7CiAjZWxpZiBVU0Uo VEVYVFVSRV9NQVBQRVJfR0wpCiAgICAgaWYgKCFpc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSkg ewotICAgICAgICBtX3BhZ2UtPnVwZGF0ZVJlbmRlcmluZygpOworICAgICAgICBtX3BhZ2UtPmlz b2xhdGVkVXBkYXRlUmVuZGVyaW5nKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYg KCFtX2FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0KQpAQCAtNzQzOSw3ICs3NDM5LDcgQEAg dm9pZCBXZWJWaWV3OjpmbHVzaFBlbmRpbmdHcmFwaGljc0xheWVyQ2hhbmdlcygpCiAgICAgaWYg KCFpc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9w YWdlLT51cGRhdGVSZW5kZXJpbmcoKTsKKyAgICBtX3BhZ2UtPmlzb2xhdGVkVXBkYXRlUmVuZGVy aW5nKCk7CiAKICAgICAvLyBVcGRhdGluZyBsYXlvdXQgbWlnaHQgaGF2ZSB0YWtlbiB1cyBvdXQg b2YgY29tcG9zaXRpbmcgbW9kZS4KICAgICBpZiAobV9iYWNraW5nTGF5ZXIpCg== 409857 2020-09-27 13:14:47 -0700 2020-09-27 16:14:12 -0700 Patch bug-216958-20200927131446.patch text/plain 15907 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzU0ZTAyMzlhMmMwNDM2 ODU0OTBhMDcwMDg3OWU4ZjdhYTQzNzEzOC4uZTZhYTU0YTU1YTM5ZDgyMzEzNjM4YmE1MDk1NzNh MTQ4OGQzOWZkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA5LTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFdlYktpdExlZ2Fj eSBzaG91bGQgY2FsbCBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY5NTgKKworICAgICAgICBS ZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIENvbnZlcnQgUGFnZTo6bV9pblVwZGF0 ZVJlbmRlcmluZyB0byBhbiBlbnVtIHdoaWNoIHRyYWNrcyB0aGUgcGhhc2UsIHdoaWNoIHdpbGwg YmUKKyAgICAgICAgdXNlZCBpbiBhIGxhdGVyIHBhdGNoIHRvIHByZXZlbnQgZXh0cmEgdXBkYXRl IHNjaGVkdWxpbmcgKHdlYmtpdC5vcmcvYi8yMTY3MjYpLgorICAgICAgICBQYWdlIGhhcyB0byB0 cmFjayBSZW5kZXJpbmdVcGRhdGVQaGFzZSBhcyBhIHN0YWNrIHRvIGhhbmRsZSB0aGUgcmUtZW50 cmFuY3kgd2hlbiBsYXlvdXQgdGVzdHMKKyAgICAgICAgY2FsbCBub3RpZnlEb25lKCkgaW5zaWRl IG9mIHRoZSBKUyBjYWxsYmFja3M7IHRoZSBzdGFjayBvbmx5IGhhcyBvbmUgZW50cnkgb3V0c2lk ZSBvZiB0ZXN0aW5nLgorCisgICAgICAgIEFkZCBpc29sYXRlZFVwZGF0ZVJlbmRlcmluZygpLCB3 aGljaCBpcyBmb3IgY2FsbGVycyB3aG8gYXJlbid0IGdvaW5nIHRvIGNhbGwgZmluYWxpemVSZW5k ZXJpbmdVcGRhdGUoKSwKKyAgICAgICAgYW5kIHVzZSBpdCBmb3IgU1ZHSW1hZ2UgdXBkYXRlcy4K KworICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjp1cGRh dGVSZW5kZXJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6aXNvbGF0ZWRVcGRhdGVSZW5k ZXJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6ZG9BZnRlclVwZGF0ZVJlbmRlcmluZyk6 CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSk6CisgICAg ICAgICogcGFnZS9QYWdlLmg6CisKIDIwMjAtMDktMjcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBDYWxsIHNob3dMYXlvdXRUcmVlIG9ubHkg d2hlbiB0cmVlcyBhcmUgbWlzbWF0Y2hpbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ1NTVkODBjYmZlNWQ5Y2Q0 ZGIzOWFmZDBlMDhjZGYyZjIyYjEzZTkuLmM1YjY0ZmI0OTAyZDIwZWVlMzBkMDg1YTk5NjY0MThj ZTJkZmQ0OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMDktMjUgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0TGVnYWN5IHNo b3VsZCBjYWxsIFBhZ2U6OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjk1OAorCisgICAgICAgIFJldmll d2VkIGJ5IFRpbSBIb3J0b24uCisgICAgICAgIAorICAgICAgICBkeW5hbWljVmlld3BvcnRTaXpl VXBkYXRlKCkgbmVlZHMgdG8gY2FsbCBpc29sYXRlZFVwZGF0ZVJlbmRlcmluZygpIGJlY2F1c2Ug aXQgaXNuJ3QgZm9sbG93ZWQKKyAgICAgICAgYnkgYSBmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgp LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjpkeW5hbWljVmlld3BvcnRTaXplVXBkYXRlKToKKwogMjAy MC0wOS0yNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW1NPVVBdIFdlYlNvY2tldDogY29va2llcyBzZXQgaW4gcmVxdWVzdCBkb24ndCBhcHBl YXIgaW4gdGhlIGluc3BlY3RvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCmluZGV4IGVkMjJi ZjFlMDQzNGFkYWYzZmU5OWJhMGFiZjM0MGE0ZDU2ZjBlMzkuLjQwMTBiMTYxN2I4NDFlMWM5OWU2 NDY5Y2E1ZTcyM2EwZDA3ZDQ1NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAyMC0wOS0yNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxl LmNvbT4KKworICAgICAgICBXZWJLaXRMZWdhY3kgc2hvdWxkIGNhbGwgUGFnZTo6ZmluYWxpemVS ZW5kZXJpbmdVcGRhdGUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE2OTU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhpcyBpcyBhIHByZWN1cnNvciB0byBmaXhpbmcgd2Via2l0Lm9yZy9iLzIxNjcy Ni4gUGFnZSBuZWVkcyB0byB0cmFjayB0aGUgcGhhc2UKKyAgICAgICAgb2YgdXBkYXRlUmVuZGVy aW5nIHRoYXQgd2UgYXJlIGluLCBhbmQgdG8gZWFzZSB0aGlzIHRyYWNraW5nLCBXZWJLaXRMZWdh Y3kgbmVlZHMgdG8gY2FsbAorICAgICAgICBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgp IHNvIHRoZSBzdGF0ZSBpcyB0cmFja2VkLgorICAgICAgICAKKyAgICAgICAgUmVuYW1lIC1fdmll d1dpbGxEcmF3SW50ZXJuYWwgdG8gLV91cGRhdGVSZW5kZXJpbmcsIGFuZCBoYXZlIGl0IGNhbGwg dXBkYXRlUmVuZGVyaW5nKCkKKyAgICAgICAgYW5kIGZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCku IFdlIGNhbiBhbHNvIG1vdmUgaW4gdGhlIGNhbGwgdG8gLV9zeW5jaHJvbml6ZUN1c3RvbUZpeGVk UG9zaXRpb25MYXlvdXRSZWN0CisgICAgICAgIHdoaWNoIGJvdGggY2FsbCBzaXRlcyBkby4KKyAg ICAgICAgCisgICAgICAgIFNpbmNlIHVwZGF0ZVJlbmRlcmluZygpIGlzIGd1YXJhbnRlZWQgdG8g dXBkYXRlIGxheW91dCwgd2Uga25vdyAtX2ZsdXNoQ29tcG9zaXRpbmdDaGFuZ2VzIHdvdWxkIGhh dmUKKyAgICAgICAgbmV2ZXIgcmV0dXJuZWQgTk8gaGVyZSwgc28gd2UgY2FuIHJlbW92ZSB0aGUg Y29uZGl0aW9uIGluIExheWVyRmx1c2hDb250cm9sbGVyOjpmbHVzaExheWVycygpLgorICAgICAg ICAKKyAgICAgICAgLVtXZWJIVE1MVmlldyB2aWV3V2lsbERyYXddIGFsc28gZG9lcyBhIHNpbWls YXIgLV93ZWJfdXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5lZWRlZFJlY3Vyc2l2ZQorICAgICAgICB0 aGVuIC1fZmx1c2hDb21wb3NpdGluZ0NoYW5nZXMgYnV0IHRoaXMgaXMgY2FsbGVkIGZyb20gQXBw S2l0IHdpdGggYSB0aW1pbmcgdGhhdCB3ZSBkb24ndCBjb250cm9sOworICAgICAgICBpdCBtYXkg YmUgcmVkdW5kYW50IHdpdGggLVtXZWJWaWV3IF91cGRhdGVSZW5kZXJpbmddIGJ1dCBJIGxlYXZl IHRoYXQgYmVoYXZpb3IgdW5jaGFuZ2VkLgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1t OgorICAgICAgICAoLVtXZWJWaWV3IF91cGRhdGVSZW5kZXJpbmddKToKKyAgICAgICAgKC1bV2Vi VmlldyBfZm9yY2VSZXBhaW50Rm9yVGVzdGluZ10pOgorICAgICAgICAoTGF5ZXJGbHVzaENvbnRy b2xsZXI6OmZsdXNoTGF5ZXJzKToKKyAgICAgICAgKC1bV2ViVmlldyBfdmlld1dpbGxEcmF3SW50 ZXJuYWxdKTogRGVsZXRlZC4KKwogMjAyMC0wOS0yNiAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBs ZS5jb20+CiAKICAgICAgICAgW1ByZWZlcmVuY2VzXSBHZW5lcmF0ZSBEZWJ1ZyBhbmQgSW50ZXJu YWwgcHJlZmVyZW5jZXMgZm9yIFdlYktpdExlZ2FjeQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dExlZ2FjeS93aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9n CmluZGV4IDVhZmNmOGE0MzQ4ZWI3YjdhMjhlYjg3NGI3Y2E0ZDc2OWVkODdjN2IuLjJjNTMzNzNk NjExZWU1MzQzYjcxMTdkMGY3OGM2MjU0ZTA3NmU1NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXRMZWdhY3kvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMC0wOS0yNSAgU2ltb24gRnJhc2VyICA8c2ltb24u ZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXRMZWdhY3kgc2hvdWxkIGNhbGwgUGFn ZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2OTU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhv cnRvbi4KKworICAgICAgICBXaW5kb3dzIGRvZXNuJ3QgY2FsbCBmaW5hbGl6ZVJlbmRlcmluZ1Vw ZGF0ZSgpIHNvIG5lZWRzIHRvIHVzZSBpc29sYXRlZFVwZGF0ZVJlbmRlcmluZygpLgorCisgICAg ICAgICogV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQuY3BwOgor ICAgICAgICAoQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmZsdXNoQW5kUmVuZGVyTGF5 ZXJzKToKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6OnBhaW50KToK KyAgICAgICAgKFdlYlZpZXc6OmZsdXNoUGVuZGluZ0dyYXBoaWNzTGF5ZXJDaGFuZ2VzU29vbik6 CisgICAgICAgIChXZWJWaWV3OjpmbHVzaFBlbmRpbmdHcmFwaGljc0xheWVyQ2hhbmdlcyk6CisK IDIwMjAtMDktMjUgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgQWRkIGFuIGV4cGVyaW1lbnRhbCBmZWF0dXJlIGZsYWcgZm9yIENTUyBpbmRpdmlkdWFsIHRy YW5zZm9ybSBwcm9wZXJ0aWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAppbmRleCA4NjllMjJmMmNhZjRkMjZl ZDE0MzNjNTA3OGJmN2RjYjg5Y2FkYmIzLi4xM2Q5NWEwMDY2MTA3NTI1MDFmNjAwOTI2MmRmNTBj YzZiNWVjOGYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTE0NDEsMTMgKzE0NDEsMTUgQEAgdW5z aWduZWQgUGFnZTo6cmVuZGVyaW5nVXBkYXRlQ291bnQoKSBjb25zdAogLy8gaHR0cHM6Ly9odG1s LnNwZWMud2hhdHdnLm9yZy9tdWx0aXBhZ2Uvd2ViYXBwYXBpcy5odG1sI3VwZGF0ZS10aGUtcmVu ZGVyaW5nCiB2b2lkIFBhZ2U6OnVwZGF0ZVJlbmRlcmluZygpCiB7Ci0gICAgLy8gVGhpcyBmdW5j dGlvbiBpcyBub3QgcmVlbnRyYW50LCBlLmcuIGEgckFGIGNhbGxiYWNrIG1heSBmb3JjZSByZXBh aW50LgotICAgIGlmIChtX2luVXBkYXRlUmVuZGVyaW5nKSB7CisgICAgbV91cGRhdGVSZW5kZXJp bmdQaGFzZVN0YWNrLmFwcGVuZChSZW5kZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJp bmcpOworCisgICAgLy8gVGhpcyBmdW5jdGlvbiBpcyBub3QgcmVlbnRyYW50LCBlLmcuIGEgckFG IGNhbGxiYWNrIG1heSB0cmlnZ2VyIGEgZm9yY2VzIHJlcGFpbnQgaW4gdGVzdGluZy4KKyAgICAv LyBUaGlzIGlzIHdoeSB3ZSB0cmFjayB1cGRhdGVSZW5kZXJpbmdQaGFzZSBhcyBhIHN0YWNrLgor ICAgIGlmIChtX3VwZGF0ZVJlbmRlcmluZ1BoYXNlU3RhY2suc2l6ZSgpID4gMSkgewogICAgICAg ICBsYXlvdXRJZk5lZWRlZCgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgU2V0Rm9y U2NvcGU8Ym9vbD4gaW5VcGRhdGVSZW5kZXJpbmcobV9pblVwZGF0ZVJlbmRlcmluZywgdHJ1ZSk7 CiAgICAgbV9sYXN0UmVuZGVyaW5nVXBkYXRlVGltZXN0YW1wID0gTW9ub3RvbmljVGltZTo6bm93 KCk7CiAKICAgICBib29sIGlzU1ZHSW1hZ2VQYWdlID0gY2hyb21lKCkuY2xpZW50KCkuaXNTVkdJ bWFnZUNocm9tZUNsaWVudCgpOwpAQCAtMTUwOSwxMCArMTUxMSwxMiBAQCB2b2lkIFBhZ2U6OnVw ZGF0ZVJlbmRlcmluZygpCiAgICAgZm9yRWFjaERvY3VtZW50KFtdIChEb2N1bWVudCYgZG9jdW1l bnQpIHsKICAgICAgICAgZm9yIChhdXRvJiBpbWFnZSA6IGRvY3VtZW50LmNhY2hlZFJlc291cmNl TG9hZGVyKCkuYWxsQ2FjaGVkU1ZHSW1hZ2VzKCkpIHsKICAgICAgICAgICAgIGlmIChhdXRvKiBw YWdlID0gaW1hZ2UtPmludGVybmFsUGFnZSgpKQotICAgICAgICAgICAgICAgIHBhZ2UtPnVwZGF0 ZVJlbmRlcmluZygpOworICAgICAgICAgICAgICAgIHBhZ2UtPmlzb2xhdGVkVXBkYXRlUmVuZGVy aW5nKCk7CiAgICAgICAgIH0KICAgICB9KTsKIAorICAgIEFTU0VSVChtX3VwZGF0ZVJlbmRlcmlu Z1BoYXNlU3RhY2subGFzdCgpID09IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpJblVwZGF0ZVJlbmRl cmluZyk7CisKICAgICBmb3IgKGF1dG8mIGRvY3VtZW50IDogaW5pdGlhbERvY3VtZW50cykgewog ICAgICAgICBpZiAoZG9jdW1lbnQgJiYgZG9jdW1lbnQtPmRvbVdpbmRvdygpKQogICAgICAgICAg ICAgZG9jdW1lbnQtPmRvbVdpbmRvdygpLT51bmZyZWV6ZU5vd1RpbWVzdGFtcCgpOwpAQCAtMTUy OSwxMCArMTUzMywyMCBAQCB2b2lkIFBhZ2U6OnVwZGF0ZVJlbmRlcmluZygpCiAKICAgICBpZiAo IWlzU1ZHSW1hZ2VQYWdlKQogICAgICAgICB0cmFjZVBvaW50KFJlbmRlcmluZ1VwZGF0ZUVuZCk7 CisKKyAgICBBU1NFUlQobV91cGRhdGVSZW5kZXJpbmdQaGFzZVN0YWNrLmxhc3QoKSA9PSBSZW5k ZXJpbmdVcGRhdGVQaGFzZTo6SW5VcGRhdGVSZW5kZXJpbmcpOworfQorCit2b2lkIFBhZ2U6Omlz b2xhdGVkVXBkYXRlUmVuZGVyaW5nKCkKK3sKKyAgICB1cGRhdGVSZW5kZXJpbmcoKTsKKyAgICBt X3VwZGF0ZVJlbmRlcmluZ1BoYXNlU3RhY2sucmVtb3ZlTGFzdCgpOwogfQogCiB2b2lkIFBhZ2U6 OmRvQWZ0ZXJVcGRhdGVSZW5kZXJpbmcoKQogeworICAgIEFTU0VSVChtX3VwZGF0ZVJlbmRlcmlu Z1BoYXNlU3RhY2subGFzdCgpID09IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpJblVwZGF0ZVJlbmRl cmluZyk7CisKICAgICAvLyBDb2RlIGhlcmUgc2hvdWxkIGRvIG9uY2UtcGVyLWZyYW1lIHdvcmsg dGhhdCBuZWVkcyB0byBiZSBkb25lIGJlZm9yZSBwYWludGluZywgYW5kIHJlcXVpcmVzCiAgICAg Ly8gbGF5b3V0IHRvIGJlIHVwLXRvLWRhdGUuIEl0IHNob3VsZCBub3QgcnVuIHNjcmlwdCwgdHJp Z2dlciBsYXlvdXQsIG9yIGRpcnR5IGxheW91dC4KIApAQCAtMTU4NiwxMCArMTYwMCwxNCBAQCB2 b2lkIFBhZ2U6OmRvQWZ0ZXJVcGRhdGVSZW5kZXJpbmcoKQogICAgICAgICBBU1NFUlQoIWZyYW1l VmlldyB8fCAhZnJhbWVWaWV3LT5uZWVkc0xheW91dCgpKTsKICAgICB9CiAjZW5kaWYKKworICAg IEFTU0VSVChtX3VwZGF0ZVJlbmRlcmluZ1BoYXNlU3RhY2subGFzdCgpID09IFJlbmRlcmluZ1Vw ZGF0ZVBoYXNlOjpJblVwZGF0ZVJlbmRlcmluZyk7CiB9CiAKIHZvaWQgUGFnZTo6ZmluYWxpemVS ZW5kZXJpbmdVcGRhdGUoT3B0aW9uU2V0PEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxhZ3M+IGZs YWdzKQogeworICAgIEFTU0VSVChtX3VwZGF0ZVJlbmRlcmluZ1BoYXNlU3RhY2subGFzdCgpID09 IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpJblVwZGF0ZVJlbmRlcmluZyk7CisKICAgICBhdXRvKiB2 aWV3ID0gbWFpbkZyYW1lKCkudmlldygpOwogICAgIGlmICghdmlldykKICAgICAgICAgcmV0dXJu OwpAQCAtMTU5Nyw4ICsxNjE1LDEyIEBAIHZvaWQgUGFnZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRh dGUoT3B0aW9uU2V0PEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxhZ3M+IGZsYWdzCiAgICAgaWYg KGZsYWdzLmNvbnRhaW5zKEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxhZ3M6OkludmFsaWRhdGVJ bWFnZXNXaXRoQXN5bmNEZWNvZGVzKSkKICAgICAgICAgdmlldy0+aW52YWxpZGF0ZUltYWdlc1dp dGhBc3luY0RlY29kZXMoKTsKIAorICAgIG1fdXBkYXRlUmVuZGVyaW5nUGhhc2VTdGFjay5sYXN0 KCkgPSBSZW5kZXJpbmdVcGRhdGVQaGFzZTo6TGF5ZXJGbHVzaGluZzsKKwogICAgIHZpZXctPmZs dXNoQ29tcG9zaXRpbmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpOwogCisgICAgbV91cGRhdGVS ZW5kZXJpbmdQaGFzZVN0YWNrLmxhc3QoKSA9IFJlbmRlcmluZ1VwZGF0ZVBoYXNlOjpQb3N0TGF5 ZXJGbHVzaDsKKwogI2lmIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCiAgICAgaWYgKGF1dG8qIHNj cm9sbGluZ0Nvb3JkaW5hdG9yID0gdGhpcy0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkgewogICAg ICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+Y29tbWl0VHJlZVN0YXRlSWZOZWVkZWQoKTsKQEAg LTE2MDgsNiArMTYzMCw4IEBAIHZvaWQgUGFnZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoT3B0 aW9uU2V0PEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxhZ3M+IGZsYWdzCiAgICAgICAgIHNjcm9s bGluZ0Nvb3JkaW5hdG9yLT5kaWRDb21wbGV0ZVJlbmRlcmluZ1VwZGF0ZSgpOwogICAgIH0KICNl bmRpZgorCisgICAgbV91cGRhdGVSZW5kZXJpbmdQaGFzZVN0YWNrLnJlbW92ZUxhc3QoKTsKIH0K IAogdm9pZCBQYWdlOjpzdXNwZW5kU2NyaXB0ZWRBbmltYXRpb25zKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKaW5k ZXggYjA3YWZlOGExOWMzYjk3OTJjYmFjMDEyZDE4MDE5YjVhMmFlOTU5ZC4uZDU3YjE2MGRmMDFk YjNjYmFlMzgwZTMyODMzZDY4NzE4Zjk5ZDVhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKQEAgLTQ4OCw3ICs0 ODgsOCBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGxheW91dElmTmVlZGVk KCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB1cGRhdGVSZW5kZXJpbmcoKTsKLSAgICAKKyAg ICAvLyBBIGNhbGwgdG8gdXBkYXRlUmVuZGVyaW5nKCkgdGhhdCBpcyBub3QgZm9sbG93ZWQgYnkg YSBjYWxsIHRvIGZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCkuCisgICAgV0VCQ09SRV9FWFBPUlQg dm9pZCBpc29sYXRlZFVwZGF0ZVJlbmRlcmluZygpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQg ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoT3B0aW9uU2V0PEZpbmFsaXplUmVuZGVyaW5nVXBkYXRl RmxhZ3M+KTsKIAogICAgIC8vIERvIGltbWVkaWF0ZSBvciB0aW1lZCB1cGRhdGUgYXMgZGljdGF0 ZWQgYnkgdGhlIENocm9tZUNsaWVudC4KQEAgLTc4MCw2ICs3ODEsMTMgQEAgcHVibGljOgogICAg IE1vbm90b25pY1RpbWUgbGFzdFJlbmRlcmluZ1VwZGF0ZVRpbWVzdGFtcCgpIGNvbnN0IHsgcmV0 dXJuIG1fbGFzdFJlbmRlcmluZ1VwZGF0ZVRpbWVzdGFtcDsgfQogCiBwcml2YXRlOgorICAgIGVu dW0gY2xhc3MgUmVuZGVyaW5nVXBkYXRlUGhhc2UgOiB1aW50OF90IHsKKyAgICAgICAgT3V0c2lk ZSwKKyAgICAgICAgSW5VcGRhdGVSZW5kZXJpbmcsCisgICAgICAgIExheWVyRmx1c2hpbmcsCisg ICAgICAgIFBvc3RMYXllckZsdXNoCisgICAgfTsKKwogICAgIHN0cnVjdCBOYXZpZ2F0aW9uIHsK ICAgICAgICAgUmVnaXN0cmFibGVEb21haW4gZG9tYWluOwogICAgICAgICBGcmFtZUxvYWRUeXBl IHR5cGU7CkBAIC0xMDE3LDcgKzEwMjUsNiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9zaG91bGRF bmFibGVJQ0VDYW5kaWRhdGVGaWx0ZXJpbmdCeURlZmF1bHQgeyB0cnVlIH07CiAgICAgYm9vbCBt X21lZGlhUGxheWJhY2tJc1N1c3BlbmRlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX21lZGlhQnVm ZmVyaW5nSXNTdXNwZW5kZWQgeyBmYWxzZSB9OwotICAgIGJvb2wgbV9pblVwZGF0ZVJlbmRlcmlu ZyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc1Jlc291cmNlTG9hZENsaWVudCB7IGZhbHNlIH07 CiAgICAgYm9vbCBtX2RlbGVnYXRlc1NjYWxpbmcgeyBmYWxzZSB9OwogCkBAIC0xMDI1LDYgKzEw MzIsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9pc0VkaXRhYmxlUmVnaW9uRW5hYmxlZCB7IGZh bHNlIH07CiAjZW5kaWYKIAorICAgIFZlY3RvcjxSZW5kZXJpbmdVcGRhdGVQaGFzZSwgMj4gbV91 cGRhdGVSZW5kZXJpbmdQaGFzZVN0YWNrOworCiAgICAgVXNlckludGVyZmFjZUxheW91dERpcmVj dGlvbiBtX3VzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb24geyBVc2VySW50ZXJmYWNlTGF5b3V0 RGlyZWN0aW9uOjpMVFIgfTsKICAgICAKICAgICAvLyBGb3IgdGVzdGluZy4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggMGFk Y2Q3N2JmNWQ3MTY3OWIzNGRjNWM4Mzk2ZjllOTI5Y2EzZDkxZC4uZGRjN2U3NjFlYWYxNDJiNzk5 MjM2Y2UxMjJmZmY0MjQ3MWRhMmI3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTM0NDEsNyArMzQ0MSw3IEBAIHZvaWQg V2ViUGFnZTo6ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShjb25zdCBGbG9hdFNpemUmIHZpZXdM YXlvdXRTaXplLCBjb25zdCBXCiAgICAgc2V0RGV2aWNlT3JpZW50YXRpb24oZGV2aWNlT3JpZW50 YXRpb24pOwogICAgIGZyYW1lVmlldy5zZXRTY3JvbGxPZmZzZXQocm91bmRlZFVub2JzY3VyZWRD b250ZW50UmVjdFBvc2l0aW9uKTsKIAotICAgIG1fcGFnZS0+dXBkYXRlUmVuZGVyaW5nKCk7Cisg ICAgbV9wYWdlLT5pc29sYXRlZFVwZGF0ZVJlbmRlcmluZygpOwogCiAjaWYgRU5BQkxFKFZJRVdQ T1JUX1JFU0laSU5HKQogICAgIHNocmlua1RvRml0Q29udGVudCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdExl Z2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IDhlM2NlYmNkYzczOGVjZDVhMmYxYmE4 MTg0NzIxOTUzZTc0ZjMwNDIuLjhkMGM4NzE1ZmE0NmVkOGUyNWQ2M2E1MDk2YzcxYTk0MzFjYmQ4 NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTE3 ODksMTAgKzE3ODksMTcgQEAgLSAoaWQpX2luaXRXaXRoRnJhbWU6KE5TUmVjdClmIGZyYW1lTmFt ZTooTlNTdHJpbmcgKilmcmFtZU5hbWUgZ3JvdXBOYW1lOihOU1N0cmkKICAgICByZXR1cm4gc2Vs ZjsKIH0KIAotLSAodm9pZClfdmlld1dpbGxEcmF3SW50ZXJuYWwKKy0gKHZvaWQpX3VwZGF0ZVJl bmRlcmluZwogewotICAgIGlmIChfcHJpdmF0ZS0+cGFnZSkKKyNpZiBQTEFURk9STShJT1NfRkFN SUxZKQorICAgIC8vIEVuc3VyZSBmaXhlZCBwb3NpdGlvbnMgbGF5ZXJzIGFyZSB3aGVyZSB0aGV5 IHNob3VsZCBiZS4KKyAgICBbc2VsZiBfc3luY2hyb25pemVDdXN0b21GaXhlZFBvc2l0aW9uTGF5 b3V0UmVjdF07CisjZW5kaWYKKworICAgIGlmIChfcHJpdmF0ZS0+cGFnZSkgewogICAgICAgICBf cHJpdmF0ZS0+cGFnZS0+dXBkYXRlUmVuZGVyaW5nKCk7CisgICAgICAgIF9wcml2YXRlLT5wYWdl LT5maW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSh7IH0pOworICAgIH0KIH0KIAogKyAoTlNBcnJheSAq KV9zdXBwb3J0ZWRNSU1FVHlwZXMKQEAgLTQ4MTMsMTMgKzQ4MjAsNyBAQCArICh2b2lkKV9yZW1v dmVBbGxVc2VyQ29udGVudEZyb21Hcm91cDooTlNTdHJpbmcgKilncm91cE5hbWUKIAogLSAodm9p ZClfZm9yY2VSZXBhaW50Rm9yVGVzdGluZwogewotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0g ICAgLy8gRW5zdXJlIGZpeGVkIHBvc2l0aW9ucyBsYXllcnMgYXJlIHdoZXJlIHRoZXkgc2hvdWxk IGJlLgotICAgIFtzZWxmIF9zeW5jaHJvbml6ZUN1c3RvbUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0 XTsKLSNlbmRpZgotCi0gICAgW3NlbGYgX3ZpZXdXaWxsRHJhd0ludGVybmFsXTsKLSAgICBbc2Vs ZiBfZmx1c2hDb21wb3NpdGluZ0NoYW5nZXNdOworICAgIFtzZWxmIF91cGRhdGVSZW5kZXJpbmdd OwogICAgIFtDQVRyYW5zYWN0aW9uIGZsdXNoXTsKICAgICBbQ0FUcmFuc2FjdGlvbiBzeW5jaHJv bml6ZV07CiB9CkBAIC05MjU3LDI4ICs5MjU4LDE5IEBAIGJvb2wgTGF5ZXJGbHVzaENvbnRyb2xs ZXI6OmZsdXNoTGF5ZXJzKCkKICAgICBOU1dpbmRvdyAqd2luZG93ID0gW21fd2ViVmlldyB3aW5k b3ddOwogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp Ci0gICAgLy8gRW5zdXJlIGZpeGVkIHBvc2l0aW9ucyBsYXllcnMgYXJlIHdoZXJlIHRoZXkgc2hv dWxkIGJlLgotICAgIFttX3dlYlZpZXcgX3N5bmNocm9uaXplQ3VzdG9tRml4ZWRQb3NpdGlvbkxh eW91dFJlY3RdOwotI2VuZGlmCi0KLSAgICBbbV93ZWJWaWV3IF92aWV3V2lsbERyYXdJbnRlcm5h bF07CisgICAgW21fd2ViVmlldyBfdXBkYXRlUmVuZGVyaW5nXTsKIAotICAgIGlmIChbbV93ZWJW aWV3IF9mbHVzaENvbXBvc2l0aW5nQ2hhbmdlc10pIHsKICNpZiBQTEFURk9STShNQUMpCi0gICAg ICAgIC8vIEFwcEtpdCBtYXkgaGF2ZSBkaXNhYmxlZCBzY3JlZW4gdXBkYXRlcywgdGhpbmtpbmcg YW4gdXBjb21pbmcgd2luZG93IGZsdXNoIHdpbGwgcmUtZW5hYmxlIHRoZW0uCi0gICAgICAgIC8v IEluIGNhc2Ugc2V0TmVlZHNEaXNwbGF5SW5SZWN0KCkgaGFzIHByZXZlbnRlZCB0aGUgd2luZG93 IGZyb20gbmVlZGluZyB0byBiZSBmbHVzaGVkLCByZS1lbmFibGUgc2NyZWVuCi0gICAgICAgIC8v IHVwZGF0ZXMgaGVyZS4KLSAgICAgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVH SU4KLSAgICAgICAgaWYgKCFbd2luZG93IGlzRmx1c2hXaW5kb3dEaXNhYmxlZF0pCi0gICAgICAg ICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKLSAgICAgICAgICAgIFt3aW5k b3cgX2VuYWJsZVNjcmVlblVwZGF0ZXNJZk5lZWRlZF07CisgICAgLy8gQXBwS2l0IG1heSBoYXZl IGRpc2FibGVkIHNjcmVlbiB1cGRhdGVzLCB0aGlua2luZyBhbiB1cGNvbWluZyB3aW5kb3cgZmx1 c2ggd2lsbCByZS1lbmFibGUgdGhlbS4KKyAgICAvLyBJbiBjYXNlIHNldE5lZWRzRGlzcGxheUlu UmVjdCgpIGhhcyBwcmV2ZW50ZWQgdGhlIHdpbmRvdyBmcm9tIG5lZWRpbmcgdG8gYmUgZmx1c2hl ZCwgcmUtZW5hYmxlIHNjcmVlbgorICAgIC8vIHVwZGF0ZXMgaGVyZS4KKyAgICBBTExPV19ERVBS RUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgorICAgIGlmICghW3dpbmRvdyBpc0ZsdXNoV2luZG93 RGlzYWJsZWRdKQorICAgICAgICBbd2luZG93IF9lbmFibGVTY3JlZW5VcGRhdGVzSWZOZWVkZWRd OworICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogI2VuZGlmCiAKLSAgICAg ICAgcmV0dXJuIHRydWU7Ci0gICAgfQotCi0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiB0 cnVlOwogfQogCiAtICh2b2lkKV9zY2hlZHVsZVVwZGF0ZVJlbmRlcmluZwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3Np dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQv QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQuY3BwCmluZGV4IGM3MWZmNDdhMDM0NjM4ZjI0 MmUwODlkMzYzM2JmMmZhZjdjMGQ3NTMuLmIwNGRiYjQzZDdjNDBkMGU1YjhhMGM3ZjQ0MmRhODE3 ODRjZGYyNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkNvcmVTdXBw b3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dC5j cHAKQEAgLTI5Nyw3ICsyOTcsNyBAQCB2b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0 OjpmbHVzaEFuZFJlbmRlckxheWVycygpCiAgICAgaWYgKCFlbmFibGVkKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGNvcmUoJm1fd2ViVmlldyktPnVwZGF0ZVJlbmRlcmluZygpOworICAgIGNv cmUoJm1fd2ViVmlldyktPmlzb2xhdGVkVXBkYXRlUmVuZGVyaW5nKCk7CiAKICAgICBpZiAoIWVu YWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2Fj eS93aW4vV2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJWaWV3LmNwcApp bmRleCAwMjdiMmFiNmFiMTMwZjcxMDUxOGJlYTBlYjczOTNmNDRlNGQ5N2VmLi45M2FiM2FmZmEw NTM4ZWI1M2U0YWRmNGU2ZTZlOThiMjFhZWMyM2IzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 TGVnYWN5L3dpbi9XZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJW aWV3LmNwcApAQCAtMTI4NSw3ICsxMjg1LDcgQEAgdm9pZCBXZWJWaWV3OjpwYWludChIREMgZGMs IExQQVJBTSBvcHRpb25zKQogewogICAgIExPQ0FMX0dESV9DT1VOVEVSKDAsIF9fRlVOQ1RJT05f Xyk7CiAKLSAgICBtX3BhZ2UtPnVwZGF0ZVJlbmRlcmluZygpOworICAgIG1fcGFnZS0+aXNvbGF0 ZWRVcGRhdGVSZW5kZXJpbmcoKTsKIAogICAgIGlmIChwYWludENvbXBvc2l0ZWRDb250ZW50VG9I REMoZGMpKSB7CiAgICAgICAgIDo6VmFsaWRhdGVSZWN0KG1fdmlld1dpbmRvdywgbnVsbHB0cik7 CkBAIC03MjExLDEzICs3MjExLDEzIEBAIHZvaWQgV2ViVmlldzo6Zmx1c2hQZW5kaW5nR3JhcGhp Y3NMYXllckNoYW5nZXNTb29uKCkKIHsKICNpZiBVU0UoQ0EpCiAgICAgaWYgKCFtX2xheWVyVHJl ZUhvc3QpIHsKLSAgICAgICAgbV9wYWdlLT51cGRhdGVSZW5kZXJpbmcoKTsKKyAgICAgICAgbV9w YWdlLT5pc29sYXRlZFVwZGF0ZVJlbmRlcmluZygpOwogICAgICAgICByZXR1cm47CiAgICAgfQog ICAgIG1fbGF5ZXJUcmVlSG9zdC0+Zmx1c2hQZW5kaW5nR3JhcGhpY3NMYXllckNoYW5nZXNTb29u KCk7CiAjZWxpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCiAgICAgaWYgKCFpc0FjY2VsZXJhdGVk Q29tcG9zaXRpbmcoKSkgewotICAgICAgICBtX3BhZ2UtPnVwZGF0ZVJlbmRlcmluZygpOworICAg ICAgICBtX3BhZ2UtPmlzb2xhdGVkVXBkYXRlUmVuZGVyaW5nKCk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAgICAgaWYgKCFtX2FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0KQpAQCAtNzQ0 NCw3ICs3NDQ0LDcgQEAgdm9pZCBXZWJWaWV3OjpmbHVzaFBlbmRpbmdHcmFwaGljc0xheWVyQ2hh bmdlcygpCiAgICAgaWYgKCFpc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgbV9wYWdlLT51cGRhdGVSZW5kZXJpbmcoKTsKKyAgICBtX3BhZ2UtPmlzb2xh dGVkVXBkYXRlUmVuZGVyaW5nKCk7CiAKICAgICAvLyBVcGRhdGluZyBsYXlvdXQgbWlnaHQgaGF2 ZSB0YWtlbiB1cyBvdXQgb2YgY29tcG9zaXRpbmcgbW9kZS4KICAgICBpZiAobV9iYWNraW5nTGF5 ZXIpCg==