54968 2011-02-22 09:29:24 -0800 Remove DatabasePolicy from FrameLoaderTypes 2011-02-23 00:03:16 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 creis webkit-unassigned ap beidson benm commit-queue darin ericu fishd mihaip oldest_to_newest 355341 0 creis 2011-02-22 09:29:24 -0800 As of http://trac.webkit.org/changeset/79107, we avoid stopping loaders on same-document navigations. This eliminates the need for the DatabasePolicy enum, which was introduced as part of the fix for issue 25710. 355344 1 83334 creis 2011-02-22 09:35:00 -0800 Created attachment 83334 Patch 355888 2 83334 commit-queue 2011-02-22 22:59:01 -0800 Comment on attachment 83334 Patch Clearing flags on attachment: 83334 Committed r79410: <http://trac.webkit.org/changeset/79410> 355889 3 commit-queue 2011-02-22 22:59:06 -0800 All reviewed patches have been landed. Closing bug. 355910 4 commit-queue 2011-02-23 00:03:16 -0800 The commit-queue encountered the following flaky tests while processing attachment 83334: fast/css/font-face-download-error.html bug 51757 (author: yuzo@google.com) The commit-queue is continuing to process your patch. 83334 2011-02-22 09:35:00 -0800 2011-02-22 22:59:01 -0800 Patch bug-54968-20110222093459.patch text/plain 10086 creis SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5MzI3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDItMjIgIENoYXJsaWUg UmVpcyAgPGNyZWlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgRGF0YWJhc2VQb2xpY3kgZnJvbSBGcmFtZUxvYWRl clR5cGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 NDk2OAorCisgICAgICAgIFRoZSBEYXRhYmFzZVBvbGljeSBlbnVtIGlzIG5vIGxvbmdlciBuZWVk ZWQgbm93IHRoYXQgd2UgYXZvaWQgc3RvcHBpbmcKKyAgICAgICAgbG9hZGVycyBvbiBzYW1lLWRv Y3VtZW50IG5hdmlnYXRpb25zLgorCisgICAgICAgIEV4aXN0aW5nIHRlc3Q6IHN0b3JhZ2UvaGFz aC1jaGFuZ2Utd2l0aC14aHIuaHRtbAorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAg ICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcDoKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1l bnRMb2FkZXIuaDoKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAq IGxvYWRlci9GcmFtZUxvYWRlci5oOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlclR5cGVz Lmg6CisgICAgICAgICogd29ya2Vycy9Xb3JrZXJUaHJlYWQuY3BwOgorCiAyMDExLTAyLTIyICBJ bHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBZdXJ5IFNlbWlraGF0c2t5LgpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHJldmlzaW9u IDc5MzI3KQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHdvcmtpbmcgY29weSkK QEAgLTE2NCw3ICsxNjQsNyBAQCBfX1pON1dlYkNvcmUxMUZyYW1lTG9hZGVyMTFzaG91bGRDbG9z ZUV2CiBfX1pON1dlYkNvcmUxMUZyYW1lTG9hZGVyMTF1cmxTZWxlY3RlZEVSS05TXzRLVVJMRVJL TjNXVEY2U3RyaW5nRU5TNF8xMFBhc3NSZWZQdHJJTlNfNUV2ZW50RUVFYmJOU18xNFJlZmVycmVy UG9saWN5RQogX19aTjdXZWJDb3JlMTFGcmFtZUxvYWRlcjEyc2hvdWxkUmVsb2FkRVJLTlNfNEtV UkxFUzNfCiBfX1pON1dlYkNvcmUxMUZyYW1lTG9hZGVyMTRkZXRhY2hDaGlsZHJlbkV2Ci1fX1pO N1dlYkNvcmUxMUZyYW1lTG9hZGVyMTRzdG9wQWxsTG9hZGVyc0VOU18xNERhdGFiYXNlUG9saWN5 RU5TXzI2Q2xlYXJQcm92aXNpb25hbEl0ZW1Qb2xpY3lFCitfX1pON1dlYkNvcmUxMUZyYW1lTG9h ZGVyMTRzdG9wQWxsTG9hZGVyc0VOU18yNkNsZWFyUHJvdmlzaW9uYWxJdGVtUG9saWN5RQogX19a TjdXZWJDb3JlMTFGcmFtZUxvYWRlcjE2ZGV0YWNoRnJvbVBhcmVudEV2CiBfX1pON1dlYkNvcmUx MUZyYW1lTG9hZGVyMTZsb2FkRnJhbWVSZXF1ZXN0RVJLTlNfMTZGcmFtZUxvYWRSZXF1ZXN0RWJi TjNXVEYxMFBhc3NSZWZQdHJJTlNfNUV2ZW50RUVFTlM1X0lOU185Rm9ybVN0YXRlRUVFTlNfMTRS ZWZlcnJlclBvbGljeUUKIF9fWk43V2ViQ29yZTExRnJhbWVMb2FkZXIxN3N0b3BGb3JVc2VyQ2Fu Y2VsRWIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAkocmV2 aXNpb24gNzkzMjcpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yMDksNyArMjA5LDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6 bWFpblJlY2VpdmVkRXJyb3IoYwogLy8gb25lIGRvY3VtZW50IGF0IGEgdGltZSwgYnV0IG9uZSBk b2N1bWVudCBtYXkgaGF2ZSBtYW55IHJlbGF0ZWQgcmVzb3VyY2VzLiAKIC8vIHN0b3BMb2FkaW5n IHdpbGwgc3RvcCBhbGwgbG9hZHMgaW5pdGlhdGVkIGJ5IHRoZSBkYXRhIHNvdXJjZSwgCiAvLyBi dXQgbm90IGxvYWRzIGluaXRpYXRlZCBieSBjaGlsZCBmcmFtZXMnIGRhdGEgc291cmNlcyAtLSB0 aGF0J3MgdGhlIFdlYkZyYW1lJ3Mgam9iLgotdm9pZCBEb2N1bWVudExvYWRlcjo6c3RvcExvYWRp bmcoRGF0YWJhc2VQb2xpY3kgZGF0YWJhc2VQb2xpY3kpCit2b2lkIERvY3VtZW50TG9hZGVyOjpz dG9wTG9hZGluZygpCiB7CiAgICAgLy8gSW4gc29tZSByYXJlIGNhc2VzLCBjYWxsaW5nIEZyYW1l TG9hZGVyOjpzdG9wTG9hZGluZyBjb3VsZCBzZXQgbV9sb2FkaW5nIHRvIGZhbHNlLgogICAgIC8v IChUaGlzIGNhbiBoYXBwZW4gd2hlbiB0aGVyZSdzIGEgc2luZ2xlIFhNTEh0dHBSZXF1ZXN0IGN1 cnJlbnRseSBsb2FkaW5nIGFuZCBzdG9wTG9hZGluZyBjYXVzZXMgaXQKQEAgLTIyMiw3ICsyMjIs NyBAQCB2b2lkIERvY3VtZW50TG9hZGVyOjpzdG9wTG9hZGluZyhEYXRhYmFzCiAgICAgICAgIERv Y3VtZW50KiBkb2MgPSBtX2ZyYW1lLT5kb2N1bWVudCgpOwogICAgICAgICAKICAgICAgICAgaWYg KGxvYWRpbmcgfHwgZG9jLT5wYXJzaW5nKCkpCi0gICAgICAgICAgICBtX2ZyYW1lLT5sb2FkZXIo KS0+c3RvcExvYWRpbmcoVW5sb2FkRXZlbnRQb2xpY3lOb25lLCBkYXRhYmFzZVBvbGljeSk7Cisg ICAgICAgICAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+c3RvcExvYWRpbmcoVW5sb2FkRXZlbnRQb2xp Y3lOb25lKTsKICAgICB9CiAKICAgICAvLyBBbHdheXMgY2FuY2VsIG11bHRpcGFydCBsb2FkZXJz CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAkocmV2aXNpb24gNzkz MjcpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAkod29ya2luZyBj b3B5KQpAQCAtMTAwLDcgKzEwMCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgCiAg ICAgICAgIHZvaWQgcmVwbGFjZVJlcXVlc3RVUkxGb3JTYW1lRG9jdW1lbnROYXZpZ2F0aW9uKGNv bnN0IEtVUkwmKTsKICAgICAgICAgYm9vbCBpc1N0b3BwaW5nKCkgY29uc3QgeyByZXR1cm4gbV9p c1N0b3BwaW5nOyB9Ci0gICAgICAgIHZvaWQgc3RvcExvYWRpbmcoRGF0YWJhc2VQb2xpY3kgPSBE YXRhYmFzZVBvbGljeVN0b3ApOworICAgICAgICB2b2lkIHN0b3BMb2FkaW5nKCk7CiAgICAgICAg IHZvaWQgc2V0Q29tbWl0dGVkKGJvb2wgY29tbWl0dGVkKSB7IG1fY29tbWl0dGVkID0gY29tbWl0 dGVkOyB9CiAgICAgICAgIGJvb2wgaXNDb21taXR0ZWQoKSBjb25zdCB7IHJldHVybiBtX2NvbW1p dHRlZDsgfQogICAgICAgICBib29sIGlzTG9hZGluZygpIGNvbnN0IHsgcmV0dXJuIG1fbG9hZGlu ZzsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiA3 OTMyNykKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTM2Miw3ICszNjIsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpzdWJtaXRGb3JtKFBh c3NSZWZQdHI8CiAgICAgdGFyZ2V0RnJhbWUtPm5hdmlnYXRpb25TY2hlZHVsZXIoKS0+c2NoZWR1 bGVGb3JtU3VibWlzc2lvbihzdWJtaXNzaW9uKTsKIH0KIAotdm9pZCBGcmFtZUxvYWRlcjo6c3Rv cExvYWRpbmcoVW5sb2FkRXZlbnRQb2xpY3kgdW5sb2FkRXZlbnRQb2xpY3ksIERhdGFiYXNlUG9s aWN5IGRhdGFiYXNlUG9saWN5KQordm9pZCBGcmFtZUxvYWRlcjo6c3RvcExvYWRpbmcoVW5sb2Fk RXZlbnRQb2xpY3kgdW5sb2FkRXZlbnRQb2xpY3kpCiB7CiAgICAgaWYgKG1fZnJhbWUtPmRvY3Vt ZW50KCkgJiYgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+cGFyc2VyKCkpCiAgICAgICAgIG1fZnJhbWUt PmRvY3VtZW50KCktPnBhcnNlcigpLT5zdG9wUGFyc2luZygpOwpAQCAtNDI5LDEwICs0MjksNyBA QCB2b2lkIEZyYW1lTG9hZGVyOjpzdG9wTG9hZGluZyhVbmxvYWRFdmVuCiAgICAgICAgICAgICBj YWNoZWRSZXNvdXJjZUxvYWRlci0+Y2FuY2VsUmVxdWVzdHMoKTsKIAogI2lmIEVOQUJMRShEQVRB QkFTRSkKLSAgICAgICAgaWYgKGRhdGFiYXNlUG9saWN5ID09IERhdGFiYXNlUG9saWN5U3RvcCkK LSAgICAgICAgICAgIGRvYy0+c3RvcERhdGFiYXNlcygwKTsKLSNlbHNlCi0gICAgVU5VU0VEX1BB UkFNKGRhdGFiYXNlUG9saWN5KTsKKyAgICAgICAgZG9jLT5zdG9wRGF0YWJhc2VzKDApOwogI2Vu ZGlmCiAgICAgfQogCkBAIC0xNjg4LDEzICsxNjg1LDEzIEBAIGJvb2wgRnJhbWVMb2FkZXI6OnNo b3VsZEFsbG93TmF2aWdhdGlvbigKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgRnJhbWVM b2FkZXI6OnN0b3BMb2FkaW5nU3ViZnJhbWVzKERhdGFiYXNlUG9saWN5IGRhdGFiYXNlUG9saWN5 LCBDbGVhclByb3Zpc2lvbmFsSXRlbVBvbGljeSBjbGVhclByb3Zpc2lvbmFsSXRlbVBvbGljeSkK K3ZvaWQgRnJhbWVMb2FkZXI6OnN0b3BMb2FkaW5nU3ViZnJhbWVzKENsZWFyUHJvdmlzaW9uYWxJ dGVtUG9saWN5IGNsZWFyUHJvdmlzaW9uYWxJdGVtUG9saWN5KQogewogICAgIGZvciAoUmVmUHRy PEZyYW1lPiBjaGlsZCA9IG1fZnJhbWUtPnRyZWUoKS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hp bGQgPSBjaGlsZC0+dHJlZSgpLT5uZXh0U2libGluZygpKQotICAgICAgICBjaGlsZC0+bG9hZGVy KCktPnN0b3BBbGxMb2FkZXJzKGRhdGFiYXNlUG9saWN5LCBjbGVhclByb3Zpc2lvbmFsSXRlbVBv bGljeSk7CisgICAgICAgIGNoaWxkLT5sb2FkZXIoKS0+c3RvcEFsbExvYWRlcnMoY2xlYXJQcm92 aXNpb25hbEl0ZW1Qb2xpY3kpOwogfQogCi12b2lkIEZyYW1lTG9hZGVyOjpzdG9wQWxsTG9hZGVy cyhEYXRhYmFzZVBvbGljeSBkYXRhYmFzZVBvbGljeSwgQ2xlYXJQcm92aXNpb25hbEl0ZW1Qb2xp Y3kgY2xlYXJQcm92aXNpb25hbEl0ZW1Qb2xpY3kpCit2b2lkIEZyYW1lTG9hZGVyOjpzdG9wQWxs TG9hZGVycyhDbGVhclByb3Zpc2lvbmFsSXRlbVBvbGljeSBjbGVhclByb3Zpc2lvbmFsSXRlbVBv bGljeSkKIHsKICAgICBBU1NFUlQoIW1fZnJhbWUtPmRvY3VtZW50KCkgfHwgIW1fZnJhbWUtPmRv Y3VtZW50KCktPmluUGFnZUNhY2hlKCkpOwogICAgIGlmIChtX3BhZ2VEaXNtaXNzYWxFdmVudEJl aW5nRGlzcGF0Y2hlZCkKQEAgLTE3MTMsMTEgKzE3MTAsMTEgQEAgdm9pZCBGcmFtZUxvYWRlcjo6 c3RvcEFsbExvYWRlcnMoRGF0YWJhcwogICAgIGlmIChjbGVhclByb3Zpc2lvbmFsSXRlbVBvbGlj eSA9PSBTaG91bGRDbGVhclByb3Zpc2lvbmFsSXRlbSkKICAgICAgICAgaGlzdG9yeSgpLT5zZXRQ cm92aXNpb25hbEl0ZW0oMCk7CiAKLSAgICBzdG9wTG9hZGluZ1N1YmZyYW1lcyhkYXRhYmFzZVBv bGljeSwgY2xlYXJQcm92aXNpb25hbEl0ZW1Qb2xpY3kpOworICAgIHN0b3BMb2FkaW5nU3ViZnJh bWVzKGNsZWFyUHJvdmlzaW9uYWxJdGVtUG9saWN5KTsKICAgICBpZiAobV9wcm92aXNpb25hbERv Y3VtZW50TG9hZGVyKQotICAgICAgICBtX3Byb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXItPnN0b3BM b2FkaW5nKGRhdGFiYXNlUG9saWN5KTsKKyAgICAgICAgbV9wcm92aXNpb25hbERvY3VtZW50TG9h ZGVyLT5zdG9wTG9hZGluZygpOwogICAgIGlmIChtX2RvY3VtZW50TG9hZGVyKQotICAgICAgICBt X2RvY3VtZW50TG9hZGVyLT5zdG9wTG9hZGluZyhkYXRhYmFzZVBvbGljeSk7CisgICAgICAgIG1f ZG9jdW1lbnRMb2FkZXItPnN0b3BMb2FkaW5nKCk7CiAKICAgICBzZXRQcm92aXNpb25hbERvY3Vt ZW50TG9hZGVyKDApOwogICAgIApAQCAtMjM3OSw3ICsyMzc2LDcgQEAgdm9pZCBGcmFtZUxvYWRl cjo6Y2hlY2tMb2FkQ29tcGxldGVGb3JUaAogICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBjYW4g c3RvcHBpbmcgbG9hZGluZyBoZXJlIHBvc3NpYmx5IGhhdmUgYW55IGVmZmVjdCwgaWYgaXNMb2Fk aW5nIGlzIGZhbHNlLAogICAgICAgICAgICAgICAgIC8vIHdoaWNoIGl0IG11c3QgYmUgdG8gYmUg aW4gdGhpcyBicmFuY2ggb2YgdGhlIGlmPyBBbmQgaXMgaXQgT0sgdG8ganVzdCBkbyBhIGZ1bGwt b24KICAgICAgICAgICAgICAgICAvLyBzdG9wQWxsTG9hZGVycyBpbnN0ZWFkIG9mIHN0b3BMb2Fk aW5nU3ViZnJhbWVzPwotICAgICAgICAgICAgICAgIHN0b3BMb2FkaW5nU3ViZnJhbWVzKERhdGFi YXNlUG9saWN5U3RvcCwgU2hvdWxkTm90Q2xlYXJQcm92aXNpb25hbEl0ZW0pOworICAgICAgICAg ICAgICAgIHN0b3BMb2FkaW5nU3ViZnJhbWVzKFNob3VsZE5vdENsZWFyUHJvdmlzaW9uYWxJdGVt KTsKICAgICAgICAgICAgICAgICBwZGwtPnN0b3BMb2FkaW5nKCk7CiAKICAgICAgICAgICAgICAg ICAvLyBJZiB3ZSdyZSBpbiB0aGUgbWlkZGxlIG9mIGxvYWRpbmcgbXVsdGlwYXJ0IGRhdGEsIHdl IG5lZWQgdG8gcmVzdG9yZSB0aGUgZG9jdW1lbnQgbG9hZGVyLgpAQCAtMjk4NCw3ICsyOTgxLDcg QEAgdm9pZCBGcmFtZUxvYWRlcjo6Y29udGludWVMb2FkQWZ0ZXJOYXZpZwogCiAgICAgRnJhbWVM b2FkVHlwZSB0eXBlID0gcG9saWN5Q2hlY2tlcigpLT5sb2FkVHlwZSgpOwogICAgIC8vIEEgbmV3 IG5hdmlnYXRpb24gaXMgaW4gcHJvZ3Jlc3MsIHNvIGRvbid0IGNsZWFyIHRoZSBoaXN0b3J5J3Mg cHJvdmlzaW9uYWwgaXRlbS4KLSAgICBzdG9wQWxsTG9hZGVycyhEYXRhYmFzZVBvbGljeVN0b3As IFNob3VsZE5vdENsZWFyUHJvdmlzaW9uYWxJdGVtKTsKKyAgICBzdG9wQWxsTG9hZGVycyhTaG91 bGROb3RDbGVhclByb3Zpc2lvbmFsSXRlbSk7CiAgICAgCiAgICAgLy8gPHJkYXI6Ly9wcm9ibGVt LzYyNTA4NTY+IC0gSW4gY2VydGFpbiBjaXJjdW1zdGFuY2VzIG9uIHBhZ2VzIHdpdGggbXVsdGlw bGUgZnJhbWVzLCBzdG9wQWxsTG9hZGVycygpCiAgICAgLy8gbWlnaHQgZGV0YWNoIHRoZSBjdXJy ZW50IEZyYW1lTG9hZGVyLCBpbiB3aGljaCBjYXNlIHdlIHNob3VsZCBiYWlsIG9uIHRoaXMgbmV3 bHkgZGVmdW5jdCBsb2FkLiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCShy ZXZpc2lvbiA3OTMyNykKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMjgsOCArMTI4LDcgQEAgcHVibGljOgogICAgIGJvb2wgY2FuSGFu ZGxlUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKIAogICAgIC8vIEFsc28gbm90IGNv b2wuCi0gICAgLy8gRklYTUU6IFdlIG5vIGxvbmdlciBuZWVkIERhdGFiYXNlUG9saWN5LCBzaW5j ZSB3ZSBhbHdheXMgc3RvcCBkYXRhYmFzZXMgbm93LgotICAgIHZvaWQgc3RvcEFsbExvYWRlcnMo RGF0YWJhc2VQb2xpY3kgPSBEYXRhYmFzZVBvbGljeVN0b3AsIENsZWFyUHJvdmlzaW9uYWxJdGVt UG9saWN5ID0gU2hvdWxkQ2xlYXJQcm92aXNpb25hbEl0ZW0pOworICAgIHZvaWQgc3RvcEFsbExv YWRlcnMoQ2xlYXJQcm92aXNpb25hbEl0ZW1Qb2xpY3kgPSBTaG91bGRDbGVhclByb3Zpc2lvbmFs SXRlbSk7CiAgICAgdm9pZCBzdG9wRm9yVXNlckNhbmNlbChib29sIGRlZmVyQ2hlY2tMb2FkQ29t cGxldGUgPSBmYWxzZSk7CiAKICAgICBib29sIGlzTG9hZGluZ01haW5SZXNvdXJjZSgpIGNvbnN0 IHsgcmV0dXJuIG1faXNMb2FkaW5nTWFpblJlc291cmNlOyB9CkBAIC0yMjIsNyArMjIxLDcgQEAg cHVibGljOgogICAgIHZvaWQgc3VibWl0Rm9ybShQYXNzUmVmUHRyPEZvcm1TdWJtaXNzaW9uPik7 CiAKICAgICB2b2lkIHN0b3AoKTsKLSAgICB2b2lkIHN0b3BMb2FkaW5nKFVubG9hZEV2ZW50UG9s aWN5LCBEYXRhYmFzZVBvbGljeSA9IERhdGFiYXNlUG9saWN5U3RvcCk7CisgICAgdm9pZCBzdG9w TG9hZGluZyhVbmxvYWRFdmVudFBvbGljeSk7CiAgICAgYm9vbCBjbG9zZVVSTCgpOwogCiAgICAg dm9pZCBkaWRFeHBsaWNpdE9wZW4oKTsKQEAgLTM1Myw3ICszNTIsNyBAQCBwcml2YXRlOgogICAg IHZvaWQgYWRkRXh0cmFGaWVsZHNUb1JlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiwgRnJhbWVMb2Fk VHlwZSBsb2FkVHlwZSwgYm9vbCBpc01haW5SZXNvdXJjZSwgYm9vbCBjb29raWVQb2xpY3lVUkxG cm9tUmVxdWVzdCk7CiAKICAgICAvLyBBbHNvIG5vdCBjb29sLgotICAgIHZvaWQgc3RvcExvYWRp bmdTdWJmcmFtZXMoRGF0YWJhc2VQb2xpY3ksIENsZWFyUHJvdmlzaW9uYWxJdGVtUG9saWN5KTsK KyAgICB2b2lkIHN0b3BMb2FkaW5nU3ViZnJhbWVzKENsZWFyUHJvdmlzaW9uYWxJdGVtUG9saWN5 KTsKIAogICAgIHZvaWQgY2xlYXJQcm92aXNpb25hbExvYWQoKTsKICAgICB2b2lkIG1hcmtMb2Fk Q29tcGxldGUoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlclR5cGVz LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyVHlwZXMu aAkocmV2aXNpb24gNzkzMjcpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJU eXBlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC02OSwxMSArNjksNiBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIE5hdmlnYXRpb25UeXBlT3RoZXIKICAgICB9OwogCi0gICAgZW51bSBEYXRh YmFzZVBvbGljeSB7Ci0gICAgICAgIERhdGFiYXNlUG9saWN5U3RvcCwgICAgLy8gVGhlIGRhdGFi YXNlIHRocmVhZCBzaG91bGQgYmUgc3RvcHBlZCBhbmQgZGF0YWJhc2UgY29ubmVjdGlvbnMgY2xv c2VkLgotICAgICAgICBEYXRhYmFzZVBvbGljeUNvbnRpbnVlCi0gICAgfTsKLSAgICAKICAgICBl bnVtIENsZWFyUHJvdmlzaW9uYWxJdGVtUG9saWN5IHsKICAgICAgICAgU2hvdWxkQ2xlYXJQcm92 aXNpb25hbEl0ZW0sCiAgICAgICAgIFNob3VsZE5vdENsZWFyUHJvdmlzaW9uYWxJdGVtCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclRocmVhZC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJUaHJlYWQuY3BwCShyZXZpc2lvbiA3OTMyNykK KysrIFNvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyVGhyZWFkLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTk1LDggKzE5NSw2IEBAIHB1YmxpYzoKICAgICAgICAgV29ya2VyQ29udGV4dCogd29y a2VyQ29udGV4dCA9IHN0YXRpY19jYXN0PFdvcmtlckNvbnRleHQqPihjb250ZXh0KTsKIAogI2lm IEVOQUJMRShEQVRBQkFTRSkKLSAgICAgICAgLy8gV2UgY3VycmVudGx5IGlnbm9yZSBhbnkgRGF0 YWJhc2VQb2xpY3kgdXNlZCBmb3IgdGhlIGRvY3VtZW50J3MKLSAgICAgICAgLy8gZGF0YWJhc2Vz OyBpZiBpdCdzIGFjdHVhbGx5IHVzZWQgYW55d2hlcmUsIHRoaXMgc2hvdWxkIGJlIHJldmlzaXRl ZC4KICAgICAgICAgRGF0YWJhc2VUYXNrU3luY2hyb25pemVyIGNsZWFudXBTeW5jOwogICAgICAg ICB3b3JrZXJDb250ZXh0LT5zdG9wRGF0YWJhc2VzKCZjbGVhbnVwU3luYyk7CiAjZW5kaWYK