213217 2020-06-15 14:54:24 -0700 [iOS] Collecting screen properties in the UI process introduced a Safari launch time regression. 2020-06-16 08:00:40 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham cdumez webkit-bug-importer oldest_to_newest 1662840 0 pvollan 2020-06-15 14:54:24 -0700 Calling collectScreenProperties() in WebProcessPool::platformInitializeWebProcess() introduced a Safari launch time regression on iOS. 1662847 1 pvollan 2020-06-15 15:03:27 -0700 rdar://problem/64374461 1662848 2 401943 pvollan 2020-06-15 15:04:29 -0700 Created attachment 401943 Patch 1662875 3 401943 bfulgham 2020-06-15 16:01:33 -0700 Comment on attachment 401943 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401943&action=review r=me > Source/WebCore/ChangeLog:4 > + https://bugs.webkit.org/show_bug.cgi?id=213217 <rdar://problem/64374461> > Source/WebCore/ChangeLog:11 > + the UI process. It's a shame this code has to differ between macOS and iOS. 1662876 4 401952 pvollan 2020-06-15 16:05:33 -0700 Created attachment 401952 Patch 1662877 5 pvollan 2020-06-15 16:06:12 -0700 (In reply to Brent Fulgham from comment #3) > Comment on attachment 401943 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=401943&action=review > > r=me > > > Source/WebCore/ChangeLog:4 > > + https://bugs.webkit.org/show_bug.cgi?id=213217 > > <rdar://problem/64374461> > Fixed. > > Source/WebCore/ChangeLog:11 > > + the UI process. > > It's a shame this code has to differ between macOS and iOS. Thanks for reviewing! 1663085 6 ews-feeder 2020-06-16 08:00:40 -0700 Committed r263090: <https://trac.webkit.org/changeset/263090> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401952. 401943 2020-06-15 15:04:29 -0700 2020-06-15 16:01:33 -0700 Patch bug-213217-20200615150428.patch text/plain 6544 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MzA2MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDIwLTA2LTE1ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBDb2xsZWN0aW5n IHNjcmVlbiBwcm9wZXJ0aWVzIGluIHRoZSBVSSBwcm9jZXNzIGludHJvZHVjZWQgYSBTYWZhcmkg bGF1bmNoIHRpbWUgcmVncmVzc2lvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxMzIxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENhbGxpbmcgY29sbGVjdFNjcmVlblByb3BlcnRpZXMoKSBpbiBXZWJQ cm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2VzcygpIGludHJvZHVjZWQgYSBT YWZhcmkgbGF1bmNoIHRpbWUgcmVncmVzc2lvbiBvbiBpT1MuCisgICAgICAgIEl0IHR1cm5zIG91 dCB0aGF0IGNhbGxpbmcgc2NyZWVuSXNNb25vY2hyb21lIG9uIGlPUyBpcyBleHBlbnNpdmUsIGJ1 dCB0aGlzIGNhbGwgY2FuIHN0aWxsIGJlIGRvbmUgaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcywg c2luY2UgdGhlcmUKKyAgICAgICAgYXJlIG5vIHNhbmRib3ggcmVzdHJpY3Rpb25zIG1ha2luZyB0 aGF0IGNhbGwgZmFpbCBpbiB0aGUgV2ViQ29udGVudCBwcm9jZXNzLiBDYWxsIHRoaXMgZnVuY3Rp b24gaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyBpbnN0ZWFkIG9mIGluCisgICAgICAgIHRoZSBV SSBwcm9jZXNzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgc2luY2UgdGhpcyBjaGFuZ2Ugc2hv dWxkIG5vdCBpbnRyb2R1Y2UgYSBjaGFuZ2UgaW4gYmVoYXZpb3IuIEl0IGdvZXMgYmFjayB0byBj YWxsaW5nIHRoZSBzY3JlZW5Jc01vbm9jaHJvbWUgZnVuY3Rpb24gaW4gdGhlCisgICAgICAgIFdl YkNvbnRlbnQgcHJvY2Vzcy4KKworICAgICAgICAqIHBsYXRmb3JtL1NjcmVlblByb3BlcnRpZXMu aDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmVlbkRhdGE6OmVuY29kZSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpTY3JlZW5EYXRhOjpkZWNvZGUpOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9Q bGF0Zm9ybVNjcmVlbklPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OnNjcmVlbklzTW9ub2Nocm9t ZSk6CisgICAgICAgIChXZWJDb3JlOjpjb2xsZWN0U2NyZWVuUHJvcGVydGllcyk6CisgICAgICAg ICogcGxhdGZvcm0vbWFjL1BsYXRmb3JtU2NyZWVuTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6 Y29sbGVjdFNjcmVlblByb3BlcnRpZXMpOgorCiAyMDIwLTA2LTE1ICBLZWl0aCBNaWxsZXIgIDxr ZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEpJVCB0aHVua3Mgc2hvdWxkIHdvcmsg b24gYXJtNjRfMzIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1NjcmVlblByb3BlcnRp ZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JlZW5Qcm9wZXJ0 aWVzLmgJKHJldmlzaW9uIDI2MjkwNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1NjcmVl blByb3BlcnRpZXMuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsOSArNDMsOSBAQCBzdHJ1Y3QgU2Ny ZWVuRGF0YSB7CiAgICAgaW50IHNjcmVlbkRlcHRoUGVyQ29tcG9uZW50IHsgMCB9OwogICAgIGJv b2wgc2NyZWVuU3VwcG9ydHNFeHRlbmRlZENvbG9yIHsgZmFsc2UgfTsKICAgICBib29sIHNjcmVl bkhhc0ludmVydGVkQ29sb3JzIHsgZmFsc2UgfTsKLSAgICBib29sIHNjcmVlbklzTW9ub2Nocm9t ZSB7IGZhbHNlIH07CiAgICAgYm9vbCBzY3JlZW5TdXBwb3J0c0hpZ2hEeW5hbWljUmFuZ2UgeyBm YWxzZSB9OwogI2lmIFBMQVRGT1JNKE1BQykKKyAgICBib29sIHNjcmVlbklzTW9ub2Nocm9tZSB7 IGZhbHNlIH07CiAgICAgdWludDMyX3QgZGlzcGxheU1hc2sgeyAwIH07CiAgICAgSU9SZWdpc3Ry eUdQVUlEIGdwdUlEIHsgMCB9OwogI2VuZGlmCkBAIC05MSwxMCArOTEsMTAgQEAgT3B0aW9uYWw8 U2NyZWVuUHJvcGVydGllcz4gU2NyZWVuUHJvcGVydAogdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4K IHZvaWQgU2NyZWVuRGF0YTo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7Ci0gICAg ZW5jb2RlciA8PCBzY3JlZW5BdmFpbGFibGVSZWN0IDw8IHNjcmVlblJlY3QgPDwgc2NyZWVuRGVw dGggPDwgc2NyZWVuRGVwdGhQZXJDb21wb25lbnQgPDwgc2NyZWVuU3VwcG9ydHNFeHRlbmRlZENv bG9yIDw8IHNjcmVlbkhhc0ludmVydGVkQ29sb3JzIDw8IHNjcmVlbklzTW9ub2Nocm9tZSA8PCBz Y3JlZW5TdXBwb3J0c0hpZ2hEeW5hbWljUmFuZ2U7CisgICAgZW5jb2RlciA8PCBzY3JlZW5BdmFp bGFibGVSZWN0IDw8IHNjcmVlblJlY3QgPDwgc2NyZWVuRGVwdGggPDwgc2NyZWVuRGVwdGhQZXJD b21wb25lbnQgPDwgc2NyZWVuU3VwcG9ydHNFeHRlbmRlZENvbG9yIDw8IHNjcmVlbkhhc0ludmVy dGVkQ29sb3JzIDw8IHNjcmVlblN1cHBvcnRzSGlnaER5bmFtaWNSYW5nZTsKIAogI2lmIFBMQVRG T1JNKE1BQykKLSAgICBlbmNvZGVyIDw8IGRpc3BsYXlNYXNrIDw8IGdwdUlEOworICAgIGVuY29k ZXIgPDwgc2NyZWVuSXNNb25vY2hyb21lIDw8IGRpc3BsYXlNYXNrIDw8IGdwdUlEOwogI2VuZGlm CiAKICAgICBpZiAoY29sb3JTcGFjZSkgewpAQCAtMTUzLDE3ICsxNTMsMTcgQEAgT3B0aW9uYWw8 U2NyZWVuRGF0YT4gU2NyZWVuRGF0YTo6ZGVjb2RlKAogICAgIGlmICghc2NyZWVuSGFzSW52ZXJ0 ZWRDb2xvcnMpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICBPcHRpb25hbDxi b29sPiBzY3JlZW5Jc01vbm9jaHJvbWU7Ci0gICAgZGVjb2RlciA+PiBzY3JlZW5Jc01vbm9jaHJv bWU7Ci0gICAgaWYgKCFzY3JlZW5Jc01vbm9jaHJvbWUpCi0gICAgICAgIHJldHVybiBXVEY6Om51 bGxvcHQ7Ci0KICAgICBPcHRpb25hbDxib29sPiBzY3JlZW5TdXBwb3J0c0hpZ2hEeW5hbWljUmFu Z2U7CiAgICAgZGVjb2RlciA+PiBzY3JlZW5TdXBwb3J0c0hpZ2hEeW5hbWljUmFuZ2U7CiAgICAg aWYgKCFzY3JlZW5TdXBwb3J0c0hpZ2hEeW5hbWljUmFuZ2UpCiAgICAgICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CiAKICNpZiBQTEFURk9STShNQUMpCisgICAgT3B0aW9uYWw8Ym9vbD4gc2NyZWVu SXNNb25vY2hyb21lOworICAgIGRlY29kZXIgPj4gc2NyZWVuSXNNb25vY2hyb21lOworICAgIGlm ICghc2NyZWVuSXNNb25vY2hyb21lKQorICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OworCiAg ICAgT3B0aW9uYWw8dWludDMyX3Q+IGRpc3BsYXlNYXNrOwogICAgIGRlY29kZXIgPj4gZGlzcGxh eU1hc2s7CiAgICAgaWYgKCFkaXNwbGF5TWFzaykKQEAgLTIxNCw5ICsyMTQsOSBAQCBPcHRpb25h bDxTY3JlZW5EYXRhPiBTY3JlZW5EYXRhOjpkZWNvZGUoCiAgICAgICAgIFdURk1vdmUoKnNjcmVl bkRlcHRoUGVyQ29tcG9uZW50KSwKICAgICAgICAgV1RGTW92ZSgqc2NyZWVuU3VwcG9ydHNFeHRl bmRlZENvbG9yKSwKICAgICAgICAgV1RGTW92ZSgqc2NyZWVuSGFzSW52ZXJ0ZWRDb2xvcnMpLAot ICAgICAgICBXVEZNb3ZlKCpzY3JlZW5Jc01vbm9jaHJvbWUpLAogICAgICAgICBXVEZNb3ZlKCpz Y3JlZW5TdXBwb3J0c0hpZ2hEeW5hbWljUmFuZ2UpLAogI2lmIFBMQVRGT1JNKE1BQykKKyAgICAg ICAgV1RGTW92ZSgqc2NyZWVuSXNNb25vY2hyb21lKSwKICAgICAgICAgV1RGTW92ZSgqZGlzcGxh eU1hc2spLAogICAgICAgICBXVEZNb3ZlKCpncHVJRCkKICNlbmRpZgpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3JtU2NyZWVuSU9TLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9ybVNjcmVlbklPUy5tbQkocmV2aXNpb24g MjYyOTA0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3JtU2NyZWVuSU9T Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC02MCw5ICs2MCw2IEBAIGludCBzY3JlZW5EZXB0aFBlckNv bXBvbmVudChXaWRnZXQqKQogCiBib29sIHNjcmVlbklzTW9ub2Nocm9tZShXaWRnZXQqKQogewot ICAgIGlmIChhdXRvIGRhdGEgPSBzY3JlZW5EYXRhKHByaW1hcnlTY3JlZW5EaXNwbGF5SUQoKSkp Ci0gICAgICAgIHJldHVybiBkYXRhLT5zY3JlZW5Jc01vbm9jaHJvbWU7Ci0gICAgCiAgICAgcmV0 dXJuIFBBTDo6c29mdExpbmtVSUtpdFVJQWNjZXNzaWJpbGl0eUlzR3JheXNjYWxlRW5hYmxlZCgp OwogfQogCkBAIC0yMDMsOSArMjAwLDggQEAgU2NyZWVuUHJvcGVydGllcyBjb2xsZWN0U2NyZWVu UHJvcGVydGllcwogICAgICAgICBpbnQgc2NyZWVuRGVwdGhQZXJDb21wb25lbnQgPSBXZWJDb3Jl OjpzY3JlZW5EZXB0aFBlckNvbXBvbmVudChudWxscHRyKTsKICAgICAgICAgYm9vbCBzY3JlZW5T dXBwb3J0c0V4dGVuZGVkQ29sb3IgPSBXZWJDb3JlOjpzY3JlZW5TdXBwb3J0c0V4dGVuZGVkQ29s b3IobnVsbHB0cik7CiAgICAgICAgIGJvb2wgc2NyZWVuSGFzSW52ZXJ0ZWRDb2xvcnMgPSBXZWJD b3JlOjpzY3JlZW5IYXNJbnZlcnRlZENvbG9ycygpOwotICAgICAgICBib29sIHNjcmVlbklzTW9u b2Nocm9tZSA9IFdlYkNvcmU6OnNjcmVlbklzTW9ub2Nocm9tZShudWxscHRyKTsKIAotICAgICAg ICBzY3JlZW5Qcm9wZXJ0aWVzLnNjcmVlbkRhdGFNYXAuc2V0KCsrZGlzcGxheUlELCBTY3JlZW5E YXRhIHsgc2NyZWVuQXZhaWxhYmxlUmVjdCwgc2NyZWVuUmVjdCwgY29sb3JTcGFjZSwgc2NyZWVu RGVwdGgsIHNjcmVlbkRlcHRoUGVyQ29tcG9uZW50LCBzY3JlZW5TdXBwb3J0c0V4dGVuZGVkQ29s b3IsIHNjcmVlbkhhc0ludmVydGVkQ29sb3JzLCBzY3JlZW5Jc01vbm9jaHJvbWUgfSk7CisgICAg ICAgIHNjcmVlblByb3BlcnRpZXMuc2NyZWVuRGF0YU1hcC5zZXQoKytkaXNwbGF5SUQsIFNjcmVl bkRhdGEgeyBzY3JlZW5BdmFpbGFibGVSZWN0LCBzY3JlZW5SZWN0LCBjb2xvclNwYWNlLCBzY3Jl ZW5EZXB0aCwgc2NyZWVuRGVwdGhQZXJDb21wb25lbnQsIHNjcmVlblN1cHBvcnRzRXh0ZW5kZWRD b2xvciwgc2NyZWVuSGFzSW52ZXJ0ZWRDb2xvcnMgfSk7CiAgICAgICAgIAogICAgICAgICBpZiAo c2NyZWVuID09IFtQQUw6OmdldFVJU2NyZWVuQ2xhc3MoKSBtYWluU2NyZWVuXSkKICAgICAgICAg ICAgIHNjcmVlblByb3BlcnRpZXMucHJpbWFyeURpc3BsYXlJRCA9IGRpc3BsYXlJRDsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVNjcmVlbk1hYy5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1TY3JlZW5NYWMubW0J KHJldmlzaW9uIDI2MjkwNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9y bVNjcmVlbk1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTI2LDcgKzEyNiw3IEBAIFNjcmVlblBy b3BlcnRpZXMgY29sbGVjdFNjcmVlblByb3BlcnRpZXMKICAgICAgICAgaWYgKGRpc3BsYXlNYXNr KQogICAgICAgICAgICAgZ3B1SUQgPSBncHVJREZvckRpc3BsYXlNYXNrKGRpc3BsYXlNYXNrKTsK IAotICAgICAgICBzY3JlZW5Qcm9wZXJ0aWVzLnNjcmVlbkRhdGFNYXAuc2V0KGRpc3BsYXlJRCwg U2NyZWVuRGF0YSB7IHNjcmVlbkF2YWlsYWJsZVJlY3QsIHNjcmVlblJlY3QsIGNvbG9yU3BhY2Us IHNjcmVlbkRlcHRoLCBzY3JlZW5EZXB0aFBlckNvbXBvbmVudCwgc2NyZWVuU3VwcG9ydHNFeHRl bmRlZENvbG9yLCBzY3JlZW5IYXNJbnZlcnRlZENvbG9ycywgc2NyZWVuSXNNb25vY2hyb21lLCBz Y3JlZW5TdXBwb3J0c0hpZ2hEeW5hbWljUmFuZ2UsIGRpc3BsYXlNYXNrLCBncHVJRCB9KTsKKyAg ICAgICAgc2NyZWVuUHJvcGVydGllcy5zY3JlZW5EYXRhTWFwLnNldChkaXNwbGF5SUQsIFNjcmVl bkRhdGEgeyBzY3JlZW5BdmFpbGFibGVSZWN0LCBzY3JlZW5SZWN0LCBjb2xvclNwYWNlLCBzY3Jl ZW5EZXB0aCwgc2NyZWVuRGVwdGhQZXJDb21wb25lbnQsIHNjcmVlblN1cHBvcnRzRXh0ZW5kZWRD b2xvciwgc2NyZWVuSGFzSW52ZXJ0ZWRDb2xvcnMsIHNjcmVlblN1cHBvcnRzSGlnaER5bmFtaWNS YW5nZSwgc2NyZWVuSXNNb25vY2hyb21lLCBkaXNwbGF5TWFzaywgZ3B1SUQgfSk7CiAKICAgICAg ICAgaWYgKCFzY3JlZW5Qcm9wZXJ0aWVzLnByaW1hcnlEaXNwbGF5SUQpCiAgICAgICAgICAgICBz Y3JlZW5Qcm9wZXJ0aWVzLnByaW1hcnlEaXNwbGF5SUQgPSBkaXNwbGF5SUQ7Cg== 401952 2020-06-15 16:05:33 -0700 2020-06-16 08:00:40 -0700 Patch bug-213217-20200615160532.patch text/plain 6578 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MzA2MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA2LTE1ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBDb2xsZWN0aW5n IHNjcmVlbiBwcm9wZXJ0aWVzIGluIHRoZSBVSSBwcm9jZXNzIGludHJvZHVjZWQgYSBTYWZhcmkg bGF1bmNoIHRpbWUgcmVncmVzc2lvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxMzIxNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQzNzQ0NjE+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAgICBDYWxsaW5n IGNvbGxlY3RTY3JlZW5Qcm9wZXJ0aWVzKCkgaW4gV2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtSW5p dGlhbGl6ZVdlYlByb2Nlc3MoKSBpbnRyb2R1Y2VkIGEgU2FmYXJpIGxhdW5jaCB0aW1lIHJlZ3Jl c3Npb24gb24gaU9TLgorICAgICAgICBJdCB0dXJucyBvdXQgdGhhdCBjYWxsaW5nIHNjcmVlbklz TW9ub2Nocm9tZSBvbiBpT1MgaXMgZXhwZW5zaXZlLCBidXQgdGhpcyBjYWxsIGNhbiBzdGlsbCBi ZSBkb25lIGluIHRoZSBXZWJDb250ZW50IHByb2Nlc3MsIHNpbmNlIHRoZXJlCisgICAgICAgIGFy ZSBubyBzYW5kYm94IHJlc3RyaWN0aW9ucyBtYWtpbmcgdGhhdCBjYWxsIGZhaWwgaW4gdGhlIFdl YkNvbnRlbnQgcHJvY2Vzcy4gQ2FsbCB0aGlzIGZ1bmN0aW9uIGluIHRoZSBXZWJDb250ZW50IHBy b2Nlc3MgaW5zdGVhZCBvZiBpbgorICAgICAgICB0aGUgVUkgcHJvY2Vzcy4KKworICAgICAgICBO byBuZXcgdGVzdHMsIHNpbmNlIHRoaXMgY2hhbmdlIHNob3VsZCBub3QgaW50cm9kdWNlIGEgY2hh bmdlIGluIGJlaGF2aW9yLiBJdCBnb2VzIGJhY2sgdG8gY2FsbGluZyB0aGUgc2NyZWVuSXNNb25v Y2hyb21lIGZ1bmN0aW9uIGluIHRoZQorICAgICAgICBXZWJDb250ZW50IHByb2Nlc3MuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9TY3JlZW5Qcm9wZXJ0aWVzLmg6CisgICAgICAgIChXZWJDb3JlOjpT Y3JlZW5EYXRhOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2NyZWVuRGF0YTo6 ZGVjb2RlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvUGxhdGZvcm1TY3JlZW5JT1MubW06Cisg ICAgICAgIChXZWJDb3JlOjpzY3JlZW5Jc01vbm9jaHJvbWUpOgorICAgICAgICAoV2ViQ29yZTo6 Y29sbGVjdFNjcmVlblByb3BlcnRpZXMpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QbGF0Zm9y bVNjcmVlbk1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmNvbGxlY3RTY3JlZW5Qcm9wZXJ0aWVz KToKKwogMjAyMC0wNi0xNSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4K IAogICAgICAgICBKSVQgdGh1bmtzIHNob3VsZCB3b3JrIG9uIGFybTY0XzMyCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JlZW5Qcm9wZXJ0aWVzLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2NyZWVuUHJvcGVydGllcy5oCShyZXZpc2lvbiAyNjI5MDQp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JlZW5Qcm9wZXJ0aWVzLmgJKHdvcmtpbmcg Y29weSkKQEAgLTQzLDkgKzQzLDkgQEAgc3RydWN0IFNjcmVlbkRhdGEgewogICAgIGludCBzY3Jl ZW5EZXB0aFBlckNvbXBvbmVudCB7IDAgfTsKICAgICBib29sIHNjcmVlblN1cHBvcnRzRXh0ZW5k ZWRDb2xvciB7IGZhbHNlIH07CiAgICAgYm9vbCBzY3JlZW5IYXNJbnZlcnRlZENvbG9ycyB7IGZh bHNlIH07Ci0gICAgYm9vbCBzY3JlZW5Jc01vbm9jaHJvbWUgeyBmYWxzZSB9OwogICAgIGJvb2wg c2NyZWVuU3VwcG9ydHNIaWdoRHluYW1pY1JhbmdlIHsgZmFsc2UgfTsKICNpZiBQTEFURk9STShN QUMpCisgICAgYm9vbCBzY3JlZW5Jc01vbm9jaHJvbWUgeyBmYWxzZSB9OwogICAgIHVpbnQzMl90 IGRpc3BsYXlNYXNrIHsgMCB9OwogICAgIElPUmVnaXN0cnlHUFVJRCBncHVJRCB7IDAgfTsKICNl bmRpZgpAQCAtOTEsMTAgKzkxLDEwIEBAIE9wdGlvbmFsPFNjcmVlblByb3BlcnRpZXM+IFNjcmVl blByb3BlcnQKIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+CiB2b2lkIFNjcmVlbkRhdGE6OmVuY29k ZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewotICAgIGVuY29kZXIgPDwgc2NyZWVuQXZhaWxh YmxlUmVjdCA8PCBzY3JlZW5SZWN0IDw8IHNjcmVlbkRlcHRoIDw8IHNjcmVlbkRlcHRoUGVyQ29t cG9uZW50IDw8IHNjcmVlblN1cHBvcnRzRXh0ZW5kZWRDb2xvciA8PCBzY3JlZW5IYXNJbnZlcnRl ZENvbG9ycyA8PCBzY3JlZW5Jc01vbm9jaHJvbWUgPDwgc2NyZWVuU3VwcG9ydHNIaWdoRHluYW1p Y1JhbmdlOworICAgIGVuY29kZXIgPDwgc2NyZWVuQXZhaWxhYmxlUmVjdCA8PCBzY3JlZW5SZWN0 IDw8IHNjcmVlbkRlcHRoIDw8IHNjcmVlbkRlcHRoUGVyQ29tcG9uZW50IDw8IHNjcmVlblN1cHBv cnRzRXh0ZW5kZWRDb2xvciA8PCBzY3JlZW5IYXNJbnZlcnRlZENvbG9ycyA8PCBzY3JlZW5TdXBw b3J0c0hpZ2hEeW5hbWljUmFuZ2U7CiAKICNpZiBQTEFURk9STShNQUMpCi0gICAgZW5jb2RlciA8 PCBkaXNwbGF5TWFzayA8PCBncHVJRDsKKyAgICBlbmNvZGVyIDw8IHNjcmVlbklzTW9ub2Nocm9t ZSA8PCBkaXNwbGF5TWFzayA8PCBncHVJRDsKICNlbmRpZgogCiAgICAgaWYgKGNvbG9yU3BhY2Up IHsKQEAgLTE1MywxNyArMTUzLDE3IEBAIE9wdGlvbmFsPFNjcmVlbkRhdGE+IFNjcmVlbkRhdGE6 OmRlY29kZSgKICAgICBpZiAoIXNjcmVlbkhhc0ludmVydGVkQ29sb3JzKQogICAgICAgICByZXR1 cm4gV1RGOjpudWxsb3B0OwogCi0gICAgT3B0aW9uYWw8Ym9vbD4gc2NyZWVuSXNNb25vY2hyb21l OwotICAgIGRlY29kZXIgPj4gc2NyZWVuSXNNb25vY2hyb21lOwotICAgIGlmICghc2NyZWVuSXNN b25vY2hyb21lKQotICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotCiAgICAgT3B0aW9uYWw8 Ym9vbD4gc2NyZWVuU3VwcG9ydHNIaWdoRHluYW1pY1JhbmdlOwogICAgIGRlY29kZXIgPj4gc2Ny ZWVuU3VwcG9ydHNIaWdoRHluYW1pY1JhbmdlOwogICAgIGlmICghc2NyZWVuU3VwcG9ydHNIaWdo RHluYW1pY1JhbmdlKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAjaWYgUExBVEZP Uk0oTUFDKQorICAgIE9wdGlvbmFsPGJvb2w+IHNjcmVlbklzTW9ub2Nocm9tZTsKKyAgICBkZWNv ZGVyID4+IHNjcmVlbklzTW9ub2Nocm9tZTsKKyAgICBpZiAoIXNjcmVlbklzTW9ub2Nocm9tZSkK KyAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKKwogICAgIE9wdGlvbmFsPHVpbnQzMl90PiBk aXNwbGF5TWFzazsKICAgICBkZWNvZGVyID4+IGRpc3BsYXlNYXNrOwogICAgIGlmICghZGlzcGxh eU1hc2spCkBAIC0yMTQsOSArMjE0LDkgQEAgT3B0aW9uYWw8U2NyZWVuRGF0YT4gU2NyZWVuRGF0 YTo6ZGVjb2RlKAogICAgICAgICBXVEZNb3ZlKCpzY3JlZW5EZXB0aFBlckNvbXBvbmVudCksCiAg ICAgICAgIFdURk1vdmUoKnNjcmVlblN1cHBvcnRzRXh0ZW5kZWRDb2xvciksCiAgICAgICAgIFdU Rk1vdmUoKnNjcmVlbkhhc0ludmVydGVkQ29sb3JzKSwKLSAgICAgICAgV1RGTW92ZSgqc2NyZWVu SXNNb25vY2hyb21lKSwKICAgICAgICAgV1RGTW92ZSgqc2NyZWVuU3VwcG9ydHNIaWdoRHluYW1p Y1JhbmdlKSwKICNpZiBQTEFURk9STShNQUMpCisgICAgICAgIFdURk1vdmUoKnNjcmVlbklzTW9u b2Nocm9tZSksCiAgICAgICAgIFdURk1vdmUoKmRpc3BsYXlNYXNrKSwKICAgICAgICAgV1RGTW92 ZSgqZ3B1SUQpCiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0 Zm9ybVNjcmVlbklPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p b3MvUGxhdGZvcm1TY3JlZW5JT1MubW0JKHJldmlzaW9uIDI2MjkwNCkKKysrIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9ybVNjcmVlbklPUy5tbQkod29ya2luZyBjb3B5KQpAQCAt NjAsOSArNjAsNiBAQCBpbnQgc2NyZWVuRGVwdGhQZXJDb21wb25lbnQoV2lkZ2V0KikKIAogYm9v bCBzY3JlZW5Jc01vbm9jaHJvbWUoV2lkZ2V0KikKIHsKLSAgICBpZiAoYXV0byBkYXRhID0gc2Ny ZWVuRGF0YShwcmltYXJ5U2NyZWVuRGlzcGxheUlEKCkpKQotICAgICAgICByZXR1cm4gZGF0YS0+ c2NyZWVuSXNNb25vY2hyb21lOwotICAgIAogICAgIHJldHVybiBQQUw6OnNvZnRMaW5rVUlLaXRV SUFjY2Vzc2liaWxpdHlJc0dyYXlzY2FsZUVuYWJsZWQoKTsKIH0KIApAQCAtMjAzLDkgKzIwMCw4 IEBAIFNjcmVlblByb3BlcnRpZXMgY29sbGVjdFNjcmVlblByb3BlcnRpZXMKICAgICAgICAgaW50 IHNjcmVlbkRlcHRoUGVyQ29tcG9uZW50ID0gV2ViQ29yZTo6c2NyZWVuRGVwdGhQZXJDb21wb25l bnQobnVsbHB0cik7CiAgICAgICAgIGJvb2wgc2NyZWVuU3VwcG9ydHNFeHRlbmRlZENvbG9yID0g V2ViQ29yZTo6c2NyZWVuU3VwcG9ydHNFeHRlbmRlZENvbG9yKG51bGxwdHIpOwogICAgICAgICBi b29sIHNjcmVlbkhhc0ludmVydGVkQ29sb3JzID0gV2ViQ29yZTo6c2NyZWVuSGFzSW52ZXJ0ZWRD b2xvcnMoKTsKLSAgICAgICAgYm9vbCBzY3JlZW5Jc01vbm9jaHJvbWUgPSBXZWJDb3JlOjpzY3Jl ZW5Jc01vbm9jaHJvbWUobnVsbHB0cik7CiAKLSAgICAgICAgc2NyZWVuUHJvcGVydGllcy5zY3Jl ZW5EYXRhTWFwLnNldCgrK2Rpc3BsYXlJRCwgU2NyZWVuRGF0YSB7IHNjcmVlbkF2YWlsYWJsZVJl Y3QsIHNjcmVlblJlY3QsIGNvbG9yU3BhY2UsIHNjcmVlbkRlcHRoLCBzY3JlZW5EZXB0aFBlckNv bXBvbmVudCwgc2NyZWVuU3VwcG9ydHNFeHRlbmRlZENvbG9yLCBzY3JlZW5IYXNJbnZlcnRlZENv bG9ycywgc2NyZWVuSXNNb25vY2hyb21lIH0pOworICAgICAgICBzY3JlZW5Qcm9wZXJ0aWVzLnNj cmVlbkRhdGFNYXAuc2V0KCsrZGlzcGxheUlELCBTY3JlZW5EYXRhIHsgc2NyZWVuQXZhaWxhYmxl UmVjdCwgc2NyZWVuUmVjdCwgY29sb3JTcGFjZSwgc2NyZWVuRGVwdGgsIHNjcmVlbkRlcHRoUGVy Q29tcG9uZW50LCBzY3JlZW5TdXBwb3J0c0V4dGVuZGVkQ29sb3IsIHNjcmVlbkhhc0ludmVydGVk Q29sb3JzIH0pOwogICAgICAgICAKICAgICAgICAgaWYgKHNjcmVlbiA9PSBbUEFMOjpnZXRVSVNj cmVlbkNsYXNzKCkgbWFpblNjcmVlbl0pCiAgICAgICAgICAgICBzY3JlZW5Qcm9wZXJ0aWVzLnBy aW1hcnlEaXNwbGF5SUQgPSBkaXNwbGF5SUQ7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tYWMvUGxhdGZvcm1TY3JlZW5NYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL1BsYXRmb3JtU2NyZWVuTWFjLm1tCShyZXZpc2lvbiAyNjI5MDQpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1TY3JlZW5NYWMubW0JKHdvcmtpbmcg Y29weSkKQEAgLTEyNiw3ICsxMjYsNyBAQCBTY3JlZW5Qcm9wZXJ0aWVzIGNvbGxlY3RTY3JlZW5Q cm9wZXJ0aWVzCiAgICAgICAgIGlmIChkaXNwbGF5TWFzaykKICAgICAgICAgICAgIGdwdUlEID0g Z3B1SURGb3JEaXNwbGF5TWFzayhkaXNwbGF5TWFzayk7CiAKLSAgICAgICAgc2NyZWVuUHJvcGVy dGllcy5zY3JlZW5EYXRhTWFwLnNldChkaXNwbGF5SUQsIFNjcmVlbkRhdGEgeyBzY3JlZW5BdmFp bGFibGVSZWN0LCBzY3JlZW5SZWN0LCBjb2xvclNwYWNlLCBzY3JlZW5EZXB0aCwgc2NyZWVuRGVw dGhQZXJDb21wb25lbnQsIHNjcmVlblN1cHBvcnRzRXh0ZW5kZWRDb2xvciwgc2NyZWVuSGFzSW52 ZXJ0ZWRDb2xvcnMsIHNjcmVlbklzTW9ub2Nocm9tZSwgc2NyZWVuU3VwcG9ydHNIaWdoRHluYW1p Y1JhbmdlLCBkaXNwbGF5TWFzaywgZ3B1SUQgfSk7CisgICAgICAgIHNjcmVlblByb3BlcnRpZXMu c2NyZWVuRGF0YU1hcC5zZXQoZGlzcGxheUlELCBTY3JlZW5EYXRhIHsgc2NyZWVuQXZhaWxhYmxl UmVjdCwgc2NyZWVuUmVjdCwgY29sb3JTcGFjZSwgc2NyZWVuRGVwdGgsIHNjcmVlbkRlcHRoUGVy Q29tcG9uZW50LCBzY3JlZW5TdXBwb3J0c0V4dGVuZGVkQ29sb3IsIHNjcmVlbkhhc0ludmVydGVk Q29sb3JzLCBzY3JlZW5TdXBwb3J0c0hpZ2hEeW5hbWljUmFuZ2UsIHNjcmVlbklzTW9ub2Nocm9t ZSwgZGlzcGxheU1hc2ssIGdwdUlEIH0pOwogCiAgICAgICAgIGlmICghc2NyZWVuUHJvcGVydGll cy5wcmltYXJ5RGlzcGxheUlEKQogICAgICAgICAgICAgc2NyZWVuUHJvcGVydGllcy5wcmltYXJ5 RGlzcGxheUlEID0gZGlzcGxheUlEOwo=