83843 2012-04-12 18:16:08 -0700 Prepare window.location for seamless navigation 2012-04-12 22:31:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth eric haraken japhet webkit.review.bot oldest_to_newest 601701 0 abarth 2012-04-12 18:16:08 -0700 Prepare window.location for seamless navigation 601703 1 137010 abarth 2012-04-12 18:18:36 -0700 Created attachment 137010 Patch 601831 2 137010 webkit.review.bot 2012-04-12 22:31:38 -0700 Comment on attachment 137010 Patch Clearing flags on attachment: 137010 Committed r114082: <http://trac.webkit.org/changeset/114082> 601832 3 webkit.review.bot 2012-04-12 22:31:43 -0700 All reviewed patches have been landed. Closing bug. 137010 2012-04-12 18:18:36 -0700 2012-04-12 22:31:38 -0700 Patch bug-83843-20120412181835.patch text/plain 8964 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNDA2NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDEyLTA0LTEyICBBZGFtIEJh cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUHJlcGFyZSB3aW5kb3cubG9jYXRp b24gZm9yIHNlYW1sZXNzIG5hdmlnYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTgzODQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZWZhY3RvcnMgd2luZG93LmxvY2F0aW9uIHRv IGZsb3cgdGhyb3VnaAorICAgICAgICBGcmFtZUxvYWRlcjo6ZmluZEZyYW1lRm9yTmF2aWdhdGlv biwgd2hpY2ggaXMgd2hlcmUgd2UncmUgZ29pbmcgdG8KKyAgICAgICAgaW1wbGVtZW50IHRoZSBz ZWFtbGVzcyBuYXZpZ2F0aW9uIHJlZGlyZWN0LiAgVGhpcyBwYXRjaCBzaG91bGRuJ3QgY2F1c2UK KyAgICAgICAgYW55IG9ic2VydmFibGUgY2hhbmdlcyBpbiBiZWhhdmlvciB0b2RheSwgYnV0IGl0 IHdpbGwgbWFrZSBhbGwgdGhlCisgICAgICAgIHNlYW1sZXNzLXdpbmRvdy1sb2NhdGlvbiogdGVz dHMgaW4KKyAgICAgICAgaHR0cHM6Ly9naXRodWIuY29tL2VzZWlkZWwvd2Via2l0L3RyZWUvc2Vh bWxlc3MvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvc2VhbWxlc3MKKyAgICAgICAgcGFzcyBvbmNl IHdlIG1lcmdlIHRoZSBzZWFtbGVzc3MgYnJhbmNoLiAgU2VlCisgICAgICAgIGh0dHBzOi8vZ2l0 aHViLmNvbS9lc2VpZGVsL3dlYmtpdC9jb21taXQvYTZlNzA4ZmE2YzY0M2IxNTYzOTdlOWEyODdi NDBhMDg2OGM3OTU5YworICAgICAgICBmb3IgY29udGV4dC4KKworICAgICAgICAqIGJpbmRpbmdz L2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTRE9NV2luZG93 OjpzZXRMb2NhdGlvbik6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93 Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9NV2luZG93Ojpsb2NhdGlvbkFjY2Vz c29yU2V0dGVyKToKKyAgICAgICAgKiBwYWdlL0xvY2F0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxvY2F0aW9uOjpzZXRIcmVmKToKKyAgICAgICAgKFdlYkNvcmU6OkxvY2F0aW9uOjpzZXRQ cm90b2NvbCk6CisgICAgICAgIChXZWJDb3JlOjpMb2NhdGlvbjo6c2V0SG9zdCk6CisgICAgICAg IChXZWJDb3JlOjpMb2NhdGlvbjo6c2V0SG9zdG5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6TG9j YXRpb246OnNldFBvcnQpOgorICAgICAgICAoV2ViQ29yZTo6TG9jYXRpb246OnNldFBhdGhuYW1l KToKKyAgICAgICAgKFdlYkNvcmU6OkxvY2F0aW9uOjpzZXRTZWFyY2gpOgorICAgICAgICAoV2Vi Q29yZTo6TG9jYXRpb246OnNldEhhc2gpOgorICAgICAgICAoV2ViQ29yZTo6TG9jYXRpb246OmFz c2lnbik6CisgICAgICAgIChXZWJDb3JlOjpMb2NhdGlvbjo6cmVwbGFjZSk6CisgICAgICAgIChX ZWJDb3JlOjpMb2NhdGlvbjo6c2V0TG9jYXRpb24pOgorICAgICAgICAoV2ViQ29yZSk6CisgICAg ICAgICogcGFnZS9Mb2NhdGlvbi5oOgorICAgICAgICAoTG9jYXRpb24pOgorCiAyMDEyLTA0LTEy ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9t aXVtXVtyZWZhY3RvcmluZ10gbWVyZ2UgQ0NTaW5nbGVUaHJlYWRQcm94eTo6e2NvbW1pdElmTmVl ZGVkLGRvQ29tcG9zaXRlfSBpbnRvIGNvbW1pdEFuZENvbXBvc2l0ZSgpCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20uY3BwCShyZXZpc2lv biAxMTQwNTYpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3Rv bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyNCw3ICs0MjQsOCBAQCB2b2lkIEpTRE9NV2luZG93 OjpzZXRMb2NhdGlvbihFeGVjU3RhdGUqCiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQog ICAgICAgICByZXR1cm47CiAKLSAgICBpbXBsKCktPnNldExvY2F0aW9uKHVzdHJpbmdUb1N0cmlu Zyhsb2NhdGlvblN0cmluZyksIGFjdGl2ZURPTVdpbmRvdyhleGVjKSwgZmlyc3RET01XaW5kb3co ZXhlYykpOworICAgIGlmIChMb2NhdGlvbiogbG9jYXRpb24gPSBpbXBsKCktPmxvY2F0aW9uKCkp CisgICAgICAgIGxvY2F0aW9uLT5zZXRIcmVmKHVzdHJpbmdUb1N0cmluZyhsb2NhdGlvblN0cmlu ZyksIGFjdGl2ZURPTVdpbmRvdyhleGVjKSwgZmlyc3RET01XaW5kb3coZXhlYykpOwogfQogCiBK U1ZhbHVlIEpTRE9NV2luZG93OjpldmVudChFeGVjU3RhdGUqIGV4ZWMpIGNvbnN0CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVdpbmRv d0N1c3RvbS5jcHAJKHJldmlzaW9uIDExNDA1NikKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOERPTVdpbmRvd0N1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyLDYg KzQyLDcgQEAKICNpbmNsdWRlICJGcmFtZVZpZXcuaCIKICNpbmNsdWRlICJIVE1MQ29sbGVjdGlv bi5oIgogI2luY2x1ZGUgIkhUTUxEb2N1bWVudC5oIgorI2luY2x1ZGUgIkxvY2F0aW9uLmgiCiAj aW5jbHVkZSAiTWVkaWFQbGF5ZXIuaCIKICNpbmNsdWRlICJNZXNzYWdlUG9ydC5oIgogI2luY2x1 ZGUgIlBhZ2UuaCIKQEAgLTE5NSw3ICsxOTYsOCBAQCB2b2lkIFY4RE9NV2luZG93Ojpsb2NhdGlv bkFjY2Vzc29yU2V0dGVyCiAgICAgaWYgKCFmaXJzdFdpbmRvdykKICAgICAgIHJldHVybjsKIAot ICAgIGltcC0+c2V0TG9jYXRpb24odG9XZWJDb3JlU3RyaW5nKHZhbHVlKSwgYWN0aXZlV2luZG93 LCBmaXJzdFdpbmRvdyk7CisgICAgaWYgKExvY2F0aW9uKiBsb2NhdGlvbiA9IGltcC0+bG9jYXRp b24oKSkKKyAgICAgICAgbG9jYXRpb24tPnNldEhyZWYodG9XZWJDb3JlU3RyaW5nKHZhbHVlKSwg YWN0aXZlV2luZG93LCBmaXJzdFdpbmRvdyk7CiB9CiAKIHZvaWQgVjhET01XaW5kb3c6Om9wZW5l ckFjY2Vzc29yU2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCB2ODo6TG9jYWw8djg6 OlZhbHVlPiB2YWx1ZSwgY29uc3Qgdjg6OkFjY2Vzc29ySW5mbyYgaW5mbykKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BhZ2UvTG9jYXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BhZ2UvTG9jYXRpb24uY3BwCShyZXZpc2lvbiAxMTQwNTYpCisrKyBTb3VyY2UvV2ViQ29yZS9w YWdlL0xvY2F0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQzLDExICsxNDMsMTEgQEAgU3Ry aW5nIExvY2F0aW9uOjpoYXNoKCkgY29uc3QKICAgICByZXR1cm4gZnJhZ21lbnRJZGVudGlmaWVy LmlzRW1wdHkoKSA/IGVtcHR5U3RyaW5nKCkgOiAiIyIgKyBmcmFnbWVudElkZW50aWZpZXI7CiB9 CiAKLXZvaWQgTG9jYXRpb246OnNldEhyZWYoY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIERPTVdp bmRvdyogYWN0aXZlV2luZG93LCBET01XaW5kb3cqIGZpcnN0V2luZG93KQordm9pZCBMb2NhdGlv bjo6c2V0SHJlZihjb25zdCBTdHJpbmcmIHVybCwgRE9NV2luZG93KiBhY3RpdmVXaW5kb3csIERP TVdpbmRvdyogZmlyc3RXaW5kb3cpCiB7CiAgICAgaWYgKCFtX2ZyYW1lKQogICAgICAgICByZXR1 cm47Ci0gICAgbV9mcmFtZS0+ZG9tV2luZG93KCktPnNldExvY2F0aW9uKHVybFN0cmluZywgYWN0 aXZlV2luZG93LCBmaXJzdFdpbmRvdyk7CisgICAgc2V0TG9jYXRpb24odXJsLCBhY3RpdmVXaW5k b3csIGZpcnN0V2luZG93KTsKIH0KIAogdm9pZCBMb2NhdGlvbjo6c2V0UHJvdG9jb2woY29uc3Qg U3RyaW5nJiBwcm90b2NvbCwgRE9NV2luZG93KiBhY3RpdmVXaW5kb3csIERPTVdpbmRvdyogZmly c3RXaW5kb3csIEV4Y2VwdGlvbkNvZGUmIGVjKQpAQCAtMTU5LDcgKzE1OSw3IEBAIHZvaWQgTG9j YXRpb246OnNldFByb3RvY29sKGNvbnN0IFN0cmluZyYKICAgICAgICAgZWMgPSBTWU5UQVhfRVJS OwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIG1fZnJhbWUtPmRvbVdpbmRvdygpLT5zZXRM b2NhdGlvbih1cmwuc3RyaW5nKCksIGFjdGl2ZVdpbmRvdywgZmlyc3RXaW5kb3cpOworICAgIHNl dExvY2F0aW9uKHVybC5zdHJpbmcoKSwgYWN0aXZlV2luZG93LCBmaXJzdFdpbmRvdyk7CiB9CiAK IHZvaWQgTG9jYXRpb246OnNldEhvc3QoY29uc3QgU3RyaW5nJiBob3N0LCBET01XaW5kb3cqIGFj dGl2ZVdpbmRvdywgRE9NV2luZG93KiBmaXJzdFdpbmRvdykKQEAgLTE2OCw3ICsxNjgsNyBAQCB2 b2lkIExvY2F0aW9uOjpzZXRIb3N0KGNvbnN0IFN0cmluZyYgaG9zCiAgICAgICAgIHJldHVybjsK ICAgICBLVVJMIHVybCA9IG1fZnJhbWUtPmRvY3VtZW50KCktPnVybCgpOwogICAgIHVybC5zZXRI b3N0QW5kUG9ydChob3N0KTsKLSAgICBtX2ZyYW1lLT5kb21XaW5kb3coKS0+c2V0TG9jYXRpb24o dXJsLnN0cmluZygpLCBhY3RpdmVXaW5kb3csIGZpcnN0V2luZG93KTsKKyAgICBzZXRMb2NhdGlv bih1cmwuc3RyaW5nKCksIGFjdGl2ZVdpbmRvdywgZmlyc3RXaW5kb3cpOwogfQogCiB2b2lkIExv Y2F0aW9uOjpzZXRIb3N0bmFtZShjb25zdCBTdHJpbmcmIGhvc3RuYW1lLCBET01XaW5kb3cqIGFj dGl2ZVdpbmRvdywgRE9NV2luZG93KiBmaXJzdFdpbmRvdykKQEAgLTE3Nyw3ICsxNzcsNyBAQCB2 b2lkIExvY2F0aW9uOjpzZXRIb3N0bmFtZShjb25zdCBTdHJpbmcmCiAgICAgICAgIHJldHVybjsK ICAgICBLVVJMIHVybCA9IG1fZnJhbWUtPmRvY3VtZW50KCktPnVybCgpOwogICAgIHVybC5zZXRI b3N0KGhvc3RuYW1lKTsKLSAgICBtX2ZyYW1lLT5kb21XaW5kb3coKS0+c2V0TG9jYXRpb24odXJs LnN0cmluZygpLCBhY3RpdmVXaW5kb3csIGZpcnN0V2luZG93KTsKKyAgICBzZXRMb2NhdGlvbih1 cmwuc3RyaW5nKCksIGFjdGl2ZVdpbmRvdywgZmlyc3RXaW5kb3cpOwogfQogCiB2b2lkIExvY2F0 aW9uOjpzZXRQb3J0KGNvbnN0IFN0cmluZyYgcG9ydFN0cmluZywgRE9NV2luZG93KiBhY3RpdmVX aW5kb3csIERPTVdpbmRvdyogZmlyc3RXaW5kb3cpCkBAIC0xOTAsNyArMTkwLDcgQEAgdm9pZCBM b2NhdGlvbjo6c2V0UG9ydChjb25zdCBTdHJpbmcmIHBvcgogICAgICAgICB1cmwucmVtb3ZlUG9y dCgpOwogICAgIGVsc2UKICAgICAgICAgdXJsLnNldFBvcnQocG9ydCk7Ci0gICAgbV9mcmFtZS0+ ZG9tV2luZG93KCktPnNldExvY2F0aW9uKHVybC5zdHJpbmcoKSwgYWN0aXZlV2luZG93LCBmaXJz dFdpbmRvdyk7CisgICAgc2V0TG9jYXRpb24odXJsLnN0cmluZygpLCBhY3RpdmVXaW5kb3csIGZp cnN0V2luZG93KTsKIH0KIAogdm9pZCBMb2NhdGlvbjo6c2V0UGF0aG5hbWUoY29uc3QgU3RyaW5n JiBwYXRobmFtZSwgRE9NV2luZG93KiBhY3RpdmVXaW5kb3csIERPTVdpbmRvdyogZmlyc3RXaW5k b3cpCkBAIC0xOTksNyArMTk5LDcgQEAgdm9pZCBMb2NhdGlvbjo6c2V0UGF0aG5hbWUoY29uc3Qg U3RyaW5nJgogICAgICAgICByZXR1cm47CiAgICAgS1VSTCB1cmwgPSBtX2ZyYW1lLT5kb2N1bWVu dCgpLT51cmwoKTsKICAgICB1cmwuc2V0UGF0aChwYXRobmFtZSk7Ci0gICAgbV9mcmFtZS0+ZG9t V2luZG93KCktPnNldExvY2F0aW9uKHVybC5zdHJpbmcoKSwgYWN0aXZlV2luZG93LCBmaXJzdFdp bmRvdyk7CisgICAgc2V0TG9jYXRpb24odXJsLnN0cmluZygpLCBhY3RpdmVXaW5kb3csIGZpcnN0 V2luZG93KTsKIH0KIAogdm9pZCBMb2NhdGlvbjo6c2V0U2VhcmNoKGNvbnN0IFN0cmluZyYgc2Vh cmNoLCBET01XaW5kb3cqIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93KiBmaXJzdFdpbmRvdykKQEAg LTIwOCw3ICsyMDgsNyBAQCB2b2lkIExvY2F0aW9uOjpzZXRTZWFyY2goY29uc3QgU3RyaW5nJiBz CiAgICAgICAgIHJldHVybjsKICAgICBLVVJMIHVybCA9IG1fZnJhbWUtPmRvY3VtZW50KCktPnVy bCgpOwogICAgIHVybC5zZXRRdWVyeShzZWFyY2gpOwotICAgIG1fZnJhbWUtPmRvbVdpbmRvdygp LT5zZXRMb2NhdGlvbih1cmwuc3RyaW5nKCksIGFjdGl2ZVdpbmRvdywgZmlyc3RXaW5kb3cpOwor ICAgIHNldExvY2F0aW9uKHVybC5zdHJpbmcoKSwgYWN0aXZlV2luZG93LCBmaXJzdFdpbmRvdyk7 CiB9CiAKIHZvaWQgTG9jYXRpb246OnNldEhhc2goY29uc3QgU3RyaW5nJiBoYXNoLCBET01XaW5k b3cqIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93KiBmaXJzdFdpbmRvdykKQEAgLTIyNiwyMSArMjI2 LDIyIEBAIHZvaWQgTG9jYXRpb246OnNldEhhc2goY29uc3QgU3RyaW5nJiBoYXMKICAgICAvLyBj YXNlcyB3aGVyZSBmcmFnbWVudCBpZGVudGlmaWVycyBhcmUgaWdub3JlZCBvciBpbnZhbGlkLiAK ICAgICBpZiAoZXF1YWxJZ25vcmluZ051bGxpdHkob2xkRnJhZ21lbnRJZGVudGlmaWVyLCB1cmwu ZnJhZ21lbnRJZGVudGlmaWVyKCkpKQogICAgICAgICByZXR1cm47Ci0gICAgbV9mcmFtZS0+ZG9t V2luZG93KCktPnNldExvY2F0aW9uKHVybC5zdHJpbmcoKSwgYWN0aXZlV2luZG93LCBmaXJzdFdp bmRvdyk7CisgICAgc2V0TG9jYXRpb24odXJsLnN0cmluZygpLCBhY3RpdmVXaW5kb3csIGZpcnN0 V2luZG93KTsKIH0KIAotdm9pZCBMb2NhdGlvbjo6YXNzaWduKGNvbnN0IFN0cmluZyYgdXJsU3Ry aW5nLCBET01XaW5kb3cqIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93KiBmaXJzdFdpbmRvdykKK3Zv aWQgTG9jYXRpb246OmFzc2lnbihjb25zdCBTdHJpbmcmIHVybCwgRE9NV2luZG93KiBhY3RpdmVX aW5kb3csIERPTVdpbmRvdyogZmlyc3RXaW5kb3cpCiB7CiAgICAgaWYgKCFtX2ZyYW1lKQogICAg ICAgICByZXR1cm47Ci0gICAgbV9mcmFtZS0+ZG9tV2luZG93KCktPnNldExvY2F0aW9uKHVybFN0 cmluZywgYWN0aXZlV2luZG93LCBmaXJzdFdpbmRvdyk7CisgICAgc2V0TG9jYXRpb24odXJsLCBh Y3RpdmVXaW5kb3csIGZpcnN0V2luZG93KTsKIH0KIAotdm9pZCBMb2NhdGlvbjo6cmVwbGFjZShj b25zdCBTdHJpbmcmIHVybFN0cmluZywgRE9NV2luZG93KiBhY3RpdmVXaW5kb3csIERPTVdpbmRv dyogZmlyc3RXaW5kb3cpCit2b2lkIExvY2F0aW9uOjpyZXBsYWNlKGNvbnN0IFN0cmluZyYgdXJs LCBET01XaW5kb3cqIGFjdGl2ZVdpbmRvdywgRE9NV2luZG93KiBmaXJzdFdpbmRvdykKIHsKICAg ICBpZiAoIW1fZnJhbWUpCiAgICAgICAgIHJldHVybjsKLSAgICBtX2ZyYW1lLT5kb21XaW5kb3co KS0+c2V0TG9jYXRpb24odXJsU3RyaW5nLCBhY3RpdmVXaW5kb3csIGZpcnN0V2luZG93LCBMb2Nr SGlzdG9yeUFuZEJhY2tGb3J3YXJkTGlzdCk7CisgICAgLy8gTm90ZTogV2UgY2FsbCBET01XaW5k b3c6OnNldExvY2F0aW9uIGRpcmVjdGx5IGhlcmUgYmVjYXVzZSByZXBsYWNlKCkgYWx3YXlzIG9w ZXJhdGVzIG9uIHRoZSBjdXJyZW50IGZyYW1lLgorICAgIG1fZnJhbWUtPmRvbVdpbmRvdygpLT5z ZXRMb2NhdGlvbih1cmwsIGFjdGl2ZVdpbmRvdywgZmlyc3RXaW5kb3csIExvY2tIaXN0b3J5QW5k QmFja0ZvcndhcmRMaXN0KTsKIH0KIAogdm9pZCBMb2NhdGlvbjo6cmVsb2FkKERPTVdpbmRvdyog YWN0aXZlV2luZG93KQpAQCAtMjYwLDQgKzI2MSwxNCBAQCB2b2lkIExvY2F0aW9uOjpyZWxvYWQo RE9NV2luZG93KiBhY3RpdmVXCiAgICAgbV9mcmFtZS0+bmF2aWdhdGlvblNjaGVkdWxlcigpLT5z Y2hlZHVsZVJlZnJlc2goKTsKIH0KIAordm9pZCBMb2NhdGlvbjo6c2V0TG9jYXRpb24oY29uc3Qg U3RyaW5nJiB1cmwsIERPTVdpbmRvdyogYWN0aXZlV2luZG93LCBET01XaW5kb3cqIGZpcnN0V2lu ZG93KQoreworICAgIEFTU0VSVChtX2ZyYW1lKTsKKyAgICAvLyBXZSBjYWxsIGZpbmRGcmFtZUZv ck5hdmlnYXRpb24gdG8gaGFuZGxlIHRoZSBjYXNlIG9mIGEgc2VhbWxlc3MgaWZyYW1lIGNvcnJl Y3RseS4KKyAgICBGcmFtZSogZnJhbWUgPSBtX2ZyYW1lLT5sb2FkZXIoKS0+ZmluZEZyYW1lRm9y TmF2aWdhdGlvbihTdHJpbmcoKSwgYWN0aXZlV2luZG93LT5kb2N1bWVudCgpKTsKKyAgICBpZiAo IWZyYW1lKQorICAgICAgICByZXR1cm47CisgICAgZnJhbWUtPmRvbVdpbmRvdygpLT5zZXRMb2Nh dGlvbih1cmwsIGFjdGl2ZVdpbmRvdywgZmlyc3RXaW5kb3cpOworfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0xvY2F0aW9uLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9Mb2NhdGlvbi5oCShyZXZpc2lvbiAxMTQwNTYpCisr KyBTb3VyY2UvV2ViQ29yZS9wYWdlL0xvY2F0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTc3LDYg Kzc3LDggQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBleHBsaWNpdCBMb2NhdGlvbihGcmFtZSop OwogCisgICAgdm9pZCBzZXRMb2NhdGlvbihjb25zdCBTdHJpbmcmLCBET01XaW5kb3cqIGFjdGl2 ZVdpbmRvdywgRE9NV2luZG93KiBmaXJzdFdpbmRvdyk7CisKICAgICBjb25zdCBLVVJMJiB1cmwo KSBjb25zdDsKIH07CiAK