208669 2020-03-05 15:39:23 -0800 Pre-fetch first page in new PDF loading model 2020-03-05 19:00:08 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson achristensen commit-queue webkit-bug-importer oldest_to_newest 1626338 0 beidson 2020-03-05 15:39:23 -0800 Pre-fetch first page in new PDF loading model 1626342 1 392638 beidson 2020-03-05 15:44:19 -0800 Created attachment 392638 Patch 1626351 2 392638 achristensen 2020-03-05 15:54:28 -0800 Comment on attachment 392638 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392638&action=review > Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm:98 > +-(void) preloadDataOfPagesInRange:(NSRange)range onQueue:(dispatch_queue_t)queue completion:(void (^)(NSIndexSet* loadedPageIndexes))completionBlock; Space in wrong place. Same with previous line. > Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm:711 > + auto firstPageQueue = WorkQueue::create("PDF first page work queue"); We should reuse this. 1626372 3 beidson 2020-03-05 16:11:24 -0800 (In reply to Alex Christensen from comment #2) > Comment on attachment 392638 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=392638&action=review > > > Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm:98 > > +-(void) preloadDataOfPagesInRange:(NSRange)range onQueue:(dispatch_queue_t)queue completion:(void (^)(NSIndexSet* loadedPageIndexes))completionBlock; > > Space in wrong place. > Same with previous line. > > > Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm:711 > > + auto firstPageQueue = WorkQueue::create("PDF first page work queue"); > > We should reuse this. There's only ever one per PDFPlugin, and there's (generally) only ever one PDFPlugin per WebContent process. So I agree in principal, but in practice it's a non-issue. 1626375 4 392643 beidson 2020-03-05 16:12:59 -0800 Created attachment 392643 PFL 1626432 5 webkit-bug-importer 2020-03-05 18:16:36 -0800 <rdar://problem/60112775> 1626433 6 webkit-bug-importer 2020-03-05 18:16:37 -0800 <rdar://problem/60112772> 1626448 7 392643 commit-queue 2020-03-05 19:00:06 -0800 Comment on attachment 392643 PFL Clearing flags on attachment: 392643 Committed r257964: <https://trac.webkit.org/changeset/257964> 1626449 8 commit-queue 2020-03-05 19:00:08 -0800 All reviewed patches have been landed. Closing bug. 392638 2020-03-05 15:44:19 -0800 2020-03-05 16:12:59 -0800 Patch patch text/plain 4924 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZjkwZDE2ZWM1ODMuLmE0ZTljOTI4YjQ5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDIwLTAzLTA1ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwor ICAgICAgICBQcmUtZmV0Y2ggZmlyc3QgcGFnZSBpbiBuZXcgUERGIGxvYWRpbmcgbW9kZWwuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg2NjkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbHNvIGFkZCBz b21lIGxvZ2dpbmcuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9Mb2dnaW5nLmg6CisgICAgICAgICog V2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW06CisgICAgICAgIChXZWJLaXQ6OmRh dGFQcm92aWRlckdldEJ5dGVzQXRQb3NpdGlvbkNhbGxiYWNrKToKKyAgICAgICAgKFdlYktpdDo6 ZGF0YVByb3ZpZGVyR2V0Qnl0ZVJhbmdlc0NhbGxiYWNrKToKKyAgICAgICAgKFdlYktpdDo6UERG UGx1Z2luOjp0aHJlYWRFbnRyeSk6CisKIDIwMjAtMDMtMDUgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CiAKICAgICAgICAgQXNzZXJ0aW9uIGZhaWxlZDogc2hvdWxkQmVBY3RpdmUo KSBpbiBCYWNrZ3JvdW5kUHJvY2Vzc1Jlc3BvbnNpdmVuZXNzVGltZXI6OnJlc3BvbnNpdmVuZXNz Q2hlY2tUaW1lckZpcmVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vTG9n Z2luZy5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9Mb2dnaW5nLmgKaW5kZXggNzg4MmIzYjQz YTkuLjJmZDcyZWQzNzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0xvZ2dp bmcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0xvZ2dpbmcuaApAQCAtNzEsNiArNzEs NyBAQCBleHRlcm4gIkMiIHsKICAgICBNKE5ldHdvcmtDYWNoZVN0b3JhZ2UpIFwKICAgICBNKE5l dHdvcmtTY2hlZHVsaW5nKSBcCiAgICAgTShOZXR3b3JrU2Vzc2lvbikgXAorICAgIE0oUERGKSBc CiAgICAgTShQZXJmb3JtYW5jZUxvZ2dpbmcpIFwKICAgICBNKFBsdWdpbnMpIFwKICAgICBNKFBy aW50aW5nKSBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9Q REYvUERGUGx1Z2luLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BE RlBsdWdpbi5tbQppbmRleCA0MzEwMWNjZjM1My4uNmIxY2VhMjk3YTYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0KKysrIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbQpAQCAtMzAsNiAr MzAsNyBAQAogCiAjaW1wb3J0ICJBcmd1bWVudENvZGVycy5oIgogI2ltcG9ydCAiRGF0YVJlZmVy ZW5jZS5oIgorI2ltcG9ydCAiTG9nZ2luZy5oIgogI2ltcG9ydCAiUERGQW5ub3RhdGlvblRleHRX aWRnZXREZXRhaWxzLmgiCiAjaW1wb3J0ICJQREZDb250ZXh0TWVudS5oIgogI2ltcG9ydCAiUERG TGF5ZXJDb250cm9sbGVyU1BJLmgiCkBAIC04OCwxMCArODksMTMgQEAKICNpbXBvcnQgPHBhbC9z cGkvbWFjL05TTWVudVNQSS5oPgogI2ltcG9ydCA8d3RmL1VVSUQuaD4KICNpbXBvcnQgPHd0Zi9X VEZTZW1hcGhvcmUuaD4KKyNpbXBvcnQgPHd0Zi9Xb3JrUXVldWUuaD4KKyNpbXBvcnQgPHd0Zi90 ZXh0L1RleHRTdHJlYW0uaD4KIAogI2lmIEhBVkUoSU5DUkVNRU5UQUxfUERGX0FQSVMpCiBAaW50 ZXJmYWNlIFBERkRvY3VtZW50ICgpCiAtKGluc3RhbmNldHlwZSkgaW5pdFdpdGhQcm92aWRlcjoo Q0dEYXRhUHJvdmlkZXJSZWYpZGF0YVByb3ZpZGVyOworLSh2b2lkKSBwcmVsb2FkRGF0YU9mUGFn ZXNJblJhbmdlOihOU1JhbmdlKXJhbmdlIG9uUXVldWU6KGRpc3BhdGNoX3F1ZXVlX3QpcXVldWUg Y29tcGxldGlvbjoodm9pZCAoXikoTlNJbmRleFNldCogbG9hZGVkUGFnZUluZGV4ZXMpKWNvbXBs ZXRpb25CbG9jazsKIEBlbmQKICNlbmRpZgogCkBAIC02MjIsNiArNjI2LDcgQEAgUERGUGx1Z2lu Ojp+UERGUGx1Z2luKCkKIHN0YXRpYyBzaXplX3QgZGF0YVByb3ZpZGVyR2V0Qnl0ZXNBdFBvc2l0 aW9uQ2FsbGJhY2sodm9pZCogaW5mbywgdm9pZCogYnVmZmVyLCBvZmZfdCBwb3NpdGlvbiwgc2l6 ZV90IGNvdW50KQogewogICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOworICAgIExPRyhQREYs ICJQREYgZGF0YSBwcm92aWRlciByZXF1ZXN0aW5nICVsdSBieXRlcyBhdCBwb3NpdGlvbiAlbGx1 IiwgY291bnQsIHBvc2l0aW9uKTsKIAogICAgIFJlZjxQREZQbHVnaW4+IHBsdWdpbiA9ICooKFBE RlBsdWdpbiopaW5mbyk7CiAgICAgV1RGOjpTZW1hcGhvcmUgZGF0YVNlbWFwaG9yZSB7IDAgfTsK QEAgLTY0NCwxMSArNjQ5LDIzIEBAIHN0YXRpYyB2b2lkIGRhdGFQcm92aWRlckdldEJ5dGVSYW5n ZXNDYWxsYmFjayh2b2lkKiBpbmZvLCBDRk11dGFibGVBcnJheVJlZiBidWZmCiB7CiAgICAgQVNT RVJUKCFpc01haW5UaHJlYWQoKSk7CiAKKyNpZm5kZWYgTkRFQlVHCisgICAgVGV4dFN0cmVhbSBz dHJlYW07CisgICAgc3RyZWFtIDw8ICJQREYgZGF0YSBwcm92aWRlciByZXF1ZXN0aW5nICIgPDwg Y291bnQgPDwgIiBieXRlIHJhbmdlcyAoIjsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNv dW50OyArK2kpIHsKKyAgICAgICAgc3RyZWFtIDw8IHJhbmdlc1tpXS5sZW5ndGggPDwgIiBhdCAi IDw8IHJhbmdlc1tpXS5sb2NhdGlvbjsKKyAgICAgICAgaWYgKGkgPCBjb3VudCAtIDEpCisgICAg ICAgICAgICBzdHJlYW0gPDwgIiwgIjsKKyAgICB9CisgICAgc3RyZWFtIDw8ICIpIjsKKyAgICBM T0coUERGLCAiJXMiLCBzdHJlYW0ucmVsZWFzZSgpLnV0ZjgoKS5kYXRhKCkpOworI2VuZGlmCisK ICAgICBSZWY8UERGUGx1Z2luPiBwbHVnaW4gPSAqKChQREZQbHVnaW4qKWluZm8pOwogICAgIFdU Rjo6U2VtYXBob3JlIGRhdGFTZW1hcGhvcmUgeyAwIH07CiAgICAgVmVjdG9yPFJldGFpblB0cjxD RkRhdGFSZWY+PiBkYXRhUmVzdWx0cyhjb3VudCk7CiAKLSAgICAvLyBGSVhNRTogT25jZSB3ZSBz dXBwb3J0IHJhbmdlIHJlcXVlc3RzLCBtYWtlIGEgc2luZ2xlIHJlcXVlc3QgZm9yIGFsbCByYW5n ZXMgaW5zdGVhZCBvZiA8Y291bnQ+IGluZGl2aWR1YWwgcmVxdWVzdHMuCisgICAgLy8gRklYTUU6 IE9uY2Ugd2Ugc3VwcG9ydCBtdWx0aS1yYW5nZSByZXF1ZXN0cywgbWFrZSBhIHNpbmdsZSByZXF1 ZXN0IGZvciBhbGwgcmFuZ2VzIGluc3RlYWQgb2YgPGNvdW50PiBpbmRpdmlkdWFsIHJlcXVlc3Rz LgogICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcGx1Z2luID0gV1RGTW92ZShwbHVnaW4p LCAmZGF0YVJlc3VsdHMsIHJhbmdlcywgY291bnQsICZkYXRhU2VtYXBob3JlXSB7CiAgICAgICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY291bnQ7ICsraSkgewogICAgICAgICAgICAgcGx1Z2lu LT5nZXRSZXNvdXJjZUJ5dGVzQXRQb3NpdGlvbihyYW5nZXNbaV0ubGVuZ3RoLCByYW5nZXNbaV0u bG9jYXRpb24sIFtpLCAmZGF0YVJlc3VsdHMsICZkYXRhU2VtYXBob3JlXShjb25zdCB1aW50OF90 KiBieXRlcywgc2l6ZV90IGJ5dGVzQ291bnQpIHsKQEAgLTY5MCwxMSArNzA3LDIxIEBAIHZvaWQg UERGUGx1Z2luOjp0aHJlYWRFbnRyeShSZWY8UERGUGx1Z2luPiYmIHByb3RlY3RlZFBsdWdpbikK ICAgICBDR0RhdGFQcm92aWRlclNldFByb3BlcnR5KGRhdGFQcm92aWRlci5nZXQoKSwga0NHRGF0 YVByb3ZpZGVySGFzSGlnaExhdGVuY3ksIGtDRkJvb2xlYW5UcnVlKTsKICAgICBtX2JhY2tncm91 bmRUaHJlYWREb2N1bWVudCA9IGFkb3B0TlMoW1twZGZEb2N1bWVudENsYXNzKCkgYWxsb2NdIGlu aXRXaXRoUHJvdmlkZXI6ZGF0YVByb3ZpZGVyLmdldCgpXSk7CiAKKyAgICBXVEY6OlNlbWFwaG9y ZSBmaXJzdFBhZ2VTZW1hcGhvcmUgeyAwIH07CisgICAgYXV0byBmaXJzdFBhZ2VRdWV1ZSA9IFdv cmtRdWV1ZTo6Y3JlYXRlKCJQREYgZmlyc3QgcGFnZSB3b3JrIHF1ZXVlIik7CisKKyAgICBbbV9i YWNrZ3JvdW5kVGhyZWFkRG9jdW1lbnQgcHJlbG9hZERhdGFPZlBhZ2VzSW5SYW5nZTpOU01ha2VS YW5nZSgwLCAxKSBvblF1ZXVlOmZpcnN0UGFnZVF1ZXVlLT5kaXNwYXRjaFF1ZXVlKCkgY29tcGxl dGlvbjpbJmZpcnN0UGFnZVNlbWFwaG9yZSwgdGhpc10gKE5TSW5kZXhTZXQgKikgbXV0YWJsZSB7 CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW3RoaXNdIHsKKyAgICAgICAgICAgIGFkb3B0QmFj a2dyb3VuZFRocmVhZERvY3VtZW50KCk7CisgICAgICAgIH0pOworICAgICAgICBmaXJzdFBhZ2VT ZW1hcGhvcmUuc2lnbmFsKCk7CisgICAgfV07CisKKyAgICBmaXJzdFBhZ2VTZW1hcGhvcmUud2Fp dCgpOworCiAgICAgLy8gVGhlIG1haW4gdGhyZWFkIGRpc3BhdGNoIGJlbG93IHJlbW92ZXMgdGhl IGxhc3QgcmVmZXJlbmNlIHRvIHRoZSBQREYgdGhyZWFkLgogICAgIC8vIEl0IG11c3QgYmUgdGhl IGxhc3QgY29kZSBleGVjdXRlZCBpbiB0aGlzIGZ1bmN0aW9uLgotICAgIGNhbGxPbk1haW5UaHJl YWQoW3RoaXMsIHByb3RlY3RlZFBsdWdpbiA9IFdURk1vdmUocHJvdGVjdGVkUGx1Z2luKV0gewot ICAgICAgICBhZG9wdEJhY2tncm91bmRUaHJlYWREb2N1bWVudCgpOwotICAgIH0pOworICAgIGNh bGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFBsdWdpbiA9IFdURk1vdmUocHJvdGVjdGVkUGx1Z2lu KV0geyB9KTsKIH0KIAogdm9pZCBQREZQbHVnaW46OnVuY29uZGl0aW9uYWxDb21wbGV0ZU91dHN0 YW5kaW5nUmFuZ2VSZXF1ZXN0cygpCg== 392643 2020-03-05 16:12:59 -0800 2020-03-05 19:00:06 -0800 PFL patch text/plain 4991 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZjkwZDE2ZWM1ODMuLmE0ZTljOTI4YjQ5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDIwLTAzLTA1ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwor ICAgICAgICBQcmUtZmV0Y2ggZmlyc3QgcGFnZSBpbiBuZXcgUERGIGxvYWRpbmcgbW9kZWwuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg2NjkKKwor ICAgICAgICBSZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgIEFsc28gYWRk IHNvbWUgbG9nZ2luZy4KKworICAgICAgICAqIFBsYXRmb3JtL0xvZ2dpbmcuaDoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbToKKyAgICAgICAgKFdlYktpdDo6 ZGF0YVByb3ZpZGVyR2V0Qnl0ZXNBdFBvc2l0aW9uQ2FsbGJhY2spOgorICAgICAgICAoV2ViS2l0 OjpkYXRhUHJvdmlkZXJHZXRCeXRlUmFuZ2VzQ2FsbGJhY2spOgorICAgICAgICAoV2ViS2l0OjpQ REZQbHVnaW46OnRocmVhZEVudHJ5KToKKwogMjAyMC0wMy0wNSAgU2lodWkgTGl1ICA8c2lodWlf bGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBBc3NlcnRpb24gZmFpbGVkOiBzaG91bGRCZUFjdGl2 ZSgpIGluIEJhY2tncm91bmRQcm9jZXNzUmVzcG9uc2l2ZW5lc3NUaW1lcjo6cmVzcG9uc2l2ZW5l c3NDaGVja1RpbWVyRmlyZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9M b2dnaW5nLmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0xvZ2dpbmcuaAppbmRleCA3ODgyYjNi NDNhOS4uMmZkNzJlZDM3MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vTG9n Z2luZy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vTG9nZ2luZy5oCkBAIC03MSw2ICs3 MSw3IEBAIGV4dGVybiAiQyIgewogICAgIE0oTmV0d29ya0NhY2hlU3RvcmFnZSkgXAogICAgIE0o TmV0d29ya1NjaGVkdWxpbmcpIFwKICAgICBNKE5ldHdvcmtTZXNzaW9uKSBcCisgICAgTShQREYp IFwKICAgICBNKFBlcmZvcm1hbmNlTG9nZ2luZykgXAogICAgIE0oUGx1Z2lucykgXAogICAgIE0o UHJpbnRpbmcpIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVnaW5z L1BERi9QREZQbHVnaW4ubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QREYv UERGUGx1Z2luLm1tCmluZGV4IDQzMTAxY2NmMzUzLi4xODRmMmU2ZTg0YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tCkBAIC0zMCw2 ICszMCw3IEBACiAKICNpbXBvcnQgIkFyZ3VtZW50Q29kZXJzLmgiCiAjaW1wb3J0ICJEYXRhUmVm ZXJlbmNlLmgiCisjaW1wb3J0ICJMb2dnaW5nLmgiCiAjaW1wb3J0ICJQREZBbm5vdGF0aW9uVGV4 dFdpZGdldERldGFpbHMuaCIKICNpbXBvcnQgIlBERkNvbnRleHRNZW51LmgiCiAjaW1wb3J0ICJQ REZMYXllckNvbnRyb2xsZXJTUEkuaCIKQEAgLTg4LDEwICs4OSwxMyBAQAogI2ltcG9ydCA8cGFs L3NwaS9tYWMvTlNNZW51U1BJLmg+CiAjaW1wb3J0IDx3dGYvVVVJRC5oPgogI2ltcG9ydCA8d3Rm L1dURlNlbWFwaG9yZS5oPgorI2ltcG9ydCA8d3RmL1dvcmtRdWV1ZS5oPgorI2ltcG9ydCA8d3Rm L3RleHQvVGV4dFN0cmVhbS5oPgogCiAjaWYgSEFWRShJTkNSRU1FTlRBTF9QREZfQVBJUykKIEBp bnRlcmZhY2UgUERGRG9jdW1lbnQgKCkKLS0oaW5zdGFuY2V0eXBlKSBpbml0V2l0aFByb3ZpZGVy OihDR0RhdGFQcm92aWRlclJlZilkYXRhUHJvdmlkZXI7CistKGluc3RhbmNldHlwZSlpbml0V2l0 aFByb3ZpZGVyOihDR0RhdGFQcm92aWRlclJlZilkYXRhUHJvdmlkZXI7CistKHZvaWQpcHJlbG9h ZERhdGFPZlBhZ2VzSW5SYW5nZTooTlNSYW5nZSlyYW5nZSBvblF1ZXVlOihkaXNwYXRjaF9xdWV1 ZV90KXF1ZXVlIGNvbXBsZXRpb246KHZvaWQgKF4pKE5TSW5kZXhTZXQqIGxvYWRlZFBhZ2VJbmRl eGVzKSljb21wbGV0aW9uQmxvY2s7CiBAZW5kCiAjZW5kaWYKIApAQCAtNjIyLDYgKzYyNiw3IEBA IFBERlBsdWdpbjo6flBERlBsdWdpbigpCiBzdGF0aWMgc2l6ZV90IGRhdGFQcm92aWRlckdldEJ5 dGVzQXRQb3NpdGlvbkNhbGxiYWNrKHZvaWQqIGluZm8sIHZvaWQqIGJ1ZmZlciwgb2ZmX3QgcG9z aXRpb24sIHNpemVfdCBjb3VudCkKIHsKICAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKKyAg ICBMT0coUERGLCAiUERGIGRhdGEgcHJvdmlkZXIgcmVxdWVzdGluZyAlbHUgYnl0ZXMgYXQgcG9z aXRpb24gJWxsdSIsIGNvdW50LCBwb3NpdGlvbik7CiAKICAgICBSZWY8UERGUGx1Z2luPiBwbHVn aW4gPSAqKChQREZQbHVnaW4qKWluZm8pOwogICAgIFdURjo6U2VtYXBob3JlIGRhdGFTZW1hcGhv cmUgeyAwIH07CkBAIC02NDQsMTEgKzY0OSwyMyBAQCBzdGF0aWMgdm9pZCBkYXRhUHJvdmlkZXJH ZXRCeXRlUmFuZ2VzQ2FsbGJhY2sodm9pZCogaW5mbywgQ0ZNdXRhYmxlQXJyYXlSZWYgYnVmZgog ewogICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOwogCisjaWZuZGVmIE5ERUJVRworICAgIFRl eHRTdHJlYW0gc3RyZWFtOworICAgIHN0cmVhbSA8PCAiUERGIGRhdGEgcHJvdmlkZXIgcmVxdWVz dGluZyAiIDw8IGNvdW50IDw8ICIgYnl0ZSByYW5nZXMgKCI7CisgICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCBjb3VudDsgKytpKSB7CisgICAgICAgIHN0cmVhbSA8PCByYW5nZXNbaV0ubGVuZ3Ro IDw8ICIgYXQgIiA8PCByYW5nZXNbaV0ubG9jYXRpb247CisgICAgICAgIGlmIChpIDwgY291bnQg LSAxKQorICAgICAgICAgICAgc3RyZWFtIDw8ICIsICI7CisgICAgfQorICAgIHN0cmVhbSA8PCAi KSI7CisgICAgTE9HKFBERiwgIiVzIiwgc3RyZWFtLnJlbGVhc2UoKS51dGY4KCkuZGF0YSgpKTsK KyNlbmRpZgorCiAgICAgUmVmPFBERlBsdWdpbj4gcGx1Z2luID0gKigoUERGUGx1Z2luKilpbmZv KTsKICAgICBXVEY6OlNlbWFwaG9yZSBkYXRhU2VtYXBob3JlIHsgMCB9OwogICAgIFZlY3RvcjxS ZXRhaW5QdHI8Q0ZEYXRhUmVmPj4gZGF0YVJlc3VsdHMoY291bnQpOwogCi0gICAgLy8gRklYTUU6 IE9uY2Ugd2Ugc3VwcG9ydCByYW5nZSByZXF1ZXN0cywgbWFrZSBhIHNpbmdsZSByZXF1ZXN0IGZv ciBhbGwgcmFuZ2VzIGluc3RlYWQgb2YgPGNvdW50PiBpbmRpdmlkdWFsIHJlcXVlc3RzLgorICAg IC8vIEZJWE1FOiBPbmNlIHdlIHN1cHBvcnQgbXVsdGktcmFuZ2UgcmVxdWVzdHMsIG1ha2UgYSBz aW5nbGUgcmVxdWVzdCBmb3IgYWxsIHJhbmdlcyBpbnN0ZWFkIG9mIDxjb3VudD4gaW5kaXZpZHVh bCByZXF1ZXN0cy4KICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3BsdWdpbiA9IFdURk1v dmUocGx1Z2luKSwgJmRhdGFSZXN1bHRzLCByYW5nZXMsIGNvdW50LCAmZGF0YVNlbWFwaG9yZV0g ewogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKICAgICAgICAg ICAgIHBsdWdpbi0+Z2V0UmVzb3VyY2VCeXRlc0F0UG9zaXRpb24ocmFuZ2VzW2ldLmxlbmd0aCwg cmFuZ2VzW2ldLmxvY2F0aW9uLCBbaSwgJmRhdGFSZXN1bHRzLCAmZGF0YVNlbWFwaG9yZV0oY29u c3QgdWludDhfdCogYnl0ZXMsIHNpemVfdCBieXRlc0NvdW50KSB7CkBAIC02OTAsMTEgKzcwNywy MSBAQCB2b2lkIFBERlBsdWdpbjo6dGhyZWFkRW50cnkoUmVmPFBERlBsdWdpbj4mJiBwcm90ZWN0 ZWRQbHVnaW4pCiAgICAgQ0dEYXRhUHJvdmlkZXJTZXRQcm9wZXJ0eShkYXRhUHJvdmlkZXIuZ2V0 KCksIGtDR0RhdGFQcm92aWRlckhhc0hpZ2hMYXRlbmN5LCBrQ0ZCb29sZWFuVHJ1ZSk7CiAgICAg bV9iYWNrZ3JvdW5kVGhyZWFkRG9jdW1lbnQgPSBhZG9wdE5TKFtbcGRmRG9jdW1lbnRDbGFzcygp IGFsbG9jXSBpbml0V2l0aFByb3ZpZGVyOmRhdGFQcm92aWRlci5nZXQoKV0pOwogCisgICAgV1RG OjpTZW1hcGhvcmUgZmlyc3RQYWdlU2VtYXBob3JlIHsgMCB9OworICAgIGF1dG8gZmlyc3RQYWdl UXVldWUgPSBXb3JrUXVldWU6OmNyZWF0ZSgiUERGIGZpcnN0IHBhZ2Ugd29yayBxdWV1ZSIpOwor CisgICAgW21fYmFja2dyb3VuZFRocmVhZERvY3VtZW50IHByZWxvYWREYXRhT2ZQYWdlc0luUmFu Z2U6TlNNYWtlUmFuZ2UoMCwgMSkgb25RdWV1ZTpmaXJzdFBhZ2VRdWV1ZS0+ZGlzcGF0Y2hRdWV1 ZSgpIGNvbXBsZXRpb246WyZmaXJzdFBhZ2VTZW1hcGhvcmUsIHRoaXNdIChOU0luZGV4U2V0ICop IG11dGFibGUgeworICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt0aGlzXSB7CisgICAgICAgICAg ICBhZG9wdEJhY2tncm91bmRUaHJlYWREb2N1bWVudCgpOworICAgICAgICB9KTsKKyAgICAgICAg Zmlyc3RQYWdlU2VtYXBob3JlLnNpZ25hbCgpOworICAgIH1dOworCisgICAgZmlyc3RQYWdlU2Vt YXBob3JlLndhaXQoKTsKKwogICAgIC8vIFRoZSBtYWluIHRocmVhZCBkaXNwYXRjaCBiZWxvdyBy ZW1vdmVzIHRoZSBsYXN0IHJlZmVyZW5jZSB0byB0aGUgUERGIHRocmVhZC4KICAgICAvLyBJdCBt dXN0IGJlIHRoZSBsYXN0IGNvZGUgZXhlY3V0ZWQgaW4gdGhpcyBmdW5jdGlvbi4KLSAgICBjYWxs T25NYWluVGhyZWFkKFt0aGlzLCBwcm90ZWN0ZWRQbHVnaW4gPSBXVEZNb3ZlKHByb3RlY3RlZFBs dWdpbildIHsKLSAgICAgICAgYWRvcHRCYWNrZ3JvdW5kVGhyZWFkRG9jdW1lbnQoKTsKLSAgICB9 KTsKKyAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRQbHVnaW4gPSBXVEZNb3ZlKHByb3Rl Y3RlZFBsdWdpbildIHsgfSk7CiB9CiAKIHZvaWQgUERGUGx1Z2luOjp1bmNvbmRpdGlvbmFsQ29t cGxldGVPdXRzdGFuZGluZ1JhbmdlUmVxdWVzdHMoKQo=