222099 2021-02-18 03:18:53 -0800 RemoteRenderingBackend commands are not processed in order if GPU process is waiting for replies 2021-03-15 04:34:06 -0700 1 1 1 Unclassified WebKit Canvas Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 kkinnunen kkinnunen dino sabouhallawa simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1730809 0 kkinnunen 2021-02-18 03:18:53 -0800 RemoteRenderingBackend commands are not processed in order if GPU process is waiting for replies Asynchronous messages need to be sent with DispatchMessageEvenWhenWaitingForSyncReply in order for them to be dispatched in order with synchronous messages. Affects case where wait happens when RemoteRenderingBackend is created. 1730810 1 420820 kkinnunen 2021-02-18 03:31:51 -0800 Created attachment 420820 Patch 1733275 2 webkit-bug-importer 2021-02-25 03:19:13 -0800 <rdar://problem/74738277> 1735920 3 420820 sabouhallawa 2021-03-04 10:41:18 -0800 Comment on attachment 420820 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420820&action=review > Source/WebKit/ChangeLog:22 > + If GPU process is waiting for a sync reply when the sequence up What are the synchronous messages which GPUP sends and waits for their replies? 1735979 4 kkinnunen 2021-03-04 12:38:31 -0800 (In reply to Said Abou-Hallawa from comment #3) > > Source/WebKit/ChangeLog:22 > > + If GPU process is waiting for a sync reply when the sequence up > > What are the synchronous messages which GPUP sends and waits for their > replies? I don't know enough of the codepaths to figure that out. I cannot see any in GPUProcess/ or Shared/, but it does not mean they don't happen today or in the future.. 1739350 5 423153 kkinnunen 2021-03-15 03:30:41 -0700 Created attachment 423153 rebase 1739368 6 ews-feeder 2021-03-15 04:34:05 -0700 Committed r274413: <https://commits.webkit.org/r274413> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423153. 420820 2021-02-18 03:31:51 -0800 2021-03-15 03:30:36 -0700 Patch bug-222099-20210218133150.patch text/plain 9082 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk3ZDFmZDkwY2Q2N2YwZWU0 ZTM5ZDZiNzA3OTBkZGRmZWZiNzdmMzguLjU5OWNjMWUwMjk0NzBmODk5NzNmN2JiMmE2Y2RlYzdh Y2FhNjYwMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTMgQEAKKzIwMjEtMDItMTggIEtpbW1vIEtp bm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdGVSZW5kZXJpbmdC YWNrZW5kIGNvbW1hbmRzIGFyZSBub3QgcHJvY2Vzc2VkIGluIG9yZGVyIGlmIEdQVSBwcm9jZXNz IGlzIHdhaXRpbmcgZm9yIHJlcGxpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyMjA5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1hcmsgYWxsIGFzeW5jaHJvbm91cyBtZXNzYWdlIHNlbmRzIHdpdGgg RGlzcGF0Y2hNZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5LgorICAgICAgICBPdGhl cndpc2Ugc3luY2hyb25vdXMgbWVzc2FnZXMgd2lsbCBiZSBkaXNwYXRjaGVkIGJlZm9yZSBhc3lu Y2hyb25vdXMgbWVzc2FnZXMuCisgICAgICAgIFRoZSBtZXNzYWdlcyBhcmUgdGVtcG9yYWxseSBk ZXBlbmRlbnQuCisKKyAgICAgICAgQ29uc2lkZXIgaW5pdGlhbCBtZXNzYWdlIGV4Y2hhbmdlIGlu IGNhbnZhcy1ibGVuZGluZy1jb2xvci1vdmVyLWltYWdlLmh0bWw6CisgICAgICAgIEdQVUNvbm5l Y3Rpb25Ub1dlYlByb2Nlc3NfQ3JlYXRlUmVuZGVyaW5nQmFja2VuZAorICAgICAgICBSZW1vdGVS ZW5kZXJpbmdCYWNrZW5kX0NyZWF0ZUltYWdlQnVmZmVyCisgICAgICAgIFJlbW90ZVJlbmRlcmlu Z0JhY2tlbmRfRGlkQ3JlYXRlU2hhcmVkRGlzcGxheUxpc3RIYW5kbGUKKyAgICAgICAgUmVtb3Rl UmVuZGVyaW5nQmFja2VuZF9DcmVhdGVJbWFnZUJ1ZmZlcgorICAgICAgICBSZW1vdGVSZW5kZXJp bmdCYWNrZW5kX1dha2VVcEFuZEFwcGx5RGlzcGxheUxpc3QKKyAgICAgICAgUmVtb3RlUmVuZGVy aW5nQmFja2VuZF9HZXREYXRhVVJMRm9ySW1hZ2VCdWZmZXIKKyAgICAgICAgUmVtb3RlUmVuZGVy aW5nQmFja2VuZFByb3h5X0RpZENyZWF0ZUltYWdlQnVmZmVyQmFja2VuZAorICAgICAgICBSZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHlfRGlkQ3JlYXRlSW1hZ2VCdWZmZXJCYWNrZW5kCisKKyAg ICAgICAgSWYgR1BVIHByb2Nlc3MgaXMgd2FpdGluZyBmb3IgYSBzeW5jIHJlcGx5IHdoZW4gdGhl IHNlcXVlbmNlIHVwCisgICAgICAgIHVudGlsIEdldERhdGFVUkwuLiBhcnJpdmVzLCB0aGVuIHRo ZSBkaXNwYXRjaCBvcmRlciBpczoKKworICAgICAgICBHUFVDb25uZWN0aW9uVG9XZWJQcm9jZXNz X0NyZWF0ZVJlbmRlcmluZ0JhY2tlbmQKKyAgICAgICAgUmVtb3RlUmVuZGVyaW5nQmFja2VuZF9H ZXREYXRhVVJMRm9ySW1hZ2VCdWZmZXIKKyAgICAgICAgIFsuLi4gcmVzdCBvZiB0aGUgbWVzc2Fn ZXNdCisKKyAgICAgICAgVGhpcyBpcyBhIHJhcmUgY2FzZSwgYWZmZWN0cyBvbmx5IHRoZSBjYXNl IHdoZXJlOgorICAgICAgICAxKSBUaGVzZSBtZXNzYWdlcyBhcnJpdmUgYmVmb3JlIG1haW4gdGhy ZWFkIHByb2Nlc3NlcyB0aGUgbWVzc2FnZSBxdWV1ZQorICAgICAgICAyKSBHUFUgcHJvY2VzcyBo YXMgc2VudCBhIHN5bmNocm9ub3VzIG1lc3NhZ2UgYW5kIGlzIHdhaXRpbmcgZm9yIGEgcmVwbHkK KworICAgICAgICBJbiBiYXNlIGNhc2UgYWZ0ZXIgUmVuZGVyaW5nQmFja2VuZCBoYXMgYmVlbiBj cmVhdGVkIGFuZCB0aGUgd29yayBxdWV1ZQorICAgICAgICByZWNlaXZlIHF1ZXVlIGhhcyBiZWVu IGluc3RhbGxlZCwgYWxsIG1lc3NhZ2VzIGFyZSBtb3ZlZCB0byB0aGUgd29yaworICAgICAgICBx dWV1ZSB0aHJlYWQgYW5kIGRpc3BhdGNoZWQgaW4gb3JkZXIgb2YgYXJyaXZhbC4KKworICAgICAg ICBObyBuZXcgdGVzdHMsIHRpbWluZyBkZXBlbmRlbnQgYW5kIFdlYktpdCBjb2RlIGNhbm5vdCBi ZQorICAgICAgICB1bml0IHRlc3RlZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJl bW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6flJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSk6 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6cmVlc3RhYmxp c2hHUFVQcm9jZXNzQ29ubmVjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmlu Z0JhY2tlbmRQcm94eTo6Y3JlYXRlSW1hZ2VCdWZmZXIpOgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmNhY2hlTmF0aXZlSW1hZ2UpOgorICAgICAgICAoV2Vi S2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmNhY2hlRm9udCk6CisgICAgICAgIChX ZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6ZGVsZXRlQWxsRm9udHMpOgorICAg ICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OnJlbGVhc2VSZW1vdGVS ZXNvdXJjZSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6 c2VuZFdha2V1cE1lc3NhZ2UpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNr ZW5kUHJveHk6OmNyZWF0ZUl0ZW1CdWZmZXIpOgorCiAyMDIxLTAyLTEyICBLaW1tbyBLaW5udW5l biAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViR0wgY29udGV4dHMgZG8gbm90 IHdvcmsgYXMgc291cmNlIGZvciBDb250ZXh0MkQgZHJhd0ltYWdlIGNhbGxzIGluIEdQVSBwcm9j ZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1Jl bW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv R1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHAKaW5kZXggM2IxNGY0 MzBmNjE5NGQ2MDY1YTMyMmU1MmE4ODU3MThmOTcxNzM3Ny4uMDcwODVjZTQzMmRlYWZjMDM1MmFj OWZjOWZlZmFiNmUwOTY2ZDhiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFBy b3h5LmNwcApAQCAtNTcsNyArNTcsNyBAQCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6On5S ZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkoKQogICAgIG1lc3NhZ2VSZWNlaXZlck1hcC5yZW1v dmVNZXNzYWdlUmVjZWl2ZXIoKnRoaXMpOwogCiAgICAgLy8gUmVsZWFzZSB0aGUgUmVtb3RlUmVu ZGVyaW5nQmFja2VuZC4KLSAgICBzZW5kKE1lc3NhZ2VzOjpHUFVDb25uZWN0aW9uVG9XZWJQcm9j ZXNzOjpSZWxlYXNlUmVuZGVyaW5nQmFja2VuZChtX3JlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVy KSwgMCk7CisgICAgc2VuZChNZXNzYWdlczo6R1BVQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6UmVs ZWFzZVJlbmRlcmluZ0JhY2tlbmQobV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllciksIDAsIElQ Qzo6U2VuZE9wdGlvbjo6RGlzcGF0Y2hNZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5 KTsKIH0KIAogdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmNvbm5lY3RUb0dQVVBy b2Nlc3MoKQpAQCAtNzUsNyArNzUsNyBAQCB2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94 eTo6cmVlc3RhYmxpc2hHUFVQcm9jZXNzQ29ubmVjdGlvbigpCiAgICAgZm9yIChhdXRvJiBpbWFn ZUJ1ZmZlciA6IG1fcmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmltYWdlQnVmZmVycygpLnZhbHVl cygpKSB7CiAgICAgICAgIGlmICghaW1hZ2VCdWZmZXIpCiAgICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgc2VuZChNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6Q3JlYXRlSW1h Z2VCdWZmZXIoaW1hZ2VCdWZmZXItPmxvZ2ljYWxTaXplKCksIGltYWdlQnVmZmVyLT5yZW5kZXJp bmdNb2RlKCksIGltYWdlQnVmZmVyLT5yZXNvbHV0aW9uU2NhbGUoKSwgaW1hZ2VCdWZmZXItPmNv bG9yU3BhY2UoKSwgaW1hZ2VCdWZmZXItPnBpeGVsRm9ybWF0KCksIGltYWdlQnVmZmVyLT5yZW5k ZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIoKSksIG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIp OworICAgICAgICBzZW5kKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpDcmVhdGVJ bWFnZUJ1ZmZlcihpbWFnZUJ1ZmZlci0+bG9naWNhbFNpemUoKSwgaW1hZ2VCdWZmZXItPnJlbmRl cmluZ01vZGUoKSwgaW1hZ2VCdWZmZXItPnJlc29sdXRpb25TY2FsZSgpLCBpbWFnZUJ1ZmZlci0+ Y29sb3JTcGFjZSgpLCBpbWFnZUJ1ZmZlci0+cGl4ZWxGb3JtYXQoKSwgaW1hZ2VCdWZmZXItPnJl bmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcigpKSwgbV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmll ciwgSVBDOjpTZW5kT3B0aW9uOjpEaXNwYXRjaE1lc3NhZ2VFdmVuV2hlbldhaXRpbmdGb3JTeW5j UmVwbHkpOwogICAgICAgICBpbWFnZUJ1ZmZlci0+Y2xlYXJCYWNrZW5kKCk7CiAgICAgfQogfQpA QCAtMTM1LDcgKzEzNSw3IEBAIFJlZlB0cjxJbWFnZUJ1ZmZlcj4gUmVtb3RlUmVuZGVyaW5nQmFj a2VuZFByb3h5OjpjcmVhdGVJbWFnZUJ1ZmZlcihjb25zdCBGbG9hdFNpCiAgICAgICAgIGltYWdl QnVmZmVyID0gVW5hY2NlbGVyYXRlZFJlbW90ZUltYWdlQnVmZmVyUHJveHk6OmNyZWF0ZShzaXpl LCByZXNvbHV0aW9uU2NhbGUsIGNvbG9yU3BhY2UsIHBpeGVsRm9ybWF0LCAqdGhpcyk7CiAKICAg ICBpZiAoaW1hZ2VCdWZmZXIpIHsKLSAgICAgICAgc2VuZChNZXNzYWdlczo6UmVtb3RlUmVuZGVy aW5nQmFja2VuZDo6Q3JlYXRlSW1hZ2VCdWZmZXIoc2l6ZSwgcmVuZGVyaW5nTW9kZSwgcmVzb2x1 dGlvblNjYWxlLCBjb2xvclNwYWNlLCBwaXhlbEZvcm1hdCwgaW1hZ2VCdWZmZXItPnJlbmRlcmlu Z1Jlc291cmNlSWRlbnRpZmllcigpKSwgbV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllcik7Cisg ICAgICAgIHNlbmQoTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OkNyZWF0ZUltYWdl QnVmZmVyKHNpemUsIHJlbmRlcmluZ01vZGUsIHJlc29sdXRpb25TY2FsZSwgY29sb3JTcGFjZSwg cGl4ZWxGb3JtYXQsIGltYWdlQnVmZmVyLT5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIoKSks IG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIsIElQQzo6U2VuZE9wdGlvbjo6RGlzcGF0Y2hN ZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsKICAgICAgICAgcmV0dXJuIGltYWdl QnVmZmVyOwogICAgIH0KIApAQCAtMTgwLDE3ICsxODAsMTcgQEAgVmVjdG9yPHVpbnQ4X3Q+IFJl bW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6Z2V0QkdSQURhdGFGb3JJbWFnZUJ1ZmZlcihSZW5k ZXJpbmcKIAogdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmNhY2hlTmF0aXZlSW1h Z2UoY29uc3QgU2hhcmVhYmxlQml0bWFwOjpIYW5kbGUmIGhhbmRsZSwgUmVuZGVyaW5nUmVzb3Vy Y2VJZGVudGlmaWVyIHJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikKIHsKLSAgICBzZW5kKE1l c3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpDYWNoZU5hdGl2ZUltYWdlKGhhbmRsZSwg cmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKSwgbV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmll cik7CisgICAgc2VuZChNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6Q2FjaGVOYXRp dmVJbWFnZShoYW5kbGUsIHJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciksIG1fcmVuZGVyaW5n QmFja2VuZElkZW50aWZpZXIsIElQQzo6U2VuZE9wdGlvbjo6RGlzcGF0Y2hNZXNzYWdlRXZlbldo ZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsKIH0KIAogdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHk6OmNhY2hlRm9udChSZWY8V2ViQ29yZTo6Rm9udD4mJiBmb250KQogewotICAgIHNlbmQo TWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OkNhY2hlRm9udChXVEZNb3ZlKGZvbnQp KSwgbV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllcik7CisgICAgc2VuZChNZXNzYWdlczo6UmVt b3RlUmVuZGVyaW5nQmFja2VuZDo6Q2FjaGVGb250KFdURk1vdmUoZm9udCkpLCBtX3JlbmRlcmlu Z0JhY2tlbmRJZGVudGlmaWVyLCBJUEM6OlNlbmRPcHRpb246OkRpc3BhdGNoTWVzc2FnZUV2ZW5X aGVuV2FpdGluZ0ZvclN5bmNSZXBseSk7CiB9CiAKIHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2Vu ZFByb3h5OjpkZWxldGVBbGxGb250cygpCiB7Ci0gICAgc2VuZChNZXNzYWdlczo6UmVtb3RlUmVu ZGVyaW5nQmFja2VuZDo6RGVsZXRlQWxsRm9udHMoKSwgbV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRp Zmllcik7CisgICAgc2VuZChNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6RGVsZXRl QWxsRm9udHMoKSwgbV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllciwgSVBDOjpTZW5kT3B0aW9u OjpEaXNwYXRjaE1lc3NhZ2VFdmVuV2hlbldhaXRpbmdGb3JTeW5jUmVwbHkpOwogfQogCiB2b2lk IFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6cmVsZWFzZVJlbW90ZVJlc291cmNlKFJlbmRl cmluZ1Jlc291cmNlSWRlbnRpZmllciByZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIpCkBAIC0x OTgsNyArMTk4LDcgQEAgdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OnJlbGVhc2VS ZW1vdGVSZXNvdXJjZShSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWYKICAgICBpZiAocmVuZGVyaW5n UmVzb3VyY2VJZGVudGlmaWVyID09IG1fY3VycmVudERlc3RpbmF0aW9uSW1hZ2VCdWZmZXJJZGVu dGlmaWVyKQogICAgICAgICBtX2N1cnJlbnREZXN0aW5hdGlvbkltYWdlQnVmZmVySWRlbnRpZmll ciA9IFdURjo6bnVsbG9wdDsKIAotICAgIHNlbmQoTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0Jh Y2tlbmQ6OlJlbGVhc2VSZW1vdGVSZXNvdXJjZShyZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIp LCBtX3JlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyKTsKKyAgICBzZW5kKE1lc3NhZ2VzOjpSZW1v dGVSZW5kZXJpbmdCYWNrZW5kOjpSZWxlYXNlUmVtb3RlUmVzb3VyY2UocmVuZGVyaW5nUmVzb3Vy Y2VJZGVudGlmaWVyKSwgbV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllciwgSVBDOjpTZW5kT3B0 aW9uOjpEaXNwYXRjaE1lc3NhZ2VFdmVuV2hlbldhaXRpbmdGb3JTeW5jUmVwbHkpOwogfQogCiB2 b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6ZGlkQ3JlYXRlSW1hZ2VCdWZmZXJCYWNr ZW5kKEltYWdlQnVmZmVyQmFja2VuZEhhbmRsZSBoYW5kbGUsIFJlbmRlcmluZ1Jlc291cmNlSWRl bnRpZmllciByZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIpCkBAIC0yNDksNyArMjQ5LDcgQEAg dm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OndpbGxBcHBlbmRJdGVtKFJlbmRlcmlu Z1Jlc291cmNlSWRlbnRpZmllciBuZXcKIAogdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJv eHk6OnNlbmRXYWtldXBNZXNzYWdlKGNvbnN0IEdQVVByb2Nlc3NXYWtldXBNZXNzYWdlQXJndW1l bnRzJiBhcmd1bWVudHMpCiB7Ci0gICAgc2VuZChNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFj a2VuZDo6V2FrZVVwQW5kQXBwbHlEaXNwbGF5TGlzdChhcmd1bWVudHMpLCBtX3JlbmRlcmluZ0Jh Y2tlbmRJZGVudGlmaWVyKTsKKyAgICBzZW5kKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNr ZW5kOjpXYWtlVXBBbmRBcHBseURpc3BsYXlMaXN0KGFyZ3VtZW50cyksIG1fcmVuZGVyaW5nQmFj a2VuZElkZW50aWZpZXIsIElQQzo6U2VuZE9wdGlvbjo6RGlzcGF0Y2hNZXNzYWdlRXZlbldoZW5X YWl0aW5nRm9yU3luY1JlcGx5KTsKIH0KIAogdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJv eHk6OnNlbmREZWZlcnJlZFdha2V1cE1lc3NhZ2VJZk5lZWRlZCgpCkBAIC0zNTAsNyArMzUwLDcg QEAgRGlzcGxheUxpc3Q6Okl0ZW1CdWZmZXJIYW5kbGUgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFBy b3h5OjpjcmVhdGVJdGVtQnVmZmVyKHNpemUKICAgICBzaGFyZWRNZW1vcnktPmNyZWF0ZUhhbmRs ZShzaGFyZWRNZW1vcnlIYW5kbGUsIFNoYXJlZE1lbW9yeTo6UHJvdGVjdGlvbjo6UmVhZFdyaXRl KTsKIAogICAgIGF1dG8gaWRlbnRpZmllciA9IERpc3BsYXlMaXN0OjpJdGVtQnVmZmVySWRlbnRp Zmllcjo6Z2VuZXJhdGUoKTsKLSAgICBzZW5kKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNr ZW5kOjpEaWRDcmVhdGVTaGFyZWREaXNwbGF5TGlzdEhhbmRsZShpZGVudGlmaWVyLCB7IFdURk1v dmUoc2hhcmVkTWVtb3J5SGFuZGxlKSwgc2hhcmVkTWVtb3J5LT5zaXplKCkgfSwgZGVzdGluYXRp b25CdWZmZXJJZGVudGlmaWVyKSwgbV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllcik7CisgICAg c2VuZChNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6RGlkQ3JlYXRlU2hhcmVkRGlz cGxheUxpc3RIYW5kbGUoaWRlbnRpZmllciwgeyBXVEZNb3ZlKHNoYXJlZE1lbW9yeUhhbmRsZSks IHNoYXJlZE1lbW9yeS0+c2l6ZSgpIH0sIGRlc3RpbmF0aW9uQnVmZmVySWRlbnRpZmllciksIG1f cmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIsIElQQzo6U2VuZE9wdGlvbjo6RGlzcGF0Y2hNZXNz YWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsKIAogICAgIGF1dG8gbmV3SGFuZGxlID0g RGlzcGxheUxpc3RXcml0ZXJIYW5kbGU6OmNyZWF0ZShpZGVudGlmaWVyLCBzaGFyZWRNZW1vcnku cmVsZWFzZU5vbk51bGwoKSk7CiAgICAgYXV0byBkaXNwbGF5TGlzdEhhbmRsZSA9IG5ld0hhbmRs ZS0+Y3JlYXRlSGFuZGxlKCk7Cg== 423153 2021-03-15 03:30:41 -0700 2021-03-15 04:34:06 -0700 rebase bug-222099-20210315123039.patch text/plain 9128 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ5MTBhYjA1ZjZkMzUwNzZh NzYyZmYxZGM2NjM3N2Q2YjhkZTEwMjYuLjQ1YTJhOGQ2MmRmMzdjZTg3NTU4NDdjZmU0MmZiMWMy NTY0NjNjM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTMgQEAKKzIwMjEtMDMtMTUgIEtpbW1vIEtp bm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdGVSZW5kZXJpbmdC YWNrZW5kIGNvbW1hbmRzIGFyZSBub3QgcHJvY2Vzc2VkIGluIG9yZGVyIGlmIEdQVSBwcm9jZXNz IGlzIHdhaXRpbmcgZm9yIHJlcGxpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyMjA5OQorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNl ci4KKworICAgICAgICBNYXJrIGFsbCBhc3luY2hyb25vdXMgbWVzc2FnZSBzZW5kcyB3aXRoIERp c3BhdGNoTWVzc2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseS4KKyAgICAgICAgT3RoZXJ3 aXNlIHN5bmNocm9ub3VzIG1lc3NhZ2VzIHdpbGwgYmUgZGlzcGF0Y2hlZCBiZWZvcmUgYXN5bmNo cm9ub3VzIG1lc3NhZ2VzLgorICAgICAgICBUaGUgbWVzc2FnZXMgYXJlIHRlbXBvcmFsbHkgZGVw ZW5kZW50LgorCisgICAgICAgIENvbnNpZGVyIGluaXRpYWwgbWVzc2FnZSBleGNoYW5nZSBpbiBj YW52YXMtYmxlbmRpbmctY29sb3Itb3Zlci1pbWFnZS5odG1sOgorICAgICAgICBHUFVDb25uZWN0 aW9uVG9XZWJQcm9jZXNzX0NyZWF0ZVJlbmRlcmluZ0JhY2tlbmQKKyAgICAgICAgUmVtb3RlUmVu ZGVyaW5nQmFja2VuZF9DcmVhdGVJbWFnZUJ1ZmZlcgorICAgICAgICBSZW1vdGVSZW5kZXJpbmdC YWNrZW5kX0RpZENyZWF0ZVNoYXJlZERpc3BsYXlMaXN0SGFuZGxlCisgICAgICAgIFJlbW90ZVJl bmRlcmluZ0JhY2tlbmRfQ3JlYXRlSW1hZ2VCdWZmZXIKKyAgICAgICAgUmVtb3RlUmVuZGVyaW5n QmFja2VuZF9XYWtlVXBBbmRBcHBseURpc3BsYXlMaXN0CisgICAgICAgIFJlbW90ZVJlbmRlcmlu Z0JhY2tlbmRfR2V0RGF0YVVSTEZvckltYWdlQnVmZmVyCisgICAgICAgIFJlbW90ZVJlbmRlcmlu Z0JhY2tlbmRQcm94eV9EaWRDcmVhdGVJbWFnZUJ1ZmZlckJhY2tlbmQKKyAgICAgICAgUmVtb3Rl UmVuZGVyaW5nQmFja2VuZFByb3h5X0RpZENyZWF0ZUltYWdlQnVmZmVyQmFja2VuZAorCisgICAg ICAgIElmIEdQVSBwcm9jZXNzIGlzIHdhaXRpbmcgZm9yIGEgc3luYyByZXBseSB3aGVuIHRoZSBz ZXF1ZW5jZSB1cAorICAgICAgICB1bnRpbCBHZXREYXRhVVJMLi4gYXJyaXZlcywgdGhlbiB0aGUg ZGlzcGF0Y2ggb3JkZXIgaXM6CisKKyAgICAgICAgR1BVQ29ubmVjdGlvblRvV2ViUHJvY2Vzc19D cmVhdGVSZW5kZXJpbmdCYWNrZW5kCisgICAgICAgIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRfR2V0 RGF0YVVSTEZvckltYWdlQnVmZmVyCisgICAgICAgICBbLi4uIHJlc3Qgb2YgdGhlIG1lc3NhZ2Vz XQorCisgICAgICAgIFRoaXMgaXMgYSByYXJlIGNhc2UsIGFmZmVjdHMgb25seSB0aGUgY2FzZSB3 aGVyZToKKyAgICAgICAgMSkgVGhlc2UgbWVzc2FnZXMgYXJyaXZlIGJlZm9yZSBtYWluIHRocmVh ZCBwcm9jZXNzZXMgdGhlIG1lc3NhZ2UgcXVldWUKKyAgICAgICAgMikgR1BVIHByb2Nlc3MgaGFz IHNlbnQgYSBzeW5jaHJvbm91cyBtZXNzYWdlIGFuZCBpcyB3YWl0aW5nIGZvciBhIHJlcGx5CisK KyAgICAgICAgSW4gYmFzZSBjYXNlIGFmdGVyIFJlbmRlcmluZ0JhY2tlbmQgaGFzIGJlZW4gY3Jl YXRlZCBhbmQgdGhlIHdvcmsgcXVldWUKKyAgICAgICAgcmVjZWl2ZSBxdWV1ZSBoYXMgYmVlbiBp bnN0YWxsZWQsIGFsbCBtZXNzYWdlcyBhcmUgbW92ZWQgdG8gdGhlIHdvcmsKKyAgICAgICAgcXVl dWUgdGhyZWFkIGFuZCBkaXNwYXRjaGVkIGluIG9yZGVyIG9mIGFycml2YWwuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCB0aW1pbmcgZGVwZW5kZW50IGFuZCBXZWJLaXQgY29kZSBjYW5ub3QgYmUK KyAgICAgICAgdW5pdCB0ZXN0ZWQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9ncmFwaGlj cy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6On5SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkpOgor ICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OnJlZXN0YWJsaXNo R1BVUHJvY2Vzc0Nvbm5lY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdC YWNrZW5kUHJveHk6OmNyZWF0ZUltYWdlQnVmZmVyKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3Rl UmVuZGVyaW5nQmFja2VuZFByb3h5OjpjYWNoZU5hdGl2ZUltYWdlKToKKyAgICAgICAgKFdlYktp dDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpjYWNoZUZvbnQpOgorICAgICAgICAoV2Vi S2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmRlbGV0ZUFsbEZvbnRzKToKKyAgICAg ICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpyZWxlYXNlUmVtb3RlUmVz b3VyY2UpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OnNl bmRXYWtldXBNZXNzYWdlKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2Vu ZFByb3h5OjpjcmVhdGVJdGVtQnVmZmVyKToKKwogMjAyMS0wMy0xMyAgUGVuZyBMaXUgIDxwZW5n LmxpdTZAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFVQXVtNU0VdIE1lZGlhU291cmNlOjpidWZm ZXJlZCBhbmQgTWVkaWFTb3VyY2U6OmFjdGl2ZVNvdXJjZUJ1ZmZlcnMgZG8gbm90IHVwZGF0ZSBp biB0aGUgc2FtZSBydW4gbG9vcCBhcyBNZWRpYVNvdXJjZTo6ZW5kT2ZTdHJlYW0oKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJp bmdCYWNrZW5kUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGlj cy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3BwCmluZGV4IGZjNWZmZjJiMmI1NTJkZTEx NzMwMmVhYWZjMGVkMmJlMGZiN2QyZWMuLjFhMGM2MzIwZTNiYmRmMTYzZTQ3MDYyNWRmYTNiYmFl ZTc3NmI5MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhp Y3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHAKQEAg LTU4LDcgKzU4LDcgQEAgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Ojp+UmVtb3RlUmVuZGVy aW5nQmFja2VuZFByb3h5KCkKICAgICBtZXNzYWdlUmVjZWl2ZXJNYXAucmVtb3ZlTWVzc2FnZVJl Y2VpdmVyKCp0aGlzKTsKIAogICAgIC8vIFJlbGVhc2UgdGhlIFJlbW90ZVJlbmRlcmluZ0JhY2tl bmQuCi0gICAgc2VuZChNZXNzYWdlczo6R1BVQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6UmVsZWFz ZVJlbmRlcmluZ0JhY2tlbmQobV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllciksIDApOworICAg IHNlbmQoTWVzc2FnZXM6OkdQVUNvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlJlbGVhc2VSZW5kZXJp bmdCYWNrZW5kKG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIpLCAwLCBJUEM6OlNlbmRPcHRp b246OkRpc3BhdGNoTWVzc2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseSk7CiB9CiAKIHZv aWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Ojpjb25uZWN0VG9HUFVQcm9jZXNzKCkKQEAg LTc2LDcgKzc2LDcgQEAgdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OnJlZXN0YWJs aXNoR1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKQogICAgIGZvciAoYXV0byYgaW1hZ2VCdWZmZXIgOiBt X3JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5pbWFnZUJ1ZmZlcnMoKS52YWx1ZXMoKSkgewogICAg ICAgICBpZiAoIWltYWdlQnVmZmVyKQogICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIHNl bmQoTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OkNyZWF0ZUltYWdlQnVmZmVyKGlt YWdlQnVmZmVyLT5sb2dpY2FsU2l6ZSgpLCBpbWFnZUJ1ZmZlci0+cmVuZGVyaW5nTW9kZSgpLCBp bWFnZUJ1ZmZlci0+cmVzb2x1dGlvblNjYWxlKCksIGltYWdlQnVmZmVyLT5jb2xvclNwYWNlKCks IGltYWdlQnVmZmVyLT5waXhlbEZvcm1hdCgpLCBpbWFnZUJ1ZmZlci0+cmVuZGVyaW5nUmVzb3Vy Y2VJZGVudGlmaWVyKCkpLCBtX3JlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyKTsKKyAgICAgICAg c2VuZChNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6Q3JlYXRlSW1hZ2VCdWZmZXIo aW1hZ2VCdWZmZXItPmxvZ2ljYWxTaXplKCksIGltYWdlQnVmZmVyLT5yZW5kZXJpbmdNb2RlKCks IGltYWdlQnVmZmVyLT5yZXNvbHV0aW9uU2NhbGUoKSwgaW1hZ2VCdWZmZXItPmNvbG9yU3BhY2Uo KSwgaW1hZ2VCdWZmZXItPnBpeGVsRm9ybWF0KCksIGltYWdlQnVmZmVyLT5yZW5kZXJpbmdSZXNv dXJjZUlkZW50aWZpZXIoKSksIG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIsIElQQzo6U2Vu ZE9wdGlvbjo6RGlzcGF0Y2hNZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsKICAg ICAgICAgaW1hZ2VCdWZmZXItPmNsZWFyQmFja2VuZCgpOwogICAgIH0KIH0KQEAgLTEzNiw3ICsx MzYsNyBAQCBSZWZQdHI8SW1hZ2VCdWZmZXI+IFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6 Y3JlYXRlSW1hZ2VCdWZmZXIoY29uc3QgRmxvYXRTaQogICAgICAgICBpbWFnZUJ1ZmZlciA9IFVu YWNjZWxlcmF0ZWRSZW1vdGVJbWFnZUJ1ZmZlclByb3h5OjpjcmVhdGUoc2l6ZSwgcmVzb2x1dGlv blNjYWxlLCBjb2xvclNwYWNlLCBwaXhlbEZvcm1hdCwgKnRoaXMpOwogCiAgICAgaWYgKGltYWdl QnVmZmVyKSB7Ci0gICAgICAgIHNlbmQoTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6 OkNyZWF0ZUltYWdlQnVmZmVyKHNpemUsIHJlbmRlcmluZ01vZGUsIHJlc29sdXRpb25TY2FsZSwg Y29sb3JTcGFjZSwgcGl4ZWxGb3JtYXQsIGltYWdlQnVmZmVyLT5yZW5kZXJpbmdSZXNvdXJjZUlk ZW50aWZpZXIoKSksIG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIpOworICAgICAgICBzZW5k KE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpDcmVhdGVJbWFnZUJ1ZmZlcihzaXpl LCByZW5kZXJpbmdNb2RlLCByZXNvbHV0aW9uU2NhbGUsIGNvbG9yU3BhY2UsIHBpeGVsRm9ybWF0 LCBpbWFnZUJ1ZmZlci0+cmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKCkpLCBtX3JlbmRlcmlu Z0JhY2tlbmRJZGVudGlmaWVyLCBJUEM6OlNlbmRPcHRpb246OkRpc3BhdGNoTWVzc2FnZUV2ZW5X aGVuV2FpdGluZ0ZvclN5bmNSZXBseSk7CiAgICAgICAgIHJldHVybiBpbWFnZUJ1ZmZlcjsKICAg ICB9CiAKQEAgLTE5MywxNyArMTkzLDE3IEBAIFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IFJlbW90 ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6Z2V0U2hhcmVhYmxlQml0bWFwKFJlbmRlcmluCiAKIHZv aWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpjYWNoZU5hdGl2ZUltYWdlKGNvbnN0IFNo YXJlYWJsZUJpdG1hcDo6SGFuZGxlJiBoYW5kbGUsIFJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmll ciByZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIpCiB7Ci0gICAgc2VuZChNZXNzYWdlczo6UmVt b3RlUmVuZGVyaW5nQmFja2VuZDo6Q2FjaGVOYXRpdmVJbWFnZShoYW5kbGUsIHJlbmRlcmluZ1Jl c291cmNlSWRlbnRpZmllciksIG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIpOworICAgIHNl bmQoTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OkNhY2hlTmF0aXZlSW1hZ2UoaGFu ZGxlLCByZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIpLCBtX3JlbmRlcmluZ0JhY2tlbmRJZGVu dGlmaWVyLCBJUEM6OlNlbmRPcHRpb246OkRpc3BhdGNoTWVzc2FnZUV2ZW5XaGVuV2FpdGluZ0Zv clN5bmNSZXBseSk7CiB9CiAKIHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpjYWNo ZUZvbnQoUmVmPFdlYkNvcmU6OkZvbnQ+JiYgZm9udCkKIHsKLSAgICBzZW5kKE1lc3NhZ2VzOjpS ZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpDYWNoZUZvbnQoV1RGTW92ZShmb250KSksIG1fcmVuZGVy aW5nQmFja2VuZElkZW50aWZpZXIpOworICAgIHNlbmQoTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmlu Z0JhY2tlbmQ6OkNhY2hlRm9udChXVEZNb3ZlKGZvbnQpKSwgbV9yZW5kZXJpbmdCYWNrZW5kSWRl bnRpZmllciwgSVBDOjpTZW5kT3B0aW9uOjpEaXNwYXRjaE1lc3NhZ2VFdmVuV2hlbldhaXRpbmdG b3JTeW5jUmVwbHkpOwogfQogCiB2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6ZGVs ZXRlQWxsRm9udHMoKQogewotICAgIHNlbmQoTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tl bmQ6OkRlbGV0ZUFsbEZvbnRzKCksIG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIpOworICAg IHNlbmQoTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OkRlbGV0ZUFsbEZvbnRzKCks IG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIsIElQQzo6U2VuZE9wdGlvbjo6RGlzcGF0Y2hN ZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsKIH0KIAogdm9pZCBSZW1vdGVSZW5k ZXJpbmdCYWNrZW5kUHJveHk6OnJlbGVhc2VSZW1vdGVSZXNvdXJjZShSZW5kZXJpbmdSZXNvdXJj ZUlkZW50aWZpZXIgcmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKQpAQCAtMjExLDcgKzIxMSw3 IEBAIHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpyZWxlYXNlUmVtb3RlUmVzb3Vy Y2UoUmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmCiAgICAgaWYgKHJlbmRlcmluZ1Jlc291cmNlSWRl bnRpZmllciA9PSBtX2N1cnJlbnREZXN0aW5hdGlvbkltYWdlQnVmZmVySWRlbnRpZmllcikKICAg ICAgICAgbV9jdXJyZW50RGVzdGluYXRpb25JbWFnZUJ1ZmZlcklkZW50aWZpZXIgPSBXVEY6Om51 bGxvcHQ7CiAKLSAgICBzZW5kKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpSZWxl YXNlUmVtb3RlUmVzb3VyY2UocmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKSwgbV9yZW5kZXJp bmdCYWNrZW5kSWRlbnRpZmllcik7CisgICAgc2VuZChNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5n QmFja2VuZDo6UmVsZWFzZVJlbW90ZVJlc291cmNlKHJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmll ciksIG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIsIElQQzo6U2VuZE9wdGlvbjo6RGlzcGF0 Y2hNZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsKIH0KIAogdm9pZCBSZW1vdGVS ZW5kZXJpbmdCYWNrZW5kUHJveHk6OmRpZENyZWF0ZUltYWdlQnVmZmVyQmFja2VuZChJbWFnZUJ1 ZmZlckJhY2tlbmRIYW5kbGUgaGFuZGxlLCBSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgcmVu ZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKQpAQCAtMjYyLDcgKzI2Miw3IEBAIHZvaWQgUmVtb3Rl UmVuZGVyaW5nQmFja2VuZFByb3h5Ojp3aWxsQXBwZW5kSXRlbShSZW5kZXJpbmdSZXNvdXJjZUlk ZW50aWZpZXIgbmV3CiAKIHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpzZW5kV2Fr ZXVwTWVzc2FnZShjb25zdCBHUFVQcm9jZXNzV2FrZXVwTWVzc2FnZUFyZ3VtZW50cyYgYXJndW1l bnRzKQogewotICAgIHNlbmQoTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6Oldha2VV cEFuZEFwcGx5RGlzcGxheUxpc3QoYXJndW1lbnRzKSwgbV9yZW5kZXJpbmdCYWNrZW5kSWRlbnRp Zmllcik7CisgICAgc2VuZChNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6V2FrZVVw QW5kQXBwbHlEaXNwbGF5TGlzdChhcmd1bWVudHMpLCBtX3JlbmRlcmluZ0JhY2tlbmRJZGVudGlm aWVyLCBJUEM6OlNlbmRPcHRpb246OkRpc3BhdGNoTWVzc2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5 bmNSZXBseSk7CiB9CiAKIHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpzZW5kRGVm ZXJyZWRXYWtldXBNZXNzYWdlSWZOZWVkZWQoKQpAQCAtMzYzLDcgKzM2Myw3IEBAIERpc3BsYXlM aXN0OjpJdGVtQnVmZmVySGFuZGxlIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6Y3JlYXRl SXRlbUJ1ZmZlcihzaXplCiAgICAgc2hhcmVkTWVtb3J5LT5jcmVhdGVIYW5kbGUoc2hhcmVkTWVt b3J5SGFuZGxlLCBTaGFyZWRNZW1vcnk6OlByb3RlY3Rpb246OlJlYWRXcml0ZSk7CiAKICAgICBh dXRvIGlkZW50aWZpZXIgPSBEaXNwbGF5TGlzdDo6SXRlbUJ1ZmZlcklkZW50aWZpZXI6OmdlbmVy YXRlKCk7Ci0gICAgc2VuZChNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6RGlkQ3Jl YXRlU2hhcmVkRGlzcGxheUxpc3RIYW5kbGUoaWRlbnRpZmllciwgeyBXVEZNb3ZlKHNoYXJlZE1l bW9yeUhhbmRsZSksIHNoYXJlZE1lbW9yeS0+c2l6ZSgpIH0sIGRlc3RpbmF0aW9uQnVmZmVySWRl bnRpZmllciksIG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIpOworICAgIHNlbmQoTWVzc2Fn ZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OkRpZENyZWF0ZVNoYXJlZERpc3BsYXlMaXN0SGFu ZGxlKGlkZW50aWZpZXIsIHsgV1RGTW92ZShzaGFyZWRNZW1vcnlIYW5kbGUpLCBzaGFyZWRNZW1v cnktPnNpemUoKSB9LCBkZXN0aW5hdGlvbkJ1ZmZlcklkZW50aWZpZXIpLCBtX3JlbmRlcmluZ0Jh Y2tlbmRJZGVudGlmaWVyLCBJUEM6OlNlbmRPcHRpb246OkRpc3BhdGNoTWVzc2FnZUV2ZW5XaGVu V2FpdGluZ0ZvclN5bmNSZXBseSk7CiAKICAgICBhdXRvIG5ld0hhbmRsZSA9IERpc3BsYXlMaXN0 V3JpdGVySGFuZGxlOjpjcmVhdGUoaWRlbnRpZmllciwgc2hhcmVkTWVtb3J5LnJlbGVhc2VOb25O dWxsKCkpOwogICAgIGF1dG8gZGlzcGxheUxpc3RIYW5kbGUgPSBuZXdIYW5kbGUtPmNyZWF0ZUhh bmRsZSgpOwo=