160264 2016-07-27 13:19:08 -0700 Stop accepting the deprecated "requiredShippingAddressFields" and "requiredBillingAddressFields" properties 2016-07-27 13:54:03 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue mkwst oldest_to_newest 1215001 0 andersca 2016-07-27 13:19:08 -0700 Stop accepting the deprecated "requiredShippingAddressFields" and "requiredBillingAddressFields" properties 1215002 1 284721 andersca 2016-07-27 13:20:09 -0700 Created attachment 284721 Patch 1215007 2 284723 andersca 2016-07-27 13:45:07 -0700 Created attachment 284723 Patch 1215015 3 andersca 2016-07-27 13:54:03 -0700 Committed r203789: <http://trac.webkit.org/changeset/203789> 284721 2016-07-27 13:20:09 -0700 2016-07-27 13:45:05 -0700 Patch bug-160264-20160727131859.patch text/plain 4855 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzNzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Y4MjQxYzQ1YmIwMjcy ZjQ0NjJjNzcwMDgyNzBkYjIxNTUwODMzNi4uMjY0MDZhNjJhMGFlZmZlZjE3YjUyMTBlY2I3N2Y4 NDMxZWU4YWM0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA3LTI3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBhY2NlcHRp bmcgdGhlIGRlcHJlY2F0ZWQgInJlcXVpcmVkU2hpcHBpbmdBZGRyZXNzRmllbGRzIiBhbmQgInJl cXVpcmVkQmlsbGluZ0FkZHJlc3NGaWVsZHMiIHByb3BlcnRpZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDI2NAorICAgICAgICByZGFyOi8vcHJv YmxlbS8yNzU3NDUxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVNlc3Npb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6Y3JlYXRlUGF5bWVudFJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6aXNWYWxp ZFBheW1lbnRSZXF1ZXN0UHJvcGVydHlOYW1lKToKKwogMjAxNi0wNy0yNyAgQ2hyaXMgRHVtZXog IDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEFsaWduIENTU1N1cHBvcnRzUnVsZSB3aXRo IHRoZSBzcGVjaWZpY2F0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2Fw cGxlcGF5L0FwcGxlUGF5U2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxl cGF5L0FwcGxlUGF5U2Vzc2lvbi5jcHAKaW5kZXggZTA5NzkyZDE4M2IwZTEyNzViNzFjNGZlODc2 ZTE4OTMwZTQ1MmJiNC4uN2RmN2UyNjMxYjM2MTQxZmU3MGExMmE3MTQ5YmE4NzliMTNiNmE2ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVNlc3Np b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlTZXNz aW9uLmNwcApAQCAtNDcyLDEwICs0NzIsNiBAQCBzdGF0aWMgYm9vbCBpc1ZhbGlkUGF5bWVudFJl cXVlc3RQcm9wZXJ0eU5hbWUoY29uc3QgU3RyaW5nJiBwcm9wZXJ0eU5hbWUpCiAgICAgICAgICJ0 b3RhbCIsCiAgICAgICAgICJsaW5lSXRlbXMiLAogICAgICAgICAiYXBwbGljYXRpb25EYXRhIiwK LQotICAgICAgICAvLyBGSVhNRTogR2V0IHJpZCBvZiB0aGVzZS4KLSAgICAgICAgInJlcXVpcmVk QmlsbGluZ0FkZHJlc3NGaWVsZHMiLAotICAgICAgICAicmVxdWlyZWRTaGlwcGluZ0FkZHJlc3NG aWVsZHMiLAogICAgIH07CiAKICAgICBmb3IgKGF1dG8mIHZhbGlkUHJvcGVydHlOYW1lIDogdmFs aWRQcm9wZXJ0eU5hbWVzKSB7CkBAIC00OTQsNiArNDkwLDE2IEBAIHN0YXRpYyBPcHRpb25hbDxQ YXltZW50UmVxdWVzdD4gY3JlYXRlUGF5bWVudFJlcXVlc3QoRE9NV2luZG93JiB3aW5kb3csIGNv bnN0IERpCiAgICAgZGljdGlvbmFyeS5nZXRPd25Qcm9wZXJ0eU5hbWVzKHByb3BlcnR5TmFtZXMp OwogCiAgICAgZm9yIChhdXRvJiBwcm9wZXJ0eU5hbWUgOiBwcm9wZXJ0eU5hbWVzKSB7CisgICAg ICAgIGlmIChwcm9wZXJ0eU5hbWUgPT0gInJlcXVpcmVkU2hpcHBpbmdBZGRyZXNzRmllbGRzIikg eworICAgICAgICAgICAgd2luZG93LnByaW50RXJyb3JNZXNzYWdlKCJcInJlcXVpcmVkU2hpcHBp bmdBZGRyZXNzRmllbGRzXCIgaGFzIGJlZW4gZGVwcmVjYXRlZCBhbmQgd2lsbCBzdG9wIHdvcmtp bmcgc2hvcnRseS4gUGxlYXNlIHN3aXRjaCB0byBcInJlcXVpcmVkU2hpcHBpbmdDb250YWN0Rmll bGRzXCIgaW5zdGVhZC4iKTsKKyAgICAgICAgICAgIHJldHVybiBOdWxsb3B0OworICAgICAgICB9 CisKKyAgICAgICAgaWYgKHByb3BlcnR5TmFtZSA9PSAicmVxdWlyZWRCaWxsaW5nQWRkcmVzc0Zp ZWxkcyIpIHsKKyAgICAgICAgICAgIHdpbmRvdy5wcmludEVycm9yTWVzc2FnZSgiXCJyZXF1aXJl ZEJpbGxpbmdBZGRyZXNzRmllbGRzXCIgaGFzIGJlZW4gZGVwcmVjYXRlZCBhbmQgd2lsbCBzdG9w IHdvcmtpbmcgc2hvcnRseS4gUGxlYXNlIHN3aXRjaCB0byBcInJlcXVpcmVkQmlsbGluZ0NvbnRh Y3RGaWVsZHNcIiBpbnN0ZWFkLiIpOworICAgICAgICAgICAgcmV0dXJuIE51bGxvcHQ7CisgICAg ICAgIH0KKwogICAgICAgICBpZiAoIWlzVmFsaWRQYXltZW50UmVxdWVzdFByb3BlcnR5TmFtZShw cm9wZXJ0eU5hbWUpKSB7CiAgICAgICAgICAgICBhdXRvIG1lc3NhZ2UgPSBtYWtlU3RyaW5nKCJc IiIgKyBwcm9wZXJ0eU5hbWUsICJcIiBpcyBub3QgYSB2YWxpZCBwYXltZW50IHJlcXVlc3QgcHJv cGVydHkgbmFtZS4iKTsKICAgICAgICAgICAgIHdpbmRvdy5wcmludEVycm9yTWVzc2FnZShtZXNz YWdlKTsKQEAgLTUyOCwxOCArNTM0LDggQEAgc3RhdGljIE9wdGlvbmFsPFBheW1lbnRSZXF1ZXN0 PiBjcmVhdGVQYXltZW50UmVxdWVzdChET01XaW5kb3cmIHdpbmRvdywgY29uc3QgRGkKICAgICAg ICAgICAgIHJldHVybiBOdWxsb3B0OwogCiAgICAgICAgIHBheW1lbnRSZXF1ZXN0LnNldFJlcXVp cmVkQmlsbGluZ0NvbnRhY3RGaWVsZHMoKnJlcXVpcmVkQmlsbGluZ0NvbnRhY3RGaWVsZHMpOwot ICAgIH0gZWxzZSBpZiAoYXV0byByZXF1aXJlZEJpbGxpbmdBZGRyZXNzRmllbGRzQXJyYXkgPSBk aWN0aW9uYXJ5LmdldDxBcnJheVZhbHVlPigicmVxdWlyZWRCaWxsaW5nQWRkcmVzc0ZpZWxkcyIp KSB7Ci0gICAgICAgIGlmIChQYWdlQ29uc29sZUNsaWVudCogcGFnZUNvbnNvbGUgPSB3aW5kb3cu Y29uc29sZSgpKQotICAgICAgICAgICAgcGFnZUNvbnNvbGUtPmFkZE1lc3NhZ2UoTWVzc2FnZVNv dXJjZTo6SlMsIE1lc3NhZ2VMZXZlbDo6V2FybmluZywgIlwicmVxdWlyZWRCaWxsaW5nQWRkcmVz c0ZpZWxkc1wiIGhhcyBiZWVuIGRlcHJlY2F0ZWQgYW5kIHdpbGwgc3RvcCB3b3JraW5nIHNob3J0 bHkuIFBsZWFzZSBzd2l0Y2ggdG8gXCJyZXF1aXJlZEJpbGxpbmdDb250YWN0RmllbGRzXCIgaW5z dGVhZC4iKTsKLQotICAgICAgICBhdXRvIHJlcXVpcmVkQmlsbGluZ0FkZHJlc3NGaWVsZHMgPSBj cmVhdGVDb250YWN0RmllbGRzKHdpbmRvdywgKnJlcXVpcmVkQmlsbGluZ0FkZHJlc3NGaWVsZHNB cnJheSk7Ci0gICAgICAgIGlmICghcmVxdWlyZWRCaWxsaW5nQWRkcmVzc0ZpZWxkcykKLSAgICAg ICAgICAgIHJldHVybiBOdWxsb3B0OwotCi0gICAgICAgIHBheW1lbnRSZXF1ZXN0LnNldFJlcXVp cmVkQmlsbGluZ0NvbnRhY3RGaWVsZHMoKnJlcXVpcmVkQmlsbGluZ0FkZHJlc3NGaWVsZHMpOwog ICAgIH0KIAotCiAgICAgaWYgKGF1dG8gYmlsbGluZ0NvbnRhY3RWYWx1ZSA9IGRpY3Rpb25hcnku Z2V0PEpTQzo6SlNWYWx1ZT4oImJpbGxpbmdDb250YWN0IikpIHsKICAgICAgICAgU3RyaW5nIGVy cm9yTWVzc2FnZTsKICAgICAgICAgYXV0byBiaWxsaW5nQ29udGFjdCA9IFBheW1lbnRDb250YWN0 Ojpmcm9tSlMoKkpTTWFpblRocmVhZEV4ZWNTdGF0ZTo6Y3VycmVudFN0YXRlKCksICpiaWxsaW5n Q29udGFjdFZhbHVlLCBlcnJvck1lc3NhZ2UpOwpAQCAtNTU3LDE4ICs1NTMsOCBAQCBzdGF0aWMg T3B0aW9uYWw8UGF5bWVudFJlcXVlc3Q+IGNyZWF0ZVBheW1lbnRSZXF1ZXN0KERPTVdpbmRvdyYg d2luZG93LCBjb25zdCBEaQogICAgICAgICAgICAgcmV0dXJuIE51bGxvcHQ7CiAKICAgICAgICAg cGF5bWVudFJlcXVlc3Quc2V0UmVxdWlyZWRTaGlwcGluZ0NvbnRhY3RGaWVsZHMoKnJlcXVpcmVk U2hpcHBpbmdDb250YWN0RmllbGRzKTsKLSAgICB9IGVsc2UgaWYgKGF1dG8gcmVxdWlyZWRTaGlw cGluZ0FkZHJlc3NGaWVsZHNBcnJheSA9IGRpY3Rpb25hcnkuZ2V0PEFycmF5VmFsdWU+KCJyZXF1 aXJlZFNoaXBwaW5nQWRkcmVzc0ZpZWxkcyIpKSB7Ci0gICAgICAgIGlmIChQYWdlQ29uc29sZUNs aWVudCogcGFnZUNvbnNvbGUgPSB3aW5kb3cuY29uc29sZSgpKQotICAgICAgICAgICAgcGFnZUNv bnNvbGUtPmFkZE1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6SlMsIE1lc3NhZ2VMZXZlbDo6V2Fybmlu ZywgIlwicmVxdWlyZWRTaGlwcGluZ0FkZHJlc3NGaWVsZHNcIiBoYXMgYmVlbiBkZXByZWNhdGVk IGFuZCB3aWxsIHN0b3Agd29ya2luZyBzaG9ydGx5LiBQbGVhc2Ugc3dpdGNoIHRvIFwicmVxdWly ZWRTaGlwcGluZ0NvbnRhY3RGaWVsZHNcIiBpbnN0ZWFkLiIpOwotCi0gICAgICAgIGF1dG8gcmVx dWlyZWRTaGlwcGluZ0FkZHJlc3NGaWVsZHMgPSBjcmVhdGVDb250YWN0RmllbGRzKHdpbmRvdywg KnJlcXVpcmVkU2hpcHBpbmdBZGRyZXNzRmllbGRzQXJyYXkpOwotICAgICAgICBpZiAoIXJlcXVp cmVkU2hpcHBpbmdBZGRyZXNzRmllbGRzKQotICAgICAgICAgICAgcmV0dXJuIE51bGxvcHQ7Ci0K LSAgICAgICAgcGF5bWVudFJlcXVlc3Quc2V0UmVxdWlyZWRTaGlwcGluZ0NvbnRhY3RGaWVsZHMo KnJlcXVpcmVkU2hpcHBpbmdBZGRyZXNzRmllbGRzKTsKICAgICB9CiAKLQogICAgIGlmIChhdXRv IHNoaXBwaW5nQ29udGFjdFZhbHVlID0gZGljdGlvbmFyeS5nZXQ8SlNDOjpKU1ZhbHVlPigic2hp cHBpbmdDb250YWN0IikpIHsKICAgICAgICAgU3RyaW5nIGVycm9yTWVzc2FnZTsKICAgICAgICAg YXV0byBzaGlwcGluZ0NvbnRhY3QgPSBQYXltZW50Q29udGFjdDo6ZnJvbUpTKCpKU01haW5UaHJl YWRFeGVjU3RhdGU6OmN1cnJlbnRTdGF0ZSgpLCAqc2hpcHBpbmdDb250YWN0VmFsdWUsIGVycm9y TWVzc2FnZSk7Cg== 284723 2016-07-27 13:45:07 -0700 2016-07-27 13:50:55 -0700 Patch bug-160264-20160727134356.patch text/plain 4795 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzNzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Y4MjQxYzQ1YmIwMjcy ZjQ0NjJjNzcwMDgyNzBkYjIxNTUwODMzNi4uMjY0MDZhNjJhMGFlZmZlZjE3YjUyMTBlY2I3N2Y4 NDMxZWU4YWM0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA3LTI3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCBhY2NlcHRp bmcgdGhlIGRlcHJlY2F0ZWQgInJlcXVpcmVkU2hpcHBpbmdBZGRyZXNzRmllbGRzIiBhbmQgInJl cXVpcmVkQmlsbGluZ0FkZHJlc3NGaWVsZHMiIHByb3BlcnRpZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDI2NAorICAgICAgICByZGFyOi8vcHJv YmxlbS8yNzU3NDUxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVNlc3Npb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6Y3JlYXRlUGF5bWVudFJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6aXNWYWxp ZFBheW1lbnRSZXF1ZXN0UHJvcGVydHlOYW1lKToKKwogMjAxNi0wNy0yNyAgQ2hyaXMgRHVtZXog IDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEFsaWduIENTU1N1cHBvcnRzUnVsZSB3aXRo IHRoZSBzcGVjaWZpY2F0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2Fw cGxlcGF5L0FwcGxlUGF5U2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxl cGF5L0FwcGxlUGF5U2Vzc2lvbi5jcHAKaW5kZXggZTA5NzkyZDE4M2IwZTEyNzViNzFjNGZlODc2 ZTE4OTMwZTQ1MmJiNC4uMjdjNGI2ODRmN2Y0MTExNmQ2ZGY5NTIxM2IyMDZkOTU3OWVhZGM4NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVNlc3Np b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlTZXNz aW9uLmNwcApAQCAtNDcyLDEwICs0NzIsNiBAQCBzdGF0aWMgYm9vbCBpc1ZhbGlkUGF5bWVudFJl cXVlc3RQcm9wZXJ0eU5hbWUoY29uc3QgU3RyaW5nJiBwcm9wZXJ0eU5hbWUpCiAgICAgICAgICJ0 b3RhbCIsCiAgICAgICAgICJsaW5lSXRlbXMiLAogICAgICAgICAiYXBwbGljYXRpb25EYXRhIiwK LQotICAgICAgICAvLyBGSVhNRTogR2V0IHJpZCBvZiB0aGVzZS4KLSAgICAgICAgInJlcXVpcmVk QmlsbGluZ0FkZHJlc3NGaWVsZHMiLAotICAgICAgICAicmVxdWlyZWRTaGlwcGluZ0FkZHJlc3NG aWVsZHMiLAogICAgIH07CiAKICAgICBmb3IgKGF1dG8mIHZhbGlkUHJvcGVydHlOYW1lIDogdmFs aWRQcm9wZXJ0eU5hbWVzKSB7CkBAIC00OTQsNiArNDkwLDE2IEBAIHN0YXRpYyBPcHRpb25hbDxQ YXltZW50UmVxdWVzdD4gY3JlYXRlUGF5bWVudFJlcXVlc3QoRE9NV2luZG93JiB3aW5kb3csIGNv bnN0IERpCiAgICAgZGljdGlvbmFyeS5nZXRPd25Qcm9wZXJ0eU5hbWVzKHByb3BlcnR5TmFtZXMp OwogCiAgICAgZm9yIChhdXRvJiBwcm9wZXJ0eU5hbWUgOiBwcm9wZXJ0eU5hbWVzKSB7CisgICAg ICAgIGlmIChwcm9wZXJ0eU5hbWUgPT0gInJlcXVpcmVkU2hpcHBpbmdBZGRyZXNzRmllbGRzIikg eworICAgICAgICAgICAgd2luZG93LnByaW50RXJyb3JNZXNzYWdlKCJcInJlcXVpcmVkU2hpcHBp bmdBZGRyZXNzRmllbGRzXCIgaGFzIGJlZW4gZGVwcmVjYXRlZC4gUGxlYXNlIHN3aXRjaCB0byBc InJlcXVpcmVkU2hpcHBpbmdDb250YWN0RmllbGRzXCIgaW5zdGVhZC4iKTsKKyAgICAgICAgICAg IHJldHVybiBOdWxsb3B0OworICAgICAgICB9CisKKyAgICAgICAgaWYgKHByb3BlcnR5TmFtZSA9 PSAicmVxdWlyZWRCaWxsaW5nQWRkcmVzc0ZpZWxkcyIpIHsKKyAgICAgICAgICAgIHdpbmRvdy5w cmludEVycm9yTWVzc2FnZSgiXCJyZXF1aXJlZEJpbGxpbmdBZGRyZXNzRmllbGRzXCIgaGFzIGJl ZW4gZGVwcmVjYXRlZC4gUGxlYXNlIHN3aXRjaCB0byBcInJlcXVpcmVkQmlsbGluZ0NvbnRhY3RG aWVsZHNcIiBpbnN0ZWFkLiIpOworICAgICAgICAgICAgcmV0dXJuIE51bGxvcHQ7CisgICAgICAg IH0KKwogICAgICAgICBpZiAoIWlzVmFsaWRQYXltZW50UmVxdWVzdFByb3BlcnR5TmFtZShwcm9w ZXJ0eU5hbWUpKSB7CiAgICAgICAgICAgICBhdXRvIG1lc3NhZ2UgPSBtYWtlU3RyaW5nKCJcIiIg KyBwcm9wZXJ0eU5hbWUsICJcIiBpcyBub3QgYSB2YWxpZCBwYXltZW50IHJlcXVlc3QgcHJvcGVy dHkgbmFtZS4iKTsKICAgICAgICAgICAgIHdpbmRvdy5wcmludEVycm9yTWVzc2FnZShtZXNzYWdl KTsKQEAgLTUyOCwxOCArNTM0LDggQEAgc3RhdGljIE9wdGlvbmFsPFBheW1lbnRSZXF1ZXN0PiBj cmVhdGVQYXltZW50UmVxdWVzdChET01XaW5kb3cmIHdpbmRvdywgY29uc3QgRGkKICAgICAgICAg ICAgIHJldHVybiBOdWxsb3B0OwogCiAgICAgICAgIHBheW1lbnRSZXF1ZXN0LnNldFJlcXVpcmVk QmlsbGluZ0NvbnRhY3RGaWVsZHMoKnJlcXVpcmVkQmlsbGluZ0NvbnRhY3RGaWVsZHMpOwotICAg IH0gZWxzZSBpZiAoYXV0byByZXF1aXJlZEJpbGxpbmdBZGRyZXNzRmllbGRzQXJyYXkgPSBkaWN0 aW9uYXJ5LmdldDxBcnJheVZhbHVlPigicmVxdWlyZWRCaWxsaW5nQWRkcmVzc0ZpZWxkcyIpKSB7 Ci0gICAgICAgIGlmIChQYWdlQ29uc29sZUNsaWVudCogcGFnZUNvbnNvbGUgPSB3aW5kb3cuY29u c29sZSgpKQotICAgICAgICAgICAgcGFnZUNvbnNvbGUtPmFkZE1lc3NhZ2UoTWVzc2FnZVNvdXJj ZTo6SlMsIE1lc3NhZ2VMZXZlbDo6V2FybmluZywgIlwicmVxdWlyZWRCaWxsaW5nQWRkcmVzc0Zp ZWxkc1wiIGhhcyBiZWVuIGRlcHJlY2F0ZWQgYW5kIHdpbGwgc3RvcCB3b3JraW5nIHNob3J0bHku IFBsZWFzZSBzd2l0Y2ggdG8gXCJyZXF1aXJlZEJpbGxpbmdDb250YWN0RmllbGRzXCIgaW5zdGVh ZC4iKTsKLQotICAgICAgICBhdXRvIHJlcXVpcmVkQmlsbGluZ0FkZHJlc3NGaWVsZHMgPSBjcmVh dGVDb250YWN0RmllbGRzKHdpbmRvdywgKnJlcXVpcmVkQmlsbGluZ0FkZHJlc3NGaWVsZHNBcnJh eSk7Ci0gICAgICAgIGlmICghcmVxdWlyZWRCaWxsaW5nQWRkcmVzc0ZpZWxkcykKLSAgICAgICAg ICAgIHJldHVybiBOdWxsb3B0OwotCi0gICAgICAgIHBheW1lbnRSZXF1ZXN0LnNldFJlcXVpcmVk QmlsbGluZ0NvbnRhY3RGaWVsZHMoKnJlcXVpcmVkQmlsbGluZ0FkZHJlc3NGaWVsZHMpOwogICAg IH0KIAotCiAgICAgaWYgKGF1dG8gYmlsbGluZ0NvbnRhY3RWYWx1ZSA9IGRpY3Rpb25hcnkuZ2V0 PEpTQzo6SlNWYWx1ZT4oImJpbGxpbmdDb250YWN0IikpIHsKICAgICAgICAgU3RyaW5nIGVycm9y TWVzc2FnZTsKICAgICAgICAgYXV0byBiaWxsaW5nQ29udGFjdCA9IFBheW1lbnRDb250YWN0Ojpm cm9tSlMoKkpTTWFpblRocmVhZEV4ZWNTdGF0ZTo6Y3VycmVudFN0YXRlKCksICpiaWxsaW5nQ29u dGFjdFZhbHVlLCBlcnJvck1lc3NhZ2UpOwpAQCAtNTU3LDE4ICs1NTMsOCBAQCBzdGF0aWMgT3B0 aW9uYWw8UGF5bWVudFJlcXVlc3Q+IGNyZWF0ZVBheW1lbnRSZXF1ZXN0KERPTVdpbmRvdyYgd2lu ZG93LCBjb25zdCBEaQogICAgICAgICAgICAgcmV0dXJuIE51bGxvcHQ7CiAKICAgICAgICAgcGF5 bWVudFJlcXVlc3Quc2V0UmVxdWlyZWRTaGlwcGluZ0NvbnRhY3RGaWVsZHMoKnJlcXVpcmVkU2hp cHBpbmdDb250YWN0RmllbGRzKTsKLSAgICB9IGVsc2UgaWYgKGF1dG8gcmVxdWlyZWRTaGlwcGlu Z0FkZHJlc3NGaWVsZHNBcnJheSA9IGRpY3Rpb25hcnkuZ2V0PEFycmF5VmFsdWU+KCJyZXF1aXJl ZFNoaXBwaW5nQWRkcmVzc0ZpZWxkcyIpKSB7Ci0gICAgICAgIGlmIChQYWdlQ29uc29sZUNsaWVu dCogcGFnZUNvbnNvbGUgPSB3aW5kb3cuY29uc29sZSgpKQotICAgICAgICAgICAgcGFnZUNvbnNv bGUtPmFkZE1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6SlMsIE1lc3NhZ2VMZXZlbDo6V2FybmluZywg IlwicmVxdWlyZWRTaGlwcGluZ0FkZHJlc3NGaWVsZHNcIiBoYXMgYmVlbiBkZXByZWNhdGVkIGFu ZCB3aWxsIHN0b3Agd29ya2luZyBzaG9ydGx5LiBQbGVhc2Ugc3dpdGNoIHRvIFwicmVxdWlyZWRT aGlwcGluZ0NvbnRhY3RGaWVsZHNcIiBpbnN0ZWFkLiIpOwotCi0gICAgICAgIGF1dG8gcmVxdWly ZWRTaGlwcGluZ0FkZHJlc3NGaWVsZHMgPSBjcmVhdGVDb250YWN0RmllbGRzKHdpbmRvdywgKnJl cXVpcmVkU2hpcHBpbmdBZGRyZXNzRmllbGRzQXJyYXkpOwotICAgICAgICBpZiAoIXJlcXVpcmVk U2hpcHBpbmdBZGRyZXNzRmllbGRzKQotICAgICAgICAgICAgcmV0dXJuIE51bGxvcHQ7Ci0KLSAg ICAgICAgcGF5bWVudFJlcXVlc3Quc2V0UmVxdWlyZWRTaGlwcGluZ0NvbnRhY3RGaWVsZHMoKnJl cXVpcmVkU2hpcHBpbmdBZGRyZXNzRmllbGRzKTsKICAgICB9CiAKLQogICAgIGlmIChhdXRvIHNo aXBwaW5nQ29udGFjdFZhbHVlID0gZGljdGlvbmFyeS5nZXQ8SlNDOjpKU1ZhbHVlPigic2hpcHBp bmdDb250YWN0IikpIHsKICAgICAgICAgU3RyaW5nIGVycm9yTWVzc2FnZTsKICAgICAgICAgYXV0 byBzaGlwcGluZ0NvbnRhY3QgPSBQYXltZW50Q29udGFjdDo6ZnJvbUpTKCpKU01haW5UaHJlYWRF eGVjU3RhdGU6OmN1cnJlbnRTdGF0ZSgpLCAqc2hpcHBpbmdDb250YWN0VmFsdWUsIGVycm9yTWVz c2FnZSk7Cg==