144958 2015-05-13 12:15:30 -0700 Rename some StorageManager functions to indicate that they work on local storage entries 2015-05-13 12:25:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca bdakin commit-queue oldest_to_newest 1094514 0 andersca 2015-05-13 12:15:30 -0700 Rename some StorageManager functions to indicate that they work on local storage entries 1094515 1 253043 andersca 2015-05-13 12:16:09 -0700 Created attachment 253043 Patch 1094518 2 commit-queue 2015-05-13 12:18:55 -0700 Attachment 253043 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.h:60: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.h:61: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.h:66: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.cpp:517: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.cpp:530: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.cpp:593: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 6 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1094529 3 andersca 2015-05-13 12:25:36 -0700 Committed r184295: <http://trac.webkit.org/changeset/184295> 253043 2015-05-13 12:16:09 -0700 2015-05-13 12:16:41 -0700 Patch bug-144958-20150513121447.patch text/plain 9264 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0Mjg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODU3MDQwYjQwMDZkYzEy M2IyZGNhZWUyNzI2ZWYzODY0MTRhMzgzYy4uZGEzNGFlOWJmNjEzNWI4YzNmNDUzNDZhMzQ0Y2Uz OTAxYzY0OGI4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE1LTA1LTEzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIHNvbWUg U3RvcmFnZU1hbmFnZXIgZnVuY3Rpb25zIHRvIGluZGljYXRlIHRoYXQgdGhleSB3b3JrIG9uIGxv Y2FsIHN0b3JhZ2UgZW50cmllcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTQ0OTU4CisgICAgICAgIEZpcnN0IHBhcnQgb2YgcmRhcjovL3Byb2JsZW0v MTA2OTA0NDcuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJL aXQ6OlN0b3JhZ2VNYW5hZ2VyOjpnZXRMb2NhbFN0b3JhZ2VPcmlnaW5zKToKKyAgICAgICAgKFdl YktpdDo6U3RvcmFnZU1hbmFnZXI6OmdldExvY2FsU3RvcmFnZURldGFpbHNCeU9yaWdpbik6Cisg ICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVMb2NhbFN0b3JhZ2VFbnRyaWVz Rm9yT3JpZ2luKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUFsbExv Y2FsU3RvcmFnZUVudHJpZXMpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVs ZXRlTG9jYWxTdG9yYWdlRW50cmllc0Zvck9yaWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpTdG9y YWdlTWFuYWdlcjo6Z2V0T3JpZ2lucyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OlN0b3Jh Z2VNYW5hZ2VyOjpnZXRTdG9yYWdlRGV0YWlsc0J5T3JpZ2luKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUVudHJpZXNGb3JPcmlnaW4pOiBEZWxldGVk LgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlQWxsRW50cmllcyk6IERl bGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVFbnRyaWVzRm9y T3JpZ2lucyk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1h bmFnZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OmdldEtleVZh bHVlU3RvcmFnZU9yaWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJLZXlWYWx1ZVN0b3JhZ2VN YW5hZ2VyOjpnZXRTdG9yYWdlRGV0YWlsc0J5T3JpZ2luKToKKyAgICAgICAgKFdlYktpdDo6V2Vi S2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlRW50cmllc0Zvck9yaWdpbik6CisgICAgICAg IChXZWJLaXQ6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUFsbEVudHJpZXMpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6ZmV0Y2hEYXRhKToKKyAgICAgICAgKFdl YktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YSk6CisKIDIwMTUtMDUtMTMgIFN1bmdt YW5uIENobyAgPHN1bmdtYW5uLmNob0BuYXZlcmNvcnAuY29tPgogCiAgICAgICAgIE1pbm9yIGNs ZWFudXBzIHRvIFBsdWdpblByb3h5LmNwcC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCAwYjlhYzY0YmE3NmFiNDdiNTQ0 MGJkOTRhMTc5ZDgwY2Q1Yjc4NmI2Li4yNzY1MmZhZTZlYmMzZGZjNzU0ZWU2OGIyNGI2Zjc5Njcw YTFlOWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9y YWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3Rv cmFnZU1hbmFnZXIuY3BwCkBAIC01MTQsNyArNTE0LDcgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6 cHJvY2Vzc0RpZENsb3NlQ29ubmVjdGlvbihXZWJQcm9jZXNzUHJveHkmLCBJUEM6OkNvbm5lY3Rp b24KICAgICB9KTsKIH0KIAotdm9pZCBTdG9yYWdlTWFuYWdlcjo6Z2V0T3JpZ2lucyhzdGQ6OmZ1 bmN0aW9uPHZvaWQgKFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+Pik+IGNv bXBsZXRpb25IYW5kbGVyKQordm9pZCBTdG9yYWdlTWFuYWdlcjo6Z2V0TG9jYWxTdG9yYWdlT3Jp Z2lucyhzdGQ6OmZ1bmN0aW9uPHZvaWQgKFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlP cmlnaW4+Pik+IGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIFJlZlB0cjxTdG9yYWdlTWFuYWdl cj4gc3RvcmFnZU1hbmFnZXIodGhpcyk7CiAKQEAgLTUyNyw3ICs1MjcsNyBAQCB2b2lkIFN0b3Jh Z2VNYW5hZ2VyOjpnZXRPcmlnaW5zKHN0ZDo6ZnVuY3Rpb248dm9pZCAoVmVjdG9yPFJlZlB0cjxX ZWJDb3JlOjpTZWN1cgogICAgIH0pOwogfQogCi12b2lkIFN0b3JhZ2VNYW5hZ2VyOjpnZXRTdG9y YWdlRGV0YWlsc0J5T3JpZ2luKHN0ZDo6ZnVuY3Rpb248dm9pZCAoVmVjdG9yPExvY2FsU3RvcmFn ZURldGFpbHM+KT4gY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpnZXRM b2NhbFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW4oc3RkOjpmdW5jdGlvbjx2b2lkIChWZWN0b3I8TG9j YWxTdG9yYWdlRGV0YWlscz4pPiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBSZWZQdHI8U3Rv cmFnZU1hbmFnZXI+IHN0b3JhZ2VNYW5hZ2VyKHRoaXMpOwogCkBAIC01NDAsNyArNTQwLDcgQEAg dm9pZCBTdG9yYWdlTWFuYWdlcjo6Z2V0U3RvcmFnZURldGFpbHNCeU9yaWdpbihzdGQ6OmZ1bmN0 aW9uPHZvaWQgKFZlY3RvcjxMb2NhbFMKICAgICB9KTsKIH0KIAotdm9pZCBTdG9yYWdlTWFuYWdl cjo6ZGVsZXRlRW50cmllc0Zvck9yaWdpbihjb25zdCBTZWN1cml0eU9yaWdpbiYgc2VjdXJpdHlP cmlnaW4pCit2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVMb2NhbFN0b3JhZ2VFbnRyaWVzRm9y T3JpZ2luKGNvbnN0IFNlY3VyaXR5T3JpZ2luJiBzZWN1cml0eU9yaWdpbikKIHsKICAgICBSZWZQ dHI8U3RvcmFnZU1hbmFnZXI+IHN0b3JhZ2VNYW5hZ2VyKHRoaXMpOwogCkBAIC01NTYsNyArNTU2 LDcgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlRW50cmllc0Zvck9yaWdpbihjb25zdCBT ZWN1cml0eU9yaWdpbiYgc2VjdXJpdHlPcmlnaW4KICAgICB9KTsKIH0KIAotdm9pZCBTdG9yYWdl TWFuYWdlcjo6ZGVsZXRlQWxsRW50cmllcygpCit2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVB bGxMb2NhbFN0b3JhZ2VFbnRyaWVzKCkKIHsKICAgICBSZWZQdHI8U3RvcmFnZU1hbmFnZXI+IHN0 b3JhZ2VNYW5hZ2VyKHRoaXMpOwogCkBAIC01OTAsNyArNTkwLDcgQEAgdm9pZCBTdG9yYWdlTWFu YWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlT3JpZ2luc01vZGlmaWVkU2luY2Uoc3RkOjpjaHJvbm86 OnN5c3RlbV8KICAgICB9KTsKIH0KIAotdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlRW50cmll c0Zvck9yaWdpbnMoY29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+ JiBvcmlnaW5zLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGNvbXBsZXRpb25IYW5kbGVyKQordm9p ZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlRW50cmllc0Zvck9yaWdpbnMoY29u c3QgVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+JiBvcmlnaW5zLCBzdGQ6 OmZ1bmN0aW9uPHZvaWQgKCk+IGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIFZlY3RvcjxSZWZQ dHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+PiBjb3BpZWRPcmlnaW5zOwogICAgIGNvcGllZE9y aWdpbnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShvcmlnaW5zLnNpemUoKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaAppbmRleCA4NDU0 Y2NmYWUxNjkyMDg1OTlmZjBhNjM5YjMwZDNhYjdmYmNiZWYwLi4wYmY2MDczMzI1YTk5ZWFkODVi Mzg3MTJkYjJiMDkzMmZiZjcwYWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKQEAgLTU3LDEzICs1NywxMyBAQCBwdWJsaWM6CiAg ICAgdm9pZCBwcm9jZXNzRGlkQ2xvc2VDb25uZWN0aW9uKFdlYlByb2Nlc3NQcm94eSYsIElQQzo6 Q29ubmVjdGlvbiYpOwogICAgIHZvaWQgYXBwbGljYXRpb25XaWxsVGVybWluYXRlKCk7CiAKLSAg ICB2b2lkIGdldE9yaWdpbnMoc3RkOjpmdW5jdGlvbjx2b2lkIChWZWN0b3I8UmVmUHRyPFdlYkNv cmU6OlNlY3VyaXR5T3JpZ2luPj4pPiBjb21wbGV0aW9uSGFuZGxlcik7Ci0gICAgdm9pZCBnZXRT dG9yYWdlRGV0YWlsc0J5T3JpZ2luKHN0ZDo6ZnVuY3Rpb248dm9pZCAoVmVjdG9yPExvY2FsU3Rv cmFnZURldGFpbHM+KT4gY29tcGxldGlvbkhhbmRsZXIpOwotICAgIHZvaWQgZGVsZXRlRW50cmll c0Zvck9yaWdpbihjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiYpOwotICAgIHZvaWQgZGVs ZXRlQWxsRW50cmllcygpOworICAgIHZvaWQgZ2V0TG9jYWxTdG9yYWdlT3JpZ2lucyhzdGQ6OmZ1 bmN0aW9uPHZvaWQgKFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+Pik+IGNv bXBsZXRpb25IYW5kbGVyKTsKKyAgICB2b2lkIGdldExvY2FsU3RvcmFnZURldGFpbHNCeU9yaWdp bihzdGQ6OmZ1bmN0aW9uPHZvaWQgKFZlY3RvcjxMb2NhbFN0b3JhZ2VEZXRhaWxzPik+IGNvbXBs ZXRpb25IYW5kbGVyKTsKKyAgICB2b2lkIGRlbGV0ZUxvY2FsU3RvcmFnZUVudHJpZXNGb3JPcmln aW4oY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4mKTsKKyAgICB2b2lkIGRlbGV0ZUFsbExv Y2FsU3RvcmFnZUVudHJpZXMoKTsKIAogICAgIHZvaWQgZGVsZXRlTG9jYWxTdG9yYWdlT3JpZ2lu c01vZGlmaWVkU2luY2Uoc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCwgc3Rk OjpmdW5jdGlvbjx2b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcik7Ci0gICAgdm9pZCBkZWxldGVF bnRyaWVzRm9yT3JpZ2lucyhjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3Jp Z2luPj4mLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGNvbXBsZXRpb25IYW5kbGVyKTsKKyAgICB2 b2lkIGRlbGV0ZUxvY2FsU3RvcmFnZUVudHJpZXNGb3JPcmlnaW5zKGNvbnN0IFZlY3RvcjxSZWZQ dHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+PiYsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gY29t cGxldGlvbkhhbmRsZXIpOwogCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFN0b3JhZ2VNYW5hZ2Vy KGNvbnN0IFN0cmluZyYgbG9jYWxTdG9yYWdlRGlyZWN0b3J5KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCAx MGVjZWYyMTJjMWM5YjJiZjhhOGQxNDg4ODJhZDcyMDUwYzc3YWExLi42NDE5OWRjMWFjNmQ4OTlk YjQyOWRiMjEzZWVlMGJmNWJhMWUxMGQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYktleVZhbHVlU3RvcmFnZU1hbmFnZXIuY3BwCkBAIC05OCw3ICs5OCw3IEBA IHZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6Z2V0S2V5VmFsdWVTdG9yYWdlT3JpZ2lu cyhzdGQ6OmZ1bmN0aW9uPHZvaWQgKEFQCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBz dG9yYWdlTWFuYWdlci0+Z2V0T3JpZ2lucyhbY2FsbGJhY2tGdW5jdGlvbl0oVmVjdG9yPFJlZlB0 cjxTZWN1cml0eU9yaWdpbj4+IHNlY3VyaXR5T3JpZ2lucykgeworICAgIHN0b3JhZ2VNYW5hZ2Vy LT5nZXRMb2NhbFN0b3JhZ2VPcmlnaW5zKFtjYWxsYmFja0Z1bmN0aW9uXShWZWN0b3I8UmVmUHRy PFNlY3VyaXR5T3JpZ2luPj4gc2VjdXJpdHlPcmlnaW5zKSB7CiAgICAgICAgIFZlY3RvcjxSZWZQ dHI8QVBJOjpPYmplY3Q+PiB3ZWJTZWN1cml0eU9yaWdpbnM7CiAgICAgICAgIHdlYlNlY3VyaXR5 T3JpZ2lucy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KHNlY3VyaXR5T3JpZ2lucy5zaXplKCkpOwog ICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IHNlY3VyaXR5T3JpZ2lucykKQEAgLTExOCw3ICsx MTgsNyBAQCB2b2lkIFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OmdldFN0b3JhZ2VEZXRhaWxz QnlPcmlnaW4oc3RkOjpmdW5jdGlvbjx2b2lkIChBUAogICAgICAgICByZXR1cm47CiAgICAgfQog Ci0gICAgc3RvcmFnZU1hbmFnZXItPmdldFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW4oW2NhbGxiYWNr RnVuY3Rpb25dKFZlY3RvcjxMb2NhbFN0b3JhZ2VEZXRhaWxzPiBzdG9yYWdlRGV0YWlscykgewor ICAgIHN0b3JhZ2VNYW5hZ2VyLT5nZXRMb2NhbFN0b3JhZ2VEZXRhaWxzQnlPcmlnaW4oW2NhbGxi YWNrRnVuY3Rpb25dKFZlY3RvcjxMb2NhbFN0b3JhZ2VEZXRhaWxzPiBzdG9yYWdlRGV0YWlscykg ewogICAgICAgICBIYXNoTWFwPFN0cmluZywgUmVmUHRyPEFQSTo6T2JqZWN0Pj4gZGV0YWlsc01h cDsKICAgICAgICAgVmVjdG9yPFJlZlB0cjxBUEk6Ok9iamVjdD4+IHJlc3VsdDsKICAgICAgICAg cmVzdWx0LnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoc3RvcmFnZURldGFpbHMuc2l6ZSgpKTsKQEAg LTE0Nyw3ICsxNDcsNyBAQCB2b2lkIFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUVu dHJpZXNGb3JPcmlnaW4oQVBJOjpTZWN1cml0eU9yaWdpbiogb3JpZwogICAgIGlmICghc3RvcmFn ZU1hbmFnZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIHN0b3JhZ2VNYW5hZ2VyLT5kZWxldGVF bnRyaWVzRm9yT3JpZ2luKG9yaWdpbi0+c2VjdXJpdHlPcmlnaW4oKSk7CisgICAgc3RvcmFnZU1h bmFnZXItPmRlbGV0ZUxvY2FsU3RvcmFnZUVudHJpZXNGb3JPcmlnaW4ob3JpZ2luLT5zZWN1cml0 eU9yaWdpbigpKTsKIH0KIAogdm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVB bGxFbnRyaWVzKCkKQEAgLTE1Niw3ICsxNTYsNyBAQCB2b2lkIFdlYktleVZhbHVlU3RvcmFnZU1h bmFnZXI6OmRlbGV0ZUFsbEVudHJpZXMoKQogICAgIGlmICghc3RvcmFnZU1hbmFnZXIpCiAgICAg ICAgIHJldHVybjsKIAotICAgIHN0b3JhZ2VNYW5hZ2VyLT5kZWxldGVBbGxFbnRyaWVzKCk7Cisg ICAgc3RvcmFnZU1hbmFnZXItPmRlbGV0ZUFsbExvY2FsU3RvcmFnZUVudHJpZXMoKTsKIH0KIAog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKaW5kZXggZjcyNzM0YTAwYmQy NWEzZWM2ZWNhODYyN2NjYTYwNmVhZTViYzAyYi4uZDU2OTFhMzhiNGJlY2FlZTNlNTcxMGMzZWM0 MDY5ZmUwMWM3ZTdmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNp dGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApAQCAtMjY5LDcgKzI2OSw3IEBAIHZv aWQgV2Vic2l0ZURhdGFTdG9yZTo6ZmV0Y2hEYXRhKFdlYnNpdGVEYXRhVHlwZXMgZGF0YVR5cGVz LCBzdGQ6OmZ1bmN0aW9uPHZvaWQKICAgICBpZiAoZGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBl TG9jYWxTdG9yYWdlICYmIG1fc3RvcmFnZU1hbmFnZXIpIHsKICAgICAgICAgY2FsbGJhY2tBZ2dy ZWdhdG9yLT5hZGRQZW5kaW5nQ2FsbGJhY2soKTsKIAotICAgICAgICBtX3N0b3JhZ2VNYW5hZ2Vy LT5nZXRPcmlnaW5zKFtjYWxsYmFja0FnZ3JlZ2F0b3JdKFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6 U2VjdXJpdHlPcmlnaW4+PiBvcmlnaW5zKSB7CisgICAgICAgIG1fc3RvcmFnZU1hbmFnZXItPmdl dExvY2FsU3RvcmFnZU9yaWdpbnMoW2NhbGxiYWNrQWdncmVnYXRvcl0oVmVjdG9yPFJlZlB0cjxX ZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+IG9yaWdpbnMpIHsKICAgICAgICAgICAgIFdlYnNpdGVE YXRhIHdlYnNpdGVEYXRhOwogICAgICAgICAgICAgZm9yIChhdXRvJiBvcmlnaW4gOiBvcmlnaW5z KQogICAgICAgICAgICAgICAgIHdlYnNpdGVEYXRhLmVudHJpZXMuYXBwZW5kKFdlYnNpdGVEYXRh OjpFbnRyeSB7IFdURjo6bW92ZShvcmlnaW4pLCBXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2Ug fSk7CkBAIC02MTYsNyArNjE2LDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRh KFdlYnNpdGVEYXRhVHlwZXMgZGF0YVR5cGVzLCBjb25zdCBWZWN0b3I8V2Vic2kKICAgICBpZiAo ZGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9yYWdlICYmIG1fc3RvcmFnZU1hbmFn ZXIpIHsKICAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5hZGRQZW5kaW5nQ2FsbGJhY2soKTsK IAotICAgICAgICBtX3N0b3JhZ2VNYW5hZ2VyLT5kZWxldGVFbnRyaWVzRm9yT3JpZ2lucyhvcmln aW5zLCBbY2FsbGJhY2tBZ2dyZWdhdG9yXSB7CisgICAgICAgIG1fc3RvcmFnZU1hbmFnZXItPmRl bGV0ZUxvY2FsU3RvcmFnZUVudHJpZXNGb3JPcmlnaW5zKG9yaWdpbnMsIFtjYWxsYmFja0FnZ3Jl Z2F0b3JdIHsKICAgICAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+cmVtb3ZlUGVuZGluZ0Nh bGxiYWNrKCk7CiAgICAgICAgIH0pOwogICAgIH0K