94649 2012-08-21 16:51:51 -0700 Populate DatabaseTracker's origins lazily on demand 2012-08-24 16:18:35 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin beidson webkit.review.bot oldest_to_newest 701307 0 benjamin 2012-08-21 16:51:51 -0700 Synchronous accesses to the disk = BAD! 701320 1 159806 benjamin 2012-08-21 16:59:09 -0700 Created attachment 159806 Patch 704415 2 159806 beidson 2012-08-24 14:22:02 -0700 Comment on attachment 159806 Patch I would like to see populateOrigins() renamed to populateOriginsIfNeeded() to make it clear to readers of the individual functions that there's no recurring side effect or cost. 704454 3 160510 benjamin 2012-08-24 15:18:01 -0700 Created attachment 160510 Patch 704497 4 160510 webkit.review.bot 2012-08-24 16:18:32 -0700 Comment on attachment 160510 Patch Clearing flags on attachment: 160510 Committed r126648: <http://trac.webkit.org/changeset/126648> 704498 5 webkit.review.bot 2012-08-24 16:18:35 -0700 All reviewed patches have been landed. Closing bug. 159806 2012-08-21 16:59:09 -0700 2012-08-24 15:17:59 -0700 Patch bug-94649-20120821165908.patch text/plain 4114 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWZlZGQzMWNlMzI1N2Vk NzA1ZGUyZDUwNTcxMjViODA0NzAyYmMxZS4uZDJkNzFmNmZlYjQ0ZDYzNzZmMjVjYzY4MzA2MjQ3 MDgwNWZmOTU4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA4LTIxICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFBvcHVsYXRlIERh dGFiYXNlVHJhY2tlcidzIG9yaWdpbnMgbGF6aWx5IG9uIGRlbWFuZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ2NDkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmV2aW91c2x5LCB3ZSB3b3VsZCBwb3B1 bGF0ZSBtX3F1b3RhTWFwIG9uIHN0YXJ0dXAgd2hlbiBpbml0aWFsaWFsaXppbmcgRGF0YWJhc2VU cmFja2VyLgorICAgICAgICBUaGlzIHRha2VzIGEgc2lnbmlmaWNhbnQgYW1vdW50IG9mIHRpbWUg YW5kIG1lbW9yeSBhbmQgaXQgaXMgbm90IG5lZWRlZCBpbiBtYW55IGNhc2VzLgorCisgICAgICAg IFRoaXMgcGF0Y2ggY2hhbmdlIERhdGFiYXNlVHJhY2tlciB0byBpbnZva2UgcG9wdWxhdGVPcmln aW5zKCkgb25seSB3aGVuIG5lZWRlZC4KKyAgICAgICAgVGhpcyBzYXZlczoKKyAgICAgICAgLTct MTVtcyBvbiBzdGFydHVwLgorICAgICAgICAtOTZLYnl0ZXMgb2YgU1FMaXRlIHBhZ2UgY2FjaGUK KyAgICAgICAgLXRoZSBzaXplIG9mIG1fcXVvdGFNYXAgb24gdGhhdCBwYXJ0aWN1bGFyIHN5c3Rl bS4KKworICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUcmFja2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6RGF0YWJhc2VUcmFja2VyKToKKyAg ICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6aGFzRW50cnlGb3JPcmlnaW5Ob0xvY2sp OgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjpvcmlnaW5zKToKKyAgICAgICAg KFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6cXVvdGFGb3JPcmlnaW5Ob0xvY2spOgorICAgICAg ICAoV2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjphZGREYXRhYmFzZSk6CisgICAgICAgIChXZWJD b3JlOjpEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZU9yaWdpbik6CisKIDIwMTItMDgtMjEgIFRhaWp1 IFRzdWlraSAgPHR6aWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNw bGl0IG91dCBjcnVtYiBsaXN0IHBhcnQgb2Ygc3R5bGVzIGZyb20gZWxlbWVudHNQYW5lbC5jc3MK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VU cmFja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VU cmFja2VyLmNwcAppbmRleCAwZTU3OTNjZmYxZTYzNTI0MDM2MjllMmQwOWM2MzY0NjMwMzMyNTBl Li44YTBjMDQ0MGYzZGU5MzcxMWQ2MmRmZTY4NWM1YjU5Nzk1OTRlZTI1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVHJhY2tlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRyYWNrZXIuY3Bw CkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDgsIDIw MTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICog bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCkBAIC04NCw5ICs4NCw2IEBAIERhdGFiYXNlVHJhY2tlcjo6RGF0YWJhc2VUcmFj a2VyKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VQYXRoKQogICAgIHNldERhdGFiYXNlRGlyZWN0b3J5 UGF0aChkYXRhYmFzZVBhdGgpOwogICAgIAogICAgIFNRTGl0ZUZpbGVTeXN0ZW06OnJlZ2lzdGVy U1FMaXRlVkZTKCk7Ci0KLSAgICBNdXRleExvY2tlciBsb2NrRGF0YWJhc2UobV9kYXRhYmFzZUd1 YXJkKTsKLSAgICBwb3B1bGF0ZU9yaWdpbnMoKTsKIH0KIAogdm9pZCBEYXRhYmFzZVRyYWNrZXI6 OnNldERhdGFiYXNlRGlyZWN0b3J5UGF0aChjb25zdCBTdHJpbmcmIHBhdGgpCkBAIC0xOTQsNiAr MTkxLDcgQEAgYm9vbCBEYXRhYmFzZVRyYWNrZXI6OmNhbkVzdGFibGlzaERhdGFiYXNlKFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbnMKIGJvb2wgRGF0YWJhc2VUcmFja2VyOjpo YXNFbnRyeUZvck9yaWdpbk5vTG9jayhTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogewogICAgIEFT U0VSVCghbV9kYXRhYmFzZUd1YXJkLnRyeUxvY2soKSk7CisgICAgcG9wdWxhdGVPcmlnaW5zKCk7 CiAgICAgQVNTRVJUKG1fcXVvdGFNYXApOwogICAgIHJldHVybiBtX3F1b3RhTWFwLT5jb250YWlu cyhvcmlnaW4pOwogfQpAQCAtMzY0LDYgKzM2Miw3IEBAIHZvaWQgRGF0YWJhc2VUcmFja2VyOjpw b3B1bGF0ZU9yaWdpbnMoKQogdm9pZCBEYXRhYmFzZVRyYWNrZXI6Om9yaWdpbnMoVmVjdG9yPFJl ZlB0cjxTZWN1cml0eU9yaWdpbj4gPiYgcmVzdWx0KQogewogICAgIE11dGV4TG9ja2VyIGxvY2tE YXRhYmFzZShtX2RhdGFiYXNlR3VhcmQpOworICAgIHBvcHVsYXRlT3JpZ2lucygpOwogICAgIEFT U0VSVChtX3F1b3RhTWFwKTsKICAgICBjb3B5S2V5c1RvVmVjdG9yKCptX3F1b3RhTWFwLCByZXN1 bHQpOwogfQpAQCAtNjQ1LDYgKzY0NCw3IEBAIHVuc2lnbmVkIGxvbmcgbG9uZyBEYXRhYmFzZVRy YWNrZXI6OnVzYWdlRm9yT3JpZ2luKFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pCiB1bnNpZ25lZCBs b25nIGxvbmcgRGF0YWJhc2VUcmFja2VyOjpxdW90YUZvck9yaWdpbk5vTG9jayhTZWN1cml0eU9y aWdpbiogb3JpZ2luKQogewogICAgIEFTU0VSVCghbV9kYXRhYmFzZUd1YXJkLnRyeUxvY2soKSk7 CisgICAgcG9wdWxhdGVPcmlnaW5zKCk7CiAgICAgQVNTRVJUKG1fcXVvdGFNYXApOwogICAgIHJl dHVybiBtX3F1b3RhTWFwLT5nZXQob3JpZ2luKTsKIH0KQEAgLTcwNSwxMCArNzA1LDExIEBAIHZv aWQgRGF0YWJhc2VUcmFja2VyOjpzZXRRdW90YShTZWN1cml0eU9yaWdpbiogb3JpZ2luLCB1bnNp Z25lZCBsb25nIGxvbmcgcXVvdGEpCiBib29sIERhdGFiYXNlVHJhY2tlcjo6YWRkRGF0YWJhc2Uo U2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcm IHBhdGgpCiB7CiAgICAgQVNTRVJUKCFtX2RhdGFiYXNlR3VhcmQudHJ5TG9jaygpKTsKLSAgICBB U1NFUlQobV9xdW90YU1hcCk7CiAgICAgb3BlblRyYWNrZXJEYXRhYmFzZSh0cnVlKTsKICAgICBp ZiAoIW1fZGF0YWJhc2UuaXNPcGVuKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBwb3B1 bGF0ZU9yaWdpbnMoKTsKKyAgICBBU1NFUlQobV9xdW90YU1hcCk7CiAKICAgICAvLyBOZXcgZGF0 YWJhc2Ugc2hvdWxkIG5ldmVyIGJlIGFkZGVkIHVudGlsIHRoZSBvcmlnaW4gaGFzIGJlZW4gZXN0 YWJsaXNoZWQKICAgICBBU1NFUlQoaGFzRW50cnlGb3JPcmlnaW5Ob0xvY2sob3JpZ2luKSk7CkBA IC04MDUsNiArODA2LDcgQEAgYm9vbCBEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZU9yaWdpbihTZWN1 cml0eU9yaWdpbiogb3JpZ2luKQogCiAgICAgICAgIFNRTGl0ZUZpbGVTeXN0ZW06OmRlbGV0ZUVt cHR5RGF0YWJhc2VEaXJlY3Rvcnkob3JpZ2luUGF0aChvcmlnaW4pKTsKIAorICAgICAgICBwb3B1 bGF0ZU9yaWdpbnMoKTsKICAgICAgICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBvcmlnaW5Qb3Nz aWJseUxhc3RSZWZlcmVuY2UgPSBvcmlnaW47CiAgICAgICAgIG1fcXVvdGFNYXAtPnJlbW92ZShv cmlnaW4pOwogCg== 160510 2012-08-24 15:18:01 -0700 2012-08-24 16:18:32 -0700 Patch bug-94649-20120824151755.patch text/plain 5317 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOThhZjE4YjMyZGFlNGU5 MDE1MWQ0MzRlZTM0NmJjMjQ5OWZkNDJjMi4uZjExNTEwNTVlZWVjMDkxY2MwOTExZTY2MmUwNGMx NjRkYWY3OThjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA4LTI0ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFBvcHVsYXRlIERh dGFiYXNlVHJhY2tlcidzIG9yaWdpbnMgbGF6aWx5IG9uIGRlbWFuZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ2NDkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmV2aW91c2x5LCB3ZSB3b3VsZCBwb3B1 bGF0ZSBtX3F1b3RhTWFwIG9uIHN0YXJ0dXAgd2hlbiBpbml0aWFsaWFsaXppbmcgRGF0YWJhc2VU cmFja2VyLgorICAgICAgICBUaGlzIHRha2VzIGEgc2lnbmlmaWNhbnQgYW1vdW50IG9mIHRpbWUg YW5kIG1lbW9yeSBhbmQgaXQgaXMgbm90IG5lZWRlZCBpbiBtYW55IGNhc2VzLgorCisgICAgICAg IFRoaXMgcGF0Y2ggY2hhbmdlIERhdGFiYXNlVHJhY2tlciB0byBpbnZva2UgcG9wdWxhdGVPcmln aW5zKCkgb25seSB3aGVuIG5lZWRlZC4KKyAgICAgICAgVGhpcyBzYXZlczoKKyAgICAgICAgLTct MTVtcyBvbiBzdGFydHVwLgorICAgICAgICAtOTZLYnl0ZXMgb2YgU1FMaXRlIHBhZ2UgY2FjaGUK KyAgICAgICAgLXRoZSBzaXplIG9mIG1fcXVvdGFNYXAgb24gdGhhdCBwYXJ0aWN1bGFyIHN5c3Rl bS4KKworICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUcmFja2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6RGF0YWJhc2VUcmFja2VyKToKKyAg ICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6aGFzRW50cnlGb3JPcmlnaW5Ob0xvY2sp OgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjpwb3B1bGF0ZU9yaWdpbnNJZk5l ZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6Om9yaWdpbnMpOgorICAg ICAgICAoV2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjpxdW90YUZvck9yaWdpbk5vTG9jayk6Cisg ICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OmFkZERhdGFiYXNlKToKKyAgICAgICAg KFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6ZGVsZXRlT3JpZ2luKToKKyAgICAgICAgKiBNb2R1 bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVHJhY2tlci5oOgorICAgICAgICAoRGF0YWJhc2VUcmFj a2VyKToKKwogMjAxMi0wOC0yNCAgQW5kcmVpIE9uZWEgIDxvbmVhQGFkb2JlLmNvbT4KIAogICAg ICAgICBbQ1NTUmVnaW9uc11FeHBvc2UgV2ViS2l0TmFtZWRGbG93Q29sbGVjdGlvbiBpbnRlcmZh Y2UgdGhyb3VnaCBkb2N1bWVudC5nZXROYW1lZEZsb3dzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUcmFja2VyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUcmFja2VyLmNwcAppbmRleCAwZTU3 OTNjZmYxZTYzNTI0MDM2MjllMmQwOWM2MzY0NjMwMzMyNTBlLi40NmQyODEyOTJkOWI3ZTQzN2I1 ZGUwZjMyNWZhZjI0NWM4MTYzYWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L3dlYmRhdGFiYXNlL0RhdGFiYXNlVHJhY2tlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRyYWNrZXIuY3BwCkBAIC0xLDUgKzEsNSBAQAogLyoK LSAqIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDgsIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC04NCw5ICs4 NCw2IEBAIERhdGFiYXNlVHJhY2tlcjo6RGF0YWJhc2VUcmFja2VyKGNvbnN0IFN0cmluZyYgZGF0 YWJhc2VQYXRoKQogICAgIHNldERhdGFiYXNlRGlyZWN0b3J5UGF0aChkYXRhYmFzZVBhdGgpOwog ICAgIAogICAgIFNRTGl0ZUZpbGVTeXN0ZW06OnJlZ2lzdGVyU1FMaXRlVkZTKCk7Ci0KLSAgICBN dXRleExvY2tlciBsb2NrRGF0YWJhc2UobV9kYXRhYmFzZUd1YXJkKTsKLSAgICBwb3B1bGF0ZU9y aWdpbnMoKTsKIH0KIAogdm9pZCBEYXRhYmFzZVRyYWNrZXI6OnNldERhdGFiYXNlRGlyZWN0b3J5 UGF0aChjb25zdCBTdHJpbmcmIHBhdGgpCkBAIC0xOTQsNiArMTkxLDcgQEAgYm9vbCBEYXRhYmFz ZVRyYWNrZXI6OmNhbkVzdGFibGlzaERhdGFiYXNlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNv bnRleHQsIGNvbnMKIGJvb2wgRGF0YWJhc2VUcmFja2VyOjpoYXNFbnRyeUZvck9yaWdpbk5vTG9j ayhTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogewogICAgIEFTU0VSVCghbV9kYXRhYmFzZUd1YXJk LnRyeUxvY2soKSk7CisgICAgcG9wdWxhdGVPcmlnaW5zSWZOZWVkZWQoKTsKICAgICBBU1NFUlQo bV9xdW90YU1hcCk7CiAgICAgcmV0dXJuIG1fcXVvdGFNYXAtPmNvbnRhaW5zKG9yaWdpbik7CiB9 CkBAIC0zMzIsNyArMzMwLDcgQEAgU3RyaW5nIERhdGFiYXNlVHJhY2tlcjo6ZnVsbFBhdGhGb3JE YXRhYmFzZShTZWN1cml0eU9yaWdpbiogb3JpZ2luLCBjb25zdCBTdHJpbmcKICAgICByZXR1cm4g ZnVsbFBhdGhGb3JEYXRhYmFzZU5vTG9jayhvcmlnaW4sIG5hbWUsIGNyZWF0ZUlmTm90RXhpc3Rz KS5pc29sYXRlZENvcHkoKTsKIH0KIAotdm9pZCBEYXRhYmFzZVRyYWNrZXI6OnBvcHVsYXRlT3Jp Z2lucygpCit2b2lkIERhdGFiYXNlVHJhY2tlcjo6cG9wdWxhdGVPcmlnaW5zSWZOZWVkZWQoKQog ewogICAgIEFTU0VSVCghbV9kYXRhYmFzZUd1YXJkLnRyeUxvY2soKSk7CiAgICAgaWYgKG1fcXVv dGFNYXApCkBAIC0zNjQsNiArMzYyLDcgQEAgdm9pZCBEYXRhYmFzZVRyYWNrZXI6OnBvcHVsYXRl T3JpZ2lucygpCiB2b2lkIERhdGFiYXNlVHJhY2tlcjo6b3JpZ2lucyhWZWN0b3I8UmVmUHRyPFNl Y3VyaXR5T3JpZ2luPiA+JiByZXN1bHQpCiB7CiAgICAgTXV0ZXhMb2NrZXIgbG9ja0RhdGFiYXNl KG1fZGF0YWJhc2VHdWFyZCk7CisgICAgcG9wdWxhdGVPcmlnaW5zSWZOZWVkZWQoKTsKICAgICBB U1NFUlQobV9xdW90YU1hcCk7CiAgICAgY29weUtleXNUb1ZlY3RvcigqbV9xdW90YU1hcCwgcmVz dWx0KTsKIH0KQEAgLTY0NSw2ICs2NDQsNyBAQCB1bnNpZ25lZCBsb25nIGxvbmcgRGF0YWJhc2VU cmFja2VyOjp1c2FnZUZvck9yaWdpbihTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogdW5zaWduZWQg bG9uZyBsb25nIERhdGFiYXNlVHJhY2tlcjo6cXVvdGFGb3JPcmlnaW5Ob0xvY2soU2VjdXJpdHlP cmlnaW4qIG9yaWdpbikKIHsKICAgICBBU1NFUlQoIW1fZGF0YWJhc2VHdWFyZC50cnlMb2NrKCkp OworICAgIHBvcHVsYXRlT3JpZ2luc0lmTmVlZGVkKCk7CiAgICAgQVNTRVJUKG1fcXVvdGFNYXAp OwogICAgIHJldHVybiBtX3F1b3RhTWFwLT5nZXQob3JpZ2luKTsKIH0KQEAgLTcwNSwxMCArNzA1 LDExIEBAIHZvaWQgRGF0YWJhc2VUcmFja2VyOjpzZXRRdW90YShTZWN1cml0eU9yaWdpbiogb3Jp Z2luLCB1bnNpZ25lZCBsb25nIGxvbmcgcXVvdGEpCiBib29sIERhdGFiYXNlVHJhY2tlcjo6YWRk RGF0YWJhc2UoU2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25z dCBTdHJpbmcmIHBhdGgpCiB7CiAgICAgQVNTRVJUKCFtX2RhdGFiYXNlR3VhcmQudHJ5TG9jaygp KTsKLSAgICBBU1NFUlQobV9xdW90YU1hcCk7CiAgICAgb3BlblRyYWNrZXJEYXRhYmFzZSh0cnVl KTsKICAgICBpZiAoIW1fZGF0YWJhc2UuaXNPcGVuKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICBwb3B1bGF0ZU9yaWdpbnNJZk5lZWRlZCgpOworICAgIEFTU0VSVChtX3F1b3RhTWFwKTsK IAogICAgIC8vIE5ldyBkYXRhYmFzZSBzaG91bGQgbmV2ZXIgYmUgYWRkZWQgdW50aWwgdGhlIG9y aWdpbiBoYXMgYmVlbiBlc3RhYmxpc2hlZAogICAgIEFTU0VSVChoYXNFbnRyeUZvck9yaWdpbk5v TG9jayhvcmlnaW4pKTsKQEAgLTgwNSw2ICs4MDYsNyBAQCBib29sIERhdGFiYXNlVHJhY2tlcjo6 ZGVsZXRlT3JpZ2luKFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pCiAKICAgICAgICAgU1FMaXRlRmls ZVN5c3RlbTo6ZGVsZXRlRW1wdHlEYXRhYmFzZURpcmVjdG9yeShvcmlnaW5QYXRoKG9yaWdpbikp OwogCisgICAgICAgIHBvcHVsYXRlT3JpZ2luc0lmTmVlZGVkKCk7CiAgICAgICAgIFJlZlB0cjxT ZWN1cml0eU9yaWdpbj4gb3JpZ2luUG9zc2libHlMYXN0UmVmZXJlbmNlID0gb3JpZ2luOwogICAg ICAgICBtX3F1b3RhTWFwLT5yZW1vdmUob3JpZ2luKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRhYmFzZVRyYWNrZXIuaCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUcmFja2VyLmgKaW5kZXggNGZmN2ZhMmM5 ZTliNjAyNzQ1MWRhYjcwMzAyY2U3YzhhN2Q1Y2M2NS4uNmM3MGVhNWI3Y2E4YzVjZWQzNjE0M2Zh MjdkNzZiZDZiMjA5YjVjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJk YXRhYmFzZS9EYXRhYmFzZVRyYWNrZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YmRhdGFiYXNlL0RhdGFiYXNlVHJhY2tlci5oCkBAIC0xMjUsNyArMTI1LDcgQEAgcHJpdmF0ZToK ICAgICBib29sIGhhc0VudHJ5Rm9yRGF0YWJhc2UoU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBTdHJp bmcmIGRhdGFiYXNlSWRlbnRpZmllcik7CiAKICAgICBib29sIGFkZERhdGFiYXNlKFNlY3VyaXR5 T3JpZ2luKiwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHBhdGgpOwotICAgIHZv aWQgcG9wdWxhdGVPcmlnaW5zKCk7CisgICAgdm9pZCBwb3B1bGF0ZU9yaWdpbnNJZk5lZWRlZCgp OwogCiAgICAgYm9vbCBkZWxldGVEYXRhYmFzZUZpbGUoU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBT dHJpbmcmIG5hbWUpOwogCg==