127536 2014-01-23 18:37:49 -0800 Move policy client into WKPage.cpp and get rid of WebPolicyClient files 2014-01-23 18:45:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 971454 0 andersca 2014-01-23 18:37:49 -0800 Move policy client into WKPage.cpp and get rid of WebPolicyClient files 971455 1 222067 andersca 2014-01-23 18:38:15 -0800 Created attachment 222067 Patch 971459 2 andersca 2014-01-23 18:45:12 -0800 Committed r162678: <http://trac.webkit.org/changeset/162678> 222067 2014-01-23 18:38:15 -0800 2014-01-23 18:41:09 -0800 Patch bug-127536-20140123183813.patch text/plain 21144 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNjc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGRiMTA4MjY4YjA2MzNj MTczYmM3NjM4YTc2OTc5N2UyYTYzNjM2NC4uYzc4N2Q0YjgzZjlhOTkyZDQ4OGJmYzk5ZGViZGY2 OWZjM2NmOTZkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE0LTAxLTIzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSBwb2xpY3kg Y2xpZW50IGludG8gV0tQYWdlLmNwcCBhbmQgZ2V0IHJpZCBvZiBXZWJQb2xpY3lDbGllbnQgZmls ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzUz NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL1dLUGFnZS5jcHA6CisgICAgICAgIChXS1BhZ2VTZXRQYWdlUG9saWN5Q2xp ZW50KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUG9saWN5Q2xpZW50LmNwcDogUmVtb3ZlZC4K KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUG9saWN5Q2xpZW50Lmg6IFJlbW92ZWQuCisgICAgICAg ICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorCisyMDE0LTAxLTIzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgT25seSBXS1BhZ2Ug c2hvdWxkIGtub3cgYWJvdXQgV2ViUG9saWN5Q2xpZW50CiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc1MzUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQYWdlLmNwcAppbmRleCAwNDExMjczYWYxMDA4MzRlYTFjY2IxNTRjYjdiZDE2 ODdkODQxZDdkLi5mNDdhNGJhOThmNzhjYWM1MDdhYzhlZTllOTEyYTRiNDYzOTZjNjdjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcApAQCAtMjksMTQgKzI5LDE1 IEBACiAKICNpbmNsdWRlICJBUElBcnJheS5oIgogI2luY2x1ZGUgIkFQSURhdGEuaCIKKyNpbmNs dWRlICJBUElQb2xpY3lDbGllbnQuaCIKICNpbmNsdWRlICJQcmludEluZm8uaCIKICNpbmNsdWRl ICJXS0FQSUNhc3QuaCIKKyNpbmNsdWRlICJXS1BhZ2VQb2xpY3lDbGllbnRJbnRlcm5hbC5oIgog I2luY2x1ZGUgIldLUGx1Z2luSW5mb3JtYXRpb24uaCIKICNpbmNsdWRlICJXZWJCYWNrRm9yd2Fy ZExpc3QuaCIKICNpbmNsdWRlICJXZWJMb2FkZXJDbGllbnQuaCIKICNpbmNsdWRlICJXZWJQYWdl TWVzc2FnZXMuaCIKICNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKLSNpbmNsdWRlICJXZWJQb2xp Y3lDbGllbnQuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKICNpbmNsdWRlIDxXZWJD b3JlL1BhZ2UuaD4KIApAQCAtNTEsNiArNTIsMTIgQEAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3Jl OwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAorbmFtZXNwYWNlIEFQSSB7Cit0ZW1wbGF0ZTw+ IHN0cnVjdCBDbGllbnRUcmFpdHM8V0tQYWdlUG9saWN5Q2xpZW50QmFzZT4geworICAgIHR5cGVk ZWYgc3RkOjp0dXBsZTxXS1BhZ2VQb2xpY3lDbGllbnRWMCwgV0tQYWdlUG9saWN5Q2xpZW50VjEs IFdLUGFnZVBvbGljeUNsaWVudEludGVybmFsPiBWZXJzaW9uczsKK307Cit9CisKIFdLVHlwZUlE IFdLUGFnZUdldFR5cGVJRCgpCiB7CiAgICAgcmV0dXJuIHRvQVBJKFdlYlBhZ2VQcm94eTo6QVBJ VHlwZSk7CkBAIC02OTEsNyArNjk4LDcwIEBAIHZvaWQgV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVu dChXS1BhZ2VSZWYgcGFnZVJlZiwgY29uc3QgV0tQYWdlTG9hZGVyQ2xpZW50QmFzZSoKIAogdm9p ZCBXS1BhZ2VTZXRQYWdlUG9saWN5Q2xpZW50KFdLUGFnZVJlZiBwYWdlUmVmLCBjb25zdCBXS1Bh Z2VQb2xpY3lDbGllbnRCYXNlKiB3a0NsaWVudCkKIHsKLSAgICB0b0ltcGwocGFnZVJlZiktPnNl dFBvbGljeUNsaWVudChzdGQ6Om1ha2VfdW5pcXVlPFdlYlBvbGljeUNsaWVudD4od2tDbGllbnQp KTsKKyAgICBjbGFzcyBQb2xpY3lDbGllbnQgOiBwdWJsaWMgQVBJOjpDbGllbnQ8V0tQYWdlUG9s aWN5Q2xpZW50QmFzZT4sIHB1YmxpYyBBUEk6OlBvbGljeUNsaWVudCB7CisgICAgcHVibGljOgor ICAgICAgICBleHBsaWNpdCBQb2xpY3lDbGllbnQoY29uc3QgV0tQYWdlUG9saWN5Q2xpZW50QmFz ZSogY2xpZW50KQorICAgICAgICB7CisgICAgICAgICAgICBpbml0aWFsaXplKGNsaWVudCk7Cisg ICAgICAgIH0KKworICAgIHByaXZhdGU6CisgICAgICAgIHZpcnR1YWwgdm9pZCBkZWNpZGVQb2xp Y3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSog ZnJhbWUsIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlIHR5cGUsIFdlYkV2ZW50OjpNb2RpZmllcnMg bW9kaWZpZXJzLCBXZWJNb3VzZUV2ZW50OjpCdXR0b24gbW91c2VCdXR0b24sIFdlYkZyYW1lUHJv eHkqIG9yaWdpbmF0aW5nRnJhbWUsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3Jp Z2luYWxSZXNvdXJjZVJlcXVlc3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVz b3VyY2VSZXF1ZXN0LCBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkqIGxpc3RlbmVyLCBBUEk6 Ok9iamVjdCogdXNlckRhdGEpIG92ZXJyaWRlCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICgh bV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbl9kZXByZWNhdGVkRm9yVXNl V2l0aFYwICYmICFtX2NsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uX2RlcHJl Y2F0ZWRGb3JVc2VXaXRoVjEgJiYgIW1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb24pIHsKKyAgICAgICAgICAgICAgICBsaXN0ZW5lci0+dXNlKCk7CisgICAgICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBSZWZQdHI8QVBJOjpVUkxS ZXF1ZXN0PiBvcmlnaW5hbFJlcXVlc3QgPSBBUEk6OlVSTFJlcXVlc3Q6OmNyZWF0ZShvcmlnaW5h bFJlc291cmNlUmVxdWVzdCk7CisgICAgICAgICAgICBSZWZQdHI8QVBJOjpVUkxSZXF1ZXN0PiBy ZXF1ZXN0ID0gQVBJOjpVUkxSZXF1ZXN0OjpjcmVhdGUocmVzb3VyY2VSZXF1ZXN0KTsKKworICAg ICAgICAgICAgaWYgKG1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25fZGVw cmVjYXRlZEZvclVzZVdpdGhWMCkKKyAgICAgICAgICAgICAgICBtX2NsaWVudC5kZWNpZGVQb2xp Y3lGb3JOYXZpZ2F0aW9uQWN0aW9uX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjAodG9BUEkocGFnZSks IHRvQVBJKGZyYW1lKSwgdG9BUEkodHlwZSksIHRvQVBJKG1vZGlmaWVycyksIHRvQVBJKG1vdXNl QnV0dG9uKSwgdG9BUEkocmVxdWVzdC5nZXQoKSksIHRvQVBJKGxpc3RlbmVyKSwgdG9BUEkodXNl ckRhdGEpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOworICAgICAgICAgICAgZWxzZSBpZiAo bV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbl9kZXByZWNhdGVkRm9yVXNl V2l0aFYxKQorICAgICAgICAgICAgICAgIG1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb25fZGVwcmVjYXRlZEZvclVzZVdpdGhWMSh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUp LCB0b0FQSSh0eXBlKSwgdG9BUEkobW9kaWZpZXJzKSwgdG9BUEkobW91c2VCdXR0b24pLCB0b0FQ SShvcmlnaW5hdGluZ0ZyYW1lKSwgdG9BUEkocmVxdWVzdC5nZXQoKSksIHRvQVBJKGxpc3RlbmVy KSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOworICAgICAgICAg ICAgZWxzZQorICAgICAgICAgICAgICAgIG1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24odG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkodHlwZSksIHRvQVBJKG1v ZGlmaWVycyksIHRvQVBJKG1vdXNlQnV0dG9uKSwgdG9BUEkob3JpZ2luYXRpbmdGcmFtZSksIHRv QVBJKG9yaWdpbmFsUmVxdWVzdC5nZXQoKSksIHRvQVBJKHJlcXVlc3QuZ2V0KCkpLCB0b0FQSShs aXN0ZW5lciksIHRvQVBJKHVzZXJEYXRhKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKKyAg ICAgICAgfQorCisgICAgICAgIHZpcnR1YWwgdm9pZCBkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dB Y3Rpb24oV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwgTmF2aWdhdGlv blR5cGUgdHlwZSwgV2ViRXZlbnQ6Ok1vZGlmaWVycyBtb2RpZmllcnMsIFdlYk1vdXNlRXZlbnQ6 OkJ1dHRvbiBtb3VzZUJ1dHRvbiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVl c3QsIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkq IGxpc3RlbmVyLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpIG92ZXJyaWRlCisgICAgICAgIHsKKyAg ICAgICAgICAgIGlmICghbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKSB7 CisgICAgICAgICAgICAgICAgbGlzdGVuZXItPnVzZSgpOworICAgICAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgUmVmUHRyPEFQSTo6VVJMUmVxdWVzdD4g cmVxdWVzdCA9IEFQSTo6VVJMUmVxdWVzdDo6Y3JlYXRlKHJlc291cmNlUmVxdWVzdCk7CisKKyAg ICAgICAgICAgIG1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbih0b0FQSShw YWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSSh0eXBlKSwgdG9BUEkobW9kaWZpZXJzKSwgdG9BUEko bW91c2VCdXR0b24pLCB0b0FQSShyZXF1ZXN0LmdldCgpKSwgdG9BUEkoZnJhbWVOYW1lLmltcGwo KSksIHRvQVBJKGxpc3RlbmVyKSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5iYXNlLmNsaWVu dEluZm8pOworICAgICAgICB9CisKKyAgICAgICAgdmlydHVhbCB2b2lkIGRlY2lkZVBvbGljeUZv clJlc3BvbnNlKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUsIGNvbnN0 IFJlc291cmNlUmVzcG9uc2UmIHJlc291cmNlUmVzcG9uc2UsIGNvbnN0IFJlc291cmNlUmVxdWVz dCYgcmVzb3VyY2VSZXF1ZXN0LCBib29sIGNhblNob3dNSU1FVHlwZSwgV2ViRnJhbWVQb2xpY3lM aXN0ZW5lclByb3h5KiBsaXN0ZW5lciwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKSBvdmVycmlkZQor ICAgICAgICB7CisgICAgICAgICAgICBpZiAoIW1fY2xpZW50LmRlY2lkZVBvbGljeUZvclJlc3Bv bnNlX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjAgJiYgIW1fY2xpZW50LmRlY2lkZVBvbGljeUZvclJl c3BvbnNlKSB7CisgICAgICAgICAgICAgICAgbGlzdGVuZXItPnVzZSgpOworICAgICAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgUmVmUHRyPEFQSTo6VVJM UmVzcG9uc2U+IHJlc3BvbnNlID0gQVBJOjpVUkxSZXNwb25zZTo6Y3JlYXRlKHJlc291cmNlUmVz cG9uc2UpOworICAgICAgICAgICAgUmVmUHRyPEFQSTo6VVJMUmVxdWVzdD4gcmVxdWVzdCA9IEFQ STo6VVJMUmVxdWVzdDo6Y3JlYXRlKHJlc291cmNlUmVxdWVzdCk7CisKKyAgICAgICAgICAgIGlm IChtX2NsaWVudC5kZWNpZGVQb2xpY3lGb3JSZXNwb25zZV9kZXByZWNhdGVkRm9yVXNlV2l0aFYw KQorICAgICAgICAgICAgICAgIG1fY2xpZW50LmRlY2lkZVBvbGljeUZvclJlc3BvbnNlX2RlcHJl Y2F0ZWRGb3JVc2VXaXRoVjAodG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkocmVzcG9u c2UuZ2V0KCkpLCB0b0FQSShyZXF1ZXN0LmdldCgpKSwgdG9BUEkobGlzdGVuZXIpLCB0b0FQSSh1 c2VyRGF0YSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CisgICAgICAgICAgICBlbHNlCisg ICAgICAgICAgICAgICAgbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UodG9BUEkocGFn ZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkocmVzcG9uc2UuZ2V0KCkpLCB0b0FQSShyZXF1ZXN0Lmdl dCgpKSwgY2FuU2hvd01JTUVUeXBlLCB0b0FQSShsaXN0ZW5lciksIHRvQVBJKHVzZXJEYXRhKSwg bV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKKyAgICAgICAgfQorCisgICAgICAgIHZpcnR1YWwg dm9pZCB1bmFibGVUb0ltcGxlbWVudFBvbGljeShXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZyYW1l UHJveHkqIGZyYW1lLCBjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvciwgQVBJOjpPYmplY3QqIHVz ZXJEYXRhKSBvdmVycmlkZQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIW1fY2xpZW50LnVu YWJsZVRvSW1wbGVtZW50UG9saWN5KQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg ICAgIAorICAgICAgICAgICAgbV9jbGllbnQudW5hYmxlVG9JbXBsZW1lbnRQb2xpY3kodG9BUEko cGFnZSksIHRvQVBJKGZyYW1lKSwgdG9BUEkoZXJyb3IpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xp ZW50LmJhc2UuY2xpZW50SW5mbyk7CisgICAgICAgIH0KKyAgICB9OworCisgICAgdG9JbXBsKHBh Z2VSZWYpLT5zZXRQb2xpY3lDbGllbnQoc3RkOjptYWtlX3VuaXF1ZTxQb2xpY3lDbGllbnQ+KHdr Q2xpZW50KSk7CiB9CiAKIHZvaWQgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KFdLUGFnZVJlZiBwYWdl UmVmLCBjb25zdCBXS1BhZ2VVSUNsaWVudEJhc2UqIHdrQ2xpZW50KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBvbGljeUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUG9saWN5Q2xpZW50LmNwcApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMjBjMzg2NWJkN2JkNjQyZWVhOWVjN2UzYWNiODEyNGM3ZGM2ZDZkYi4uMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUG9saWN5Q2xpZW50LmNwcAorKysgL2Rldi9udWxsCkBAIC0xLDk3ICswLDAgQEAK LS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICogMS4gUmVk aXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmln aHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KLSAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0 IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICBk b2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlz dHJpYnV0aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5D LiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKLSAqIEFORCBBTlkgRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogVEhF IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUgotICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCi0gKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJF Q1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCi0gKiBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJF TUVOVCBPRgotICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERB VEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCi0gKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FV U0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgotICogQ09OVFJB Q1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkKLSAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKLSAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KLSAqLwotCi0jaW5jbHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAiV2ViUG9saWN5Q2xp ZW50LmgiCi0KLSNpbmNsdWRlICJBUElPYmplY3QuaCIKLSNpbmNsdWRlICJBUElVUkxSZXF1ZXN0 LmgiCi0jaW5jbHVkZSAiV0tBUElDYXN0LmgiCi0jaW5jbHVkZSAiV2ViRnJhbWVQb2xpY3lMaXN0 ZW5lclByb3h5LmgiCi0KLXVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwotCi1uYW1lc3BhY2UgV2Vi S2l0IHsKLQotV2ViUG9saWN5Q2xpZW50OjpXZWJQb2xpY3lDbGllbnQoY29uc3QgV0tQYWdlUG9s aWN5Q2xpZW50QmFzZSogY2xpZW50KQotewotICAgIGluaXRpYWxpemUoY2xpZW50KTsKLX0KLQot dm9pZCBXZWJQb2xpY3lDbGllbnQ6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV2Vi UGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwgV2ViQ29yZTo6TmF2aWdhdGlv blR5cGUgdHlwZSwgV2ViRXZlbnQ6Ok1vZGlmaWVycyBtb2RpZmllcnMsIFdlYk1vdXNlRXZlbnQ6 OkJ1dHRvbiBtb3VzZUJ1dHRvbiwgV2ViRnJhbWVQcm94eSogb3JpZ2luYXRpbmdGcmFtZSwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJlc291cmNlUmVxdWVzdCwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIFdlYkZyYW1lUG9s aWN5TGlzdGVuZXJQcm94eSogbGlzdGVuZXIsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkKLXsKLSAg ICBpZiAoIW1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25fZGVwcmVjYXRl ZEZvclVzZVdpdGhWMCAmJiAhbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv bl9kZXByZWNhdGVkRm9yVXNlV2l0aFYxICYmICFtX2NsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uKSB7Ci0gICAgICAgIGxpc3RlbmVyLT51c2UoKTsKLSAgICAgICAgcmV0dXJu OwotICAgIH0KLQotICAgIFJlZlB0cjxBUEk6OlVSTFJlcXVlc3Q+IG9yaWdpbmFsUmVxdWVzdCA9 IEFQSTo6VVJMUmVxdWVzdDo6Y3JlYXRlKG9yaWdpbmFsUmVzb3VyY2VSZXF1ZXN0KTsKLSAgICBS ZWZQdHI8QVBJOjpVUkxSZXF1ZXN0PiByZXF1ZXN0ID0gQVBJOjpVUkxSZXF1ZXN0OjpjcmVhdGUo cmVzb3VyY2VSZXF1ZXN0KTsKLQotICAgIGlmIChtX2NsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uX2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjApCi0gICAgICAgIG1fY2xpZW50LmRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25fZGVwcmVjYXRlZEZvclVzZVdpdGhWMCh0b0FQ SShwYWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSSh0eXBlKSwgdG9BUEkobW9kaWZpZXJzKSwgdG9B UEkobW91c2VCdXR0b24pLCB0b0FQSShyZXF1ZXN0LmdldCgpKSwgdG9BUEkobGlzdGVuZXIpLCB0 b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7Ci0gICAgZWxzZSBpZiAo bV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbl9kZXByZWNhdGVkRm9yVXNl V2l0aFYxKQotICAgICAgICBtX2NsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9u X2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjEodG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgdG9BUEko dHlwZSksIHRvQVBJKG1vZGlmaWVycyksIHRvQVBJKG1vdXNlQnV0dG9uKSwgdG9BUEkob3JpZ2lu YXRpbmdGcmFtZSksIHRvQVBJKHJlcXVlc3QuZ2V0KCkpLCB0b0FQSShsaXN0ZW5lciksIHRvQVBJ KHVzZXJEYXRhKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKLSAgICBlbHNlCi0gICAgICAg IG1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24odG9BUEkocGFnZSksIHRv QVBJKGZyYW1lKSwgdG9BUEkodHlwZSksIHRvQVBJKG1vZGlmaWVycyksIHRvQVBJKG1vdXNlQnV0 dG9uKSwgdG9BUEkob3JpZ2luYXRpbmdGcmFtZSksIHRvQVBJKG9yaWdpbmFsUmVxdWVzdC5nZXQo KSksIHRvQVBJKHJlcXVlc3QuZ2V0KCkpLCB0b0FQSShsaXN0ZW5lciksIHRvQVBJKHVzZXJEYXRh KSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKLX0KLQotdm9pZCBXZWJQb2xpY3lDbGllbnQ6 OmRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbihXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYkZy YW1lUHJveHkqIGZyYW1lLCBOYXZpZ2F0aW9uVHlwZSB0eXBlLCBXZWJFdmVudDo6TW9kaWZpZXJz IG1vZGlmaWVycywgV2ViTW91c2VFdmVudDo6QnV0dG9uIG1vdXNlQnV0dG9uLCBjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIFdl YkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSogbGlzdGVuZXIsIEFQSTo6T2JqZWN0KiB1c2VyRGF0 YSkKLXsKLSAgICBpZiAoIW1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbikg ewotICAgICAgICBsaXN0ZW5lci0+dXNlKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAg ICBSZWZQdHI8QVBJOjpVUkxSZXF1ZXN0PiByZXF1ZXN0ID0gQVBJOjpVUkxSZXF1ZXN0OjpjcmVh dGUocmVzb3VyY2VSZXF1ZXN0KTsKLQotICAgIG1fY2xpZW50LmRlY2lkZVBvbGljeUZvck5ld1dp bmRvd0FjdGlvbih0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSSh0eXBlKSwgdG9BUEko bW9kaWZpZXJzKSwgdG9BUEkobW91c2VCdXR0b24pLCB0b0FQSShyZXF1ZXN0LmdldCgpKSwgdG9B UEkoZnJhbWVOYW1lLmltcGwoKSksIHRvQVBJKGxpc3RlbmVyKSwgdG9BUEkodXNlckRhdGEpLCBt X2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwotfQotCi12b2lkIFdlYlBvbGljeUNsaWVudDo6ZGVj aWRlUG9saWN5Rm9yUmVzcG9uc2UoV2ViUGFnZVByb3h5KiBwYWdlLCBXZWJGcmFtZVByb3h5KiBm cmFtZSwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzb3VyY2VSZXNwb25zZSwgY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIGJvb2wgY2FuU2hvd01JTUVUeXBlLCBXZWJG cmFtZVBvbGljeUxpc3RlbmVyUHJveHkqIGxpc3RlbmVyLCBBUEk6Ok9iamVjdCogdXNlckRhdGEp Ci17Ci0gICAgaWYgKCFtX2NsaWVudC5kZWNpZGVQb2xpY3lGb3JSZXNwb25zZV9kZXByZWNhdGVk Rm9yVXNlV2l0aFYwICYmICFtX2NsaWVudC5kZWNpZGVQb2xpY3lGb3JSZXNwb25zZSkgewotICAg ICAgICBsaXN0ZW5lci0+dXNlKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBSZWZQ dHI8QVBJOjpVUkxSZXNwb25zZT4gcmVzcG9uc2UgPSBBUEk6OlVSTFJlc3BvbnNlOjpjcmVhdGUo cmVzb3VyY2VSZXNwb25zZSk7Ci0gICAgUmVmUHRyPEFQSTo6VVJMUmVxdWVzdD4gcmVxdWVzdCA9 IEFQSTo6VVJMUmVxdWVzdDo6Y3JlYXRlKHJlc291cmNlUmVxdWVzdCk7Ci0KLSAgICBpZiAobV9j bGllbnQuZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2VfZGVwcmVjYXRlZEZvclVzZVdpdGhWMCkKLSAg ICAgICAgbV9jbGllbnQuZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2VfZGVwcmVjYXRlZEZvclVzZVdp dGhWMCh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSShyZXNwb25zZS5nZXQoKSksIHRv QVBJKHJlcXVlc3QuZ2V0KCkpLCB0b0FQSShsaXN0ZW5lciksIHRvQVBJKHVzZXJEYXRhKSwgbV9j bGllbnQuYmFzZS5jbGllbnRJbmZvKTsKLSAgICBlbHNlCi0gICAgICAgIG1fY2xpZW50LmRlY2lk ZVBvbGljeUZvclJlc3BvbnNlKHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKHJlc3Bv bnNlLmdldCgpKSwgdG9BUEkocmVxdWVzdC5nZXQoKSksIGNhblNob3dNSU1FVHlwZSwgdG9BUEko bGlzdGVuZXIpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7Ci19 Ci0KLXZvaWQgV2ViUG9saWN5Q2xpZW50Ojp1bmFibGVUb0ltcGxlbWVudFBvbGljeShXZWJQYWdl UHJveHkqIHBhZ2UsIFdlYkZyYW1lUHJveHkqIGZyYW1lLCBjb25zdCBSZXNvdXJjZUVycm9yJiBl cnJvciwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQotewotICAgIGlmICghbV9jbGllbnQudW5hYmxl VG9JbXBsZW1lbnRQb2xpY3kpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1fY2xpZW50LnVuYWJs ZVRvSW1wbGVtZW50UG9saWN5KHRvQVBJKHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKGVycm9y KSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwotfQotCi19IC8v IG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQb2xpY3lDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQb2xpY3lDbGll bnQuaApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNGY4NTYxYmVhNTMxNmQ5MTUwM2E0 ZjllMTgwMDFmZDViYTBiZGFhOC4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUG9saWN5Q2xpZW50LmgKKysr IC9kZXYvbnVsbApAQCAtMSw2MCArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDEwIEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucwotICogYXJlIG1ldDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBt dXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3Ry aWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdo dAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyIGluIHRoZQotICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0 ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRX QVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJ UycnCi0gKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywKLSAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hB TlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJ U0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9S UwotICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BF Q0lBTCwgRVhFTVBMQVJZLCBPUgotICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKLSAqIFNVQlNUSVRVVEUgR09PRFMg T1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUwot ICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4KLSAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JU IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCi0gKiBBUklTSU5HIElOIEFOWSBX QVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCi0g KiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQotI2lmbmRlZiBXZWJQb2xp Y3lDbGllbnRfaAotI2RlZmluZSBXZWJQb2xpY3lDbGllbnRfaAotCi0jaW5jbHVkZSAiQVBJQ2xp ZW50LmgiCi0jaW5jbHVkZSAiQVBJUG9saWN5Q2xpZW50LmgiCi0jaW5jbHVkZSAiV0tQYWdlLmgi Ci0jaW5jbHVkZSAiV0tQYWdlUG9saWN5Q2xpZW50SW50ZXJuYWwuaCIKLSNpbmNsdWRlICJXZWJF dmVudC5oIgotI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVMb2FkZXJUeXBlcy5oPgotI2luY2x1ZGUg PHd0Zi9Gb3J3YXJkLmg+Ci0KLW5hbWVzcGFjZSBBUEkgewotY2xhc3MgT2JqZWN0OwotCi10ZW1w bGF0ZTw+IHN0cnVjdCBDbGllbnRUcmFpdHM8V0tQYWdlUG9saWN5Q2xpZW50QmFzZT4gewotICAg IHR5cGVkZWYgc3RkOjp0dXBsZTxXS1BhZ2VQb2xpY3lDbGllbnRWMCwgV0tQYWdlUG9saWN5Q2xp ZW50VjEsIFdLUGFnZVBvbGljeUNsaWVudEludGVybmFsPiBWZXJzaW9uczsKLX07Ci19Ci0KLW5h bWVzcGFjZSBXZWJLaXQgewotCi1jbGFzcyBXZWJQb2xpY3lDbGllbnQgZmluYWwgOiBwdWJsaWMg QVBJOjpDbGllbnQ8V0tQYWdlUG9saWN5Q2xpZW50QmFzZT4sIHB1YmxpYyBBUEk6OlBvbGljeUNs aWVudCB7Ci1wdWJsaWM6Ci0gICAgZXhwbGljaXQgV2ViUG9saWN5Q2xpZW50KGNvbnN0IFdLUGFn ZVBvbGljeUNsaWVudEJhc2UqKTsKLQotcHJpdmF0ZToKLSAgICB2aXJ0dWFsIHZvaWQgZGVjaWRl UG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXZWJQYWdlUHJveHkqLCBXZWJGcmFtZVByb3h5Kiwg V2ViQ29yZTo6TmF2aWdhdGlvblR5cGUsIFdlYkV2ZW50OjpNb2RpZmllcnMsIFdlYk1vdXNlRXZl bnQ6OkJ1dHRvbiwgV2ViRnJhbWVQcm94eSogb3JpZ2luYXRpbmdGcmFtZSwgY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJlcXVlc3QsIGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlUmVxdWVzdCYsIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSosIEFQSTo6T2JqZWN0KiB1 c2VyRGF0YSkgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCB2b2lkIGRlY2lkZVBvbGljeUZvck5ld1dp bmRvd0FjdGlvbihXZWJLaXQ6OldlYlBhZ2VQcm94eSosIFdlYktpdDo6V2ViRnJhbWVQcm94eSos IFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlLCBXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcnMsIFdl YktpdDo6V2ViTW91c2VFdmVudDo6QnV0dG9uLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgV2ViS2l0OjpXZWJGcmFtZVBvbGljeUxpc3Rl bmVyUHJveHkqLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwg dm9pZCBkZWNpZGVQb2xpY3lGb3JSZXNwb25zZShXZWJQYWdlUHJveHkqLCBXZWJGcmFtZVByb3h5 KiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlUmVxdWVzdCYsIGJvb2wgY2FuU2hvd01JTUVUeXBlLCBXZWJGcmFtZVBvbGljeUxpc3RlbmVy UHJveHkqLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9p ZCB1bmFibGVUb0ltcGxlbWVudFBvbGljeShXZWJQYWdlUHJveHkqLCBXZWJGcmFtZVByb3h5Kiwg Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkgb3Zl cnJpZGU7Ci19OwotCi19IC8vIG5hbWVzcGFjZSBXZWJLaXQKLQotI2VuZGlmIC8vIFdlYlBvbGlj eUNsaWVudF9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKaW5kZXggZDI0ZTY5NjM3ZDU3YzJhZWI0MDUzMTUxZDVmNThjNzRiOWZjYzQ5MS4u ZTY5MTg4Mzk3ZTQyM2FiZDY5NmZiNDg1MGU2OWMzMDQ3ZWFlNmU4OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMTE5NCw4ICsx MTk0LDYgQEAKIAkJQkNCOUY2QTExMTIzQTg0QjAwQTEzN0UwIC8qIFdlYkZyYW1lUG9saWN5TGlz dGVuZXJQcm94eS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSBCQ0I5RjY5RjExMjNBODRCMDBBMTM3RTAgLyogV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclBy b3h5LmNwcCAqLzsgfTsKIAkJQkNCOUY2QTUxMTIzREQwRDAwQTEzN0UwIC8qIFdLRnJhbWVQb2xp Y3lMaXN0ZW5lci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQkNCOUY2QTMxMTIzREQwRDAwQTEzN0UwIC8qIFdLRnJhbWVQb2xpY3lMaXN0ZW5lci5oICov OyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUJDQjlGNkE2 MTEyM0REMEQwMEExMzdFMCAvKiBXS0ZyYW1lUG9saWN5TGlzdGVuZXIuY3BwIGluIFNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNCOUY2QTQxMTIzREQwRDAwQTEz N0UwIC8qIFdLRnJhbWVQb2xpY3lMaXN0ZW5lci5jcHAgKi87IH07Ci0JCUJDQjlGOEFGMTEyNEUw NzcwMEExMzdFMCAvKiBXZWJQb2xpY3lDbGllbnQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNCOUY4QUQxMTI0RTA3NzAwQTEzN0UwIC8qIFdlYlBv bGljeUNsaWVudC5jcHAgKi87IH07Ci0JCUJDQjlGOEIwMTEyNEUwNzcwMEExMzdFMCAvKiBXZWJQ b2xpY3lDbGllbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IEJDQjlGOEFFMTEyNEUwNzcwMEExMzdFMCAvKiBXZWJQb2xpY3lDbGllbnQuaCAqLzsgfTsK IAkJQkNCQUFDNzIxNDRFNjE5OTAwNTNGODJGIC8qIFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxl ci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDQkFB QzZEMTQ0RTYxOTIwMDUzRjgyRiAvKiBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIubW0gKi87 IH07CiAJCUJDQkFBQzczMTQ0RTYxOUUwMDUzRjgyRiAvKiBXS0Jyb3dzaW5nQ29udGV4dENvbnRy b2xsZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJD QkFBQzZDMTQ0RTYxOTEwMDUzRjgyRiAvKiBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIuaCAq Lzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlCQ0JBQUM3 NDE0NEU2MUE1MDA1M0Y4MkYgLyogV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVySW50ZXJuYWwu aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDQkFBQzZF MTQ0RTYxOTIwMDUzRjgyRiAvKiBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJJbnRlcm5hbC5o ICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKCk7IH07IH07CkBAIC0yOTIxLDggKzI5MTks NiBAQAogCQlCQ0I5RjY5RjExMjNBODRCMDBBMTM3RTAgLyogV2ViRnJhbWVQb2xpY3lMaXN0ZW5l clByb3h5LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdlYkZyYW1l UG9saWN5TGlzdGVuZXJQcm94eS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJD QjlGNkEzMTEyM0REMEQwMEExMzdFMCAvKiBXS0ZyYW1lUG9saWN5TGlzdGVuZXIuaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tGcmFtZVBvbGljeUxpc3RlbmVyLmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDQjlGNkE0MTEyM0REMEQwMEExMzdFMCAvKiBXS0Zy YW1lUG9saWN5TGlzdGVuZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRo ID0gV0tGcmFtZVBvbGljeUxpc3RlbmVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK LQkJQkNCOUY4QUQxMTI0RTA3NzAwQTEzN0UwIC8qIFdlYlBvbGljeUNsaWVudC5jcHAgKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXZWJQb2xpY3lDbGllbnQuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwotCQlCQ0I5RjhBRTExMjRFMDc3MDBBMTM3RTAgLyogV2Vi UG9saWN5Q2xpZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYlBvbGlj eUNsaWVudC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQ0JBQUM2QzE0NEU2MTkx MDA1M0Y4MkYgLyogV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLmggKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgcGF0aCA9IFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQlCQ0JBQUM2RDE0NEU2MTkyMDA1M0Y4MkYgLyogV0tCcm93 c2luZ0NvbnRleHRDb250cm9sbGVyLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3Bw OyBwYXRoID0gV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQlCQ0JBQUM2RTE0NEU2MTkyMDA1M0Y4MkYgLyogV0tCcm93c2luZ0NvbnRl eHRDb250cm9sbGVySW50ZXJuYWwuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g V0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVySW50ZXJuYWwuaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKQEAgLTQ5ODgsOCArNDk4NCw2IEBACiAJCQkJQkMxMTFCMEIxMTJGNUU0RjAwMzM3 QkFCIC8qIFdlYlBhZ2VQcm94eS5jcHAgKi8sCiAJCQkJQkMwMzJEQ0IxMEY0Mzg5RjAwNThDMTVB IC8qIFdlYlBhZ2VQcm94eS5oICovLAogCQkJCUJDQkQzOEZBMTI1QkFCOUEwMEQyQzI5RiAvKiBX ZWJQYWdlUHJveHkubWVzc2FnZXMuaW4gKi8sCi0JCQkJQkNCOUY4QUQxMTI0RTA3NzAwQTEzN0Uw IC8qIFdlYlBvbGljeUNsaWVudC5jcHAgKi8sCi0JCQkJQkNCOUY4QUUxMTI0RTA3NzAwQTEzN0Uw IC8qIFdlYlBvbGljeUNsaWVudC5oICovLAogCQkJCUJDNTc0RTYxMTI2N0QwODAwMDZGMEYxMiAv KiBXZWJQb3B1cE1lbnVQcm94eS5oICovLAogCQkJCUJDRDU5N0ZFMTEyQjU3QkUwMEVDOEMyMyAv KiBXZWJQcmVmZXJlbmNlcy5jcHAgKi8sCiAJCQkJQkNENTk3RkQxMTJCNTdCRTAwRUM4QzIzIC8q IFdlYlByZWZlcmVuY2VzLmggKi8sCkBAIC02NTA3LDcgKzY1MDEsNiBAQAogCQkJCTFBM0U3MzYx MTFDQzI2NTkwMDdCRDUzOSAvKiBXZWJQbGF0Zm9ybVN0cmF0ZWdpZXMuaCBpbiBIZWFkZXJzICov LAogCQkJCTMxRDU5MjlGMTY2RTA2MDAwMEU2QkYwMiAvKiBXZWJQbHVnSW5DbGllbnQuaCBpbiBI ZWFkZXJzICovLAogCQkJCTFBQzg3MDJEMTMwQjQ5QTIwMDJDMTI1NyAvKiBXZWJQbHVnaW5TaXRl RGF0YU1hbmFnZXIuaCBpbiBIZWFkZXJzICovLAotCQkJCUJDQjlGOEIwMTEyNEUwNzcwMEExMzdF MCAvKiBXZWJQb2xpY3lDbGllbnQuaCBpbiBIZWFkZXJzICovLAogCQkJCTUxODM1M0RCMTg4NUJG OEMwMEQ5RkU0NCAvKiBJREJTZXJpYWxpemF0aW9uLmggaW4gSGVhZGVycyAqLywKIAkJCQkxQURG NTkxQjE4OTA1MjhFMDA0M0MxNDUgLyogV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5oIGluIEhlYWRl cnMgKi8sCiAJCQkJQkM1NzQ0RjAxMjYzOEZCMzAwNkYwRjEyIC8qIFdlYlBvcHVwSXRlbS5oIGlu IEhlYWRlcnMgKi8sCkBAIC03OTA3LDcgKzc5MDAsNiBAQAogCQkJCTMxRDU5MjlFMTY2RTA2MDAw MEU2QkYwMiAvKiBXZWJQbHVnSW5DbGllbnQuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJMUFFMDBE NUMxODJEQURFMTAwMDg3REQ3IC8qIEtleWVkRW5jb2Rlci5jcHAgaW4gU291cmNlcyAqLywKIAkJ CQkxQUM4NzAyRTEzMEI0OUEyMDAyQzEyNTcgLyogV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyLmNw cCBpbiBTb3VyY2VzICovLAotCQkJCUJDQjlGOEFGMTEyNEUwNzcwMEExMzdFMCAvKiBXZWJQb2xp Y3lDbGllbnQuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQkM1NzQ0RUYxMjYzOEZCMzAwNkYwRjEy IC8qIFdlYlBvcHVwSXRlbS5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlEM0I5NDg0NjExRkY0QjY1 MDAwMzJCMzkgLyogV2ViUG9wdXBNZW51LmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUJDQzQzQUM3 MTI3Qjk5REUwMDMxN0YxNiAvKiBXZWJQb3B1cE1lbnVNYWMubW0gaW4gU291cmNlcyAqLywK