168541 2017-02-17 17:16:06 -0800 Resource Load Statistics: Only scan website data store once per session ID + reinstate removal counting 2017-02-21 14:57:16 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=167474 P2 Normal --- 1 wilander wilander aestes commit-queue wilander oldest_to_newest 1278527 0 wilander 2017-02-17 17:16:06 -0800 As of https://bugs.webkit.org/show_bug.cgi?id=167474 we iterate over all pages' WebsiteDataStores. Since pages share data stores we should make sure to only scan a WebsiteDataStore with a specific session ID once. https://bugs.webkit.org/show_bug.cgi?id=167474 also explicitly regressed data record removal counting. We should add it back in. 1278529 1 302020 wilander 2017-02-17 17:25:06 -0800 Created attachment 302020 Patch 1278531 2 wilander 2017-02-17 17:26:38 -0800 Andy, this is small a follow-up patch to https://bugs.webkit.org/show_bug.cgi?id=167474 which you reviewed. 1279533 3 302020 wilander 2017-02-21 14:31:03 -0800 Comment on attachment 302020 Patch Thanks, Alex! 1279556 4 302020 commit-queue 2017-02-21 14:57:13 -0800 Comment on attachment 302020 Patch Clearing flags on attachment: 302020 Committed r212766: <http://trac.webkit.org/changeset/212766> 1279557 5 commit-queue 2017-02-21 14:57:16 -0800 All reviewed patches have been landed. Closing bug. 302020 2017-02-17 17:25:06 -0800 2017-02-21 14:57:13 -0800 Patch bug-168541-20170217172228.patch text/plain 11762 wilander SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMjU5NykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE3LTAyLTE3ICBKb2huIFdp bGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlIExvYWQgU3Rh dGlzdGljczogT25seSBzY2FuIHdlYnNpdGUgZGF0YSBzdG9yZSBvbmNlIHBlciBzZXNzaW9uIElE ICsgcmVpbnN0YXRlIHJlbW92YWwgY291bnRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODU0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6ZGVsZXRlV2Vic2l0ZURhdGFGb3JUb3BQ cml2YXRlbHlPd25lZERvbWFpbnNJbkFsbFBlcnNpc3RlbnREYXRhU3RvcmVzKToKKyAgICAgICAg ICAgIFRoZSBDYWxsYmFja0FnZ3JlZ2F0b3Igbm93IG1lcmdlcyBhIGxpc3Qgb2YgZG9tYWlucyBm b3Igd2hpY2ggd2UKKyAgICAgICAgICAgIGhhdmUgcmVtb3ZlZCBkYXRhIHJlY29yZHMgYW5kIGV2 ZW50dWFsbHkgcmVwb3J0cyB0aGlzIGJhY2sgdG8gdGhlCisgICAgICAgICAgICBjYWxsZXIuCisg ICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlbW92ZURhdGFSZWNvcmRzKToKKyAgICAg ICAgICAgIE5vdyByZXBvcnRzIGJhY2sgdG8gaXRzIFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZQorICAgICAgICAgICAgd2hpY2ggZG9tYWlucyBoYXZlIGhhZCBkYXRhIHJlY29y ZHMgcmVtb3ZlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFT dG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OmZldGNoRGF0YUZv clRvcFByaXZhdGVseU93bmVkRG9tYWlucyk6CisgICAgICAgICAgICBUaGUgY29tcGxldGlvbiBo YW5kbGVyIG5vdyBoYW5kbGVzIGRhdGEgcmVjb3JkIHJlbW92YWwgY291bnRpbmcuCisgICAgICAg IChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGFGb3JUb3BQcml2YXRlbHlPd25l ZERvbWFpbnMpOgorICAgICAgICAgICAgVGhlIGNvbXBsZXRpb24gaGFuZGxlciBub3cgaGFuZGxl cyBkYXRhIHJlY29yZCByZW1vdmFsIGNvdW50aW5nLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJz aXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmg6CisKIDIwMTctMDItMTcgIEJyaWFuIEJ1cmcgIDxi YnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUlRMOiBJbnNwZWN0b3Ig d2luZG93IHNob3VsZCBkb2NrIHRvIHRoZSBsZWZ0IHdoZW4gdXNpbmcgUlRMIGxheW91dCBkaXJl Y3Rpb24KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwCShyZXZpc2lvbiAyMTI1NjEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjAwLDEzICsyMDAsMTcgQEAgV2ViUGFn ZVByb3h5KiBXZWJQcm9jZXNzUHJveHk6OndlYlBhZ2UodQogICAgIHJldHVybiBnbG9iYWxQYWdl TWFwKCkuZ2V0KHBhZ2VJRCk7CiB9CiAKLXZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkZWxldGVXZWJz aXRlRGF0YUZvclRvcFByaXZhdGVseU93bmVkRG9tYWluc0luQWxsUGVyc2lzdGVudERhdGFTdG9y ZXMoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBWZWN0b3I8U3RyaW5nPiYg dG9wUHJpdmF0ZWx5T3duZWREb21haW5zLCBib29sIHNob3VsZE5vdGlmeVBhZ2UsIHN0ZDo6ZnVu Y3Rpb248dm9pZCgpPiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpk ZWxldGVXZWJzaXRlRGF0YUZvclRvcFByaXZhdGVseU93bmVkRG9tYWluc0luQWxsUGVyc2lzdGVu dERhdGFTdG9yZXMoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBWZWN0b3I8 U3RyaW5nPiYgdG9wUHJpdmF0ZWx5T3duZWREb21haW5zLCBib29sIHNob3VsZE5vdGlmeVBhZ2Us IHN0ZDo6ZnVuY3Rpb248dm9pZChWZWN0b3I8U3RyaW5nPik+IGNvbXBsZXRpb25IYW5kbGVyKQog ewogICAgIHN0cnVjdCBDYWxsYmFja0FnZ3JlZ2F0b3IgOiBUaHJlYWRTYWZlUmVmQ291bnRlZDxD YWxsYmFja0FnZ3JlZ2F0b3I+IHsKLSAgICAgICAgZXhwbGljaXQgQ2FsbGJhY2tBZ2dyZWdhdG9y KHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBjb21wbGV0aW9uSGFuZGxlcikKKyAgICAgICAgZXhwbGlj aXQgQ2FsbGJhY2tBZ2dyZWdhdG9yKHN0ZDo6ZnVuY3Rpb248dm9pZChWZWN0b3I8U3RyaW5nPik+ IGNvbXBsZXRpb25IYW5kbGVyKQogICAgICAgICAgICAgOiBjb21wbGV0aW9uSGFuZGxlcihXVEZN b3ZlKGNvbXBsZXRpb25IYW5kbGVyKSkKICAgICAgICAgewogICAgICAgICB9CisgICAgICAgIHZv aWQgYWRkRG9tYWluc1dpdGhEZWxldGVkV2Vic2l0ZURhdGEoY29uc3QgVmVjdG9yPFN0cmluZz4m IGRvbWFpbnMpCisgICAgICAgIHsKKyAgICAgICAgICAgIGRvbWFpbnNXaXRoRGVsZXRlZFdlYnNp dGVEYXRhLmFwcGVuZFZlY3Rvcihkb21haW5zKTsKKyAgICAgICAgfQogICAgICAgICAKICAgICAg ICAgdm9pZCBhZGRQZW5kaW5nQ2FsbGJhY2soKQogICAgICAgICB7CkBAIC0yMjQsMjMgKzIyOCwy OCBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGVsZXRlV2Vic2l0ZURhdGFGCiAgICAgICAgIHZv aWQgY2FsbElmTmVlZGVkKCkKICAgICAgICAgewogICAgICAgICAgICAgaWYgKCFwZW5kaW5nQ2Fs bGJhY2tzKQotICAgICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CisgICAgICAgICAg ICAgICAgY29tcGxldGlvbkhhbmRsZXIoZG9tYWluc1dpdGhEZWxldGVkV2Vic2l0ZURhdGEpOwog ICAgICAgICB9CiAgICAgICAgIAogICAgICAgICB1bnNpZ25lZCBwZW5kaW5nQ2FsbGJhY2tzID0g MDsKLSAgICAgICAgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGNvbXBsZXRpb25IYW5kbGVyOworICAg ICAgICBzdGQ6OmZ1bmN0aW9uPHZvaWQoVmVjdG9yPFN0cmluZz4pPiBjb21wbGV0aW9uSGFuZGxl cjsKKyAgICAgICAgVmVjdG9yPFN0cmluZz4gZG9tYWluc1dpdGhEZWxldGVkV2Vic2l0ZURhdGE7 CiAgICAgfTsKICAgICAKICAgICBSZWZQdHI8Q2FsbGJhY2tBZ2dyZWdhdG9yPiBjYWxsYmFja0Fn Z3JlZ2F0b3IgPSBhZG9wdFJlZihuZXcgQ2FsbGJhY2tBZ2dyZWdhdG9yKFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpKSk7CiAKKyAgICBIYXNoU2V0PFdlYkNvcmU6OlNlc3Npb25JRD4gdmlzaXRl ZFNlc3Npb25JRHM7CiAgICAgZm9yIChhdXRvJiBwYWdlIDogZ2xvYmFsUGFnZU1hcCgpKSB7Ci0g ICAgICAgIGlmICghcGFnZS52YWx1ZS0+d2Vic2l0ZURhdGFTdG9yZSgpLmlzUGVyc2lzdGVudCgp KQorICAgICAgICBhdXRvJiBkYXRhU3RvcmUgPSBwYWdlLnZhbHVlLT53ZWJzaXRlRGF0YVN0b3Jl KCk7CisgICAgICAgIGlmICghZGF0YVN0b3JlLmlzUGVyc2lzdGVudCgpIHx8IHZpc2l0ZWRTZXNz aW9uSURzLmNvbnRhaW5zKGRhdGFTdG9yZS5zZXNzaW9uSUQoKSkpCiAgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgdmlzaXRlZFNlc3Npb25JRHMuYWRkKGRhdGFTdG9yZS5zZXNzaW9uSUQo KSk7CiAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVuZGluZ0NhbGxiYWNrKCk7Ci0g ICAgICAgIHBhZ2UudmFsdWUtPndlYnNpdGVEYXRhU3RvcmUoKS5yZW1vdmVEYXRhRm9yVG9wUHJp dmF0ZWx5T3duZWREb21haW5zKGRhdGFUeXBlcywgeyB9LCB0b3BQcml2YXRlbHlPd25lZERvbWFp bnMsIFtjYWxsYmFja0FnZ3JlZ2F0b3IsIHNob3VsZE5vdGlmeVBhZ2UsIHBhZ2VdKCkgeworICAg ICAgICBkYXRhU3RvcmUucmVtb3ZlRGF0YUZvclRvcFByaXZhdGVseU93bmVkRG9tYWlucyhkYXRh VHlwZXMsIHsgfSwgdG9wUHJpdmF0ZWx5T3duZWREb21haW5zLCBbY2FsbGJhY2tBZ2dyZWdhdG9y LCBzaG91bGROb3RpZnlQYWdlLCBwYWdlXShhdXRvIGRvbWFpbnNXaXRoRGVsZXRlZFdlYnNpdGVE YXRhKSB7CiAgICAgICAgICAgICBpZiAoc2hvdWxkTm90aWZ5UGFnZSkKICAgICAgICAgICAgICAg ICBwYWdlLnZhbHVlLT5wb3N0TWVzc2FnZVRvSW5qZWN0ZWRCdW5kbGUoIldlYnNpdGVEYXRhRGVs ZXRpb25Gb3JUb3BQcml2YXRlbHlPd25lZERvbWFpbnNGaW5pc2hlZCIsIG51bGxwdHIpOwotICAg ICAgICAgICAgV1RGOjpSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW2NhbGxiYWNrQWdncmVnYXRv cl0geworICAgICAgICAgICAgV1RGOjpSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW2NhbGxiYWNr QWdncmVnYXRvciwgZG9tYWluc1dpdGhEZWxldGVkV2Vic2l0ZURhdGFdIHsKKyAgICAgICAgICAg ICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPmFkZERvbWFpbnNXaXRoRGVsZXRlZFdlYnNpdGVEYXRh KGRvbWFpbnNXaXRoRGVsZXRlZFdlYnNpdGVEYXRhKTsKICAgICAgICAgICAgICAgICBjYWxsYmFj a0FnZ3JlZ2F0b3ItPnJlbW92ZVBlbmRpbmdDYWxsYmFjaygpOwogICAgICAgICAgICAgfSk7CiAg ICAgICAgIH0pOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJv eHkuaAkocmV2aXNpb24gMjEyNTYxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjAsNyArMTIwLDcgQEAgcHVibGljOgog ICAgIHZvaWQgZmV0Y2hXZWJzaXRlRGF0YShXZWJDb3JlOjpTZXNzaW9uSUQsIE9wdGlvblNldDxX ZWJzaXRlRGF0YVR5cGU+LCBGdW5jdGlvbjx2b2lkKFdlYnNpdGVEYXRhKT4gY29tcGxldGlvbkhh bmRsZXIpOwogICAgIHZvaWQgZGVsZXRlV2Vic2l0ZURhdGEoV2ViQ29yZTo6U2Vzc2lvbklELCBP cHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiwgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGlt ZV9wb2ludCBtb2RpZmllZFNpbmNlLCBGdW5jdGlvbjx2b2lkKCk+IGNvbXBsZXRpb25IYW5kbGVy KTsKICAgICB2b2lkIGRlbGV0ZVdlYnNpdGVEYXRhRm9yT3JpZ2lucyhXZWJDb3JlOjpTZXNzaW9u SUQsIE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+LCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6U2Vj dXJpdHlPcmlnaW5EYXRhPiYsIEZ1bmN0aW9uPHZvaWQoKT4gY29tcGxldGlvbkhhbmRsZXIpOwot ICAgIHN0YXRpYyB2b2lkIGRlbGV0ZVdlYnNpdGVEYXRhRm9yVG9wUHJpdmF0ZWx5T3duZWREb21h aW5zSW5BbGxQZXJzaXN0ZW50RGF0YVN0b3JlcyhPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiwg VmVjdG9yPFN0cmluZz4mIHRvcFByaXZhdGVseU93bmVkRG9tYWlucywgYm9vbCBzaG91bGROb3Rp ZnlQYWdlcywgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGNvbXBsZXRpb25IYW5kbGVyKTsKKyAgICBz dGF0aWMgdm9pZCBkZWxldGVXZWJzaXRlRGF0YUZvclRvcFByaXZhdGVseU93bmVkRG9tYWluc0lu QWxsUGVyc2lzdGVudERhdGFTdG9yZXMoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4sIFZlY3Rv cjxTdHJpbmc+JiB0b3BQcml2YXRlbHlPd25lZERvbWFpbnMsIGJvb2wgc2hvdWxkTm90aWZ5UGFn ZXMsIHN0ZDo6ZnVuY3Rpb248dm9pZChWZWN0b3I8U3RyaW5nPik+IGNvbXBsZXRpb25IYW5kbGVy KTsKIAogICAgIHZvaWQgZW5hYmxlU3VkZGVuVGVybWluYXRpb24oKTsKICAgICB2b2lkIGRpc2Fi bGVTdWRkZW5UZXJtaW5hdGlvbigpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAJKHJldmlz aW9uIDIxMjU2MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTgsNyArMTU4LDggQEAgdm9p ZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnJlbQogCiAgICAgLy8gU3dpdGNoIHRv IHRoZSBtYWluIHRocmVhZCB0byBnZXQgdGhlIGRlZmF1bHQgd2Vic2l0ZSBkYXRhIHN0b3JlCiAg ICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcmV2YWxlbnRSZXNvdXJjZURvbWFpbnMgPSBX VEZNb3ZlKHByZXZhbGVudFJlc291cmNlRG9tYWlucyksIHRoaXNdICgpIG11dGFibGUgewotICAg ICAgICBXZWJQcm9jZXNzUHJveHk6OmRlbGV0ZVdlYnNpdGVEYXRhRm9yVG9wUHJpdmF0ZWx5T3du ZWREb21haW5zSW5BbGxQZXJzaXN0ZW50RGF0YVN0b3JlcyhkYXRhVHlwZXNUb1JlbW92ZSwgcHJl dmFsZW50UmVzb3VyY2VEb21haW5zLCBub3RpZnlQYWdlcywgW3RoaXNdKCkgbXV0YWJsZSB7Cisg ICAgICAgIFdlYlByb2Nlc3NQcm94eTo6ZGVsZXRlV2Vic2l0ZURhdGFGb3JUb3BQcml2YXRlbHlP d25lZERvbWFpbnNJbkFsbFBlcnNpc3RlbnREYXRhU3RvcmVzKGRhdGFUeXBlc1RvUmVtb3ZlLCBw cmV2YWxlbnRSZXNvdXJjZURvbWFpbnMsIG5vdGlmeVBhZ2VzLCBbdGhpc10oVmVjdG9yPFN0cmlu Zz4gZG9tYWluc1dpdGhEZWxldGVkV2Vic2l0ZURhdGEpIG11dGFibGUgeworICAgICAgICAgICAg dGhpcy0+Y29yZVN0b3JlKCkudXBkYXRlU3RhdGlzdGljc0ZvclJlbW92ZWREYXRhUmVjb3Jkcyhk b21haW5zV2l0aERlbGV0ZWRXZWJzaXRlRGF0YSk7CiAgICAgICAgICAgICBtX2RhdGFSZWNvcmRz UmVtb3ZhbFBlbmRpbmcgPSBmYWxzZTsKICAgICAgICAgfSk7CiAgICAgfSk7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVE YXRhU3RvcmUuY3BwCShyZXZpc2lvbiAyMTI1NjEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3 Myw3ICs0NzMsNyBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmZldGNoRGF0YShPcHRpb25TCiAg ICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5jYWxsSWZOZWVkZWQoKTsKIH0KIAotdm9pZCBXZWJzaXRl RGF0YVN0b3JlOjpmZXRjaERhdGFGb3JUb3BQcml2YXRlbHlPd25lZERvbWFpbnMoT3B0aW9uU2V0 PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFGZXRjaE9w dGlvbj4gZmV0Y2hPcHRpb25zLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgdG9wUHJpdmF0ZWx5T3du ZWREb21haW5zLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoVmVjdG9yPFdlYnNpdGVEYXRhUmVjb3JkPik+ IGNvbXBsZXRpb25IYW5kbGVyKQordm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpmZXRjaERhdGFGb3JU b3BQcml2YXRlbHlPd25lZERvbWFpbnMoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5 cGVzLCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFGZXRjaE9wdGlvbj4gZmV0Y2hPcHRpb25zLCBjb25z dCBWZWN0b3I8U3RyaW5nPiYgdG9wUHJpdmF0ZWx5T3duZWREb21haW5zLCBzdGQ6OmZ1bmN0aW9u PHZvaWQoVmVjdG9yPFdlYnNpdGVEYXRhUmVjb3JkPiYmLCBWZWN0b3I8U3RyaW5nPiYmKT4gY29t cGxldGlvbkhhbmRsZXIpCiB7CiAgICAgZmV0Y2hEYXRhKGRhdGFUeXBlcywgZmV0Y2hPcHRpb25z LCBbdG9wUHJpdmF0ZWx5T3duZWREb21haW5zLCBjb21wbGV0aW9uSGFuZGxlciwgdGhpc10oYXV0 byBleGlzdGluZ0RhdGFSZWNvcmRzKSB7CiAgICAgICAgIFZlY3RvcjxXZWJzaXRlRGF0YVJlY29y ZD4gbWF0Y2hpbmdEYXRhUmVjb3JkczsKQEAgLTQ5OCw3ICs0OTgsNyBAQCB2b2lkIFdlYnNpdGVE YXRhU3RvcmU6OmZldGNoRGF0YUZvclRvcFByCiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKG1hdGNo aW5nRGF0YVJlY29yZHMpOworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKG1hdGNo aW5nRGF0YVJlY29yZHMpLCBXVEZNb3ZlKGRvbWFpbnNXaXRoRGF0YVJlY29yZHMpKTsKICAgICB9 KTsKIH0KICAgICAKQEAgLTEwMjcsMTEgKzEwMjcsMTEgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3Jl OjpyZW1vdmVEYXRhKE9wdGlvbgogICAgIGNhbGxiYWNrQWdncmVnYXRvci0+Y2FsbElmTmVlZGVk KCk7CiB9CiAKLXZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YUZvclRvcFByaXZhdGVs eU93bmVkRG9tYWlucyhPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiBkYXRhVHlwZXMsIE9wdGlv blNldDxXZWJzaXRlRGF0YUZldGNoT3B0aW9uPiBmZXRjaE9wdGlvbnMsIGNvbnN0IFZlY3RvcjxT dHJpbmc+JiB0b3BQcml2YXRlbHlPd25lZERvbWFpbnMsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBj b21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YUZvclRv cFByaXZhdGVseU93bmVkRG9tYWlucyhPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiBkYXRhVHlw ZXMsIE9wdGlvblNldDxXZWJzaXRlRGF0YUZldGNoT3B0aW9uPiBmZXRjaE9wdGlvbnMsIGNvbnN0 IFZlY3RvcjxTdHJpbmc+JiB0b3BQcml2YXRlbHlPd25lZERvbWFpbnMsIHN0ZDo6ZnVuY3Rpb248 dm9pZChWZWN0b3I8U3RyaW5nPik+IGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGZldGNoRGF0 YUZvclRvcFByaXZhdGVseU93bmVkRG9tYWlucyhkYXRhVHlwZXMsIGZldGNoT3B0aW9ucywgdG9w UHJpdmF0ZWx5T3duZWREb21haW5zLCBbZGF0YVR5cGVzLCBjb21wbGV0aW9uSGFuZGxlciwgdGhp c10oYXV0byB3ZWJzaXRlRGF0YVJlY29yZHMpIHsKLSAgICAgICAgdGhpcy0+cmVtb3ZlRGF0YShk YXRhVHlwZXMsIHdlYnNpdGVEYXRhUmVjb3JkcywgW2NvbXBsZXRpb25IYW5kbGVyXSgpIHsKLSAg ICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CisgICAgZmV0Y2hEYXRhRm9yVG9wUHJpdmF0 ZWx5T3duZWREb21haW5zKGRhdGFUeXBlcywgZmV0Y2hPcHRpb25zLCB0b3BQcml2YXRlbHlPd25l ZERvbWFpbnMsIFtkYXRhVHlwZXMsIGNvbXBsZXRpb25IYW5kbGVyLCB0aGlzXShhdXRvIHdlYnNp dGVEYXRhUmVjb3JkcywgYXV0byBkb21haW5zV2l0aERhdGFSZWNvcmRzKSB7CisgICAgICAgIHRo aXMtPnJlbW92ZURhdGEoZGF0YVR5cGVzLCB3ZWJzaXRlRGF0YVJlY29yZHMsIFtkb21haW5zV2l0 aERhdGFSZWNvcmRzLCBjb21wbGV0aW9uSGFuZGxlcl0oKSB7CisgICAgICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcihkb21haW5zV2l0aERhdGFSZWNvcmRzKTsKICAgICAgICAgfSk7CiAgICAgfSk7 CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURh dGFTdG9yZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRl RGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgJKHJldmlzaW9uIDIxMjU2MSkKKysrIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTg0LDEwICs4NCwxMCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgY2xvbmVTZXNz aW9uRGF0YShXZWJQYWdlUHJveHkmIHNvdXJjZVBhZ2UsIFdlYlBhZ2VQcm94eSYgbmV3UGFnZSk7 CiAKICAgICB2b2lkIGZldGNoRGF0YShPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiwgT3B0aW9u U2V0PFdlYnNpdGVEYXRhRmV0Y2hPcHRpb24+LCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKFZlY3RvcjxX ZWJzaXRlRGF0YVJlY29yZD4pPiBjb21wbGV0aW9uSGFuZGxlcik7Ci0gICAgdm9pZCBmZXRjaERh dGFGb3JUb3BQcml2YXRlbHlPd25lZERvbWFpbnMoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4s IE9wdGlvblNldDxXZWJzaXRlRGF0YUZldGNoT3B0aW9uPiwgY29uc3QgVmVjdG9yPFN0cmluZz4m IHRvcFByaXZhdGVseU93bmVkRG9tYWlucywgc3RkOjpmdW5jdGlvbjx2b2lkKFZlY3RvcjxXZWJz aXRlRGF0YVJlY29yZD4pPiBjb21wbGV0aW9uSGFuZGxlcik7CisgICAgdm9pZCBmZXRjaERhdGFG b3JUb3BQcml2YXRlbHlPd25lZERvbWFpbnMoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4sIE9w dGlvblNldDxXZWJzaXRlRGF0YUZldGNoT3B0aW9uPiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHRv cFByaXZhdGVseU93bmVkRG9tYWlucywgc3RkOjpmdW5jdGlvbjx2b2lkKFZlY3RvcjxXZWJzaXRl RGF0YVJlY29yZD4mJiwgVmVjdG9yPFN0cmluZz4mJik+IGNvbXBsZXRpb25IYW5kbGVyKTsKICAg ICB2b2lkIHJlbW92ZURhdGEoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4sIHN0ZDo6Y2hyb25v OjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgbW9kaWZpZWRTaW5jZSwgc3RkOjpmdW5jdGlvbjx2 b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcik7CiAgICAgdm9pZCByZW1vdmVEYXRhKE9wdGlvblNl dDxXZWJzaXRlRGF0YVR5cGU+LCBjb25zdCBWZWN0b3I8V2Vic2l0ZURhdGFSZWNvcmQ+Jiwgc3Rk OjpmdW5jdGlvbjx2b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcik7Ci0gICAgdm9pZCByZW1vdmVE YXRhRm9yVG9wUHJpdmF0ZWx5T3duZWREb21haW5zKE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+ LCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFGZXRjaE9wdGlvbj4sIGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiB0b3BQcml2YXRlbHlPd25lZERvbWFpbnMsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBjb21wbGV0 aW9uSGFuZGxlcik7CisgICAgdm9pZCByZW1vdmVEYXRhRm9yVG9wUHJpdmF0ZWx5T3duZWREb21h aW5zKE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+LCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFGZXRj aE9wdGlvbj4sIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiB0b3BQcml2YXRlbHlPd25lZERvbWFpbnMs IHN0ZDo6ZnVuY3Rpb248dm9pZChWZWN0b3I8U3RyaW5nPik+IGNvbXBsZXRpb25IYW5kbGVyKTsK IAogICAgIFN0b3JhZ2VNYW5hZ2VyKiBzdG9yYWdlTWFuYWdlcigpIHsgcmV0dXJuIG1fc3RvcmFn ZU1hbmFnZXIuZ2V0KCk7IH0KIAo=