110635 2013-02-22 13:24:18 -0800 Move pluginLoadPolicy to the page loader client 2013-02-22 14:08:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 839863 0 andersca 2013-02-22 13:24:18 -0800 Move pluginLoadPolicy to the page loader client 839868 1 189813 andersca 2013-02-22 13:27:25 -0800 Created attachment 189813 Patch 839936 2 andersca 2013-02-22 14:08:32 -0800 Committed r143790: <http://trac.webkit.org/changeset/143790> 189813 2013-02-22 13:27:25 -0800 2013-02-22 13:28:13 -0800 Patch bug-110635-20130222132344.patch text/plain 15621 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjVmOGYzODIwYmZmNzdk OTRhOGJiNDlkMTdkMGFjYTJhODA3YTRkZi4uNDc0NjdmZjAwZTM4YzAxNmU2ODkxYzk0NTVhMTNk MTk0MDE2ZDg4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAyLTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSBwbHVnaW5M b2FkUG9saWN5IHRvIHRoZSBwYWdlIGxvYWRlciBjbGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDYzNQorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMTMyNjUzMDM+CisgICAgICAgIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBNb3ZlIHRoZSBwbHVnaW5Mb2FkUG9saWN5IGNhbGxiYWNrIHRvIHRoZSBw YWdlIGxvYWRlciBjbGllbnQgd2hlcmUgaXQgYmVsb25ncy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQy9XS1BhZ2UuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViTG9hZGVyQ2xpZW50LmNw cDoKKyAgICAgICAgKFdlYktpdDo6dG9XS1BsdWdpbkxvYWRQb2xpY3kpOgorICAgICAgICAoV2Vi S2l0KToKKyAgICAgICAgKFdlYktpdDo6dG9QbHVnaW5Nb2R1bGVMb2FkUG9saWN5KToKKyAgICAg ICAgKFdlYktpdDo6V2ViTG9hZGVyQ2xpZW50OjpwbHVnaW5Mb2FkUG9saWN5KToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgIChXZWJMb2FkZXJDbGllbnQp OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmdldFBsdWdpblBhdGgpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJV SUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJV SUNsaWVudC5oOgorICAgICAgICAoV2ViVUlDbGllbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9t YWMvV2ViSW5zcGVjdG9yUHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3Rv clByb3h5OjpwbGF0Zm9ybUNyZWF0ZUluc3BlY3RvclBhZ2UpOgorCiAyMDEzLTAyLTIxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFR3byB2aWRlbyBjb250b2xs ZXJzIGFwcGVhciBhZnRlciBleGl0aW5nIHRoZSBmdWxsc2NyZWVuIHZpZGVvIHdoZW4gdXNpbmcg bWVudWJhciB0byBleGl0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL1dLUGFnZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCmlu ZGV4IGE1OWFlZTU3NzFiNjFiNTY1YWU3MTQxZjFkOGE5ZjNlNjQ1MWFlZTAuLjE0ODUzYjhhM2Zk MWRhZDM0MmZiYzE3MWYyM2VhMGQzYWNjMWRmYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tQYWdlLmgKQEAgLTQ5LDYgKzQ5LDEzIEBAIGVudW0gewogfTsKIHR5cGVkZWYgdWlu dDMyX3QgV0tGb2N1c0RpcmVjdGlvbjsKIAorZW51bSB7CisgICAga1dLUGx1Z2luTG9hZFBvbGlj eUxvYWROb3JtYWxseSA9IDAsCisgICAga1dLUGx1Z2luTG9hZFBvbGljeUJsb2NrZWQsCisgICAg a1dLUGx1Z2luTG9hZFBvbGljeUluYWN0aXZlLAorfTsKK3R5cGVkZWYgdWludDMyX3QgV0tQbHVn aW5Mb2FkUG9saWN5OworCiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VDYWxsYmFjaykoV0tQYWdlUmVm IHBhZ2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwogCiAvLyBGcmFtZUxvYWQgQ2xpZW50CkBA IC03NSw2ICs4Miw3IEBAIHR5cGVkZWYgdm9pZCAoKldLUGFnZURpZE5ld0ZpcnN0VmlzdWFsbHlO b25FbXB0eUxheW91dENhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwKIHR5cGVkZWYgdm9pZCAoKldL UGFnZVdpbGxHb1RvQmFja0ZvcndhcmRMaXN0SXRlbUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwg V0tCYWNrRm9yd2FyZExpc3RJdGVtUmVmIGl0ZW0sIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qg dm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VQbHVnaW5EaWRGYWlsQ2Fs bGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS0Vycm9yQ29kZSBlcnJvckNvZGUsIFdLU3RyaW5nUmVm IG1pbWVUeXBlLCBXS1N0cmluZ1JlZiBwbHVnaW5JZGVudGlmaWVyLCBXS1N0cmluZ1JlZiBwbHVn aW5WZXJzaW9uLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLUGFn ZURpZExheW91dENhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tMYXlvdXRNaWxlc3RvbmVzIG1p bGVzdG9uZXMsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7Cit0 eXBlZGVmIFdLUGx1Z2luTG9hZFBvbGljeSAoKldLUGFnZVBsdWdpbkxvYWRQb2xpY3lDYWxsYmFj aykoV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIGlkZW50aWZpZXIsIFdLU3RyaW5nUmVmIGRp c3BsYXlOYW1lLCBXS1VSTFJlZiBkb2N1bWVudFVSTCwgV0tQbHVnaW5Mb2FkUG9saWN5IGN1cnJl bnRQbHVnaW5Mb2FkUG9saWN5LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKIAogLy8gRGVwcmVj YXRlZAogdHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkRmFpbFRvSW5pdGlhbGl6ZVBsdWdpbkNhbGxi YWNrX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjApKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBt aW1lVHlwZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CkBAIC0xMjksNiArMTM3LDcgQEAgc3Ry dWN0IFdLUGFnZUxvYWRlckNsaWVudCB7CiAgICAgdm9pZCAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoKnJlZ2lzdGVySW50ZW50 U2VydmljZUZvckZyYW1lX3VuYXZhaWxhYmxlKSh2b2lkKTsKIAogICAgIFdLUGFnZURpZExheW91 dENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlk TGF5b3V0OworICAgIFdLUGFnZVBsdWdpbkxvYWRQb2xpY3lDYWxsYmFjayAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcGx1Z2luTG9hZFBvbGljeTsKIH07CiB0eXBlZGVmIHN0 cnVjdCBXS1BhZ2VMb2FkZXJDbGllbnQgV0tQYWdlTG9hZGVyQ2xpZW50OwogCkBAIC0xNzEsMTMg KzE4MCw2IEBAIGVudW0gewogfTsKIHR5cGVkZWYgdWludDMyX3QgV0tQbHVnaW5VbmF2YWlsYWJp bGl0eVJlYXNvbjsKIAotZW51bSB7Ci0gICAga1dLUGx1Z2luTG9hZFBvbGljeUxvYWROb3JtYWxs eSA9IDAsCi0gICAga1dLUGx1Z2luTG9hZFBvbGljeUJsb2NrZWQsCi0gICAga1dLUGx1Z2luTG9h ZFBvbGljeUluYWN0aXZlLAotfTsKLXR5cGVkZWYgdWludDMyX3QgV0tQbHVnaW5Mb2FkUG9saWN5 OwotCiAvLyBVSSBDbGllbnQKIHR5cGVkZWYgV0tQYWdlUmVmICgqV0tQYWdlQ3JlYXRlTmV3UGFn ZUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tVUkxSZXF1ZXN0UmVmIHVybFJlcXVlc3QsIFdL RGljdGlvbmFyeVJlZiBmZWF0dXJlcywgV0tFdmVudE1vZGlmaWVycyBtb2RpZmllcnMsIFdLRXZl bnRNb3VzZUJ1dHRvbiBtb3VzZUJ1dHRvbiwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBl ZGVmIHZvaWQgKCpXS1BhZ2VSdW5KYXZhU2NyaXB0QWxlcnRDYWxsYmFjaykoV0tQYWdlUmVmIHBh Z2UsIFdLU3RyaW5nUmVmIGFsZXJ0VGV4dCwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAq Y2xpZW50SW5mbyk7CkBAIC0yMTUsNyArMjE3LDYgQEAgdHlwZWRlZiB2b2lkICgqV0tQYWdlRGVj aWRlUG9saWN5Rm9yTm90aWZpY2F0aW9uUGVybWlzc2lvblJlcXVlc3RDYWxsYmFjaykoV0tQYWcK IHR5cGVkZWYgdm9pZCAoKldLUGFnZVVuYXZhaWxhYmxlUGx1Z2luQnV0dG9uQ2xpY2tlZENhbGxi YWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbiBwbHVnaW5V bmF2YWlsYWJpbGl0eVJlYXNvbiwgV0tTdHJpbmdSZWYgbWltZVR5cGUsIFdLU3RyaW5nUmVmIHVy bCwgV0tTdHJpbmdSZWYgcGx1Z2luc1BhZ2VVUkwsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwog dHlwZWRlZiB2b2lkICgqV0tQYWdlU2hvd0NvbG9yUGlja2VyQ2FsbGJhY2spKFdLUGFnZVJlZiBw YWdlLCBXS1N0cmluZ1JlZiBpbml0aWFsQ29sb3IsIFdLQ29sb3JQaWNrZXJSZXN1bHRMaXN0ZW5l clJlZiBsaXN0ZW5lciwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpX S1BhZ2VIaWRlQ29sb3JQaWNrZXJDYWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQq IGNsaWVudEluZm8pOwotdHlwZWRlZiBXS1BsdWdpbkxvYWRQb2xpY3kgKCpXS1BhZ2VQbHVnaW5M b2FkUG9saWN5Q2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBpZGVudGlmaWVy LCBXS1N0cmluZ1JlZiBkaXNwbGF5TmFtZSwgV0tVUkxSZWYgZG9jdW1lbnRVUkwsIFdLUGx1Z2lu TG9hZFBvbGljeSBjdXJyZW50UGx1Z2luTG9hZFBvbGljeSwgY29uc3Qgdm9pZCogY2xpZW50SW5m byk7CiAKIC8vIERlcHJlY2F0ZWQgICAgCiB0eXBlZGVmIFdLUGFnZVJlZiAoKldLUGFnZUNyZWF0 ZU5ld1BhZ2VDYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFYwKShXS1BhZ2VSZWYgcGFnZSwg V0tEaWN0aW9uYXJ5UmVmIGZlYXR1cmVzLCBXS0V2ZW50TW9kaWZpZXJzIG1vZGlmaWVycywgV0tF dmVudE1vdXNlQnV0dG9uIG1vdXNlQnV0dG9uLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKQEAg LTI3Niw3ICsyNzcsNiBAQCBzdHJ1Y3QgV0tQYWdlVUlDbGllbnQgewogICAgIC8vIFZlcnNpb24g MgogICAgIFdLUGFnZVNob3dDb2xvclBpY2tlckNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc2hvd0NvbG9yUGlja2VyOwogICAgIFdLUGFnZUhpZGVDb2xvclBp Y2tlckNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGlkZUNv bG9yUGlja2VyOwotICAgIFdLUGFnZVBsdWdpbkxvYWRQb2xpY3lDYWxsYmFjayAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcGx1Z2luTG9hZFBvbGljeTsKIH07CiB0eXBlZGVm IHN0cnVjdCBXS1BhZ2VVSUNsaWVudCBXS1BhZ2VVSUNsaWVudDsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViTG9hZGVyQ2xpZW50LmNwcAppbmRleCA2NzRkZGIxMTc0ZTU1ZDZmMWNl ZDgyYjAwZDM4MzRkYTdiYTJjYWQxLi43YTQ3OTIwZDZhMjU4MmNhNTI3OGEwNWIxZTZjYjE3NzA2 NjdlNjliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTG9hZGVyQ2xp ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTG9hZGVyQ2xpZW50LmNw cApAQCAtMjkxLDQgKzI5MSw0MyBAQCB2b2lkIFdlYkxvYWRlckNsaWVudDo6ZGlkQmxvY2tJbnNl Y3VyZVBsdWdpblZlcnNpb24oV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBTdAogICAgIG1fY2xp ZW50LnBsdWdpbkRpZEZhaWwodG9BUEkocGFnZSksIGtXS0Vycm9yQ29kZUluc2VjdXJlUGx1Z0lu VmVyc2lvbiwgdG9BUEkobWltZVR5cGUuaW1wbCgpKSwgdG9BUEkocGx1Z2luSWRlbnRpZmllci5p bXBsKCkpLCB0b0FQSShwbHVnaW5WZXJzaW9uLmltcGwoKSksIG1fY2xpZW50LmNsaWVudEluZm8p OwogfQogCitzdGF0aWMgaW5saW5lIFdLUGx1Z2luTG9hZFBvbGljeSB0b1dLUGx1Z2luTG9hZFBv bGljeShQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IHBsdWdpbk1vZHVsZUxvYWRQb2xpY3kpCit7Cisg ICAgc3dpdGNoIChwbHVnaW5Nb2R1bGVMb2FkUG9saWN5KSB7CisgICAgY2FzZSBQbHVnaW5Nb2R1 bGVMb2FkTm9ybWFsbHk6CisgICAgICAgIHJldHVybiBrV0tQbHVnaW5Mb2FkUG9saWN5TG9hZE5v cm1hbGx5OworICAgIGNhc2UgUGx1Z2luTW9kdWxlQmxvY2tlZDoKKyAgICAgICAgcmV0dXJuIGtX S1BsdWdpbkxvYWRQb2xpY3lCbG9ja2VkOworICAgIGNhc2UgUGx1Z2luTW9kdWxlSW5hY3RpdmU6 CisgICAgICAgIHJldHVybiBrV0tQbHVnaW5Mb2FkUG9saWN5SW5hY3RpdmU7CisgICAgfQorCisg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIGtXS1BsdWdpbkxvYWRQb2xpY3lC bG9ja2VkOworfQorCitzdGF0aWMgaW5saW5lIFBsdWdpbk1vZHVsZUxvYWRQb2xpY3kgdG9QbHVn aW5Nb2R1bGVMb2FkUG9saWN5KFdLUGx1Z2luTG9hZFBvbGljeSBwbHVnaW5Mb2FkUG9saWN5KQor eworICAgIHN3aXRjaCAocGx1Z2luTG9hZFBvbGljeSkgeworICAgIGNhc2Uga1dLUGx1Z2luTG9h ZFBvbGljeUxvYWROb3JtYWxseToKKyAgICAgICAgcmV0dXJuIFBsdWdpbk1vZHVsZUxvYWROb3Jt YWxseTsKKyAgICBjYXNlIGtXS1BsdWdpbkxvYWRQb2xpY3lCbG9ja2VkOgorICAgICAgICByZXR1 cm4gUGx1Z2luTW9kdWxlQmxvY2tlZDsKKyAgICBjYXNlIGtXS1BsdWdpbkxvYWRQb2xpY3lJbmFj dGl2ZToKKyAgICAgICAgcmV0dXJuIFBsdWdpbk1vZHVsZUluYWN0aXZlOworICAgIH0KKworICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBQbHVnaW5Nb2R1bGVCbG9ja2VkOwor fQorCitQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IFdlYkxvYWRlckNsaWVudDo6cGx1Z2luTG9hZFBv bGljeShXZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgY29uc3Qg U3RyaW5nJiBkaXNwbGF5TmFtZSwgY29uc3QgU3RyaW5nJiBkb2N1bWVudFVSTFN0cmluZywgUGx1 Z2luTW9kdWxlTG9hZFBvbGljeSBjdXJyZW50UGx1Z2luTG9hZFBvbGljeSkKK3sKKyAgICBpZiAo IW1fY2xpZW50LnBsdWdpbkxvYWRQb2xpY3kpCisgICAgICAgIHJldHVybiBjdXJyZW50UGx1Z2lu TG9hZFBvbGljeTsKKworICAgIHJldHVybiB0b1BsdWdpbk1vZHVsZUxvYWRQb2xpY3kobV9jbGll bnQucGx1Z2luTG9hZFBvbGljeSh0b0FQSShwYWdlKSwgdG9BUEkoaWRlbnRpZmllci5pbXBsKCkp LCB0b0FQSShkaXNwbGF5TmFtZS5pbXBsKCkpLCB0b1VSTFJlZihkb2N1bWVudFVSTFN0cmluZy5p bXBsKCkpLCB0b1dLUGx1Z2luTG9hZFBvbGljeShjdXJyZW50UGx1Z2luTG9hZFBvbGljeSksIG1f Y2xpZW50LmNsaWVudEluZm8pKTsKK30KKworCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJMb2FkZXJDbGllbnQuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJMb2FkZXJDbGllbnQuaAppbmRleCA1M2YyNGI5YmMzYTk5 OGQzNzJjMGU5MjM5NzNmNDczZjZiNWJhODcyLi44NjQ5Njc3MzUwMDExNjAxMTBmMjhiMGRlY2Rj NmRjNzVmMmI3N2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTG9h ZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkxvYWRlckNsaWVu dC5oCkBAIC0yNyw2ICsyNyw3IEBACiAjZGVmaW5lIFdlYkxvYWRlckNsaWVudF9oCiAKICNpbmNs dWRlICJBUElDbGllbnQuaCIKKyNpbmNsdWRlICJQbHVnaW5Nb2R1bGVJbmZvLmgiCiAjaW5jbHVk ZSAiU2FtZURvY3VtZW50TmF2aWdhdGlvblR5cGUuaCIKICNpbmNsdWRlICJXS1BhZ2UuaCIKICNp bmNsdWRlIDxXZWJDb3JlL0xheW91dE1pbGVzdG9uZXMuaD4KQEAgLTg4LDggKzg5LDEwIEBAIHB1 YmxpYzoKICAgICBib29sIHNob3VsZEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtKFdlYlBhZ2VQcm94 eSosIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qKTsKICAgICB2b2lkIHdpbGxHb1RvQmFja0Zvcndh cmRMaXN0SXRlbShXZWJQYWdlUHJveHkqLCBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiwgQVBJT2Jq ZWN0Kik7CiAKKyAgICBQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IHBsdWdpbkxvYWRQb2xpY3koV2Vi UGFnZVByb3h5KiwgY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGRpc3Bs YXlOYW1lLCBjb25zdCBTdHJpbmcmIGRvY3VtZW50VVJMU3RyaW5nLCBQbHVnaW5Nb2R1bGVMb2Fk UG9saWN5IGN1cnJlbnRQbHVnaW5Mb2FkUG9saWN5KTsKICAgICB2b2lkIGRpZEZhaWxUb0luaXRp YWxpemVQbHVnaW4oV2ViUGFnZVByb3h5KiwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSk7CiAgICAg dm9pZCBkaWRCbG9ja0luc2VjdXJlUGx1Z2luVmVyc2lvbihXZWJQYWdlUHJveHkqLCBjb25zdCBT dHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIHBsdWdpbklkZW50aWZpZXIsIGNvbnN0IFN0 cmluZyYgcGx1Z2luVmVyc2lvbik7CisKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAyYzNlYzBmYmM4NGI3 ODc0ZGEzMDI0MDFiZmE0NDM0ZTFkYTM2NzRhLi4zMTg2YjI2ZWYzMDYwOWUxYmVjZDJkNjk2ODcx ODU3ZjkxMDhkMzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cApAQCAtMTI1Niw3ICsxMjU2LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmdldFBsdWdpblBhdGgo Y29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcKIAogI2lmIFBM QVRGT1JNKE1BQykKICAgICBQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IGN1cnJlbnRQbHVnaW5Mb2Fk UG9saWN5ID0gc3RhdGljX2Nhc3Q8UGx1Z2luTW9kdWxlTG9hZFBvbGljeT4ocGx1Z2luTG9hZFBv bGljeSk7Ci0gICAgcGx1Z2luTG9hZFBvbGljeSA9IG1fdWlDbGllbnQucGx1Z2luTG9hZFBvbGlj eSh0aGlzLCBwbHVnaW4uYnVuZGxlSWRlbnRpZmllciwgcGx1Z2luLmluZm8ubmFtZSwgZG9jdW1l bnRVUkxTdHJpbmcsIGN1cnJlbnRQbHVnaW5Mb2FkUG9saWN5KTsKKyAgICBwbHVnaW5Mb2FkUG9s aWN5ID0gbV9sb2FkZXJDbGllbnQucGx1Z2luTG9hZFBvbGljeSh0aGlzLCBwbHVnaW4uYnVuZGxl SWRlbnRpZmllciwgcGx1Z2luLmluZm8ubmFtZSwgZG9jdW1lbnRVUkxTdHJpbmcsIGN1cnJlbnRQ bHVnaW5Mb2FkUG9saWN5KTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKGRvY3VtZW50VVJMU3Ry aW5nKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlVJ Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVudC5jcHAKaW5k ZXggODJhZDRjNGM4MzVhZjZkN2FkZGQxNjU1N2VhMjBmMzI1MGQwZTQ2Yi4uZjg4YzAwYTI0MjUx YWQ2ZGRmYTRmYmVmOGM5ZWZiNWQwYzgyM2NhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlVJQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViVUlDbGllbnQuY3BwCkBAIC00MzgsNDIgKzQzOCw0IEBAIGJvb2wgV2ViVUlDbGllbnQ6Omhp ZGVDb2xvclBpY2tlcihXZWJQYWdlUHJveHkqIHBhZ2UpCiB9CiAjZW5kaWYKIAotc3RhdGljIGlu bGluZSBXS1BsdWdpbkxvYWRQb2xpY3kgdG9XS1BsdWdpbkxvYWRQb2xpY3koUGx1Z2luTW9kdWxl TG9hZFBvbGljeSBwbHVnaW5Nb2R1bGVMb2FkUG9saWN5KQotewotICAgIHN3aXRjaCAocGx1Z2lu TW9kdWxlTG9hZFBvbGljeSkgewotICAgIGNhc2UgUGx1Z2luTW9kdWxlTG9hZE5vcm1hbGx5Ogot ICAgICAgICByZXR1cm4ga1dLUGx1Z2luTG9hZFBvbGljeUxvYWROb3JtYWxseTsKLSAgICBjYXNl IFBsdWdpbk1vZHVsZUJsb2NrZWQ6Ci0gICAgICAgIHJldHVybiBrV0tQbHVnaW5Mb2FkUG9saWN5 QmxvY2tlZDsKLSAgICBjYXNlIFBsdWdpbk1vZHVsZUluYWN0aXZlOgotICAgICAgICByZXR1cm4g a1dLUGx1Z2luTG9hZFBvbGljeUluYWN0aXZlOwotICAgIH0KLQotICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOwotICAgIHJldHVybiBrV0tQbHVnaW5Mb2FkUG9saWN5QmxvY2tlZDsKLX0KLQotc3Rh dGljIGlubGluZSBQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IHRvUGx1Z2luTW9kdWxlTG9hZFBvbGlj eShXS1BsdWdpbkxvYWRQb2xpY3kgcGx1Z2luTG9hZFBvbGljeSkKLXsKLSAgICBzd2l0Y2ggKHBs dWdpbkxvYWRQb2xpY3kpIHsKLSAgICBjYXNlIGtXS1BsdWdpbkxvYWRQb2xpY3lMb2FkTm9ybWFs bHk6Ci0gICAgICAgIHJldHVybiBQbHVnaW5Nb2R1bGVMb2FkTm9ybWFsbHk7Ci0gICAgY2FzZSBr V0tQbHVnaW5Mb2FkUG9saWN5QmxvY2tlZDoKLSAgICAgICAgcmV0dXJuIFBsdWdpbk1vZHVsZUJs b2NrZWQ7Ci0gICAgY2FzZSBrV0tQbHVnaW5Mb2FkUG9saWN5SW5hY3RpdmU6Ci0gICAgICAgIHJl dHVybiBQbHVnaW5Nb2R1bGVJbmFjdGl2ZTsKLSAgICB9Ci0KLSAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKLSAgICByZXR1cm4gUGx1Z2luTW9kdWxlQmxvY2tlZDsKLX0KLQotUGx1Z2luTW9kdWxl TG9hZFBvbGljeSBXZWJVSUNsaWVudDo6cGx1Z2luTG9hZFBvbGljeShXZWJQYWdlUHJveHkqIHBh Z2UsIGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBkaXNwbGF5TmFtZSwg Y29uc3QgU3RyaW5nJiBkb2N1bWVudFVSTFN0cmluZywgUGx1Z2luTW9kdWxlTG9hZFBvbGljeSBj dXJyZW50UGx1Z2luTG9hZFBvbGljeSkKLXsKLSAgICBpZiAoIW1fY2xpZW50LnBsdWdpbkxvYWRQ b2xpY3kpCi0gICAgICAgIHJldHVybiBjdXJyZW50UGx1Z2luTG9hZFBvbGljeTsKLQotICAgIHJl dHVybiB0b1BsdWdpbk1vZHVsZUxvYWRQb2xpY3kobV9jbGllbnQucGx1Z2luTG9hZFBvbGljeSh0 b0FQSShwYWdlKSwgdG9BUEkoaWRlbnRpZmllci5pbXBsKCkpLCB0b0FQSShkaXNwbGF5TmFtZS5p bXBsKCkpLCB0b1VSTFJlZihkb2N1bWVudFVSTFN0cmluZy5pbXBsKCkpLCB0b1dLUGx1Z2luTG9h ZFBvbGljeShjdXJyZW50UGx1Z2luTG9hZFBvbGljeSksIG1fY2xpZW50LmNsaWVudEluZm8pKTsK LX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViVUlDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNs aWVudC5oCmluZGV4IDI4NTZhNTJhZTk0NjU4MWRhNTUzZGE3Yjg4M2MyMzczOWE1NDMzZjcuLjli NTJiZmQwZWYxNDY1MmQ0MGFkNmU2MWViOWY0NWY5M2IyM2Q2MzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJVSUNsaWVudC5oCkBAIC0yNyw3ICsyNyw2IEBACiAjZGVmaW5lIFdlYlVJQ2xp ZW50X2gKIAogI2luY2x1ZGUgIkFQSUNsaWVudC5oIgotI2luY2x1ZGUgIlBsdWdpbk1vZHVsZUlu Zm8uaCIKICNpbmNsdWRlICJXS1BhZ2UuaCIKICNpbmNsdWRlICJXZWJFdmVudC5oIgogI2luY2x1 ZGUgIldlYkhpdFRlc3RSZXN1bHQuaCIKQEAgLTEyMiw4ICsxMjEsNiBAQCBwdWJsaWM6CiAgICAg Ym9vbCBzaG93Q29sb3JQaWNrZXIoV2ViUGFnZVByb3h5KiwgY29uc3QgU3RyaW5nJiwgV2ViQ29s b3JQaWNrZXJSZXN1bHRMaXN0ZW5lclByb3h5Kik7CiAgICAgYm9vbCBoaWRlQ29sb3JQaWNrZXIo V2ViUGFnZVByb3h5Kik7CiAjZW5kaWYKLQotICAgIFBsdWdpbk1vZHVsZUxvYWRQb2xpY3kgcGx1 Z2luTG9hZFBvbGljeShXZWJQYWdlUHJveHkqLCBjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIGNv bnN0IFN0cmluZyYgZGlzcGxheU5hbWUsIGNvbnN0IFN0cmluZyYgZG9jdW1lbnRVUkxTdHJpbmcs IFBsdWdpbk1vZHVsZUxvYWRQb2xpY3kgY3VycmVudFBsdWdpbkxvYWRQb2xpY3kpOwogfTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbQppbmRleCA1ZGE0Yzg3N2FiMTQwNzhkMzVhMGRj OGRkYzEyMWI4OGUwZTM5MDBkLi44NjI2NmRhYWY4ZTZiNTZiZmJkMjc4NDY5MjZlZDhiMmI3YmFi NmRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3Rv clByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViSW5zcGVj dG9yUHJveHlNYWMubW0KQEAgLTM1Miw3ICszNTIsNiBAQCBXZWJQYWdlUHJveHkqIFdlYkluc3Bl Y3RvclByb3h5OjpwbGF0Zm9ybUNyZWF0ZUluc3BlY3RvclBhZ2UoKQogICAgICAgICAwLCAvLyB1 bmF2YWlsYWJsZVBsdWdpbkJ1dHRvbkNsaWNrZWQKICAgICAgICAgMCwgLy8gc2hvd0NvbG9yUGlj a2VyCiAgICAgICAgIDAsIC8vIGhpZGVDb2xvclBpY2tlcgotICAgICAgICAwLCAvLyBzaG91bGRJ bnN0YW50aWF0ZVBsdWdpbgogICAgIH07CiAKICAgICBpbnNwZWN0b3JQYWdlLT5pbml0aWFsaXpl VUlDbGllbnQoJnVpQ2xpZW50KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCAzNzUyMjNhMzZkY2I0ZTU4M2JhMzJhZjE1NDY0ZThlYmIzNjdiYzli Li4zMzRjNWU2ZDMwZWY1NGFmOGMxNGNjNTAyYWUxOTg2YjEzNDkxZGNjIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIw MTMtMDItMjIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAg ICBNb3ZlIHBsdWdpbkxvYWRQb2xpY3kgdG8gdGhlIHBhZ2UgbG9hZGVyIGNsaWVudAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwNjM1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9t YWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubToKKyAgICAgICAgKC1bV0syQnJvd3Nlcldp bmRvd0NvbnRyb2xsZXIgYXdha2VGcm9tTmliXSk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpjcmVh dGVPdGhlclBhZ2UpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6Y3JlYXRlV2ViVmll d1dpdGhPcHRpb25zKToKKwogMjAxMy0wMi0yMiAgUmFwaGFlbCBLdWJvIGRhIENvc3RhICA8cmFw aGFlbC5rdWJvLmRhLmNvc3RhQGludGVsLmNvbT4KIAogICAgICAgICBbV1RSXSBEbyBub3QgZHVt cCBpbmZvcm1hdGlvbiBhYm91dCBlbXB0eSBzdWJmcmFtZXMuCmRpZmYgLS1naXQgYS9Ub29scy9N aW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubSBiL1Rvb2xzL01pbmlC cm93c2VyL21hYy9XSzJCcm93c2VyV2luZG93Q29udHJvbGxlci5tCmluZGV4IGY3MDVmZTFjZjFj NDViNDVjMzRhYmZlYzFlMWY2MmNlOGQ1M2ZlMzEuLmRlYTM1NDg5OTkzZTAzZDNlYTBkMjZlOWZl MGNiZjQ3MDJhYTFkZDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzJCcm93 c2VyV2luZG93Q29udHJvbGxlci5tCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzJCcm93 c2VyV2luZG93Q29udHJvbGxlci5tCkBAIC02NDIsNiArNjQyLDcgQEAgLSAodm9pZClhd2FrZUZy b21OaWIKICAgICAgICAgMCwgLy8gZGlkUmVjZWl2ZUludGVudEZvckZyYW1lCiAgICAgICAgIDAs IC8vIHJlZ2lzdGVySW50ZW50U2VydmljZUZvckZyYW1lCiAgICAgICAgIDAsIC8vIGRpZExheW91 dAorICAgICAgICAwLCAvLyBwbHVnaW5Mb2FkUG9saWN5CiAgICAgfTsKICAgICBXS1BhZ2VTZXRQ YWdlTG9hZGVyQ2xpZW50KF93ZWJWaWV3LnBhZ2VSZWYsICZsb2FkQ2xpZW50KTsKICAgICAKQEAg LTcwMyw3ICs3MDQsNiBAQCAtICh2b2lkKWF3YWtlRnJvbU5pYgogICAgICAgICAwLCAvLyB1bmF2 YWlsYWJsZVBsdWdpbkJ1dHRvbkNsaWNrZWQKICAgICAgICAgMCwgLy8gc2hvd0NvbG9yUGlja2Vy CiAgICAgICAgIDAsIC8vIGhpZGVDb2xvclBpY2tlcgotICAgICAgICAwLCAvLyBzaG91bGRJbnN0 YW50aWF0ZVBsdWdpbgogICAgIH07CiAgICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KF93ZWJWaWV3 LnBhZ2VSZWYsICZ1aUNsaWVudCk7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL1Rlc3RDb250cm9sbGVyLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRy b2xsZXIuY3BwCmluZGV4IDY5Y2Q5NWY2OWZlOTQ0ZWIxNDcyODQ1YTU3MmIzMzNiYTE4N2RkZDYu LjZjOGRlOTUzN2RhNjdmNDNhMDg2MTAxYTI4ODcyZTFmNTdmYTEzN2UgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCisrKyBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCkBAIC0yMzcsNyArMjM3LDYgQEAgV0tQYWdl UmVmIFRlc3RDb250cm9sbGVyOjpjcmVhdGVPdGhlclBhZ2UoV0tQYWdlUmVmIG9sZFBhZ2UsIFdL VVJMUmVxdWVzdFJlZiwgV0sKICAgICAgICAgMCwgLy8gdW5hdmFpbGFibGVQbHVnaW5CdXR0b25D bGlja2VkCiAgICAgICAgIDAsIC8vIHNob3dDb2xvclBpY2tlcgogICAgICAgICAwLCAvLyBoaWRl Q29sb3JQaWNrZXIKLSAgICAgICAgMCwgLy8gc2hvdWxkSW5zdGFudGlhdGVQbHVnaW4KICAgICB9 OwogICAgIFdLUGFnZVNldFBhZ2VVSUNsaWVudChuZXdQYWdlLCAmb3RoZXJQYWdlVUlDbGllbnQp OwogCkBAIC00MjgsNyArNDI3LDYgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6Y3JlYXRlV2ViVmll d1dpdGhPcHRpb25zKFdLRGljdGlvbmFyeVJlZiBvcHRpb25zKQogICAgICAgICB1bmF2YWlsYWJs ZVBsdWdpbkJ1dHRvbkNsaWNrZWQsCiAgICAgICAgIDAsIC8vIHNob3dDb2xvclBpY2tlcgogICAg ICAgICAwLCAvLyBoaWRlQ29sb3JQaWNrZXIKLSAgICAgICAgMCwgLy8gc2hvdWxkSW5zdGFudGlh dGVQbHVnaW4KICAgICB9OwogICAgIFdLUGFnZVNldFBhZ2VVSUNsaWVudChtX21haW5XZWJWaWV3 LT5wYWdlKCksICZwYWdlVUlDbGllbnQpOwogCkBAIC00NjgsNiArNDY2LDcgQEAgdm9pZCBUZXN0 Q29udHJvbGxlcjo6Y3JlYXRlV2ViVmlld1dpdGhPcHRpb25zKFdLRGljdGlvbmFyeVJlZiBvcHRp b25zKQogICAgICAgICAwLCAvLyBkaWRSZWNlaXZlSW50ZW50Rm9yRnJhbWUKICAgICAgICAgMCwg Ly8gcmVnaXN0ZXJJbnRlbnRTZXJ2aWNlRm9yRnJhbWUKICAgICAgICAgMCwgLy8gZGlkTGF5b3V0 CisgICAgICAgIDAsIC8vIHBsdWdpbkxvYWRQb2xpY3kKICAgICB9OwogICAgIFdLUGFnZVNldFBh Z2VMb2FkZXJDbGllbnQobV9tYWluV2ViVmlldy0+cGFnZSgpLCAmcGFnZUxvYWRlckNsaWVudCk7 CiAK