145111 2015-05-17 17:14:53 -0700 Rename WebsiteDataStore::isNonPersistent() to WebsiteDataStore::isPersistent() 2015-05-20 08:54:07 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sungmann.cho sungmann.cho commit-queue oldest_to_newest 1095532 0 sungmann.cho 2015-05-17 17:14:53 -0700 This is a follow up to https://bugs.webkit.org/show_bug.cgi?id=144158. 1095533 1 253299 sungmann.cho 2015-05-17 17:16:42 -0700 Created attachment 253299 Patch 1096247 2 253299 commit-queue 2015-05-20 08:54:04 -0700 Comment on attachment 253299 Patch Clearing flags on attachment: 253299 Committed r184637: <http://trac.webkit.org/changeset/184637> 1096248 3 commit-queue 2015-05-20 08:54:07 -0700 All reviewed patches have been landed. Closing bug. 253299 2015-05-17 17:16:42 -0700 2015-05-20 08:54:04 -0700 Patch bug-145111-20150518091640.patch text/plain 9917 sungmann.cho U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0NDQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2NlM2Q5NTFiNDVmYjdi Nzc5NDdlM2NlOTRjYjc4YTMyZjdjNjFlNi4uNzdjOGM2ZWE0OTY1Nzc4YjM2ZWMxMDY0YjM2YjJh ZTRmOWJhODYyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA1LTE3ICBTdW5n bWFubiBDaG8gIDxzdW5nbWFubi5jaG9AbmF2ZXJjb3JwLmNvbT4KKworICAgICAgICBSZW5hbWUg V2Vic2l0ZURhdGFTdG9yZTo6aXNOb25QZXJzaXN0ZW50KCkgdG8gV2Vic2l0ZURhdGFTdG9yZTo6 aXNQZXJzaXN0ZW50KCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDUxMTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGlzIGlzIGEgZm9sbG93IHVwIHRvIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDQxNTguCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSVdlYnNp dGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAoQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjppc1BlcnNp c3RlbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3Jl LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6ZmV0Y2hEYXRhKToKKyAg ICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YSk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaDoKKyAgICAgICAgKFdlYktp dDo6V2Vic2l0ZURhdGFTdG9yZTo6aXNQZXJzaXN0ZW50KToKKyAgICAgICAgKFdlYktpdDo6V2Vi c2l0ZURhdGFTdG9yZTo6aXNOb25QZXJzaXN0ZW50KTogRGVsZXRlZC4KKwogMjAxNS0wNS0xNiAg QW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gV0tQREZWaWV3 IHNob3VsZCBub3QgZm9sbG93IGphdmFzY3JpcHQ6IGxpbmtzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVdlYnNpdGVEYXRhU3RvcmUuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRleCA1ZjZkZmY5 ZWQzMTg1MWU1ZGM1ZDk5MzBkODA0ZTdmYzhkYmY5ODY1Li45NWEwN2Q5NGE4OTVkOWU1ZWVmNWE3 MWVlYjI1NmY4NzUwNWNiNGExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0FQSVdlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQVBJV2Vic2l0ZURhdGFTdG9yZS5jcHAKQEAgLTYzLDcgKzYzLDcgQEAgV2Vic2l0ZURh dGFTdG9yZTo6fldlYnNpdGVEYXRhU3RvcmUoKQogCiBib29sIFdlYnNpdGVEYXRhU3RvcmU6Omlz UGVyc2lzdGVudCgpCiB7Ci0gICAgcmV0dXJuICFtX3dlYnNpdGVEYXRhU3RvcmUtPmlzTm9uUGVy c2lzdGVudCgpOworICAgIHJldHVybiBtX3dlYnNpdGVEYXRhU3RvcmUtPmlzUGVyc2lzdGVudCgp OwogfQogCiAjaWYgIVBMQVRGT1JNKENPQ09BKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCmluZGV4IDNiZjk3 OGVjYWZhMTEyNDYzMmZkMGI3N2VkMDVkYjU4M2ZkZWYxMDMuLjhjMjE3YjRlMmQ0YTIzNmQ5N2Y5 NmMwOGMwOGFhNTUyOTIyYzNlODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKQEAgLTIxMyw3ICsyMTMs NyBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmZldGNoRGF0YShXZWJzaXRlRGF0YVR5cGVzIGRh dGFUeXBlcywgc3RkOjpmdW5jdGlvbjx2b2lkCiAKICAgICBSZWZQdHI8Q2FsbGJhY2tBZ2dyZWdh dG9yPiBjYWxsYmFja0FnZ3JlZ2F0b3IgPSBhZG9wdFJlZihuZXcgQ2FsbGJhY2tBZ2dyZWdhdG9y KFdURjo6bW92ZShjb21wbGV0aW9uSGFuZGxlcikpKTsKIAotICAgIGF1dG8gbmV0d29ya1Byb2Nl c3NBY2Nlc3NUeXBlID0gY29tcHV0ZU5ldHdvcmtQcm9jZXNzQWNjZXNzVHlwZUZvckRhdGFGZXRj aChkYXRhVHlwZXMsIGlzTm9uUGVyc2lzdGVudCgpKTsKKyAgICBhdXRvIG5ldHdvcmtQcm9jZXNz QWNjZXNzVHlwZSA9IGNvbXB1dGVOZXR3b3JrUHJvY2Vzc0FjY2Vzc1R5cGVGb3JEYXRhRmV0Y2go ZGF0YVR5cGVzLCAhaXNQZXJzaXN0ZW50KCkpOwogICAgIGlmIChuZXR3b3JrUHJvY2Vzc0FjY2Vz c1R5cGUgIT0gUHJvY2Vzc0FjY2Vzc1R5cGU6Ok5vbmUpIHsKICAgICAgICAgSGFzaFNldDxXZWJQ cm9jZXNzUG9vbCo+IHByb2Nlc3NQb29sczsKICAgICAgICAgZm9yIChhdXRvJiBwcm9jZXNzIDog cHJvY2Vzc2VzKCkpCkBAIC0yNDEsNyArMjQxLDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpm ZXRjaERhdGEoV2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIHN0ZDo6ZnVuY3Rpb248dm9pZAog ICAgICAgICB9CiAgICAgfQogCi0gICAgYXV0byB3ZWJQcm9jZXNzQWNjZXNzVHlwZSA9IGNvbXB1 dGVXZWJQcm9jZXNzQWNjZXNzVHlwZUZvckRhdGFGZXRjaChkYXRhVHlwZXMsIGlzTm9uUGVyc2lz dGVudCgpKTsKKyAgICBhdXRvIHdlYlByb2Nlc3NBY2Nlc3NUeXBlID0gY29tcHV0ZVdlYlByb2Nl c3NBY2Nlc3NUeXBlRm9yRGF0YUZldGNoKGRhdGFUeXBlcywgIWlzUGVyc2lzdGVudCgpKTsKICAg ICBpZiAod2ViUHJvY2Vzc0FjY2Vzc1R5cGUgIT0gUHJvY2Vzc0FjY2Vzc1R5cGU6Ok5vbmUpIHsK ICAgICAgICAgZm9yIChhdXRvJiBwcm9jZXNzIDogcHJvY2Vzc2VzKCkpIHsKICAgICAgICAgICAg IHN3aXRjaCAod2ViUHJvY2Vzc0FjY2Vzc1R5cGUpIHsKQEAgLTI3OSw3ICsyNzksNyBAQCB2b2lk IFdlYnNpdGVEYXRhU3RvcmU6OmZldGNoRGF0YShXZWJzaXRlRGF0YVR5cGVzIGRhdGFUeXBlcywg c3RkOjpmdW5jdGlvbjx2b2lkCiAgICAgICAgIH0pOwogICAgIH0KIAotICAgIGlmIChkYXRhVHlw ZXMgJiBXZWJzaXRlRGF0YVR5cGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSAmJiAhaXNOb25Q ZXJzaXN0ZW50KCkpIHsKKyAgICBpZiAoZGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlT2ZmbGlu ZVdlYkFwcGxpY2F0aW9uQ2FjaGUgJiYgaXNQZXJzaXN0ZW50KCkpIHsKICAgICAgICAgU3RyaW5n Q2FwdHVyZSBhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5IHsgbV9hcHBsaWNhdGlvbkNhY2hlRGly ZWN0b3J5IH07CiAKICAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5hZGRQZW5kaW5nQ2FsbGJh Y2soKTsKQEAgLTMwMSw3ICszMDEsNyBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmZldGNoRGF0 YShXZWJzaXRlRGF0YVR5cGVzIGRhdGFUeXBlcywgc3RkOjpmdW5jdGlvbjx2b2lkCiAgICAgICAg IH0pOwogICAgIH0KIAotICAgIGlmIChkYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVXZWJTUUxE YXRhYmFzZXMgJiYgIWlzTm9uUGVyc2lzdGVudCgpKSB7CisgICAgaWYgKGRhdGFUeXBlcyAmIFdl YnNpdGVEYXRhVHlwZVdlYlNRTERhdGFiYXNlcyAmJiBpc1BlcnNpc3RlbnQoKSkgewogICAgICAg ICBTdHJpbmdDYXB0dXJlIHdlYlNRTERhdGFiYXNlRGlyZWN0b3J5IHsgbV93ZWJTUUxEYXRhYmFz ZURpcmVjdG9yeSB9OwogCiAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVuZGluZ0Nh bGxiYWNrKCk7CkBAIC0zMjEsNyArMzIxLDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpmZXRj aERhdGEoV2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIHN0ZDo6ZnVuY3Rpb248dm9pZAogICAg IH0KIAogI2lmIEVOQUJMRShEQVRBQkFTRV9QUk9DRVNTKQotICAgIGlmIChkYXRhVHlwZXMgJiBX ZWJzaXRlRGF0YVR5cGVJbmRleGVkREJEYXRhYmFzZXMgJiYgIWlzTm9uUGVyc2lzdGVudCgpKSB7 CisgICAgaWYgKGRhdGFUeXBlcyAmIFdlYnNpdGVEYXRhVHlwZUluZGV4ZWREQkRhdGFiYXNlcyAm JiBpc1BlcnNpc3RlbnQoKSkgewogICAgICAgICBIYXNoU2V0PFdlYlByb2Nlc3NQb29sKj4gcHJv Y2Vzc1Bvb2xzOwogICAgICAgICBmb3IgKGF1dG8mIHByb2Nlc3MgOiBwcm9jZXNzZXMoKSkKICAg ICAgICAgICAgIHByb2Nlc3NQb29scy5hZGQoJnByb2Nlc3MtPnByb2Nlc3NQb29sKCkpOwpAQCAt NDAyLDcgKzQwMiw3IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YShXZWJzaXRl RGF0YVR5cGVzIGRhdGFUeXBlcywgc3RkOjpjaHJvbm86OnN5c3RlCiAKICAgICBSZWZQdHI8Q2Fs bGJhY2tBZ2dyZWdhdG9yPiBjYWxsYmFja0FnZ3JlZ2F0b3IgPSBhZG9wdFJlZihuZXcgQ2FsbGJh Y2tBZ2dyZWdhdG9yKFdURjo6bW92ZShjb21wbGV0aW9uSGFuZGxlcikpKTsKIAotICAgIGF1dG8g bmV0d29ya1Byb2Nlc3NBY2Nlc3NUeXBlID0gY29tcHV0ZU5ldHdvcmtQcm9jZXNzQWNjZXNzVHlw ZUZvckRhdGFSZW1vdmFsKGRhdGFUeXBlcywgaXNOb25QZXJzaXN0ZW50KCkpOworICAgIGF1dG8g bmV0d29ya1Byb2Nlc3NBY2Nlc3NUeXBlID0gY29tcHV0ZU5ldHdvcmtQcm9jZXNzQWNjZXNzVHlw ZUZvckRhdGFSZW1vdmFsKGRhdGFUeXBlcywgIWlzUGVyc2lzdGVudCgpKTsKICAgICBpZiAobmV0 d29ya1Byb2Nlc3NBY2Nlc3NUeXBlICE9IFByb2Nlc3NBY2Nlc3NUeXBlOjpOb25lKSB7CiAgICAg ICAgIEhhc2hTZXQ8V2ViUHJvY2Vzc1Bvb2wqPiBwcm9jZXNzUG9vbHM7CiAgICAgICAgIGZvciAo YXV0byYgcHJvY2VzcyA6IHByb2Nlc3NlcygpKQpAQCAtNDMwLDcgKzQzMCw3IEBAIHZvaWQgV2Vi c2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YShXZWJzaXRlRGF0YVR5cGVzIGRhdGFUeXBlcywgc3Rk OjpjaHJvbm86OnN5c3RlCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBhdXRvIHdlYlByb2Nlc3NB Y2Nlc3NUeXBlID0gY29tcHV0ZVdlYlByb2Nlc3NBY2Nlc3NUeXBlRm9yRGF0YVJlbW92YWwoZGF0 YVR5cGVzLCBpc05vblBlcnNpc3RlbnQoKSk7CisgICAgYXV0byB3ZWJQcm9jZXNzQWNjZXNzVHlw ZSA9IGNvbXB1dGVXZWJQcm9jZXNzQWNjZXNzVHlwZUZvckRhdGFSZW1vdmFsKGRhdGFUeXBlcywg IWlzUGVyc2lzdGVudCgpKTsKICAgICBpZiAod2ViUHJvY2Vzc0FjY2Vzc1R5cGUgIT0gUHJvY2Vz c0FjY2Vzc1R5cGU6Ok5vbmUpIHsKICAgICAgICAgZm9yIChhdXRvJiBwcm9jZXNzIDogcHJvY2Vz c2VzKCkpIHsKICAgICAgICAgICAgIHN3aXRjaCAod2ViUHJvY2Vzc0FjY2Vzc1R5cGUpIHsKQEAg LTQ2Myw3ICs0NjMsNyBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoV2Vic2l0 ZURhdGFUeXBlcyBkYXRhVHlwZXMsIHN0ZDo6Y2hyb25vOjpzeXN0ZQogICAgICAgICB9KTsKICAg ICB9CiAKLSAgICBpZiAoZGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlT2ZmbGluZVdlYkFwcGxp Y2F0aW9uQ2FjaGUgJiYgIWlzTm9uUGVyc2lzdGVudCgpKSB7CisgICAgaWYgKGRhdGFUeXBlcyAm IFdlYnNpdGVEYXRhVHlwZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlICYmIGlzUGVyc2lzdGVu dCgpKSB7CiAgICAgICAgIFN0cmluZ0NhcHR1cmUgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSB7 IG1fYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSB9OwogCiAgICAgICAgIGNhbGxiYWNrQWdncmVn YXRvci0+YWRkUGVuZGluZ0NhbGxiYWNrKCk7CkBAIC00NzksNyArNDc5LDcgQEAgdm9pZCBXZWJz aXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKFdlYnNpdGVEYXRhVHlwZXMgZGF0YVR5cGVzLCBzdGQ6 OmNocm9ubzo6c3lzdGUKICAgICAgICAgfSk7CiAgICAgfQogCi0gICAgaWYgKGRhdGFUeXBlcyAm IFdlYnNpdGVEYXRhVHlwZVdlYlNRTERhdGFiYXNlcyAmJiAhaXNOb25QZXJzaXN0ZW50KCkpIHsK KyAgICBpZiAoZGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlV2ViU1FMRGF0YWJhc2VzICYmIGlz UGVyc2lzdGVudCgpKSB7CiAgICAgICAgIFN0cmluZ0NhcHR1cmUgd2ViU1FMRGF0YWJhc2VEaXJl Y3RvcnkgeyBtX3dlYlNRTERhdGFiYXNlRGlyZWN0b3J5IH07CiAKICAgICAgICAgY2FsbGJhY2tB Z2dyZWdhdG9yLT5hZGRQZW5kaW5nQ2FsbGJhY2soKTsKQEAgLTQ5NCw3ICs0OTQsNyBAQCB2b2lk IFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoV2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMs IHN0ZDo6Y2hyb25vOjpzeXN0ZQogICAgIH0KIAogI2lmIEVOQUJMRShEQVRBQkFTRV9QUk9DRVNT KQotICAgIGlmIChkYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVJbmRleGVkREJEYXRhYmFzZXMg JiYgIWlzTm9uUGVyc2lzdGVudCgpKSB7CisgICAgaWYgKGRhdGFUeXBlcyAmIFdlYnNpdGVEYXRh VHlwZUluZGV4ZWREQkRhdGFiYXNlcyAmJiBpc1BlcnNpc3RlbnQoKSkgewogICAgICAgICBIYXNo U2V0PFdlYlByb2Nlc3NQb29sKj4gcHJvY2Vzc1Bvb2xzOwogICAgICAgICBmb3IgKGF1dG8mIHBy b2Nlc3MgOiBwcm9jZXNzZXMoKSkKICAgICAgICAgICAgIHByb2Nlc3NQb29scy5hZGQoJnByb2Nl c3MtPnByb2Nlc3NQb29sKCkpOwpAQCAtNTU0LDcgKzU1NCw3IEBAIHZvaWQgV2Vic2l0ZURhdGFT dG9yZTo6cmVtb3ZlRGF0YShXZWJzaXRlRGF0YVR5cGVzIGRhdGFUeXBlcywgY29uc3QgVmVjdG9y PFdlYnNpCiAKICAgICBSZWZQdHI8Q2FsbGJhY2tBZ2dyZWdhdG9yPiBjYWxsYmFja0FnZ3JlZ2F0 b3IgPSBhZG9wdFJlZihuZXcgQ2FsbGJhY2tBZ2dyZWdhdG9yKFdURjo6bW92ZShjb21wbGV0aW9u SGFuZGxlcikpKTsKIAotICAgIGF1dG8gbmV0d29ya1Byb2Nlc3NBY2Nlc3NUeXBlID0gY29tcHV0 ZU5ldHdvcmtQcm9jZXNzQWNjZXNzVHlwZUZvckRhdGFSZW1vdmFsKGRhdGFUeXBlcywgaXNOb25Q ZXJzaXN0ZW50KCkpOworICAgIGF1dG8gbmV0d29ya1Byb2Nlc3NBY2Nlc3NUeXBlID0gY29tcHV0 ZU5ldHdvcmtQcm9jZXNzQWNjZXNzVHlwZUZvckRhdGFSZW1vdmFsKGRhdGFUeXBlcywgIWlzUGVy c2lzdGVudCgpKTsKICAgICBpZiAobmV0d29ya1Byb2Nlc3NBY2Nlc3NUeXBlICE9IFByb2Nlc3NB Y2Nlc3NUeXBlOjpOb25lKSB7CiAgICAgICAgIEhhc2hTZXQ8V2ViUHJvY2Vzc1Bvb2wqPiBwcm9j ZXNzUG9vbHM7CiAgICAgICAgIGZvciAoYXV0byYgcHJvY2VzcyA6IHByb2Nlc3NlcygpKQpAQCAt NTg4LDcgKzU4OCw3IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YShXZWJzaXRl RGF0YVR5cGVzIGRhdGFUeXBlcywgY29uc3QgVmVjdG9yPFdlYnNpCiAgICAgICAgIH0KICAgICB9 CiAKLSAgICBhdXRvIHdlYlByb2Nlc3NBY2Nlc3NUeXBlID0gY29tcHV0ZVdlYlByb2Nlc3NBY2Nl c3NUeXBlRm9yRGF0YVJlbW92YWwoZGF0YVR5cGVzLCBpc05vblBlcnNpc3RlbnQoKSk7CisgICAg YXV0byB3ZWJQcm9jZXNzQWNjZXNzVHlwZSA9IGNvbXB1dGVXZWJQcm9jZXNzQWNjZXNzVHlwZUZv ckRhdGFSZW1vdmFsKGRhdGFUeXBlcywgIWlzUGVyc2lzdGVudCgpKTsKICAgICBpZiAod2ViUHJv Y2Vzc0FjY2Vzc1R5cGUgIT0gUHJvY2Vzc0FjY2Vzc1R5cGU6Ok5vbmUpIHsKICAgICAgICAgZm9y IChhdXRvJiBwcm9jZXNzIDogcHJvY2Vzc2VzKCkpIHsKICAgICAgICAgICAgIHN3aXRjaCAod2Vi UHJvY2Vzc0FjY2Vzc1R5cGUpIHsKQEAgLTYyMiw3ICs2MjIsNyBAQCB2b2lkIFdlYnNpdGVEYXRh U3RvcmU6OnJlbW92ZURhdGEoV2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIGNvbnN0IFZlY3Rv cjxXZWJzaQogICAgICAgICB9KTsKICAgICB9CiAKLSAgICBpZiAoZGF0YVR5cGVzICYgV2Vic2l0 ZURhdGFUeXBlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUgJiYgIWlzTm9uUGVyc2lzdGVudCgp KSB7CisgICAgaWYgKGRhdGFUeXBlcyAmIFdlYnNpdGVEYXRhVHlwZU9mZmxpbmVXZWJBcHBsaWNh dGlvbkNhY2hlICYmIGlzUGVyc2lzdGVudCgpKSB7CiAgICAgICAgIFN0cmluZ0NhcHR1cmUgYXBw bGljYXRpb25DYWNoZURpcmVjdG9yeSB7IG1fYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSB9Owog CiAgICAgICAgIEhhc2hTZXQ8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4gb3JpZ2lu czsKQEAgLTY0NCw3ICs2NDQsNyBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEo V2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIGNvbnN0IFZlY3RvcjxXZWJzaQogICAgICAgICB9 KTsKICAgICB9CiAKLSAgICBpZiAoZGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlV2ViU1FMRGF0 YWJhc2VzICYmICFpc05vblBlcnNpc3RlbnQoKSkgeworICAgIGlmIChkYXRhVHlwZXMgJiBXZWJz aXRlRGF0YVR5cGVXZWJTUUxEYXRhYmFzZXMgJiYgaXNQZXJzaXN0ZW50KCkpIHsKICAgICAgICAg U3RyaW5nQ2FwdHVyZSB3ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSB7IG1fd2ViU1FMRGF0YWJhc2VE aXJlY3RvcnkgfTsKIAogICAgICAgICBIYXNoU2V0PFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9y aWdpbj4+IG9yaWdpbnM7CkBAIC02NjcsNyArNjY3LDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3Jl OjpyZW1vdmVEYXRhKFdlYnNpdGVEYXRhVHlwZXMgZGF0YVR5cGVzLCBjb25zdCBWZWN0b3I8V2Vi c2kKICAgICB9CiAKICNpZiBFTkFCTEUoREFUQUJBU0VfUFJPQ0VTUykKLSAgICBpZiAoZGF0YVR5 cGVzICYgV2Vic2l0ZURhdGFUeXBlSW5kZXhlZERCRGF0YWJhc2VzICYmICFpc05vblBlcnNpc3Rl bnQoKSkgeworICAgIGlmIChkYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVJbmRleGVkREJEYXRh YmFzZXMgJiYgaXNQZXJzaXN0ZW50KCkpIHsKICAgICAgICAgSGFzaFNldDxXZWJQcm9jZXNzUG9v bCo+IHByb2Nlc3NQb29sczsKICAgICAgICAgZm9yIChhdXRvJiBwcm9jZXNzIDogcHJvY2Vzc2Vz KCkpCiAgICAgICAgICAgICBwcm9jZXNzUG9vbHMuYWRkKCZwcm9jZXNzLT5wcm9jZXNzUG9vbCgp KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJz aXRlRGF0YVN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vi c2l0ZURhdGFTdG9yZS5oCmluZGV4IGZjZWI5MTA5ZjE3Nzg4NWJlOTlmYTYzOTk3NDMxMTgwMzU0 NjY4OGMuLmQyNjdmYjg3ZDA0NTk3YTdkN2MzYzQzZGNmMmExZTFiOTIzNTk0NjAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3Jl LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRh U3RvcmUuaApAQCAtNTcsOCArNTcsNyBAQCBwdWJsaWM6CiAKICAgICB1aW50NjRfdCBpZGVudGlm aWVyKCkgY29uc3QgeyByZXR1cm4gbV9pZGVudGlmaWVyOyB9CiAKLSAgICAvLyBGSVhNRTogQ2hh bmdlIHRoaXMgdG8gaXNQZXJzaXN0ZW50KCkgYW5kIHVwZGF0ZSBjYWxsZXJzLgotICAgIGJvb2wg aXNOb25QZXJzaXN0ZW50KCkgY29uc3QgeyByZXR1cm4gbV9zZXNzaW9uSUQuaXNFcGhlbWVyYWwo KTsgfQorICAgIGJvb2wgaXNQZXJzaXN0ZW50KCkgY29uc3QgeyByZXR1cm4gIW1fc2Vzc2lvbklE LmlzRXBoZW1lcmFsKCk7IH0KICAgICBXZWJDb3JlOjpTZXNzaW9uSUQgc2Vzc2lvbklEKCkgY29u c3QgeyByZXR1cm4gbV9zZXNzaW9uSUQ7IH0KIAogICAgIHN0YXRpYyB2b2lkIGNsb25lU2Vzc2lv bkRhdGEoV2ViUGFnZVByb3h5JiBzb3VyY2VQYWdlLCBXZWJQYWdlUHJveHkmIG5ld1BhZ2UpOwo=