125758 2013-12-15 13:24:41 -0800 [Cocoa] Expose whether the page contains only secure content 2013-12-16 14:14:24 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz oldest_to_newest 959945 0 mitz 2013-12-15 13:24:41 -0800 [Cocoa] Expose whether the page contains only secure content 959946 1 219281 mitz 2013-12-15 13:29:57 -0800 Created attachment 219281 Add observable hasOnlySecureContent property to WKBrowsingContextController 960149 2 219281 mitz 2013-12-16 11:14:11 -0800 Comment on attachment 219281 Add observable hasOnlySecureContent property to WKBrowsingContextController Going to make this property private, to match WebKit1. 960217 3 219350 mitz 2013-12-16 14:05:45 -0800 Created attachment 219350 Add private observable hasOnlySecureContent property to WKBrowsingContextController 960219 4 mitz 2013-12-16 14:14:24 -0800 Committed <http://trac.webkit.org/r160662>. 219281 2013-12-15 13:29:57 -0800 2013-12-16 11:19:35 -0800 Add observable hasOnlySecureContent property to WKBrowsingContextController bug-125758-20131215133005.patch text/plain 9709 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDYyMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEzLTEyLTE1ICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBFeHBvc2Ugd2hldGhl ciB0aGUgcGFnZSBjb250YWlucyBvbmx5IHNlY3VyZSBjb250ZW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU3NTgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tC cm93c2luZ0NvbnRleHRDb250cm9sbGVyLmg6IERlY2xhcmVkIG5ldyBwcm9wZXJ0eS4KKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5tbToK KyAgICAgICAgKC1bV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyIGhhc09ubHlTZWN1cmVDb250 ZW50XSk6IEFkZGVkIGEgZ2V0dGVyIHRoYXQgY2FsbHMKKyAgICAgICAgUGFnZUxvYWRTdGF0ZTo6 aGFzT25seVNlY3VyZUNvbnRlbnQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUxvYWRTdGF0 ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VMb2FkU3RhdGU6OmNvbW1pdENoYW5nZXMpOiBO b3RpZnkgb2JzZXJ2ZXJzIG9mIGhhc09ubHlTZWN1cmVDb250ZW50KCkgY2hhbmdlcy4KKyAgICAg ICAgKFdlYktpdDo6UGFnZUxvYWRTdGF0ZTo6cmVzZXQpOiBSZXNldCBoYXNJbnNlY3VyZUNvbnRl bnQgaW4gdGhlIHVuY29tbWl0dGVkIHN0YXRlLgorICAgICAgICAoV2ViS2l0OjpQYWdlTG9hZFN0 YXRlOjpoYXNPbmx5U2VjdXJlQ29udGVudCk6IEFkZGVkLiBSZXR1cm5zIHRydWUgaWYgdGhlcmUg aXMgbm8gaW5zZWN1cmUKKyAgICAgICAgY29udGVudCBhbmQgdGhlIFVSTCBpcyBhbiBIVFRQUyBV UkwuCisgICAgICAgIChXZWJLaXQ6OlBhZ2VMb2FkU3RhdGU6OmRpZENvbW1pdExvYWQpOiBTZXQg aGFzSW5zZWN1cmVDb250ZW50IHRvIGZhbHNlIGluIHRoZSB1bmNvbW1pdHRlZAorICAgICAgICBz dGF0ZS4KKyAgICAgICAgKFdlYktpdDo6UGFnZUxvYWRTdGF0ZTo6ZGlkRGlzcGxheU9yUnVuSW5z ZWN1cmVDb250ZW50KTogU2V0IGhhc0luc2VjdXJlQ29udGVudCB0byB0cnVlIGluCisgICAgICAg IHRoZSB1bmNvbW1pdHRlZCBzdGF0ZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUxvYWRTdGF0 ZS5oOgorICAgICAgICAoV2ViS2l0OjpQYWdlTG9hZFN0YXRlOjpEYXRhOjpEYXRhKTogQWRkZWQg aGFzSW5zZWN1cmVDb250ZW50IG1lbWJlci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZERpc3BsYXlJbnNl Y3VyZUNvbnRlbnRGb3JGcmFtZSk6IENhbGwKKyAgICAgICAgUGFnZUxvYWRTdGF0ZTo6ZGlkRGlz cGxheU9yUnVuSW5zZWN1cmVDb250ZW50IGFuZCBjb21taXQgdGhlIGNoYW5nZSBiZWZvcmUgY2Fs bGluZyBvdXQgdG8KKyAgICAgICAgdGhlIGNsaWVudC4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpkaWRSdW5JbnNlY3VyZUNvbnRlbnRGb3JGcmFtZSk6IERpdHRvLgorCiAyMDEzLTEy LTE1ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBVcHN0 cmVhbSBjaGFuZ2VzIHRvIEZlYXR1cmVEZWZpbmVzLnhjY29uZmlnCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuY3BwCShyZXZpc2lvbiAxNjA2MjApCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTc1LDYgKzc1LDcgQEAgdm9pZCBQYWdlTG9hZFN0YXRlOjpjb21taXRDaGFuZ2VzKCkKICAg ICBib29sIHRpdGxlQ2hhbmdlZCA9IG1fY29tbWl0dGVkU3RhdGUudGl0bGUgIT0gbV91bmNvbW1p dHRlZFN0YXRlLnRpdGxlOwogICAgIGJvb2wgaXNMb2FkaW5nQ2hhbmdlZCA9IGlzTG9hZGluZ1N0 YXRlKG1fY29tbWl0dGVkU3RhdGUuc3RhdGUpICE9IGlzTG9hZGluZ1N0YXRlKG1fdW5jb21taXR0 ZWRTdGF0ZS5zdGF0ZSk7CiAgICAgYm9vbCBhY3RpdmVVUkxDaGFuZ2VkID0gYWN0aXZlVVJMKG1f Y29tbWl0dGVkU3RhdGUpICE9IGFjdGl2ZVVSTChtX3VuY29tbWl0dGVkU3RhdGUpOworICAgIGJv b2wgaGFzT25seVNlY3VyZUNvbnRlbnRDaGFuZ2VkID0gaGFzT25seVNlY3VyZUNvbnRlbnQobV9j b21taXR0ZWRTdGF0ZSkgIT0gaGFzT25seVNlY3VyZUNvbnRlbnQobV91bmNvbW1pdHRlZFN0YXRl KTsKICAgICBib29sIGVzdGltYXRlZFByb2dyZXNzQ2hhbmdlZCA9IGVzdGltYXRlZFByb2dyZXNz KG1fY29tbWl0dGVkU3RhdGUpICE9IGVzdGltYXRlZFByb2dyZXNzKG1fdW5jb21taXR0ZWRTdGF0 ZSk7CiAKICAgICBpZiAodGl0bGVDaGFuZ2VkKQpAQCAtODMsNiArODQsOCBAQCB2b2lkIFBhZ2VM b2FkU3RhdGU6OmNvbW1pdENoYW5nZXMoKQogICAgICAgICBjYWxsT2JzZXJ2ZXJDYWxsYmFjaygm T2JzZXJ2ZXI6OndpbGxDaGFuZ2VJc0xvYWRpbmcpOwogICAgIGlmIChhY3RpdmVVUkxDaGFuZ2Vk KQogICAgICAgICBjYWxsT2JzZXJ2ZXJDYWxsYmFjaygmT2JzZXJ2ZXI6OndpbGxDaGFuZ2VBY3Rp dmVVUkwpOworICAgIGlmIChoYXNPbmx5U2VjdXJlQ29udGVudENoYW5nZWQpCisgICAgICAgIGNh bGxPYnNlcnZlckNhbGxiYWNrKCZPYnNlcnZlcjo6d2lsbENoYW5nZUhhc09ubHlTZWN1cmVDb250 ZW50KTsKICAgICBpZiAoZXN0aW1hdGVkUHJvZ3Jlc3NDaGFuZ2VkKQogICAgICAgICBjYWxsT2Jz ZXJ2ZXJDYWxsYmFjaygmT2JzZXJ2ZXI6OndpbGxDaGFuZ2VFc3RpbWF0ZWRQcm9ncmVzcyk7CiAK QEAgLTkxLDYgKzk0LDggQEAgdm9pZCBQYWdlTG9hZFN0YXRlOjpjb21taXRDaGFuZ2VzKCkKICAg ICAvLyBUaGUgImRpZCIgb3JkZXJpbmcgaXMgdGhlIHJldmVyc2Ugb2YgdGhlICJ3aWxsIi4gVGhp cyBpcyBhIHJlcXVpcmVtZW50IG9mIENvY29hIEtleS1WYWx1ZSBPYnNlcnZpbmcuCiAgICAgaWYg KGVzdGltYXRlZFByb2dyZXNzQ2hhbmdlZCkKICAgICAgICAgY2FsbE9ic2VydmVyQ2FsbGJhY2so Jk9ic2VydmVyOjpkaWRDaGFuZ2VFc3RpbWF0ZWRQcm9ncmVzcyk7CisgICAgaWYgKGhhc09ubHlT ZWN1cmVDb250ZW50Q2hhbmdlZCkKKyAgICAgICAgY2FsbE9ic2VydmVyQ2FsbGJhY2soJk9ic2Vy dmVyOjpkaWRDaGFuZ2VIYXNPbmx5U2VjdXJlQ29udGVudCk7CiAgICAgaWYgKGFjdGl2ZVVSTENo YW5nZWQpCiAgICAgICAgIGNhbGxPYnNlcnZlckNhbGxiYWNrKCZPYnNlcnZlcjo6ZGlkQ2hhbmdl QWN0aXZlVVJMKTsKICAgICBpZiAoaXNMb2FkaW5nQ2hhbmdlZCkKQEAgLTEwNCw2ICsxMDksNyBA QCB2b2lkIFBhZ2VMb2FkU3RhdGU6OnJlc2V0KGNvbnN0IFRyYW5zYWN0CiAgICAgQVNTRVJUX1VO VVNFRCh0b2tlbiwgJnRva2VuLm1fcGFnZUxvYWRTdGF0ZSA9PSB0aGlzKTsKIAogICAgIG1fdW5j b21taXR0ZWRTdGF0ZS5zdGF0ZSA9IFN0YXRlOjpGaW5pc2hlZDsKKyAgICBtX3VuY29tbWl0dGVk U3RhdGUuaGFzSW5zZWN1cmVDb250ZW50ID0gZmFsc2U7CiAKICAgICBtX3VuY29tbWl0dGVkU3Rh dGUucGVuZGluZ0FQSVJlcXVlc3RVUkwgPSBTdHJpbmcoKTsKICAgICBtX3VuY29tbWl0dGVkU3Rh dGUucHJvdmlzaW9uYWxVUkwgPSBTdHJpbmcoKTsKQEAgLTE1MCw2ICsxNTYsMTkgQEAgU3RyaW5n IFBhZ2VMb2FkU3RhdGU6OmFjdGl2ZVVSTCgpIGNvbnN0CiAgICAgcmV0dXJuIGFjdGl2ZVVSTCht X2NvbW1pdHRlZFN0YXRlKTsKIH0KIAorYm9vbCBQYWdlTG9hZFN0YXRlOjpoYXNPbmx5U2VjdXJl Q29udGVudChjb25zdCBEYXRhJiBkYXRhKQoreworICAgIGlmIChkYXRhLmhhc0luc2VjdXJlQ29u dGVudCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIGRhdGEudXJsLnN0YXJ0 c1dpdGgoImh0dHBzOiIsIGZhbHNlKTsKK30KKworYm9vbCBQYWdlTG9hZFN0YXRlOjpoYXNPbmx5 U2VjdXJlQ29udGVudCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGhhc09ubHlTZWN1cmVDb250ZW50 KG1fY29tbWl0dGVkU3RhdGUpOworfQorCiBkb3VibGUgUGFnZUxvYWRTdGF0ZTo6ZXN0aW1hdGVk UHJvZ3Jlc3MoY29uc3QgRGF0YSYgZGF0YSkKIHsKICAgICBpZiAoIWRhdGEucGVuZGluZ0FQSVJl cXVlc3RVUkwuaXNOdWxsKCkpCkBAIC0yMTcsNiArMjM2LDcgQEAgdm9pZCBQYWdlTG9hZFN0YXRl OjpkaWRDb21taXRMb2FkKGNvbnN0IAogICAgIEFTU0VSVChtX3VuY29tbWl0dGVkU3RhdGUuc3Rh dGUgPT0gU3RhdGU6OlByb3Zpc2lvbmFsKTsKIAogICAgIG1fdW5jb21taXR0ZWRTdGF0ZS5zdGF0 ZSA9IFN0YXRlOjpDb21taXR0ZWQ7CisgICAgbV91bmNvbW1pdHRlZFN0YXRlLmhhc0luc2VjdXJl Q29udGVudCA9IGZhbHNlOwogCiAgICAgbV91bmNvbW1pdHRlZFN0YXRlLnVybCA9IG1fdW5jb21t aXR0ZWRTdGF0ZS5wcm92aXNpb25hbFVSTDsKICAgICBtX3VuY29tbWl0dGVkU3RhdGUucHJvdmlz aW9uYWxVUkwgPSBTdHJpbmcoKTsKQEAgLTI0OSw2ICsyNjksMTQgQEAgdm9pZCBQYWdlTG9hZFN0 YXRlOjpkaWRTYW1lRG9jdW1lbnROYXZpZwogICAgIG1fdW5jb21taXR0ZWRTdGF0ZS51cmwgPSB1 cmw7CiB9CiAKK3ZvaWQgUGFnZUxvYWRTdGF0ZTo6ZGlkRGlzcGxheU9yUnVuSW5zZWN1cmVDb250 ZW50KGNvbnN0IFRyYW5zYWN0aW9uOjpUb2tlbiYgdG9rZW4pCit7CisgICAgQVNTRVJUX1VOVVNF RCh0b2tlbiwgJnRva2VuLm1fcGFnZUxvYWRTdGF0ZSA9PSB0aGlzKTsKKyAgICBBU1NFUlQobV91 bmNvbW1pdHRlZFN0YXRlLnVybC5zdGFydHNXaXRoKCJodHRwczoiLCBmYWxzZSkpOworCisgICAg bV91bmNvbW1pdHRlZFN0YXRlLmhhc0luc2VjdXJlQ29udGVudCA9IHRydWU7Cit9CisKIHZvaWQg UGFnZUxvYWRTdGF0ZTo6c2V0VW5yZWFjaGFibGVVUkwoY29uc3QgVHJhbnNhY3Rpb246OlRva2Vu JiB0b2tlbiwgY29uc3QgU3RyaW5nJiB1bnJlYWNoYWJsZVVSTCkKIHsKICAgICBBU1NFUlRfVU5V U0VEKHRva2VuLCAmdG9rZW4ubV9wYWdlTG9hZFN0YXRlID09IHRoaXMpOwpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5oCShyZXZpc2lvbiAxNjA2MjApCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBA IC01NCw2ICs1NCw5IEBAIHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIHdpbGxDaGFuZ2VB Y3RpdmVVUkwoKSA9IDA7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VBY3RpdmVVUkwo KSA9IDA7CiAKKyAgICAgICAgdmlydHVhbCB2b2lkIHdpbGxDaGFuZ2VIYXNPbmx5U2VjdXJlQ29u dGVudCgpID0gMDsKKyAgICAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUhhc09ubHlTZWN1cmVD b250ZW50KCkgPSAwOworCiAgICAgICAgIHZpcnR1YWwgdm9pZCB3aWxsQ2hhbmdlRXN0aW1hdGVk UHJvZ3Jlc3MoKSA9IDA7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VFc3RpbWF0ZWRQ cm9ncmVzcygpID0gMDsKICAgICB9OwpAQCAtMTE2LDYgKzExOSw4IEBAIHB1YmxpYzoKIAogICAg IFN0cmluZyBhY3RpdmVVUkwoKSBjb25zdDsKIAorICAgIGJvb2wgaGFzT25seVNlY3VyZUNvbnRl bnQoKSBjb25zdDsKKwogICAgIGRvdWJsZSBlc3RpbWF0ZWRQcm9ncmVzcygpIGNvbnN0OwogCiAg ICAgY29uc3QgU3RyaW5nJiBwZW5kaW5nQVBJUmVxdWVzdFVSTCgpIGNvbnN0OwpAQCAtMTMyLDYg KzEzNyw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbihj b25zdCBUcmFuc2FjdGlvbjo6VG9rZW4mLCBjb25zdCBTdHJpbmcmIHVybCk7CiAKKyAgICB2b2lk IGRpZERpc3BsYXlPclJ1bkluc2VjdXJlQ29udGVudChjb25zdCBUcmFuc2FjdGlvbjo6VG9rZW4m KTsKKwogICAgIHZvaWQgc2V0VW5yZWFjaGFibGVVUkwoY29uc3QgVHJhbnNhY3Rpb246OlRva2Vu JiwgY29uc3QgU3RyaW5nJik7CiAKICAgICBjb25zdCBTdHJpbmcmIHRpdGxlKCkgY29uc3Q7CkBA IC0xNTQsMTEgKzE2MSwxMyBAQCBwcml2YXRlOgogICAgIHN0cnVjdCBEYXRhIHsKICAgICAgICAg RGF0YSgpCiAgICAgICAgICAgICA6IHN0YXRlKFN0YXRlOjpGaW5pc2hlZCkKKyAgICAgICAgICAg ICwgaGFzSW5zZWN1cmVDb250ZW50KGZhbHNlKQogICAgICAgICAgICAgLCBlc3RpbWF0ZWRQcm9n cmVzcygwKQogICAgICAgICB7CiAgICAgICAgIH0KIAogICAgICAgICBTdGF0ZSBzdGF0ZTsKKyAg ICAgICAgYm9vbCBoYXNJbnNlY3VyZUNvbnRlbnQ7CiAKICAgICAgICAgU3RyaW5nIHBlbmRpbmdB UElSZXF1ZXN0VVJMOwogCkBAIC0xNzMsNiArMTgyLDcgQEAgcHJpdmF0ZToKICAgICB9OwogCiAg ICAgc3RhdGljIFN0cmluZyBhY3RpdmVVUkwoY29uc3QgRGF0YSYpOworICAgIHN0YXRpYyBib29s IGhhc09ubHlTZWN1cmVDb250ZW50KGNvbnN0IERhdGEmKTsKICAgICBzdGF0aWMgZG91YmxlIGVz dGltYXRlZFByb2dyZXNzKGNvbnN0IERhdGEmKTsKIAogICAgIERhdGEgbV9jb21taXR0ZWRTdGF0 ZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZp c2lvbiAxNjA2MjApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjM4NCw2ICsyMzg0LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5 OjpkaWREaXNwbGF5SW5zZWN1cmVDb24KICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJv Y2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAKKyAg ICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CisgICAg bV9wYWdlTG9hZFN0YXRlLmRpZERpc3BsYXlPclJ1bkluc2VjdXJlQ29udGVudCh0cmFuc2FjdGlv bik7CisKKyAgICBtX3BhZ2VMb2FkU3RhdGUuY29tbWl0Q2hhbmdlcygpOwogICAgIG1fbG9hZGVy Q2xpZW50LmRpZERpc3BsYXlJbnNlY3VyZUNvbnRlbnRGb3JGcmFtZSh0aGlzLCBmcmFtZSwgdXNl ckRhdGEuZ2V0KCkpOwogfQogCkBAIC0yMzk3LDYgKzI0MDEsMTAgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmRpZFJ1bkluc2VjdXJlQ29udGVudAogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9w cm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIAor ICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKKyAg ICBtX3BhZ2VMb2FkU3RhdGUuZGlkRGlzcGxheU9yUnVuSW5zZWN1cmVDb250ZW50KHRyYW5zYWN0 aW9uKTsKKworICAgIG1fcGFnZUxvYWRTdGF0ZS5jb21taXRDaGFuZ2VzKCk7CiAgICAgbV9sb2Fk ZXJDbGllbnQuZGlkUnVuSW5zZWN1cmVDb250ZW50Rm9yRnJhbWUodGhpcywgZnJhbWUsIHVzZXJE YXRhLmdldCgpKTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5oCShy ZXZpc2lvbiAxNjA2MjApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL QnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjQsNiArMTI0 LDggQEAgV0tfQVBJX0NMQVNTCiAKIEBwcm9wZXJ0eShyZWFkb25seSkgTlNVUkwgKnVucmVhY2hh YmxlVVJMOwogCitAcHJvcGVydHkgKHJlYWRvbmx5KSBCT09MIGhhc09ubHlTZWN1cmVDb250ZW50 OworCiBAcHJvcGVydHkocmVhZG9ubHkpIGRvdWJsZSBlc3RpbWF0ZWRQcm9ncmVzczsKIAogQHBy b3BlcnR5IChub25hdG9taWMpIFdLUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHMgb2JzZXJ2ZWRSZW5k ZXJpbmdQcm9ncmVzc0V2ZW50czsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVy Lm1tCShyZXZpc2lvbiAxNjA2MjApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtOTQs NiArOTQsMTYgQEAgcHJpdmF0ZToKICAgICAgICAgW21fY29udHJvbGxlciBkaWRDaGFuZ2VWYWx1 ZUZvcktleTpAImFjdGl2ZVVSTCJdOwogICAgIH0KIAorICAgIHZpcnR1YWwgdm9pZCB3aWxsQ2hh bmdlSGFzT25seVNlY3VyZUNvbnRlbnQoKSBPVkVSUklERQorICAgIHsKKyAgICAgICAgW21fY29u dHJvbGxlciB3aWxsQ2hhbmdlVmFsdWVGb3JLZXk6QCJoYXNPbmx5U2VjdXJlQ29udGVudCJdOwor ICAgIH0KKworICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VIYXNPbmx5U2VjdXJlQ29udGVudCgp IE9WRVJSSURFCisgICAgeworICAgICAgICBbbV9jb250cm9sbGVyIGRpZENoYW5nZVZhbHVlRm9y S2V5OkAiaGFzT25seVNlY3VyZUNvbnRlbnQiXTsKKyAgICB9CisKICAgICB2aXJ0dWFsIHZvaWQg d2lsbENoYW5nZUVzdGltYXRlZFByb2dyZXNzKCkgT1ZFUlJJREUKICAgICB7CiAgICAgICAgIFtt X2NvbnRyb2xsZXIgd2lsbENoYW5nZVZhbHVlRm9yS2V5OkAiZXN0aW1hdGVkUHJvZ3Jlc3MiXTsK QEAgLTMyOCw2ICszMzgsMTEgQEAgLSAoTlNVUkwgKil1bnJlYWNoYWJsZVVSTAogICAgIHJldHVy biBbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOl9wYWdlLT5wYWdlTG9hZFN0YXRlKCkudW5y ZWFjaGFibGVVUkwoKV07CiB9CiAKKy0gKEJPT0wpaGFzT25seVNlY3VyZUNvbnRlbnQKK3sKKyAg ICByZXR1cm4gX3BhZ2UtPnBhZ2VMb2FkU3RhdGUoKS5oYXNPbmx5U2VjdXJlQ29udGVudCgpOwor fQorCiAtIChkb3VibGUpZXN0aW1hdGVkUHJvZ3Jlc3MKIHsKICAgICByZXR1cm4gX3BhZ2UtPmVz dGltYXRlZFByb2dyZXNzKCk7Cg== 219350 2013-12-16 14:05:45 -0800 2013-12-16 14:12:28 -0800 Add private observable hasOnlySecureContent property to WKBrowsingContextController bug-125758-20131216140545.patch text/plain 9800 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDY1MCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEzLTEyLTE2ICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBFeHBvc2Ugd2hldGhl ciB0aGUgcGFnZSBjb250YWlucyBvbmx5IHNlY3VyZSBjb250ZW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU3NTgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tC cm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tOgorICAgICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4 dENvbnRyb2xsZXIgaGFzT25seVNlY3VyZUNvbnRlbnRdKTogQWRkZWQgYSBnZXR0ZXIgdGhhdCBj YWxscworICAgICAgICBQYWdlTG9hZFN0YXRlOjpoYXNPbmx5U2VjdXJlQ29udGVudC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlclByaXZh dGUuaDogRGVjbGFyZWQgbmV3IHByb3BlcnR5LgorCisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VM b2FkU3RhdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlTG9hZFN0YXRlOjpjb21taXRDaGFu Z2VzKTogTm90aWZ5IG9ic2VydmVycyBvZiBoYXNPbmx5U2VjdXJlQ29udGVudCgpIGNoYW5nZXMu CisgICAgICAgIChXZWJLaXQ6OlBhZ2VMb2FkU3RhdGU6OnJlc2V0KTogUmVzZXQgaGFzSW5zZWN1 cmVDb250ZW50IGluIHRoZSB1bmNvbW1pdHRlZCBzdGF0ZS4KKyAgICAgICAgKFdlYktpdDo6UGFn ZUxvYWRTdGF0ZTo6aGFzT25seVNlY3VyZUNvbnRlbnQpOiBBZGRlZC4gUmV0dXJucyB0cnVlIGlm IHRoZXJlIGlzIG5vIGluc2VjdXJlCisgICAgICAgIGNvbnRlbnQgYW5kIHRoZSBVUkwgaXMgYW4g SFRUUFMgVVJMLgorICAgICAgICAoV2ViS2l0OjpQYWdlTG9hZFN0YXRlOjpkaWRDb21taXRMb2Fk KTogU2V0IGhhc0luc2VjdXJlQ29udGVudCB0byBmYWxzZSBpbiB0aGUgdW5jb21taXR0ZWQKKyAg ICAgICAgc3RhdGUuCisgICAgICAgIChXZWJLaXQ6OlBhZ2VMb2FkU3RhdGU6OmRpZERpc3BsYXlP clJ1bkluc2VjdXJlQ29udGVudCk6IFNldCBoYXNJbnNlY3VyZUNvbnRlbnQgdG8gdHJ1ZSBpbgor ICAgICAgICB0aGUgdW5jb21taXR0ZWQgc3RhdGUuCisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VM b2FkU3RhdGUuaDoKKyAgICAgICAgKFdlYktpdDo6UGFnZUxvYWRTdGF0ZTo6RGF0YTo6RGF0YSk6 IEFkZGVkIGhhc0luc2VjdXJlQ29udGVudCBtZW1iZXIuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWREaXNw bGF5SW5zZWN1cmVDb250ZW50Rm9yRnJhbWUpOiBDYWxsCisgICAgICAgIFBhZ2VMb2FkU3RhdGU6 OmRpZERpc3BsYXlPclJ1bkluc2VjdXJlQ29udGVudCBhbmQgY29tbWl0IHRoZSBjaGFuZ2UgYmVm b3JlIGNhbGxpbmcgb3V0IHRvCisgICAgICAgIHRoZSBjbGllbnQuCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6ZGlkUnVuSW5zZWN1cmVDb250ZW50Rm9yRnJhbWUpOiBEaXR0by4KKwog MjAxMy0xMi0xNiAgTWljaGHFgiBQYWt1xYJhIHZlbCBSdXRrYSAgPG0ucGFrdWxhQHNhbXN1bmcu Y29tPgogCiAgICAgICAgIEZpeCBidWlsZCB3YXJuaW5nIGluIGZpbGVzIGluY2x1ZGluZyBEcmF3 aW5nQXJlYVByb3h5LmgKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlTG9hZFN0 YXRlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxvYWRT dGF0ZS5jcHAJKHJldmlzaW9uIDE2MDY1MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlTG9hZFN0YXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzUsNiArNzUsNyBAQCB2b2lkIFBh Z2VMb2FkU3RhdGU6OmNvbW1pdENoYW5nZXMoKQogICAgIGJvb2wgdGl0bGVDaGFuZ2VkID0gbV9j b21taXR0ZWRTdGF0ZS50aXRsZSAhPSBtX3VuY29tbWl0dGVkU3RhdGUudGl0bGU7CiAgICAgYm9v bCBpc0xvYWRpbmdDaGFuZ2VkID0gaXNMb2FkaW5nU3RhdGUobV9jb21taXR0ZWRTdGF0ZS5zdGF0 ZSkgIT0gaXNMb2FkaW5nU3RhdGUobV91bmNvbW1pdHRlZFN0YXRlLnN0YXRlKTsKICAgICBib29s IGFjdGl2ZVVSTENoYW5nZWQgPSBhY3RpdmVVUkwobV9jb21taXR0ZWRTdGF0ZSkgIT0gYWN0aXZl VVJMKG1fdW5jb21taXR0ZWRTdGF0ZSk7CisgICAgYm9vbCBoYXNPbmx5U2VjdXJlQ29udGVudENo YW5nZWQgPSBoYXNPbmx5U2VjdXJlQ29udGVudChtX2NvbW1pdHRlZFN0YXRlKSAhPSBoYXNPbmx5 U2VjdXJlQ29udGVudChtX3VuY29tbWl0dGVkU3RhdGUpOwogICAgIGJvb2wgZXN0aW1hdGVkUHJv Z3Jlc3NDaGFuZ2VkID0gZXN0aW1hdGVkUHJvZ3Jlc3MobV9jb21taXR0ZWRTdGF0ZSkgIT0gZXN0 aW1hdGVkUHJvZ3Jlc3MobV91bmNvbW1pdHRlZFN0YXRlKTsKIAogICAgIGlmICh0aXRsZUNoYW5n ZWQpCkBAIC04Myw2ICs4NCw4IEBAIHZvaWQgUGFnZUxvYWRTdGF0ZTo6Y29tbWl0Q2hhbmdlcygp CiAgICAgICAgIGNhbGxPYnNlcnZlckNhbGxiYWNrKCZPYnNlcnZlcjo6d2lsbENoYW5nZUlzTG9h ZGluZyk7CiAgICAgaWYgKGFjdGl2ZVVSTENoYW5nZWQpCiAgICAgICAgIGNhbGxPYnNlcnZlckNh bGxiYWNrKCZPYnNlcnZlcjo6d2lsbENoYW5nZUFjdGl2ZVVSTCk7CisgICAgaWYgKGhhc09ubHlT ZWN1cmVDb250ZW50Q2hhbmdlZCkKKyAgICAgICAgY2FsbE9ic2VydmVyQ2FsbGJhY2soJk9ic2Vy dmVyOjp3aWxsQ2hhbmdlSGFzT25seVNlY3VyZUNvbnRlbnQpOwogICAgIGlmIChlc3RpbWF0ZWRQ cm9ncmVzc0NoYW5nZWQpCiAgICAgICAgIGNhbGxPYnNlcnZlckNhbGxiYWNrKCZPYnNlcnZlcjo6 d2lsbENoYW5nZUVzdGltYXRlZFByb2dyZXNzKTsKIApAQCAtOTEsNiArOTQsOCBAQCB2b2lkIFBh Z2VMb2FkU3RhdGU6OmNvbW1pdENoYW5nZXMoKQogICAgIC8vIFRoZSAiZGlkIiBvcmRlcmluZyBp cyB0aGUgcmV2ZXJzZSBvZiB0aGUgIndpbGwiLiBUaGlzIGlzIGEgcmVxdWlyZW1lbnQgb2YgQ29j b2EgS2V5LVZhbHVlIE9ic2VydmluZy4KICAgICBpZiAoZXN0aW1hdGVkUHJvZ3Jlc3NDaGFuZ2Vk KQogICAgICAgICBjYWxsT2JzZXJ2ZXJDYWxsYmFjaygmT2JzZXJ2ZXI6OmRpZENoYW5nZUVzdGlt YXRlZFByb2dyZXNzKTsKKyAgICBpZiAoaGFzT25seVNlY3VyZUNvbnRlbnRDaGFuZ2VkKQorICAg ICAgICBjYWxsT2JzZXJ2ZXJDYWxsYmFjaygmT2JzZXJ2ZXI6OmRpZENoYW5nZUhhc09ubHlTZWN1 cmVDb250ZW50KTsKICAgICBpZiAoYWN0aXZlVVJMQ2hhbmdlZCkKICAgICAgICAgY2FsbE9ic2Vy dmVyQ2FsbGJhY2soJk9ic2VydmVyOjpkaWRDaGFuZ2VBY3RpdmVVUkwpOwogICAgIGlmIChpc0xv YWRpbmdDaGFuZ2VkKQpAQCAtMTA0LDYgKzEwOSw3IEBAIHZvaWQgUGFnZUxvYWRTdGF0ZTo6cmVz ZXQoY29uc3QgVHJhbnNhY3QKICAgICBBU1NFUlRfVU5VU0VEKHRva2VuLCAmdG9rZW4ubV9wYWdl TG9hZFN0YXRlID09IHRoaXMpOwogCiAgICAgbV91bmNvbW1pdHRlZFN0YXRlLnN0YXRlID0gU3Rh dGU6OkZpbmlzaGVkOworICAgIG1fdW5jb21taXR0ZWRTdGF0ZS5oYXNJbnNlY3VyZUNvbnRlbnQg PSBmYWxzZTsKIAogICAgIG1fdW5jb21taXR0ZWRTdGF0ZS5wZW5kaW5nQVBJUmVxdWVzdFVSTCA9 IFN0cmluZygpOwogICAgIG1fdW5jb21taXR0ZWRTdGF0ZS5wcm92aXNpb25hbFVSTCA9IFN0cmlu ZygpOwpAQCAtMTUwLDYgKzE1NiwxOSBAQCBTdHJpbmcgUGFnZUxvYWRTdGF0ZTo6YWN0aXZlVVJM KCkgY29uc3QKICAgICByZXR1cm4gYWN0aXZlVVJMKG1fY29tbWl0dGVkU3RhdGUpOwogfQogCiti b29sIFBhZ2VMb2FkU3RhdGU6Omhhc09ubHlTZWN1cmVDb250ZW50KGNvbnN0IERhdGEmIGRhdGEp Cit7CisgICAgaWYgKGRhdGEuaGFzSW5zZWN1cmVDb250ZW50KQorICAgICAgICByZXR1cm4gZmFs c2U7CisKKyAgICByZXR1cm4gZGF0YS51cmwuc3RhcnRzV2l0aCgiaHR0cHM6IiwgZmFsc2UpOwor fQorCitib29sIFBhZ2VMb2FkU3RhdGU6Omhhc09ubHlTZWN1cmVDb250ZW50KCkgY29uc3QKK3sK KyAgICByZXR1cm4gaGFzT25seVNlY3VyZUNvbnRlbnQobV9jb21taXR0ZWRTdGF0ZSk7Cit9CisK IGRvdWJsZSBQYWdlTG9hZFN0YXRlOjplc3RpbWF0ZWRQcm9ncmVzcyhjb25zdCBEYXRhJiBkYXRh KQogewogICAgIGlmICghZGF0YS5wZW5kaW5nQVBJUmVxdWVzdFVSTC5pc051bGwoKSkKQEAgLTIx Nyw2ICsyMzYsNyBAQCB2b2lkIFBhZ2VMb2FkU3RhdGU6OmRpZENvbW1pdExvYWQoY29uc3QgCiAg ICAgQVNTRVJUKG1fdW5jb21taXR0ZWRTdGF0ZS5zdGF0ZSA9PSBTdGF0ZTo6UHJvdmlzaW9uYWwp OwogCiAgICAgbV91bmNvbW1pdHRlZFN0YXRlLnN0YXRlID0gU3RhdGU6OkNvbW1pdHRlZDsKKyAg ICBtX3VuY29tbWl0dGVkU3RhdGUuaGFzSW5zZWN1cmVDb250ZW50ID0gZmFsc2U7CiAKICAgICBt X3VuY29tbWl0dGVkU3RhdGUudXJsID0gbV91bmNvbW1pdHRlZFN0YXRlLnByb3Zpc2lvbmFsVVJM OwogICAgIG1fdW5jb21taXR0ZWRTdGF0ZS5wcm92aXNpb25hbFVSTCA9IFN0cmluZygpOwpAQCAt MjQ5LDYgKzI2OSwxNCBAQCB2b2lkIFBhZ2VMb2FkU3RhdGU6OmRpZFNhbWVEb2N1bWVudE5hdmln CiAgICAgbV91bmNvbW1pdHRlZFN0YXRlLnVybCA9IHVybDsKIH0KIAordm9pZCBQYWdlTG9hZFN0 YXRlOjpkaWREaXNwbGF5T3JSdW5JbnNlY3VyZUNvbnRlbnQoY29uc3QgVHJhbnNhY3Rpb246OlRv a2VuJiB0b2tlbikKK3sKKyAgICBBU1NFUlRfVU5VU0VEKHRva2VuLCAmdG9rZW4ubV9wYWdlTG9h ZFN0YXRlID09IHRoaXMpOworICAgIEFTU0VSVChtX3VuY29tbWl0dGVkU3RhdGUudXJsLnN0YXJ0 c1dpdGgoImh0dHBzOiIsIGZhbHNlKSk7CisKKyAgICBtX3VuY29tbWl0dGVkU3RhdGUuaGFzSW5z ZWN1cmVDb250ZW50ID0gdHJ1ZTsKK30KKwogdm9pZCBQYWdlTG9hZFN0YXRlOjpzZXRVbnJlYWNo YWJsZVVSTChjb25zdCBUcmFuc2FjdGlvbjo6VG9rZW4mIHRva2VuLCBjb25zdCBTdHJpbmcmIHVu cmVhY2hhYmxlVVJMKQogewogICAgIEFTU0VSVF9VTlVTRUQodG9rZW4sICZ0b2tlbi5tX3BhZ2VM b2FkU3RhdGUgPT0gdGhpcyk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUxv YWRTdGF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlTG9h ZFN0YXRlLmgJKHJldmlzaW9uIDE2MDY1MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlTG9hZFN0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU0LDYgKzU0LDkgQEAgcHVibGljOgog ICAgICAgICB2aXJ0dWFsIHZvaWQgd2lsbENoYW5nZUFjdGl2ZVVSTCgpID0gMDsKICAgICAgICAg dmlydHVhbCB2b2lkIGRpZENoYW5nZUFjdGl2ZVVSTCgpID0gMDsKIAorICAgICAgICB2aXJ0dWFs IHZvaWQgd2lsbENoYW5nZUhhc09ubHlTZWN1cmVDb250ZW50KCkgPSAwOworICAgICAgICB2aXJ0 dWFsIHZvaWQgZGlkQ2hhbmdlSGFzT25seVNlY3VyZUNvbnRlbnQoKSA9IDA7CisKICAgICAgICAg dmlydHVhbCB2b2lkIHdpbGxDaGFuZ2VFc3RpbWF0ZWRQcm9ncmVzcygpID0gMDsKICAgICAgICAg dmlydHVhbCB2b2lkIGRpZENoYW5nZUVzdGltYXRlZFByb2dyZXNzKCkgPSAwOwogICAgIH07CkBA IC0xMTYsNiArMTE5LDggQEAgcHVibGljOgogCiAgICAgU3RyaW5nIGFjdGl2ZVVSTCgpIGNvbnN0 OwogCisgICAgYm9vbCBoYXNPbmx5U2VjdXJlQ29udGVudCgpIGNvbnN0OworCiAgICAgZG91Ymxl IGVzdGltYXRlZFByb2dyZXNzKCkgY29uc3Q7CiAKICAgICBjb25zdCBTdHJpbmcmIHBlbmRpbmdB UElSZXF1ZXN0VVJMKCkgY29uc3Q7CkBAIC0xMzIsNiArMTM3LDggQEAgcHVibGljOgogCiAgICAg dm9pZCBkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uKGNvbnN0IFRyYW5zYWN0aW9uOjpUb2tlbiYs IGNvbnN0IFN0cmluZyYgdXJsKTsKIAorICAgIHZvaWQgZGlkRGlzcGxheU9yUnVuSW5zZWN1cmVD b250ZW50KGNvbnN0IFRyYW5zYWN0aW9uOjpUb2tlbiYpOworCiAgICAgdm9pZCBzZXRVbnJlYWNo YWJsZVVSTChjb25zdCBUcmFuc2FjdGlvbjo6VG9rZW4mLCBjb25zdCBTdHJpbmcmKTsKIAogICAg IGNvbnN0IFN0cmluZyYgdGl0bGUoKSBjb25zdDsKQEAgLTE1NCwxMSArMTYxLDEzIEBAIHByaXZh dGU6CiAgICAgc3RydWN0IERhdGEgewogICAgICAgICBEYXRhKCkKICAgICAgICAgICAgIDogc3Rh dGUoU3RhdGU6OkZpbmlzaGVkKQorICAgICAgICAgICAgLCBoYXNJbnNlY3VyZUNvbnRlbnQoZmFs c2UpCiAgICAgICAgICAgICAsIGVzdGltYXRlZFByb2dyZXNzKDApCiAgICAgICAgIHsKICAgICAg ICAgfQogCiAgICAgICAgIFN0YXRlIHN0YXRlOworICAgICAgICBib29sIGhhc0luc2VjdXJlQ29u dGVudDsKIAogICAgICAgICBTdHJpbmcgcGVuZGluZ0FQSVJlcXVlc3RVUkw7CiAKQEAgLTE3Myw2 ICsxODIsNyBAQCBwcml2YXRlOgogICAgIH07CiAKICAgICBzdGF0aWMgU3RyaW5nIGFjdGl2ZVVS TChjb25zdCBEYXRhJik7CisgICAgc3RhdGljIGJvb2wgaGFzT25seVNlY3VyZUNvbnRlbnQoY29u c3QgRGF0YSYpOwogICAgIHN0YXRpYyBkb3VibGUgZXN0aW1hdGVkUHJvZ3Jlc3MoY29uc3QgRGF0 YSYpOwogCiAgICAgRGF0YSBtX2NvbW1pdHRlZFN0YXRlOwpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDE2MDY1MCkKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzg0 LDYgKzIzODQsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZERpc3BsYXlJbnNlY3VyZUNvbgog ICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsK ICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIAorICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3Bh Z2VMb2FkU3RhdGUudHJhbnNhY3Rpb24oKTsKKyAgICBtX3BhZ2VMb2FkU3RhdGUuZGlkRGlzcGxh eU9yUnVuSW5zZWN1cmVDb250ZW50KHRyYW5zYWN0aW9uKTsKKworICAgIG1fcGFnZUxvYWRTdGF0 ZS5jb21taXRDaGFuZ2VzKCk7CiAgICAgbV9sb2FkZXJDbGllbnQuZGlkRGlzcGxheUluc2VjdXJl Q29udGVudEZvckZyYW1lKHRoaXMsIGZyYW1lLCB1c2VyRGF0YS5nZXQoKSk7CiB9CiAKQEAgLTIz OTcsNiArMjQwMSwxMCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUnVuSW5zZWN1cmVDb250ZW50 CiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQp OwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwogCisgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1f cGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOworICAgIG1fcGFnZUxvYWRTdGF0ZS5kaWREaXNw bGF5T3JSdW5JbnNlY3VyZUNvbnRlbnQodHJhbnNhY3Rpb24pOworCisgICAgbV9wYWdlTG9hZFN0 YXRlLmNvbW1pdENoYW5nZXMoKTsKICAgICBtX2xvYWRlckNsaWVudC5kaWRSdW5JbnNlY3VyZUNv bnRlbnRGb3JGcmFtZSh0aGlzLCBmcmFtZSwgdXNlckRhdGEuZ2V0KCkpOwogfQogCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJv bGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5tbQkocmV2aXNpb24gMTYwNjUwKQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xs ZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTk1LDYgKzk1LDE2IEBAIHByaXZhdGU6CiAgICAgICAg IFttX2NvbnRyb2xsZXIgZGlkQ2hhbmdlVmFsdWVGb3JLZXk6QCJhY3RpdmVVUkwiXTsKICAgICB9 CiAKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbENoYW5nZUhhc09ubHlTZWN1cmVDb250ZW50KCkgT1ZF UlJJREUKKyAgICB7CisgICAgICAgIFttX2NvbnRyb2xsZXIgd2lsbENoYW5nZVZhbHVlRm9yS2V5 OkAiaGFzT25seVNlY3VyZUNvbnRlbnQiXTsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZvaWQgZGlk Q2hhbmdlSGFzT25seVNlY3VyZUNvbnRlbnQoKSBPVkVSUklERQorICAgIHsKKyAgICAgICAgW21f Y29udHJvbGxlciBkaWRDaGFuZ2VWYWx1ZUZvcktleTpAImhhc09ubHlTZWN1cmVDb250ZW50Il07 CisgICAgfQorCiAgICAgdmlydHVhbCB2b2lkIHdpbGxDaGFuZ2VFc3RpbWF0ZWRQcm9ncmVzcygp IE9WRVJSSURFCiAgICAgewogICAgICAgICBbbV9jb250cm9sbGVyIHdpbGxDaGFuZ2VWYWx1ZUZv cktleTpAImVzdGltYXRlZFByb2dyZXNzIl07CkBAIC0zMjksNiArMzM5LDExIEBAIC0gKE5TVVJM ICopdW5yZWFjaGFibGVVUkwKICAgICByZXR1cm4gW05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmlu ZzpfcGFnZS0+cGFnZUxvYWRTdGF0ZSgpLnVucmVhY2hhYmxlVVJMKCldOwogfQogCistIChCT09M KWhhc09ubHlTZWN1cmVDb250ZW50Cit7CisgICAgcmV0dXJuIF9wYWdlLT5wYWdlTG9hZFN0YXRl KCkuaGFzT25seVNlY3VyZUNvbnRlbnQoKTsKK30KKwogLSAoZG91YmxlKWVzdGltYXRlZFByb2dy ZXNzCiB7CiAgICAgcmV0dXJuIF9wYWdlLT5lc3RpbWF0ZWRQcm9ncmVzcygpOwpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xs ZXJQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJQcml2YXRlLmgJKHJldmlzaW9uIDE2MDY1 MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tCcm93c2luZ0NvbnRl eHRDb250cm9sbGVyUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0Myw4IEBAIHR5 cGVkZWYgTlNfRU5VTShOU1VJbnRlZ2VyLCBXS0Jyb3dzaW5nQ28KIAogQHByb3BlcnR5IChyZWFk b25seSkgV0tQYWdlUmVmIF9wYWdlUmVmOwogCitAcHJvcGVydHkgKHJlYWRvbmx5KSBCT09MIGhh c09ubHlTZWN1cmVDb250ZW50OworCiBAcHJvcGVydHkgV0tCcm93c2luZ0NvbnRleHRQYWdpbmF0 aW9uTW9kZSBwYWdpbmF0aW9uTW9kZTsKIAogLy8gV2hldGhlciB0aGUgY29sdW1uLWJyZWFrLXti ZWZvcmUsYWZ0ZXJ9IHByb3BlcnRpZXMgYXJlIHJlc3BlY3RlZCBpbnN0ZWFkIG9mIHRoZQo=