203034 2019-10-16 08:23:30 -0700 [WK2] Handle back/forward cache entry expiration in the UIProcess instead of the WebProcess 2019-10-16 13:54:32 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 202293 1 cdumez cdumez achristensen beidson commit-queue ggaren koivisto webkit-bug-importer oldest_to_newest 1580530 0 cdumez 2019-10-16 08:23:30 -0700 Move back/forward cache entry expiration logic from the WebProcess to the UIProcess, now that back/forward cache management is done in the UIProcess. 1580531 1 webkit-bug-importer 2019-10-16 08:23:49 -0700 <rdar://problem/56332453> 1580546 2 381076 cdumez 2019-10-16 09:40:32 -0700 Created attachment 381076 Patch 1580635 3 381076 koivisto 2019-10-16 12:45:34 -0700 Comment on attachment 381076 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381076&action=review > Source/WebCore/ChangeLog:3 > + [WK2] Move back/forward cache entry expiration from the WebProcess to the UIProcess The title says "move" but no code is deleted by this patch? 1580649 4 381100 cdumez 2019-10-16 13:09:11 -0700 Created attachment 381100 Patch 1580664 5 381100 commit-queue 2019-10-16 13:54:30 -0700 Comment on attachment 381100 Patch Clearing flags on attachment: 381100 Committed r251204: <https://trac.webkit.org/changeset/251204> 1580665 6 commit-queue 2019-10-16 13:54:32 -0700 All reviewed patches have been landed. Closing bug. 381076 2019-10-16 09:40:32 -0700 2019-10-16 13:09:09 -0700 Patch bug-203034-20191016094031.patch text/plain 9448 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxMTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWFjOTgyMDY3NTFhYjY0 NDU0ZjllN2YzMDZmMWEwZWRlZTYxMDM0Mi4uYWEyMzg4MTc0ZTgzYjVkNmZjY2M1ZTFjNTlkMWNm MmYwOTNkZDVlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTEwLTE2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gTW92ZSBiYWNrL2Zv cndhcmQgY2FjaGUgZW50cnkgZXhwaXJhdGlvbiBmcm9tIHRoZSBXZWJQcm9jZXNzIHRvIHRoZSBV SVByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwMzAzNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYzMzI0NTM+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIFNlY29uZHMgdHlwZSBmb3Ig YmFja0ZvcndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZhbCBzZXR0aW5nIGluc3RlYWQgb2YKKyAg ICAgICAgZG91YmxlLCBmb3IgY2xhcml0eS4KKworICAgICAgICAqIGhpc3RvcnkvQ2FjaGVkUGFn ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRQYWdlOjpDYWNoZWRQYWdlKToKKyAgICAg ICAgKFdlYkNvcmU6OkNhY2hlZFBhZ2U6Omhhc0V4cGlyZWQgY29uc3QpOgorICAgICAgICAqIHBh Z2UvU2V0dGluZ3MueWFtbDoKKwogMjAxOS0xMC0xNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW1RGQ10gVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6ZGlz dHJpYnV0ZUV4dHJhSG9yaXpvbnRhbFNwYWNlIHNob3VsZCBub3QgaWdub3JlIGZpeGVkIHdpZHRo IGNvbHVtbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKaW5kZXggOWFmYjhlZWY4NDRlMTU0ODU0ZmZlYjNjYTBkZGZlNWQxMmEx NmMxMi4uMzRmMzNiNWZhZDU1NzI2NGQyZjAzYTNkNGZjMzZmNjRhMzYzYzI5MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyOCBAQAorMjAxOS0xMC0xNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu Y29tPgorCisgICAgICAgIFtXSzJdIE1vdmUgYmFjay9mb3J3YXJkIGNhY2hlIGVudHJ5IGV4cGly YXRpb24gZnJvbSB0aGUgV2ViUHJvY2VzcyB0byB0aGUgVUlQcm9jZXNzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDMwMzQKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzU2MzMyNDUzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1vdmUgYmFjay9mb3J3YXJkIGNhY2hlIGVudHJ5IGV4cGlyYXRpb24gbG9n aWMgZnJvbSB0aGUgV2ViUHJvY2VzcyB0byB0aGUgVUlQcm9jZXNzLAorICAgICAgICBub3cgdGhh dCBiYWNrL2ZvcndhcmQgY2FjaGUgbWFuYWdlbWVudCBpcyBkb25lIGluIHRoZSBVSVByb2Nlc3Mu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5OjpXZWJCYWNrRm9yd2FyZENh Y2hlRW50cnkpOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNrRm9yd2FyZENhY2hlRW50cnk6OnRh a2VTdXNwZW5kZWRQYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViQmFja0ZvcndhcmRDYWNoZUVu dHJ5OjpleHBpcmF0aW9uVGltZXJGaXJlZCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkJhY2tG b3J3YXJkQ2FjaGVFbnRyeS5oOgorICAgICAgICBBZGQgYSBUaW1lciB0byBXZWJCYWNrRm9yd2Fy ZENhY2hlRW50cnkgdG8gbWFrZSB0aGUgZW50cnkgZXhwaXJlIGFmdGVyIDMwIG1pbnV0ZXMsIHdo aWNoIGlzIHdoYXQgdXNlZAorICAgICAgICB0byBoYXBwZW4gb24gV2ViQ29udGVudCBwcm9jZXNz IHNpZGUuIE9uZSBkaWZmZXJlbmNlIGluIGJlaGF2aW9yIGlzIHRoYXQgd2hlbiB0aGUgZW50cnkg ZXhwaXJlcyB3ZQorICAgICAgICBub3cgcmVtb3ZlIGl0IGZyb20gdGhlIGNhY2hlIHJpZ2h0IGF3 YXkgdG8gZnJlZS11cCBtZW1vcnksIGluc3RlYWQgb2Ygc2ltcGx5IHJlZnVzaW5nIHRvIHVzZSBp dCBsYXRlcgorICAgICAgICBvbi4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcDoKKyAgICAgICAgRGlzYWJsZSBiYWNrIGZvcndhcmQgY2FjaGUgZXhwaXJhdGlvbiBp biB0aGUgV2ViQ29udGVudCBwcm9jZXNzIHdoZW4gdXNpbmcgbW9kZXJuCisgICAgICAgIFdlYktp dC4KKwogMjAxOS0xMC0xNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CiAKICAgICAgICAgW0dUS11bV1BFXSBBZGQgdXNlciBtZXNzYWdlcyBBUEkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdh Y3kvbWFjL0NoYW5nZUxvZwppbmRleCA5ZWY5YTcwMzczMGEzMTM2OGU4M2NlNjU2N2FmMTI0NzI1 NzQ0YTk3Li5iOGFlZmI4ZDlkYTMzYWM0NjAyMzkwMGE2OWM4ZTc0NGM3NjUxYWY0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dExlZ2FjeS9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMTAtMTYgIENocmlz IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbV0syXSBNb3ZlIGJhY2svZm9y d2FyZCBjYWNoZSBlbnRyeSBleHBpcmF0aW9uIGZyb20gdGhlIFdlYlByb2Nlc3MgdG8gdGhlIFVJ UHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAzMDM0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NjMzMjQ1Mz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToK KyAgICAgICAgKC1bV2ViVmlldyBfcHJlZmVyZW5jZXNDaGFuZ2VkOl0pOgorCiAyMDE5LTEwLTE1 ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBTaW1w bGlmeSBtYWluIHRocmVhZCBpbml0aWFsaXphdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaGlzdG9yeS9DYWNoZWRQYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVk UGFnZS5jcHAKaW5kZXggOTc0N2E0MDQwMTZhYzg2OGQyZjc3OTZlNTMzMDQzNmZmYTU4NzQ5Zi4u MDhhZjM5ZDQ1MzY1YzFiM2YyZmFmMmI3ZjgxYWNlYmY4MjlmYjM0MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaGlzdG9yeS9DYWNoZWRQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o aXN0b3J5L0NhY2hlZFBhZ2UuY3BwCkBAIC01NSw3ICs1NSw3IEBAIERFRklORV9ERUJVR19PTkxZ X0dMT0JBTChXVEY6OlJlZkNvdW50ZWRMZWFrQ291bnRlciwgY2FjaGVkUGFnZUNvdW50ZXIsICgi Q2FjaGVkCiAKIENhY2hlZFBhZ2U6OkNhY2hlZFBhZ2UoUGFnZSYgcGFnZSkKICAgICA6IG1fcGFn ZShwYWdlKQotICAgICwgbV9leHBpcmF0aW9uVGltZShNb25vdG9uaWNUaW1lOjpub3coKSArIFNl Y29uZHMocGFnZS5zZXR0aW5ncygpLmJhY2tGb3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWwo KSkpCisgICAgLCBtX2V4cGlyYXRpb25UaW1lKE1vbm90b25pY1RpbWU6Om5vdygpICsgcGFnZS5z ZXR0aW5ncygpLmJhY2tGb3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWwoKSkKICAgICAsIG1f Y2FjaGVkTWFpbkZyYW1lKG1ha2VVbmlxdWU8Q2FjaGVkRnJhbWU+KHBhZ2UubWFpbkZyYW1lKCkp KQogewogI2lmbmRlZiBOREVCVUcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0 dGluZ3MueWFtbCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MueWFtbAppbmRleCAwYWU3 NzQyNGM4Nzk2NGY0YmFlMTIzOGMxNmYyMTkyNzgwMDAyY2QwLi40N2YwZWQ2YThlZjA4NTVmYTVh NTQyNDQ4YTEzYjIzNjMzOTI0NTBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Nl dHRpbmdzLnlhbWwKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sCkBAIC00 MjIsOCArNDIyLDggQEAgbG9nc1BhZ2VNZXNzYWdlc1RvU3lzdGVtQ29uc29sZUVuYWJsZWQ6CiAg IGluaXRpYWw6IGZhbHNlCiAKIGJhY2tGb3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWw6Ci0g IHR5cGU6IGRvdWJsZQotICBpbml0aWFsOiAxODAwCisgIHR5cGU6IFNlY29uZHMKKyAgaW5pdGlh bDogMzBfbWluCiAKICMgU29tZSBhcHBzIGNvdWxkIGhhdmUgYSBkZWZhdWx0IHZpZGVvIHBvc3Rl ciBpZiBpdCBpcyBub3Qgc2V0LgogZGVmYXVsdFZpZGVvUG9zdGVyVVJMOgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5LmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkQ2FjaGVFbnRyeS5jcHAKaW5kZXgg NzVjZGZiNmJlNmM2MDQwYzc0MDM4MTRkNjNiMDVhZTNhYmI2NWQyZC4uNTlmYmVkNWYwY2NlYmYx ZTlhZTUyOTliYWM4YTZkYWNlNWFiMzU2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJCYWNrRm9yd2FyZENhY2hlRW50cnkuY3BwCkBAIC0yNiwxOCArMjYsMjQgQEAK ICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZENhY2hlRW50cnku aCIKIAorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJTdXNwZW5kZWRQYWdlUHJveHku aCIKKyNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZENhY2hlLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vz c01lc3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5LmgiCiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCitzdGF0aWMgY29uc3QgU2Vjb25kcyBleHBpcmF0aW9uRGVsYXkgeyAzMF9taW4g fTsKKwogV2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5OjpXZWJCYWNrRm9yd2FyZENhY2hlRW50cnko V2ViQmFja0ZvcndhcmRDYWNoZSYgYmFja0ZvcndhcmRDYWNoZSwgV2ViQ29yZTo6QmFja0Zvcndh cmRJdGVtSWRlbnRpZmllciBiYWNrRm9yd2FyZEl0ZW1JRCwgV2ViQ29yZTo6UHJvY2Vzc0lkZW50 aWZpZXIgcHJvY2Vzc0lkZW50aWZpZXIsIHN0ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJv eHk+JiYgc3VzcGVuZGVkUGFnZSkKICAgICA6IG1fYmFja0ZvcndhcmRDYWNoZShiYWNrRm9yd2Fy ZENhY2hlKQogICAgICwgbV9wcm9jZXNzSWRlbnRpZmllcihwcm9jZXNzSWRlbnRpZmllcikKICAg ICAsIG1fYmFja0ZvcndhcmRJdGVtSUQoYmFja0ZvcndhcmRJdGVtSUQpCiAgICAgLCBtX3N1c3Bl bmRlZFBhZ2UoV1RGTW92ZShzdXNwZW5kZWRQYWdlKSkKKyAgICAsIG1fZXhwaXJhdGlvblRpbWVy KFJ1bkxvb3A6Om1haW4oKSwgdGhpcywgJldlYkJhY2tGb3J3YXJkQ2FjaGVFbnRyeTo6ZXhwaXJh dGlvblRpbWVyRmlyZWQpCiB7CisgICAgbV9leHBpcmF0aW9uVGltZXIuc3RhcnRPbmVTaG90KGV4 cGlyYXRpb25EZWxheSk7CiB9CiAKIFdlYkJhY2tGb3J3YXJkQ2FjaGVFbnRyeTo6fldlYkJhY2tG b3J3YXJkQ2FjaGVFbnRyeSgpCkBAIC01Miw2ICs1OCw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxTdXNw ZW5kZWRQYWdlUHJveHk+IFdlYkJhY2tGb3J3YXJkQ2FjaGVFbnRyeTo6dGFrZVN1c3BlbmRlZFBh Z2UoCiB7CiAgICAgQVNTRVJUKG1fc3VzcGVuZGVkUGFnZSk7CiAgICAgbV9iYWNrRm9yd2FyZEl0 ZW1JRCA9IHsgfTsKKyAgICBtX2V4cGlyYXRpb25UaW1lci5zdG9wKCk7CiAgICAgcmV0dXJuIHN0 ZDo6ZXhjaGFuZ2UobV9zdXNwZW5kZWRQYWdlLCBudWxscHRyKTsKIH0KIApAQCAtNjMsNCArNzAs MTMgQEAgV2ViUHJvY2Vzc1Byb3h5JiBXZWJCYWNrRm9yd2FyZENhY2hlRW50cnk6OnByb2Nlc3Mo KSBjb25zdAogICAgIHJldHVybiAqcHJvY2VzczsKIH0KIAordm9pZCBXZWJCYWNrRm9yd2FyZENh Y2hlRW50cnk6OmV4cGlyYXRpb25UaW1lckZpcmVkKCkKK3sKKyAgICBSRUxFQVNFX0xPRyhCYWNr Rm9yd2FyZENhY2hlLCAiJXAgLSBXZWJCYWNrRm9yd2FyZENhY2hlRW50cnk6OmV4cGlyYXRpb25U aW1lckZpcmVkIGJhY2tGb3J3YXJkSXRlbUlEOiAlcywgaGFzU3VzcGVuZGVkUGFnZT8gJWQiLCB0 aGlzLCBtX2JhY2tGb3J3YXJkSXRlbUlELnN0cmluZygpLnV0ZjgoKS5kYXRhKCksICEhbV9zdXNw ZW5kZWRQYWdlKTsKKyAgICBBU1NFUlQobV9iYWNrRm9yd2FyZEl0ZW1JRCk7CisgICAgYXV0byog aXRlbSA9IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06Oml0ZW1Gb3JJRChtX2JhY2tGb3J3YXJkSXRl bUlEKTsKKyAgICBBU1NFUlQoaXRlbSk7CisgICAgbV9iYWNrRm9yd2FyZENhY2hlLnJlbW92ZUVu dHJ5KCppdGVtKTsgLy8gV2lsbCBkZXN0cm95IHx0aGlzfC4KK30KKwogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJCYWNrRm9yd2Fy ZENhY2hlRW50cnkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkQ2Fj aGVFbnRyeS5oCmluZGV4IDFmNGM2YTU3NGIzYTY4NDFiMDg1Yzk5YTQ5ZDgxM2Y4MGNjN2IyNDIu LjgzNWEyMzQ5ZDk2MTJiZDVjMjNhNDNkZDdhNDQ5YjZkMWY4NWViMTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkQ2FjaGVFbnRyeS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkQ2FjaGVFbnRyeS5oCkBAIC0yOCw2 ICsyOCw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9CYWNrRm9yd2FyZEl0ZW1JZGVudGlmaWVyLmg+ CiAjaW5jbHVkZSA8V2ViQ29yZS9Qcm9jZXNzSWRlbnRpZmllci5oPgogI2luY2x1ZGUgPHd0Zi9G b3J3YXJkLmg+CisjaW5jbHVkZSA8d3RmL1J1bkxvb3AuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7 CiAKQEAgLTQ5LDEwICs1MCwxMyBAQCBwdWJsaWM6CiAgICAgV2ViUHJvY2Vzc1Byb3h5JiBwcm9j ZXNzKCkgY29uc3Q7CiAKIHByaXZhdGU6CisgICAgdm9pZCBleHBpcmF0aW9uVGltZXJGaXJlZCgp OworCiAgICAgV2ViQmFja0ZvcndhcmRDYWNoZSYgbV9iYWNrRm9yd2FyZENhY2hlOwogICAgIFdl YkNvcmU6OlByb2Nlc3NJZGVudGlmaWVyIG1fcHJvY2Vzc0lkZW50aWZpZXI7CiAgICAgV2ViQ29y ZTo6QmFja0ZvcndhcmRJdGVtSWRlbnRpZmllciBtX2JhY2tGb3J3YXJkSXRlbUlEOwogICAgIHN0 ZDo6dW5pcXVlX3B0cjxTdXNwZW5kZWRQYWdlUHJveHk+IG1fc3VzcGVuZGVkUGFnZTsKKyAgICBS dW5Mb29wOjpUaW1lcjxXZWJCYWNrRm9yd2FyZENhY2hlRW50cnk+IG1fZXhwaXJhdGlvblRpbWVy OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDk4ZDUyYjAzNThkNmUxMDVkOWE0NzNlNTE1MDUz NDUwMTcyODY2OTkuLjE4Y2FmMTkyYWZjMDRkMzA3MmJkMTBkN2FjMTc5MGZkODI2NjBkMmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC01MjEs NiArNTIxLDEwIEBAIFdlYlBhZ2U6OldlYlBhZ2UoUGFnZUlkZW50aWZpZXIgcGFnZUlELCBXZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICBtX3BhZ2UtPnNldHRpbmdz KCkuc2V0U2Nyb2xsaW5nQ29vcmRpbmF0b3JFbmFibGVkKG1fdXNlQXN5bmNTY3JvbGxpbmcpOwog I2VuZGlmCiAKKyAgICAvLyBEaXNhYmxlIEJhY2svRm9yd2FyZCBjYWNoZSBleHBpcmF0aW9uIGlu IHRoZSBXZWJDb250ZW50IHByb2Nlc3Mgc2luY2UgbWFuYWdlbWVudCBoYXBwZW5zIGluIHRoZSBV SVByb2Nlc3MKKyAgICAvLyBpbiBtb2Rlcm4gV2ViS2l0LgorICAgIG1fcGFnZS0+c2V0dGluZ3Mo KS5zZXRCYWNrRm9yd2FyZENhY2hlRXhwaXJhdGlvbkludGVydmFsKFNlY29uZHM6OmluZmluaXR5 KCkpOworCiAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZTo6Y3JlYXRlV2l0aENvcmVNYWluRnJh bWUodGhpcywgJm1fcGFnZS0+bWFpbkZyYW1lKCkpOwogICAgIG1fZHJhd2luZ0FyZWEtPnVwZGF0 ZVByZWZlcmVuY2VzKHBhcmFtZXRlcnMuc3RvcmUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9XZWJWaWV3L1dlYlZpZXcubW0KaW5kZXggODMwZDIxNjM4N2RkNWE4NmIwMjE1MDdkYTczYWFl OWEyMGI5OTllNi4uNDg4NmM4NDkzMTc4ZWI1MWUxYzk0Mzg2OWYxMzk1N2Y3NmVhMzI3ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCisrKyBi L1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtMjkxMyw3ICsy OTEzLDcgQEAgLSAodm9pZClfcHJlZmVyZW5jZXNDaGFuZ2VkOihXZWJQcmVmZXJlbmNlcyAqKXBy ZWZlcmVuY2VzCiAgICAgc2V0dGluZ3Muc2V0RE9NUGFzdGVBbGxvd2VkKFtwcmVmZXJlbmNlcyBp c0RPTVBhc3RlQWxsb3dlZF0pOwogICAgIHNldHRpbmdzLnNldFVzZXNQYWdlQ2FjaGUoW3NlbGYg dXNlc1BhZ2VDYWNoZV0pOwogICAgIHNldHRpbmdzLnNldFBhZ2VDYWNoZVN1cHBvcnRzUGx1Z2lu cyhbcHJlZmVyZW5jZXMgcGFnZUNhY2hlU3VwcG9ydHNQbHVnaW5zXSk7Ci0gICAgc2V0dGluZ3Mu c2V0QmFja0ZvcndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZhbChbcHJlZmVyZW5jZXMgX2JhY2tG b3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWxdKTsKKyAgICBzZXR0aW5ncy5zZXRCYWNrRm9y d2FyZENhY2hlRXhwaXJhdGlvbkludGVydmFsKFNlY29uZHMgeyBbcHJlZmVyZW5jZXMgX2JhY2tG b3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWxdIH0pOwogCiAgICAgc2V0dGluZ3Muc2V0RGV2 ZWxvcGVyRXh0cmFzRW5hYmxlZChbcHJlZmVyZW5jZXMgZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZF0p OwogICAgIHNldHRpbmdzLnNldEphdmFTY3JpcHRSdW50aW1lRmxhZ3MoSlNDOjpSdW50aW1lRmxh Z3MoW3ByZWZlcmVuY2VzIGphdmFTY3JpcHRSdW50aW1lRmxhZ3NdKSk7Cg== 381100 2019-10-16 13:09:11 -0700 2019-10-16 13:54:30 -0700 Patch bug-203034-20191016130904.patch text/plain 9440 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxMTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWJlMjQzNzI4M2NkYWZm OTU2M2EwMDQ0MjJlZTU5ZjUzYmI1NzA2Ni4uYjlkMzgyZDU5ZjVlZTg3NTY3ZmY0YWZkZTUyNzU2 MmY1Y2Y5MDhjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTEwLTE2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gSGFuZGxlIGJhY2sv Zm9yd2FyZCBjYWNoZSBlbnRyeSBleHBpcmF0aW9uIGluIHRoZSBVSVByb2Nlc3MgaW5zdGVhZCBv ZiB0aGUgV2ViUHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjAzMDM0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NjMzMjQ1Mz4KKworICAg ICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBVc2UgU2Vjb25kcyB0 eXBlIGZvciBiYWNrRm9yd2FyZENhY2hlRXhwaXJhdGlvbkludGVydmFsIHNldHRpbmcgaW5zdGVh ZCBvZgorICAgICAgICBkb3VibGUsIGZvciBjbGFyaXR5LgorCisgICAgICAgICogaGlzdG9yeS9D YWNoZWRQYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFBhZ2U6OkNhY2hlZFBhZ2Up OgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUGFnZTo6aGFzRXhwaXJlZCBjb25zdCk6CisgICAg ICAgICogcGFnZS9TZXR0aW5ncy55YW1sOgorCiAyMDE5LTEwLTE2ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgRHJvcCB1bnVzZWQgV0tQYWdlU2V0UmVzb3VyY2VD YWNoaW5nRGlzYWJsZWQoKSBTUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMTVlY2MzNzhjZGIxMWRiNjUzZWZkOWE1 NjhkZTJhYjJlNDU4NmIwMS4uNGZmY2ViYmUyMzI3NDM3MTJjOGNiOTMyYzliMTcwN2Y1YWEyMzY0 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxOS0xMC0xNiAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIEhhbmRsZSBiYWNrL2ZvcndhcmQgY2Fj aGUgZW50cnkgZXhwaXJhdGlvbiBpbiB0aGUgVUlQcm9jZXNzIGluc3RlYWQgb2YgdGhlIFdlYlBy b2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw MzAzNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYzMzI0NTM+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgSGFuZGxlIGJhY2svZm9yd2FyZCBjYWNo ZSBlbnRyeSBleHBpcmF0aW9uIGluIHRoZSBVSVByb2Nlc3MgaW5zdGVhZCBvZiB0aGUgV2ViUHJv Y2VzcywKKyAgICAgICAgbm93IHRoYXQgYmFjay9mb3J3YXJkIGNhY2hlIG1hbmFnZW1lbnQgaXMg ZG9uZSBpbiB0aGUgVUlQcm9jZXNzLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkJhY2tGb3J3 YXJkQ2FjaGVFbnRyeS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkQ2FjaGVF bnRyeTo6V2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5KToKKyAgICAgICAgKFdlYktpdDo6V2ViQmFj a0ZvcndhcmRDYWNoZUVudHJ5Ojp0YWtlU3VzcGVuZGVkUGFnZSk6CisgICAgICAgIChXZWJLaXQ6 OldlYkJhY2tGb3J3YXJkQ2FjaGVFbnRyeTo6ZXhwaXJhdGlvblRpbWVyRmlyZWQpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJCYWNrRm9yd2FyZENhY2hlRW50cnkuaDoKKyAgICAgICAgQWRkIGEg VGltZXIgdG8gV2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5IHRvIG1ha2UgdGhlIGVudHJ5IGV4cGly ZSBhZnRlciAzMCBtaW51dGVzLCB3aGljaCBpcyB3aGF0IHVzZWQKKyAgICAgICAgdG8gaGFwcGVu IG9uIFdlYkNvbnRlbnQgcHJvY2VzcyBzaWRlLiBPbmUgZGlmZmVyZW5jZSBpbiBiZWhhdmlvciBp cyB0aGF0IHdoZW4gdGhlIGVudHJ5IGV4cGlyZXMgd2UKKyAgICAgICAgbm93IHJlbW92ZSBpdCBm cm9tIHRoZSBjYWNoZSByaWdodCBhd2F5IHRvIGZyZWUtdXAgbWVtb3J5LCBpbnN0ZWFkIG9mIHNp bXBseSByZWZ1c2luZyB0byB1c2UgaXQgbGF0ZXIKKyAgICAgICAgb24uCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIERpc2FibGUgYmFjayBmb3J3 YXJkIGNhY2hlIGV4cGlyYXRpb24gaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyB3aGVuIHVzaW5n IG1vZGVybgorICAgICAgICBXZWJLaXQuCisKIDIwMTktMTAtMTYgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBTdG9wIHRlcm1pbmF0aW5nIHRoZSBwcmV3 YXJtZWQgcHJvY2VzcyBvbiBhcHBsaWNhdGlvbiBzdXNwZW5zaW9uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9D aGFuZ2VMb2cKaW5kZXggOWVmOWE3MDM3MzBhMzEzNjhlODNjZTY1NjdhZjEyNDcyNTc0NGE5Ny4u MDYxYWUxYjRhZGZiYjM2NjI0YjRjYjk2ZjRjNDk1ZGRlMWQ4MWY4MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kv bWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTEwLTE2ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gTW92ZSBiYWNrL2ZvcndhcmQgY2Fj aGUgZW50cnkgZXhwaXJhdGlvbiBmcm9tIHRoZSBXZWJQcm9jZXNzIHRvIHRoZSBVSVByb2Nlc3MK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzAzNAor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYzMzI0NTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg QW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAg ICgtW1dlYlZpZXcgX3ByZWZlcmVuY2VzQ2hhbmdlZDpdKToKKwogMjAxOS0xMC0xNSAgQ2hyaXMg RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFttYWNPU10gU2ltcGxpZnkgbWFp biB0aHJlYWQgaW5pdGlhbGl6YXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hpc3Rv cnkvQ2FjaGVkUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0NhY2hlZFBhZ2UuY3Bw CmluZGV4IDk3NDdhNDA0MDE2YWM4NjhkMmY3Nzk2ZTUzMzA0MzZmZmE1ODc0OWYuLjA4YWYzOWQ0 NTM2NWMxYjNmMmZhZjJiN2Y4MWFjZWJmODI5ZmIzNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2hpc3RvcnkvQ2FjaGVkUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9D YWNoZWRQYWdlLmNwcApAQCAtNTUsNyArNTUsNyBAQCBERUZJTkVfREVCVUdfT05MWV9HTE9CQUwo V1RGOjpSZWZDb3VudGVkTGVha0NvdW50ZXIsIGNhY2hlZFBhZ2VDb3VudGVyLCAoIkNhY2hlZAog CiBDYWNoZWRQYWdlOjpDYWNoZWRQYWdlKFBhZ2UmIHBhZ2UpCiAgICAgOiBtX3BhZ2UocGFnZSkK LSAgICAsIG1fZXhwaXJhdGlvblRpbWUoTW9ub3RvbmljVGltZTo6bm93KCkgKyBTZWNvbmRzKHBh Z2Uuc2V0dGluZ3MoKS5iYWNrRm9yd2FyZENhY2hlRXhwaXJhdGlvbkludGVydmFsKCkpKQorICAg ICwgbV9leHBpcmF0aW9uVGltZShNb25vdG9uaWNUaW1lOjpub3coKSArIHBhZ2Uuc2V0dGluZ3Mo KS5iYWNrRm9yd2FyZENhY2hlRXhwaXJhdGlvbkludGVydmFsKCkpCiAgICAgLCBtX2NhY2hlZE1h aW5GcmFtZShtYWtlVW5pcXVlPENhY2hlZEZyYW1lPihwYWdlLm1haW5GcmFtZSgpKSkKIHsKICNp Zm5kZWYgTkRFQlVHCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlh bWwgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwKaW5kZXggMGFlNzc0MjRjODc5 NjRmNGJhZTEyMzhjMTZmMjE5Mjc4MDAwMmNkMC4uNDdmMGVkNmE4ZWYwODU1ZmE1YTU0MjQ0OGEx M2IyMzYzMzkyNDUwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55 YW1sCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MueWFtbApAQCAtNDIyLDggKzQy Miw4IEBAIGxvZ3NQYWdlTWVzc2FnZXNUb1N5c3RlbUNvbnNvbGVFbmFibGVkOgogICBpbml0aWFs OiBmYWxzZQogCiBiYWNrRm9yd2FyZENhY2hlRXhwaXJhdGlvbkludGVydmFsOgotICB0eXBlOiBk b3VibGUKLSAgaW5pdGlhbDogMTgwMAorICB0eXBlOiBTZWNvbmRzCisgIGluaXRpYWw6IDMwX21p bgogCiAjIFNvbWUgYXBwcyBjb3VsZCBoYXZlIGEgZGVmYXVsdCB2aWRlbyBwb3N0ZXIgaWYgaXQg aXMgbm90IHNldC4KIGRlZmF1bHRWaWRlb1Bvc3RlclVSTDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkQ2FjaGVFbnRyeS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJCYWNrRm9yd2FyZENhY2hlRW50cnkuY3BwCmluZGV4IDc1Y2RmYjZi ZTZjNjA0MGM3NDAzODE0ZDYzYjA1YWUzYWJiNjVkMmQuLjU5ZmJlZDVmMGNjZWJmMWU5YWU1Mjk5 YmFjOGE2ZGFjZTVhYjM1NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YkJhY2tGb3J3YXJkQ2FjaGVFbnRyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5LmNwcApAQCAtMjYsMTggKzI2LDI0IEBACiAjaW5jbHVk ZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiV2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5LmgiCiAKKyNp bmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiU3VzcGVuZGVkUGFnZVByb3h5LmgiCisjaW5j bHVkZSAiV2ViQmFja0ZvcndhcmRDYWNoZS5oIgogI2luY2x1ZGUgIldlYlByb2Nlc3NNZXNzYWdl cy5oIgogI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94eS5oIgogCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAorc3RhdGljIGNvbnN0IFNlY29uZHMgZXhwaXJhdGlvbkRlbGF5IHsgMzBfbWluIH07CisKIFdl YkJhY2tGb3J3YXJkQ2FjaGVFbnRyeTo6V2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5KFdlYkJhY2tG b3J3YXJkQ2FjaGUmIGJhY2tGb3J3YXJkQ2FjaGUsIFdlYkNvcmU6OkJhY2tGb3J3YXJkSXRlbUlk ZW50aWZpZXIgYmFja0ZvcndhcmRJdGVtSUQsIFdlYkNvcmU6OlByb2Nlc3NJZGVudGlmaWVyIHBy b2Nlc3NJZGVudGlmaWVyLCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiYmIHN1 c3BlbmRlZFBhZ2UpCiAgICAgOiBtX2JhY2tGb3J3YXJkQ2FjaGUoYmFja0ZvcndhcmRDYWNoZSkK ICAgICAsIG1fcHJvY2Vzc0lkZW50aWZpZXIocHJvY2Vzc0lkZW50aWZpZXIpCiAgICAgLCBtX2Jh Y2tGb3J3YXJkSXRlbUlEKGJhY2tGb3J3YXJkSXRlbUlEKQogICAgICwgbV9zdXNwZW5kZWRQYWdl KFdURk1vdmUoc3VzcGVuZGVkUGFnZSkpCisgICAgLCBtX2V4cGlyYXRpb25UaW1lcihSdW5Mb29w OjptYWluKCksIHRoaXMsICZXZWJCYWNrRm9yd2FyZENhY2hlRW50cnk6OmV4cGlyYXRpb25UaW1l ckZpcmVkKQogeworICAgIG1fZXhwaXJhdGlvblRpbWVyLnN0YXJ0T25lU2hvdChleHBpcmF0aW9u RGVsYXkpOwogfQogCiBXZWJCYWNrRm9yd2FyZENhY2hlRW50cnk6On5XZWJCYWNrRm9yd2FyZENh Y2hlRW50cnkoKQpAQCAtNTIsNiArNTgsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFn ZVByb3h5PiBXZWJCYWNrRm9yd2FyZENhY2hlRW50cnk6OnRha2VTdXNwZW5kZWRQYWdlKAogewog ICAgIEFTU0VSVChtX3N1c3BlbmRlZFBhZ2UpOwogICAgIG1fYmFja0ZvcndhcmRJdGVtSUQgPSB7 IH07CisgICAgbV9leHBpcmF0aW9uVGltZXIuc3RvcCgpOwogICAgIHJldHVybiBzdGQ6OmV4Y2hh bmdlKG1fc3VzcGVuZGVkUGFnZSwgbnVsbHB0cik7CiB9CiAKQEAgLTYzLDQgKzcwLDEzIEBAIFdl YlByb2Nlc3NQcm94eSYgV2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5Ojpwcm9jZXNzKCkgY29uc3QK ICAgICByZXR1cm4gKnByb2Nlc3M7CiB9CiAKK3ZvaWQgV2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5 OjpleHBpcmF0aW9uVGltZXJGaXJlZCgpCit7CisgICAgUkVMRUFTRV9MT0coQmFja0ZvcndhcmRD YWNoZSwgIiVwIC0gV2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5OjpleHBpcmF0aW9uVGltZXJGaXJl ZCBiYWNrRm9yd2FyZEl0ZW1JRDogJXMsIGhhc1N1c3BlbmRlZFBhZ2U/ICVkIiwgdGhpcywgbV9i YWNrRm9yd2FyZEl0ZW1JRC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCAhIW1fc3VzcGVuZGVkUGFn ZSk7CisgICAgQVNTRVJUKG1fYmFja0ZvcndhcmRJdGVtSUQpOworICAgIGF1dG8qIGl0ZW0gPSBX ZWJCYWNrRm9yd2FyZExpc3RJdGVtOjppdGVtRm9ySUQobV9iYWNrRm9yd2FyZEl0ZW1JRCk7Cisg ICAgQVNTRVJUKGl0ZW0pOworICAgIG1fYmFja0ZvcndhcmRDYWNoZS5yZW1vdmVFbnRyeSgqaXRl bSk7IC8vIFdpbGwgZGVzdHJveSB8dGhpc3wuCit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViQmFja0ZvcndhcmRDYWNoZUVu dHJ5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJCYWNrRm9yd2FyZENhY2hlRW50cnku aAppbmRleCAxZjRjNmE1NzRiM2E2ODQxYjA4NWM5OWE0OWQ4MTNmODBjYzdiMjQyLi44MzVhMjM0 OWQ5NjEyYmQ1YzIzYTQzZGQ3YTQ0OWI2ZDFmODVlYjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJCYWNrRm9yd2FyZENhY2hlRW50cnkuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJCYWNrRm9yd2FyZENhY2hlRW50cnkuaApAQCAtMjgsNiArMjgsNyBA QAogI2luY2x1ZGUgPFdlYkNvcmUvQmFja0ZvcndhcmRJdGVtSWRlbnRpZmllci5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvUHJvY2Vzc0lkZW50aWZpZXIuaD4KICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5o PgorI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC00 OSwxMCArNTAsMTMgQEAgcHVibGljOgogICAgIFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcygpIGNv bnN0OwogCiBwcml2YXRlOgorICAgIHZvaWQgZXhwaXJhdGlvblRpbWVyRmlyZWQoKTsKKwogICAg IFdlYkJhY2tGb3J3YXJkQ2FjaGUmIG1fYmFja0ZvcndhcmRDYWNoZTsKICAgICBXZWJDb3JlOjpQ cm9jZXNzSWRlbnRpZmllciBtX3Byb2Nlc3NJZGVudGlmaWVyOwogICAgIFdlYkNvcmU6OkJhY2tG b3J3YXJkSXRlbUlkZW50aWZpZXIgbV9iYWNrRm9yd2FyZEl0ZW1JRDsKICAgICBzdGQ6OnVuaXF1 ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiBtX3N1c3BlbmRlZFBhZ2U7CisgICAgUnVuTG9vcDo6 VGltZXI8V2ViQmFja0ZvcndhcmRDYWNoZUVudHJ5PiBtX2V4cGlyYXRpb25UaW1lcjsKIH07CiAK IH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAppbmRleCAxNWNkNjIzN2UzZjljNzJkM2Q0NGVlNDgxMDViODRjMTNkZjlh ZWNlLi4wODE3OTI3NjNiYmNhYjM4NWNhYTI3NWMzNTBiZjY5ZDc3OGZhY2IwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNTIxLDYgKzUyMSwx MCBAQCBXZWJQYWdlOjpXZWJQYWdlKFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAgbV9wYWdlLT5zZXR0aW5ncygpLnNldFNj cm9sbGluZ0Nvb3JkaW5hdG9yRW5hYmxlZChtX3VzZUFzeW5jU2Nyb2xsaW5nKTsKICNlbmRpZgog CisgICAgLy8gRGlzYWJsZSBCYWNrL0ZvcndhcmQgY2FjaGUgZXhwaXJhdGlvbiBpbiB0aGUgV2Vi Q29udGVudCBwcm9jZXNzIHNpbmNlIG1hbmFnZW1lbnQgaGFwcGVucyBpbiB0aGUgVUlQcm9jZXNz CisgICAgLy8gaW4gbW9kZXJuIFdlYktpdC4KKyAgICBtX3BhZ2UtPnNldHRpbmdzKCkuc2V0QmFj a0ZvcndhcmRDYWNoZUV4cGlyYXRpb25JbnRlcnZhbChTZWNvbmRzOjppbmZpbml0eSgpKTsKKwog ICAgIG1fbWFpbkZyYW1lID0gV2ViRnJhbWU6OmNyZWF0ZVdpdGhDb3JlTWFpbkZyYW1lKHRoaXMs ICZtX3BhZ2UtPm1haW5GcmFtZSgpKTsKICAgICBtX2RyYXdpbmdBcmVhLT51cGRhdGVQcmVmZXJl bmNlcyhwYXJhbWV0ZXJzLnN0b3JlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2Fj eS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmll dy9XZWJWaWV3Lm1tCmluZGV4IDgzMGQyMTYzODdkZDVhODZiMDIxNTA3ZGE3M2FhZTlhMjBiOTk5 ZTYuLjQ4ODZjODQ5MzE3OGViNTFlMWM5NDM4NjlmMTM5NTdmNzZlYTMyN2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTI5MTMsNyArMjkxMyw3IEBA IC0gKHZvaWQpX3ByZWZlcmVuY2VzQ2hhbmdlZDooV2ViUHJlZmVyZW5jZXMgKilwcmVmZXJlbmNl cwogICAgIHNldHRpbmdzLnNldERPTVBhc3RlQWxsb3dlZChbcHJlZmVyZW5jZXMgaXNET01QYXN0 ZUFsbG93ZWRdKTsKICAgICBzZXR0aW5ncy5zZXRVc2VzUGFnZUNhY2hlKFtzZWxmIHVzZXNQYWdl Q2FjaGVdKTsKICAgICBzZXR0aW5ncy5zZXRQYWdlQ2FjaGVTdXBwb3J0c1BsdWdpbnMoW3ByZWZl cmVuY2VzIHBhZ2VDYWNoZVN1cHBvcnRzUGx1Z2luc10pOwotICAgIHNldHRpbmdzLnNldEJhY2tG b3J3YXJkQ2FjaGVFeHBpcmF0aW9uSW50ZXJ2YWwoW3ByZWZlcmVuY2VzIF9iYWNrRm9yd2FyZENh Y2hlRXhwaXJhdGlvbkludGVydmFsXSk7CisgICAgc2V0dGluZ3Muc2V0QmFja0ZvcndhcmRDYWNo ZUV4cGlyYXRpb25JbnRlcnZhbChTZWNvbmRzIHsgW3ByZWZlcmVuY2VzIF9iYWNrRm9yd2FyZENh Y2hlRXhwaXJhdGlvbkludGVydmFsXSB9KTsKIAogICAgIHNldHRpbmdzLnNldERldmVsb3BlckV4 dHJhc0VuYWJsZWQoW3ByZWZlcmVuY2VzIGRldmVsb3BlckV4dHJhc0VuYWJsZWRdKTsKICAgICBz ZXR0aW5ncy5zZXRKYXZhU2NyaXB0UnVudGltZUZsYWdzKEpTQzo6UnVudGltZUZsYWdzKFtwcmVm ZXJlbmNlcyBqYXZhU2NyaXB0UnVudGltZUZsYWdzXSkpOwo=