145941 2015-06-12 14:43:27 -0700 Clean up IndexedDB website data retrieval and removal 2015-06-12 15:05:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1101702 0 andersca 2015-06-12 14:43:27 -0700 Clean up IndexedDB website data retrieval and removal 1101704 1 254822 andersca 2015-06-12 14:47:09 -0700 Created attachment 254822 Patch 1101711 2 andersca 2015-06-12 15:05:00 -0700 Committed r185521: <http://trac.webkit.org/changeset/185521> 254822 2015-06-12 14:47:09 -0700 2015-06-12 14:51:37 -0700 Patch bug-145941-20150612144638.patch text/plain 12402 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWJmZjM5OGYzNzY4YTk0 NDRmMGQ5NWZkZGRjMmQ5NWY3YjhhNDAwYy4uOWM3YjM5OGU5OTIxODliOWUyYWZhMWU1NzNhZDMx M2E1ZjFhZWM1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE1LTA2LTEyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgSW5k ZXhlZERCIHdlYnNpdGUgZGF0YSByZXRyaWV2YWwgYW5kIHJlbW92YWwKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTk0MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gVXNlIFNlY3VyaXR5T3JpZ2luIGlu c3RlYWQgb2YgU2VjdXJpdHlPcmlnaW5EYXRhOyBJdCdzIG5vdCBwb3NzaWJsZSB0byBwYXNzIFNl Y3VyaXR5T3JpZ2luRGF0YQorICAgICAgICBzYWZlbHkgYmV0d2VlbiB0aHJlYWRzLgorICAgICAg ICAKKyAgICAgICAgLSBVc2Ugc3RkOjpjaHJvbm8gaW5zdGVhZCBvZiBkb3VibGUgZm9yIG1vZGlm aWNhdGlvbiB0aW1lcy4KKyAgICAgICAgCisgICAgICAgIC0gR2V0IHJpZCBvZiBlbmRUaW1lIHNp bmNlIGl0J3Mgbm90IHVzZWQuCisgICAgICAgIAorICAgICAgICAtIENoYW5nZSBkZWxldGVJbmRl eGVkRGF0YWJhc2VFbnRyaWVzRm9yT3JpZ2luIHRvIGRlbGV0ZUluZGV4ZWREYXRhYmFzZUVudHJp ZXNGb3JPcmlnaW5zIGFuZCBtYWtlIGl0IHRha2UKKyAgICAgICAgYSB2ZWN0b3Igb2Ygb3JpZ2lu cyBpbnN0ZWFkIG9mIGEgc2luZ2xlIG9uZS4KKworICAgICAgICAtIEdldCByaWQgb2YgZGVsZXRl QWxsSW5kZXhlZERhdGFiYXNlRW50cmllcy4KKworICAgICAgICAtIENoYW5nZSBTZWN1cml0eU9y aWdpbkRhdGE6OnNlY3VyaXR5T3JpZ2luIHRvIGNhbGwgaXNvbGF0ZWRDb3B5IG9uIHRoZSBvcmln aW4gY29tcG9uZW50cywgc2luY2UgaXQncyBjb21tb24KKyAgICAgICAgdG8gcGFzcyBvcmlnaW5z IHRvIG90aGVyIHRocmVhZHMgYW5kIHdlIHdhbnQgdGhhdCB0byBiZSBzYWZlLgorCisgICAgICAg ICogRGF0YWJhc2VQcm9jZXNzL0RhdGFiYXNlUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6 OkRhdGFiYXNlUHJvY2Vzczo6ZmV0Y2hXZWJzaXRlRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OkRh dGFiYXNlUHJvY2Vzczo6ZGVsZXRlV2Vic2l0ZURhdGEpOgorICAgICAgICAoV2ViS2l0OjpEYXRh YmFzZVByb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhRm9yT3JpZ2lucyk6CisgICAgICAgIChXZWJL aXQ6OkRhdGFiYXNlUHJvY2Vzczo6aW5kZXhlZERhdGFiYXNlT3JpZ2lucyk6CisgICAgICAgIChX ZWJLaXQ6OnJlbW92ZUFsbERhdGFiYXNlc0Zvck9yaWdpblBhdGgpOgorICAgICAgICAoV2ViS2l0 OjpEYXRhYmFzZVByb2Nlc3M6OmRlbGV0ZUluZGV4ZWREYXRhYmFzZUVudHJpZXNGb3JPcmlnaW5z KToKKyAgICAgICAgKFdlYktpdDo6RGF0YWJhc2VQcm9jZXNzOjpkZWxldGVJbmRleGVkRGF0YWJh c2VFbnRyaWVzTW9kaWZpZWRTaW5jZSk6CisgICAgICAgIChXZWJLaXQ6OkRhdGFiYXNlUHJvY2Vz czo6Z2V0SW5kZXhlZERhdGFiYXNlT3JpZ2lucyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6 OkRhdGFiYXNlUHJvY2Vzczo6ZGVsZXRlSW5kZXhlZERhdGFiYXNlRW50cmllc0Zvck9yaWdpbik6 IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OkRhdGFiYXNlUHJvY2Vzczo6ZGVsZXRlSW5kZXhl ZERhdGFiYXNlRW50cmllc01vZGlmaWVkQmV0d2VlbkRhdGVzKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYktpdDo6RGF0YWJhc2VQcm9jZXNzOjpkZWxldGVBbGxJbmRleGVkRGF0YWJhc2VFbnRyaWVz KTogRGVsZXRlZC4KKyAgICAgICAgKiBEYXRhYmFzZVByb2Nlc3MvRGF0YWJhc2VQcm9jZXNzLmg6 CisgICAgICAgICogU2hhcmVkL1NlY3VyaXR5T3JpZ2luRGF0YS5jcHA6CisgICAgICAgIChXZWJL aXQ6OlNlY3VyaXR5T3JpZ2luRGF0YTo6c2VjdXJpdHlPcmlnaW4pOgorCiAyMDE1LTA2LTEyICBB bnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBOZXR3b3JrIENhY2hl OiBVc2UgU0hBMSBmb3IgaGVhZGVyIGNoZWNrc3VtCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9EYXRhYmFzZVByb2Nlc3MvRGF0YWJhc2VQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL0Rh dGFiYXNlUHJvY2Vzcy9EYXRhYmFzZVByb2Nlc3MuY3BwCmluZGV4IDNmZTJjMzEzZjBlMTI5NTk0 YjI5MTJlODcyYzEwNzVhMjc3NzhjNzMuLmM3ZWYxYWNhNzBlZThmYTJhZGY0OTc4Y2Y3OWQxMzc4 ZTg4MzQ2OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9EYXRh YmFzZVByb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9EYXRh YmFzZVByb2Nlc3MuY3BwCkBAIC0yMjcsMTAgKzIyNyw3IEBAIHZvaWQgRGF0YWJhc2VQcm9jZXNz OjpmZXRjaFdlYnNpdGVEYXRhKFNlc3Npb25JRCwgdWludDY0X3Qgd2Vic2l0ZURhdGFUeXBlcywg dWluCiAgICAgICAgIC8vIEZJWE1FOiBQaWNrIHRoZSByaWdodCBkYXRhYmFzZSBzdG9yZSBiYXNl ZCBvbiB0aGUgc2Vzc2lvbiBJRC4KICAgICAgICAgcG9zdERhdGFiYXNlVGFzayhzdGQ6Om1ha2Vf dW5pcXVlPEFzeW5jVGFzaz4oW2NhbGxiYWNrQWdncmVnYXRvciwgd2Vic2l0ZURhdGFUeXBlcywg dGhpc10gewogCi0gICAgICAgICAgICBWZWN0b3I8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4gc2Vj dXJpdHlPcmlnaW5zOwotCi0gICAgICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIG9yaWdpbkRhdGEg OiBnZXRJbmRleGVkRGF0YWJhc2VPcmlnaW5zKCkpCi0gICAgICAgICAgICAgICAgc2VjdXJpdHlP cmlnaW5zLmFwcGVuZChvcmlnaW5EYXRhLnNlY3VyaXR5T3JpZ2luKCkpOworICAgICAgICAgICAg VmVjdG9yPFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IHNlY3VyaXR5T3JpZ2lucyA9IGluZGV4ZWRE YXRhYmFzZU9yaWdpbnMoKTsKIAogICAgICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNo KFtjYWxsYmFja0FnZ3JlZ2F0b3IsIHNlY3VyaXR5T3JpZ2luc10gewogICAgICAgICAgICAgICAg IGZvciAoY29uc3QgYXV0byYgc2VjdXJpdHlPcmlnaW4gOiBzZWN1cml0eU9yaWdpbnMpCkBAIC0y NDQsNyArMjQxLDcgQEAgdm9pZCBEYXRhYmFzZVByb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhKFdl YkNvcmU6OlNlc3Npb25JRCwgdWludDY0X3Qgd2Vic2l0ZURhdGEKIHsKICAgICBzdHJ1Y3QgQ2Fs bGJhY2tBZ2dyZWdhdG9yIGZpbmFsIDogcHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVkPENhbGxi YWNrQWdncmVnYXRvcj4gewogICAgICAgICBleHBsaWNpdCBDYWxsYmFja0FnZ3JlZ2F0b3Ioc3Rk OjpmdW5jdGlvbjx2b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcikKLSAgICAgICAgOiBtX2NvbXBs ZXRpb25IYW5kbGVyKFdURjo6bW92ZShjb21wbGV0aW9uSGFuZGxlcikpCisgICAgICAgICAgICA6 IG1fY29tcGxldGlvbkhhbmRsZXIoV1RGOjptb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSkKICAgICAg ICAgewogICAgICAgICB9CiAKQEAgLTI2NCwxNSArMjYxLDE0IEBAIHZvaWQgRGF0YWJhc2VQcm9j ZXNzOjpkZWxldGVXZWJzaXRlRGF0YShXZWJDb3JlOjpTZXNzaW9uSUQsIHVpbnQ2NF90IHdlYnNp dGVEYXRhCiAKICAgICBpZiAod2Vic2l0ZURhdGFUeXBlcyAmIFdlYnNpdGVEYXRhVHlwZUluZGV4 ZWREQkRhdGFiYXNlcykgewogICAgICAgICBwb3N0RGF0YWJhc2VUYXNrKHN0ZDo6bWFrZV91bmlx dWU8QXN5bmNUYXNrPihbdGhpcywgY2FsbGJhY2tBZ2dyZWdhdG9yLCBtb2RpZmllZFNpbmNlXSB7 Ci0gICAgICAgICAgICBkb3VibGUgc3RhcnREYXRlID0gc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9j azo6dG9fdGltZV90KG1vZGlmaWVkU2luY2UpOwogCi0gICAgICAgICAgICBkZWxldGVJbmRleGVk RGF0YWJhc2VFbnRyaWVzTW9kaWZpZWRCZXR3ZWVuRGF0ZXMoc3RhcnREYXRlLCBzdGQ6Om51bWVy aWNfbGltaXRzPGRvdWJsZT46Om1heCgpKTsKKyAgICAgICAgICAgIGRlbGV0ZUluZGV4ZWREYXRh YmFzZUVudHJpZXNNb2RpZmllZFNpbmNlKG1vZGlmaWVkU2luY2UpOwogICAgICAgICAgICAgUnVu TG9vcDo6bWFpbigpLmRpc3BhdGNoKFtjYWxsYmFja0FnZ3JlZ2F0b3JdIHsgfSk7CiAgICAgICAg IH0pKTsKICAgICB9CiB9CiAKLXZvaWQgRGF0YWJhc2VQcm9jZXNzOjpkZWxldGVXZWJzaXRlRGF0 YUZvck9yaWdpbnMoV2ViQ29yZTo6U2Vzc2lvbklELCB1aW50NjRfdCB3ZWJzaXRlRGF0YVR5cGVz LCBjb25zdCBWZWN0b3I8U2VjdXJpdHlPcmlnaW5EYXRhPiYgb3JpZ2lucywgdWludDY0X3QgY2Fs bGJhY2tJRCkKK3ZvaWQgRGF0YWJhc2VQcm9jZXNzOjpkZWxldGVXZWJzaXRlRGF0YUZvck9yaWdp bnMoV2ViQ29yZTo6U2Vzc2lvbklELCB1aW50NjRfdCB3ZWJzaXRlRGF0YVR5cGVzLCBjb25zdCBW ZWN0b3I8U2VjdXJpdHlPcmlnaW5EYXRhPiYgc2VjdXJpdHlPcmlnaW5EYXRhcywgdWludDY0X3Qg Y2FsbGJhY2tJRCkKIHsKICAgICBzdHJ1Y3QgQ2FsbGJhY2tBZ2dyZWdhdG9yIGZpbmFsIDogcHVi bGljIFRocmVhZFNhZmVSZWZDb3VudGVkPENhbGxiYWNrQWdncmVnYXRvcj4gewogICAgICAgICBl eHBsaWNpdCBDYWxsYmFja0FnZ3JlZ2F0b3Ioc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBjb21wbGV0 aW9uSGFuZGxlcikKQEAgLTI5NSw0MiArMjkxLDM1IEBAIHZvaWQgRGF0YWJhc2VQcm9jZXNzOjpk ZWxldGVXZWJzaXRlRGF0YUZvck9yaWdpbnMoV2ViQ29yZTo6U2Vzc2lvbklELCB1aW50NjRfdCB3 CiAgICAgfSkpOwogCiAgICAgaWYgKHdlYnNpdGVEYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVJ bmRleGVkREJEYXRhYmFzZXMpIHsKLSAgICAgICAgcG9zdERhdGFiYXNlVGFzayhzdGQ6Om1ha2Vf dW5pcXVlPEFzeW5jVGFzaz4oW3RoaXMsIG9yaWdpbnMsIGNhbGxiYWNrQWdncmVnYXRvcl0gewot ICAgICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBvcmlnaW46IG9yaWdpbnMpCi0gICAgICAgICAg ICAgICAgZGVsZXRlSW5kZXhlZERhdGFiYXNlRW50cmllc0Zvck9yaWdpbihvcmlnaW4pOworICAg ICAgICBWZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4gc2VjdXJpdHlPcmln aW5zOworICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIHNlY3VyaXR5T3JpZ2luRGF0YSA6IHNlY3Vy aXR5T3JpZ2luRGF0YXMpCisgICAgICAgICAgICBzZWN1cml0eU9yaWdpbnMuYXBwZW5kKHNlY3Vy aXR5T3JpZ2luRGF0YS5zZWN1cml0eU9yaWdpbigpKTsKKworICAgICAgICBwb3N0RGF0YWJhc2VU YXNrKHN0ZDo6bWFrZV91bmlxdWU8QXN5bmNUYXNrPihbdGhpcywgc2VjdXJpdHlPcmlnaW5zLCBj YWxsYmFja0FnZ3JlZ2F0b3JdIHsKKyAgICAgICAgICAgIGRlbGV0ZUluZGV4ZWREYXRhYmFzZUVu dHJpZXNGb3JPcmlnaW5zKHNlY3VyaXR5T3JpZ2lucyk7CiAKICAgICAgICAgICAgIFJ1bkxvb3A6 Om1haW4oKS5kaXNwYXRjaChbY2FsbGJhY2tBZ2dyZWdhdG9yXSB7IH0pOwogICAgICAgICB9KSk7 CiAgICAgfQogfQogCi1WZWN0b3I8U2VjdXJpdHlPcmlnaW5EYXRhPiBEYXRhYmFzZVByb2Nlc3M6 OmdldEluZGV4ZWREYXRhYmFzZU9yaWdpbnMoKQorVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbj4+IERhdGFiYXNlUHJvY2Vzczo6aW5kZXhlZERhdGFiYXNlT3JpZ2lucygpCiB7 Ci0gICAgVmVjdG9yPFNlY3VyaXR5T3JpZ2luRGF0YT4gcmVzdWx0czsKLQotICAgIGlmIChtX2lu ZGV4ZWREYXRhYmFzZURpcmVjdG9yeS5pc0VtcHR5KCkpIHsKLSAgICAgICAgcmV0dXJuIHJlc3Vs dHM7Ci0gICAgfQotCi0gICAgVmVjdG9yPFN0cmluZz4gb3JpZ2luUGF0aHMgPSBsaXN0RGlyZWN0 b3J5KG1faW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5LCAiKiIpOwotICAgIGZvciAoYXV0byYgb3Jp Z2luUGF0aCA6IG9yaWdpblBhdGhzKSB7Ci0gICAgICAgIFVSTCB1cmw7Ci0gICAgICAgIHVybC5z ZXRQcm90b2NvbChBU0NJSUxpdGVyYWwoImZpbGUiKSk7Ci0gICAgICAgIHVybC5zZXRQYXRoKG9y aWdpblBhdGgpOworICAgIGlmIChtX2luZGV4ZWREYXRhYmFzZURpcmVjdG9yeS5pc0VtcHR5KCkp CisgICAgICAgIHJldHVybiB7IH07CiAKLSAgICAgICAgU3RyaW5nIGRhdGFiYXNlSWRlbnRpZmll ciA9IHVybC5sYXN0UGF0aENvbXBvbmVudCgpOworICAgIFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6 U2VjdXJpdHlPcmlnaW4+PiBzZWN1cml0eU9yaWdpbnM7CisgICAgZm9yIChhdXRvJiBvcmlnaW5Q YXRoIDogbGlzdERpcmVjdG9yeShtX2luZGV4ZWREYXRhYmFzZURpcmVjdG9yeSwgIioiKSkgewor ICAgICAgICBTdHJpbmcgZGF0YWJhc2VJZGVudGlmaWVyID0gcGF0aEdldEZpbGVOYW1lKG9yaWdp blBhdGgpOwogCi0gICAgICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4gc2VjdXJpdHlPcmlnaW4g PSBTZWN1cml0eU9yaWdpbjo6bWF5YmVDcmVhdGVGcm9tRGF0YWJhc2VJZGVudGlmaWVyKGRhdGFi YXNlSWRlbnRpZmllcik7Ci0gICAgICAgIGlmICghc2VjdXJpdHlPcmlnaW4pCi0gICAgICAgICAg ICBjb250aW51ZTsKLQotICAgICAgICByZXN1bHRzLmFwcGVuZChTZWN1cml0eU9yaWdpbkRhdGE6 OmZyb21TZWN1cml0eU9yaWdpbigqc2VjdXJpdHlPcmlnaW4pKTsKKyAgICAgICAgaWYgKGF1dG8g c2VjdXJpdHlPcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6bWF5YmVDcmVhdGVGcm9tRGF0YWJhc2VJ ZGVudGlmaWVyKGRhdGFiYXNlSWRlbnRpZmllcikpCisgICAgICAgICAgICBzZWN1cml0eU9yaWdp bnMuYXBwZW5kKFdURjo6bW92ZShzZWN1cml0eU9yaWdpbikpOwogICAgIH0KIAotICAgIHJldHVy biByZXN1bHRzOworICAgIHJldHVybiBzZWN1cml0eU9yaWdpbnM7CiB9CiAKLXN0YXRpYyB2b2lk IHJlbW92ZUFsbERhdGFiYXNlc0Zvck9yaWdpblBhdGgoY29uc3QgU3RyaW5nJiBvcmlnaW5QYXRo LCBkb3VibGUgc3RhcnREYXRlLCBkb3VibGUgZW5kRGF0ZSkKK3N0YXRpYyB2b2lkIHJlbW92ZUFs bERhdGFiYXNlc0Zvck9yaWdpblBhdGgoY29uc3QgU3RyaW5nJiBvcmlnaW5QYXRoLCBzdGQ6OmNo cm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50IG1vZGlmaWVkU2luY2UpCiB7CiAgICAgLy8g RklYTUU6IFdlIHNob3VsZCBhbHNvIGNsb3NlL2ludmFsaWRhdGUgYW55IGxpdmUgaGFuZGxlcyB0 byB0aGUgZGF0YWJhc2UgZmlsZXMgd2UgYXJlIGFib3V0IHRvIGRlbGV0ZS4KICAgICAvLyBSaWdo dCBub3c6CkBAIC0zNDYsMTEgKzMzNSwxNCBAQCBzdGF0aWMgdm9pZCByZW1vdmVBbGxEYXRhYmFz ZXNGb3JPcmlnaW5QYXRoKGNvbnN0IFN0cmluZyYgb3JpZ2luUGF0aCwgZG91YmxlIHN0YQogICAg ICAgICBpZiAoIWZpbGVFeGlzdHMoZGF0YWJhc2VGaWxlKSkKICAgICAgICAgICAgIGNvbnRpbnVl OwogCi0gICAgICAgIHRpbWVfdCBtb2RUaW1lOwotICAgICAgICBnZXRGaWxlTW9kaWZpY2F0aW9u VGltZShkYXRhYmFzZUZpbGUsIG1vZFRpbWUpOworICAgICAgICBpZiAobW9kaWZpZWRTaW5jZSA+ IHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQ6Om1pbigpKSB7CisgICAgICAg ICAgICB0aW1lX3QgbW9kaWZpY2F0aW9uVGltZTsKKyAgICAgICAgICAgIGlmICghZ2V0RmlsZU1v ZGlmaWNhdGlvblRpbWUoZGF0YWJhc2VGaWxlLCBtb2RpZmljYXRpb25UaW1lKSkKKyAgICAgICAg ICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBpZiAobW9kVGltZSA8IHN0YXJ0RGF0ZSB8fCBt b2RUaW1lID4gZW5kRGF0ZSkKLSAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgaWYg KHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OmZyb21fdGltZV90KG1vZGlmaWNhdGlvblRpbWUp IDwgbW9kaWZpZWRTaW5jZSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQog CiAgICAgICAgIGRlbGV0ZUZpbGUoZGF0YWJhc2VGaWxlKTsKICAgICAgICAgZGVsZXRlRW1wdHlE aXJlY3RvcnkoZGF0YWJhc2VQYXRoKTsKQEAgLTM1OSwzNiArMzUxLDI2IEBAIHN0YXRpYyB2b2lk IHJlbW92ZUFsbERhdGFiYXNlc0Zvck9yaWdpblBhdGgoY29uc3QgU3RyaW5nJiBvcmlnaW5QYXRo LCBkb3VibGUgc3RhCiAgICAgZGVsZXRlRW1wdHlEaXJlY3Rvcnkob3JpZ2luUGF0aCk7CiB9CiAK LXZvaWQgRGF0YWJhc2VQcm9jZXNzOjpkZWxldGVJbmRleGVkRGF0YWJhc2VFbnRyaWVzRm9yT3Jp Z2luKGNvbnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgb3JpZ2luRGF0YSkKK3ZvaWQgRGF0YWJhc2VQ cm9jZXNzOjpkZWxldGVJbmRleGVkRGF0YWJhc2VFbnRyaWVzRm9yT3JpZ2lucyhjb25zdCBWZWN0 b3I8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4mIHNlY3VyaXR5T3JpZ2lucykKIHsK ICAgICBpZiAobV9pbmRleGVkRGF0YWJhc2VEaXJlY3RvcnkuaXNFbXB0eSgpKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBSZWY8U2VjdXJpdHlPcmlnaW4+IG9yaWdpbiA9IG9yaWdpbkRhdGEuc2Vj dXJpdHlPcmlnaW4oKTsKLSAgICBTdHJpbmcgZGF0YWJhc2VJZGVudGlmaWVyID0gb3JpZ2luLT5k YXRhYmFzZUlkZW50aWZpZXIoKTsKLSAgICBTdHJpbmcgb3JpZ2luUGF0aCA9IHBhdGhCeUFwcGVu ZGluZ0NvbXBvbmVudChtX2luZGV4ZWREYXRhYmFzZURpcmVjdG9yeSwgZGF0YWJhc2VJZGVudGlm aWVyKTsKLQotICAgIHJlbW92ZUFsbERhdGFiYXNlc0Zvck9yaWdpblBhdGgob3JpZ2luUGF0aCwg c3RkOjpudW1lcmljX2xpbWl0czxkb3VibGU+Ojpsb3dlc3QoKSwgc3RkOjpudW1lcmljX2xpbWl0 czxkb3VibGU+OjptYXgoKSk7Ci19Ci0KLXZvaWQgRGF0YWJhc2VQcm9jZXNzOjpkZWxldGVJbmRl eGVkRGF0YWJhc2VFbnRyaWVzTW9kaWZpZWRCZXR3ZWVuRGF0ZXMoZG91YmxlIHN0YXJ0RGF0ZSwg ZG91YmxlIGVuZERhdGUpCi17Ci0gICAgaWYgKG1faW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5Lmlz RW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOworICAgIGZvciAoY29uc3QgYXV0byYgc2VjdXJpdHlP cmlnaW4gOiBzZWN1cml0eU9yaWdpbnMpIHsKKyAgICAgICAgU3RyaW5nIG9yaWdpblBhdGggPSBw YXRoQnlBcHBlbmRpbmdDb21wb25lbnQobV9pbmRleGVkRGF0YWJhc2VEaXJlY3RvcnksIHNlY3Vy aXR5T3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIoKSk7CiAKLSAgICBWZWN0b3I8U3RyaW5nPiBv cmlnaW5QYXRocyA9IGxpc3REaXJlY3RvcnkobV9pbmRleGVkRGF0YWJhc2VEaXJlY3RvcnksICIq Iik7Ci0gICAgZm9yIChhdXRvJiBvcmlnaW5QYXRoIDogb3JpZ2luUGF0aHMpCi0gICAgICAgIHJl bW92ZUFsbERhdGFiYXNlc0Zvck9yaWdpblBhdGgob3JpZ2luUGF0aCwgc3RhcnREYXRlLCBlbmRE YXRlKTsKKyAgICAgICAgcmVtb3ZlQWxsRGF0YWJhc2VzRm9yT3JpZ2luUGF0aChvcmlnaW5QYXRo LCBzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50OjptaW4oKSk7CisgICAgfQog fQogCi12b2lkIERhdGFiYXNlUHJvY2Vzczo6ZGVsZXRlQWxsSW5kZXhlZERhdGFiYXNlRW50cmll cygpCit2b2lkIERhdGFiYXNlUHJvY2Vzczo6ZGVsZXRlSW5kZXhlZERhdGFiYXNlRW50cmllc01v ZGlmaWVkU2luY2Uoc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCBtb2RpZmll ZFNpbmNlKQogewogICAgIGlmIChtX2luZGV4ZWREYXRhYmFzZURpcmVjdG9yeS5pc0VtcHR5KCkp CiAgICAgICAgIHJldHVybjsKIAogICAgIFZlY3RvcjxTdHJpbmc+IG9yaWdpblBhdGhzID0gbGlz dERpcmVjdG9yeShtX2luZGV4ZWREYXRhYmFzZURpcmVjdG9yeSwgIioiKTsKICAgICBmb3IgKGF1 dG8mIG9yaWdpblBhdGggOiBvcmlnaW5QYXRocykKLSAgICAgICAgcmVtb3ZlQWxsRGF0YWJhc2Vz Rm9yT3JpZ2luUGF0aChvcmlnaW5QYXRoLCBzdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46Omxv d2VzdCgpLCBzdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46Om1heCgpKTsKKyAgICAgICAgcmVt b3ZlQWxsRGF0YWJhc2VzRm9yT3JpZ2luUGF0aChvcmlnaW5QYXRoLCBtb2RpZmllZFNpbmNlKTsK IH0KIAogI2lmICFQTEFURk9STShDT0NPQSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0Rh dGFiYXNlUHJvY2Vzcy9EYXRhYmFzZVByb2Nlc3MuaCBiL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNl UHJvY2Vzcy9EYXRhYmFzZVByb2Nlc3MuaAppbmRleCA5OGRmNjFhMjFlMzBjOWY3YzkwYzQxMGUy OTAzZDc3YjJmZDYyOWU0Li44OTRjYWNjYzYyY2JmNTAyZDIwYWVjYTg3NzFkYTc0ZjM5N2ExYmE5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvRGF0YWJhc2VQcm9j ZXNzLmgKKysrIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0RhdGFiYXNlUHJvY2Vz cy5oCkBAIC01NywxMSArNTcsNiBAQCBwdWJsaWM6CiAKICAgICBXb3JrUXVldWUmIHF1ZXVlKCkg eyByZXR1cm4gbV9xdWV1ZS5nZXQoKTsgfQogCi0gICAgVmVjdG9yPFNlY3VyaXR5T3JpZ2luRGF0 YT4gZ2V0SW5kZXhlZERhdGFiYXNlT3JpZ2lucygpOwotICAgIHZvaWQgZGVsZXRlSW5kZXhlZERh dGFiYXNlRW50cmllc0Zvck9yaWdpbihjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmKTsKLSAgICB2 b2lkIGRlbGV0ZUluZGV4ZWREYXRhYmFzZUVudHJpZXNNb2RpZmllZEJldHdlZW5EYXRlcyhkb3Vi bGUgc3RhcnREYXRlLCBkb3VibGUgZW5kRGF0ZSk7Ci0gICAgdm9pZCBkZWxldGVBbGxJbmRleGVk RGF0YWJhc2VFbnRyaWVzKCk7Ci0KICAgICB2b2lkIHBvc3REYXRhYmFzZVRhc2soc3RkOjp1bmlx dWVfcHRyPEFzeW5jVGFzaz4pOwogCiBwcml2YXRlOgpAQCAtOTAsNiArODUsMTAgQEAgcHJpdmF0 ZToKICAgICB2b2lkIGRlbGV0ZVdlYnNpdGVEYXRhKFdlYkNvcmU6OlNlc3Npb25JRCwgdWludDY0 X3Qgd2Vic2l0ZURhdGFUeXBlcywgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2lu dCBtb2RpZmllZFNpbmNlLCB1aW50NjRfdCBjYWxsYmFja0lEKTsKICAgICB2b2lkIGRlbGV0ZVdl YnNpdGVEYXRhRm9yT3JpZ2lucyhXZWJDb3JlOjpTZXNzaW9uSUQsIHVpbnQ2NF90IHdlYnNpdGVE YXRhVHlwZXMsIGNvbnN0IFZlY3RvcjxTZWN1cml0eU9yaWdpbkRhdGE+JiBvcmlnaW5zLCB1aW50 NjRfdCBjYWxsYmFja0lEKTsKIAorICAgIFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlP cmlnaW4+PiBpbmRleGVkRGF0YWJhc2VPcmlnaW5zKCk7CisgICAgdm9pZCBkZWxldGVJbmRleGVk RGF0YWJhc2VFbnRyaWVzRm9yT3JpZ2lucyhjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlNl Y3VyaXR5T3JpZ2luPj4mKTsKKyAgICB2b2lkIGRlbGV0ZUluZGV4ZWREYXRhYmFzZUVudHJpZXNN b2RpZmllZFNpbmNlKHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgbW9kaWZp ZWRTaW5jZSk7CisKICAgICAvLyBGb3IgZXhlY3V0aW9uIG9uIHdvcmsgcXVldWUgdGhyZWFkIG9u bHkKICAgICB2b2lkIHBlcmZvcm1OZXh0RGF0YWJhc2VUYXNrKCk7CiAgICAgdm9pZCBlbnN1cmVQ YXRoRXhpc3RzKGNvbnN0IFN0cmluZyYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hh cmVkL1NlY3VyaXR5T3JpZ2luRGF0YS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2VjdXJp dHlPcmlnaW5EYXRhLmNwcAppbmRleCA2ZGRhNWIyNDViM2ZjYWYxN2IyZWEzMGRiZGMyYzVlZmM4 NTgyNzBkLi4yZGNhNjAxNzQyZWZiNjhkYTViZjdhYmZhOGM2YjY4ZjAzYTg0NWI3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2VjdXJpdHlPcmlnaW5EYXRhLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2VjdXJpdHlPcmlnaW5EYXRhLmNwcApAQCAtNDgsNyArNDgs NyBAQCBTZWN1cml0eU9yaWdpbkRhdGEgU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tU2VjdXJpdHlP cmlnaW4oY29uc3QgU2VjdXJpdHlPcmlnaW4mCiAKIFJlZjxTZWN1cml0eU9yaWdpbj4gU2VjdXJp dHlPcmlnaW5EYXRhOjpzZWN1cml0eU9yaWdpbigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIFNlY3Vy aXR5T3JpZ2luOjpjcmVhdGUocHJvdG9jb2wsIGhvc3QsIHBvcnQpOworICAgIHJldHVybiBTZWN1 cml0eU9yaWdpbjo6Y3JlYXRlKHByb3RvY29sLmlzb2xhdGVkQ29weSgpLCBob3N0Lmlzb2xhdGVk Q29weSgpLCBwb3J0KTsKIH0KIAogdm9pZCBTZWN1cml0eU9yaWdpbkRhdGE6OmVuY29kZShJUEM6 OkFyZ3VtZW50RW5jb2RlciYgZW5jb2RlcikgY29uc3QK