99832 2012-10-19 06:04:11 -0700 [EFL][WK2] Make Ewk intent classes members private 2012-10-21 03:39:12 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 99696 1 cdumez cdumez gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi mikhail.pozdnyakov rakuco tonikitoo webkit.review.bot oldest_to_newest 746249 0 cdumez 2012-10-19 06:04:11 -0700 As part of Bug 99696, this bug is for making the Ewk classes members private. 746269 1 169612 cdumez 2012-10-19 06:45:41 -0700 Created attachment 169612 Patch 747074 2 169612 webkit.review.bot 2012-10-21 03:39:08 -0700 Comment on attachment 169612 Patch Clearing flags on attachment: 169612 Committed r132001: <http://trac.webkit.org/changeset/132001> 747075 3 webkit.review.bot 2012-10-21 03:39:12 -0700 All reviewed patches have been landed. Closing bug. 169612 2012-10-19 06:45:41 -0700 2012-10-21 03:39:08 -0700 Patch 99832_ewk_intents_cpp.patch text/plain 13434 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkNjU5ZTdhLi41OTA3NDMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDgg QEAKKzIwMTItMTAtMTkgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIE1ha2UgRXdrIGludGVudCBjbGFzc2VzIG1lbWJl cnMgcHJpdmF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTk4MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNYWtlIEV3a19JbnRlbnQgYW5kIEV3a19JbnRlbnRfU2VydmljZSBtZW1iZXJzCisgICAgICAg IHByaXZhdGUgYW5kIGFkZCBjbGFzcyBtZXRob2RzIHRvIGdldCB0aGVtLgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2ludGVudC5jcHA6CisgICAgICAgIChFd2tfSW50ZW50OjpF d2tfSW50ZW50KToKKyAgICAgICAgKEV3a19JbnRlbnQ6OndlYkludGVudERhdGEpOgorICAgICAg ICAoRXdrX0ludGVudDo6YWN0aW9uKToKKyAgICAgICAgKEV3a19JbnRlbnQ6OnR5cGUpOgorICAg ICAgICAoRXdrX0ludGVudDo6c2VydmljZSk6CisgICAgICAgIChFd2tfSW50ZW50OjpzdWdnZXN0 aW9ucyk6CisgICAgICAgIChFd2tfSW50ZW50OjpleHRyYSk6CisgICAgICAgIChFd2tfSW50ZW50 OjpleHRyYUtleXMpOgorICAgICAgICAoZXdrX2ludGVudF9hY3Rpb25fZ2V0KToKKyAgICAgICAg KGV3a19pbnRlbnRfdHlwZV9nZXQpOgorICAgICAgICAoZXdrX2ludGVudF9zZXJ2aWNlX2dldCk6 CisgICAgICAgIChld2tfaW50ZW50X3N1Z2dlc3Rpb25zX2dldCk6CisgICAgICAgIChld2tfaW50 ZW50X2V4dHJhX2dldCk6CisgICAgICAgIChld2tfaW50ZW50X2V4dHJhX25hbWVzX2dldCk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2ludGVudF9wcml2YXRlLmg6CisgICAgICAg IChXZWJLaXQpOgorICAgICAgICAoRXdrX0ludGVudCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2ludGVudF9zZXJ2aWNlLmNwcDoKKyAgICAgICAgKEV3a19JbnRlbnRfU2Vydmlj ZTo6RXdrX0ludGVudF9TZXJ2aWNlKToKKyAgICAgICAgKEV3a19JbnRlbnRfU2VydmljZTo6YWN0 aW9uKToKKyAgICAgICAgKEV3a19JbnRlbnRfU2VydmljZTo6dHlwZSk6CisgICAgICAgIChFd2tf SW50ZW50X1NlcnZpY2U6OmhyZWYpOgorICAgICAgICAoRXdrX0ludGVudF9TZXJ2aWNlOjp0aXRs ZSk6CisgICAgICAgIChFd2tfSW50ZW50X1NlcnZpY2U6OmRpc3Bvc2l0aW9uKToKKyAgICAgICAg KGV3a19pbnRlbnRfc2VydmljZV9hY3Rpb25fZ2V0KToKKyAgICAgICAgKGV3a19pbnRlbnRfc2Vy dmljZV90eXBlX2dldCk6CisgICAgICAgIChld2tfaW50ZW50X3NlcnZpY2VfaHJlZl9nZXQpOgor ICAgICAgICAoZXdrX2ludGVudF9zZXJ2aWNlX3RpdGxlX2dldCk6CisgICAgICAgIChld2tfaW50 ZW50X3NlcnZpY2VfZGlzcG9zaXRpb25fZ2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2Vm bC9ld2tfaW50ZW50X3NlcnZpY2VfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrX0ludGVudF9TZXJ2 aWNlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAg IChld2tfdmlld19pbnRlbnRfZGVsaXZlcik6CisKIDIwMTItMTAtMTkgIENzYWJhIE9zenRyb2dv bsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxMzE4NDQpOiBJ dCBicm9rZSB0aGUgYnVpbGQgb24gIUVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKSBwbGF0Zm9y bXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19pbnRl bnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2ludGVudC5jcHAK aW5kZXggN2U1YjkxOS4uYTRmZDZlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2ludGVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX2ludGVudC5jcHAKQEAgLTM2LDE2ICszNiw1MiBAQAogCiB1c2luZyBuYW1l c3BhY2UgV2ViS2l0OwogCi0jZGVmaW5lIEVXS19JTlRFTlRfV0tfR0VUX09SX1JFVFVSTihpbnRl bnQsIHdrSW50ZW50XywgLi4uKSAgICBcCi0gICAgaWYgKCEoaW50ZW50KSkgeyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgIEVJTkFfTE9HX0NSSVQo ImludGVudCBpcyBOVUxMLiIpOyAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgIHJldHVy biBfX1ZBX0FSR1NfXzsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAg fSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBcCi0gICAgaWYgKCEoaW50ZW50KS0+d2tJbnRlbnQpIHsgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBcCi0gICAgICAgIEVJTkFfTE9HX0NSSVQoImludGVudC0+d2tJbnRlbnQgaXMg TlVMTC4iKTsgICAgICAgICAgICBcCi0gICAgICAgIHJldHVybiBfX1ZBX0FSR1NfXzsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgfSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgV0tJbnRlbnREYXRh UmVmIHdrSW50ZW50XyA9IChpbnRlbnQpLT53a0ludGVudC5nZXQoKQorI2lmIEVOQUJMRShXRUJf SU5URU5UUykKK0V3a19JbnRlbnQ6OkV3a19JbnRlbnQoV0tJbnRlbnREYXRhUmVmIGludGVudFJl ZikKKyAgICA6IG1fd2tJbnRlbnQoaW50ZW50UmVmKQorICAgICwgbV9hY3Rpb24oQWRvcHRXSywg V0tJbnRlbnREYXRhQ29weUFjdGlvbihpbnRlbnRSZWYpKQorICAgICwgbV90eXBlKEFkb3B0V0ss IFdLSW50ZW50RGF0YUNvcHlUeXBlKGludGVudFJlZikpCisgICAgLCBtX3NlcnZpY2UoQWRvcHRX SywgV0tJbnRlbnREYXRhQ29weVNlcnZpY2UoaW50ZW50UmVmKSkKK3sgfQorCitXZWJJbnRlbnRE YXRhKiBFd2tfSW50ZW50Ojp3ZWJJbnRlbnREYXRhKCkgY29uc3QKK3sKKyAgICByZXR1cm4gdG9J bXBsKG1fd2tJbnRlbnQuZ2V0KCkpOworfQorCitjb25zdCBjaGFyKiBFd2tfSW50ZW50OjphY3Rp b24oKSBjb25zdAoreworICAgIHJldHVybiBtX2FjdGlvbjsKK30KKworY29uc3QgY2hhciogRXdr X0ludGVudDo6dHlwZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fdHlwZTsKK30KKworY29uc3Qg Y2hhciogRXdrX0ludGVudDo6c2VydmljZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fc2Vydmlj ZTsKK30KKworV0tSZXRhaW5QdHI8V0tBcnJheVJlZj4gRXdrX0ludGVudDo6c3VnZ2VzdGlvbnMo KSBjb25zdAoreworICAgIHJldHVybiBhZG9wdFdLKFdLSW50ZW50RGF0YUNvcHlTdWdnZXN0aW9u cyhtX3drSW50ZW50LmdldCgpKSk7Cit9CisKK1N0cmluZyBFd2tfSW50ZW50OjpleHRyYShjb25z dCBjaGFyKiBrZXkpIGNvbnN0Cit7CisgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IGtleVJl ZiA9IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoa2V5KSk7CisgICAgV0tS ZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHdrVmFsdWUoQWRvcHRXSywgV0tJbnRlbnREYXRhQ29weUV4 dHJhVmFsdWUobV93a0ludGVudC5nZXQoKSwga2V5UmVmLmdldCgpKSk7CisgICAgcmV0dXJuIHRv SW1wbCh3a1ZhbHVlLmdldCgpKS0+c3RyaW5nKCk7Cit9CisKK1dLUmV0YWluUHRyPFdLQXJyYXlS ZWY+IEV3a19JbnRlbnQ6OmV4dHJhS2V5cygpIGNvbnN0Cit7CisgICAgV0tSZXRhaW5QdHI8V0tE aWN0aW9uYXJ5UmVmPiB3a0V4dHJhcyhBZG9wdFdLLCBXS0ludGVudERhdGFDb3B5RXh0cmFzKG1f d2tJbnRlbnQuZ2V0KCkpKTsKKyAgICByZXR1cm4gYWRvcHRXSyhXS0RpY3Rpb25hcnlDb3B5S2V5 cyh3a0V4dHJhcy5nZXQoKSkpOworfQorI2VuZGlmCiAKIEV3a19JbnRlbnQqIGV3a19pbnRlbnRf cmVmKEV3a19JbnRlbnQqIGludGVudCkKIHsKQEAgLTcxLDMwICsxMDcsMzYgQEAgY29uc3QgY2hh ciogZXdrX2ludGVudF9hY3Rpb25fZ2V0KGNvbnN0IEV3a19JbnRlbnQqIGludGVudCkKIHsKICAg ICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoaW50ZW50LCAwKTsKIAotICAgIHJldHVy biBpbnRlbnQtPmFjdGlvbjsKKyNpZiBFTkFCTEUoV0VCX0lOVEVOVFMpCisgICAgcmV0dXJuIGlu dGVudC0+YWN0aW9uKCk7CisjZW5kaWYKIH0KIAogY29uc3QgY2hhciogZXdrX2ludGVudF90eXBl X2dldChjb25zdCBFd2tfSW50ZW50KiBpbnRlbnQpCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVM TF9SRVRVUk5fVkFMKGludGVudCwgMCk7CiAKLSAgICByZXR1cm4gaW50ZW50LT50eXBlOworI2lm IEVOQUJMRShXRUJfSU5URU5UUykKKyAgICByZXR1cm4gaW50ZW50LT50eXBlKCk7CisjZW5kaWYK IH0KIAogY29uc3QgY2hhciogZXdrX2ludGVudF9zZXJ2aWNlX2dldChjb25zdCBFd2tfSW50ZW50 KiBpbnRlbnQpCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGludGVudCwg MCk7CiAKLSAgICByZXR1cm4gaW50ZW50LT5zZXJ2aWNlOworI2lmIEVOQUJMRShXRUJfSU5URU5U UykKKyAgICByZXR1cm4gaW50ZW50LT5zZXJ2aWNlKCk7CisjZW5kaWYKIH0KIAogRWluYV9MaXN0 KiBld2tfaW50ZW50X3N1Z2dlc3Rpb25zX2dldChjb25zdCBFd2tfSW50ZW50KiBpbnRlbnQpCiB7 Ci0jaWYgRU5BQkxFKFdFQl9JTlRFTlRTKQotICAgIEVXS19JTlRFTlRfV0tfR0VUX09SX1JFVFVS TihpbnRlbnQsIHdrSW50ZW50LCAwKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9W QUwoaW50ZW50LCAwKTsKIAorI2lmIEVOQUJMRShXRUJfSU5URU5UUykKICAgICBFaW5hX0xpc3Qq IGxpc3RPZlN1Z2dlc3Rpb25zID0gMDsKLSAgICBXS1JldGFpblB0cjxXS0FycmF5UmVmPiB3a1N1 Z2dlc3Rpb25zKEFkb3B0V0ssIFdLSW50ZW50RGF0YUNvcHlTdWdnZXN0aW9ucyh3a0ludGVudCkp OworICAgIFdLUmV0YWluUHRyPFdLQXJyYXlSZWY+IHdrU3VnZ2VzdGlvbnMgPSBpbnRlbnQtPnN1 Z2dlc3Rpb25zKCk7CiAgICAgY29uc3Qgc2l6ZV90IG51bVN1Z2dlc3Rpb25zID0gV0tBcnJheUdl dFNpemUod2tTdWdnZXN0aW9ucy5nZXQoKSk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBu dW1TdWdnZXN0aW9uczsgKytpKSB7CiAgICAgICAgIFdLVVJMUmVmIHdrU3VnZ2VzdGlvbiA9IHN0 YXRpY19jYXN0PFdLVVJMUmVmPihXS0FycmF5R2V0SXRlbUF0SW5kZXgod2tTdWdnZXN0aW9ucy5n ZXQoKSwgaSkpOwpAQCAtMTAyLDYgKzE0NCw3IEBAIEVpbmFfTGlzdCogZXdrX2ludGVudF9zdWdn ZXN0aW9uc19nZXQoY29uc3QgRXdrX0ludGVudCogaW50ZW50KQogICAgIH0KIAogICAgIHJldHVy biBsaXN0T2ZTdWdnZXN0aW9uczsKKwogI2Vsc2UKICAgICByZXR1cm4gMDsKICNlbmRpZgpAQCAt MTA5LDEyICsxNTIsMTEgQEAgRWluYV9MaXN0KiBld2tfaW50ZW50X3N1Z2dlc3Rpb25zX2dldChj b25zdCBFd2tfSW50ZW50KiBpbnRlbnQpCiAKIGNvbnN0IGNoYXIqIGV3a19pbnRlbnRfZXh0cmFf Z2V0KGNvbnN0IEV3a19JbnRlbnQqIGludGVudCwgY29uc3QgY2hhcioga2V5KQogeworICAgIEVJ TkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChpbnRlbnQsIDApOworCiAjaWYgRU5BQkxFKFdF Ql9JTlRFTlRTKQotICAgIEVXS19JTlRFTlRfV0tfR0VUX09SX1JFVFVSTihpbnRlbnQsIHdrSW50 ZW50LCAwKTsKKyAgICBTdHJpbmcgdmFsdWUgPSBpbnRlbnQtPmV4dHJhKGtleSk7CiAKLSAgICBX S1JldGFpblB0cjxXS1N0cmluZ1JlZj4ga2V5UmVmID0gYWRvcHRXSyhXS1N0cmluZ0NyZWF0ZVdp dGhVVEY4Q1N0cmluZyhrZXkpKTsKLSAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gd2tWYWx1 ZShBZG9wdFdLLCBXS0ludGVudERhdGFDb3B5RXh0cmFWYWx1ZSh3a0ludGVudCwga2V5UmVmLmdl dCgpKSk7Ci0gICAgU3RyaW5nIHZhbHVlID0gdG9JbXBsKHdrVmFsdWUuZ2V0KCkpLT5zdHJpbmco KTsKICAgICBpZiAodmFsdWUuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gMDsKIApAQCAtMTI2 LDEyICsxNjgsMTEgQEAgY29uc3QgY2hhciogZXdrX2ludGVudF9leHRyYV9nZXQoY29uc3QgRXdr X0ludGVudCogaW50ZW50LCBjb25zdCBjaGFyKiBrZXkpCiAKIEVpbmFfTGlzdCogZXdrX2ludGVu dF9leHRyYV9uYW1lc19nZXQoY29uc3QgRXdrX0ludGVudCogaW50ZW50KQogewotI2lmIEVOQUJM RShXRUJfSU5URU5UUykKLSAgICBFV0tfSU5URU5UX1dLX0dFVF9PUl9SRVRVUk4oaW50ZW50LCB3 a0ludGVudCwgMCk7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGludGVudCwg MCk7CiAKKyNpZiBFTkFCTEUoV0VCX0lOVEVOVFMpCiAgICAgRWluYV9MaXN0KiBsaXN0T2ZLZXlz ID0gMDsKLSAgICBXS1JldGFpblB0cjxXS0RpY3Rpb25hcnlSZWY+IHdrRXh0cmFzKEFkb3B0V0ss IFdLSW50ZW50RGF0YUNvcHlFeHRyYXMod2tJbnRlbnQpKTsKLSAgICBXS1JldGFpblB0cjxXS0Fy cmF5UmVmPiB3a0tleXMoQWRvcHRXSywgV0tEaWN0aW9uYXJ5Q29weUtleXMod2tFeHRyYXMuZ2V0 KCkpKTsKKyAgICBXS1JldGFpblB0cjxXS0FycmF5UmVmPiB3a0tleXMgPSBpbnRlbnQtPmV4dHJh S2V5cygpOwogICAgIGNvbnN0IHNpemVfdCBudW1LZXlzID0gV0tBcnJheUdldFNpemUod2tLZXlz LmdldCgpKTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG51bUtleXM7ICsraSkgewogICAg ICAgICBXS1N0cmluZ1JlZiB3a0tleSA9IHN0YXRpY19jYXN0PFdLU3RyaW5nUmVmPihXS0FycmF5 R2V0SXRlbUF0SW5kZXgod2tLZXlzLmdldCgpLCBpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfaW50ZW50X3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19pbnRlbnRfcHJpdmF0ZS5oCmluZGV4IDE2NmE4YTQu LjAzYWYxZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19pbnRlbnRfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a19pbnRlbnRfcHJpdmF0ZS5oCkBAIC0zNCw2ICszNCwxMSBAQAogI2luY2x1ZGUgPFdlYktp dDIvV0tCYXNlLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYv UmVmQ291bnRlZC5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgorCituYW1lc3Bh Y2UgV2ViS2l0IHsKK2NsYXNzIFdlYkludGVudERhdGE7Cit9CiAKIC8qKgogICogXHN0cnVjdCAg RXdrX0ludGVudApAQCAtNDEsMjMgKzQ2LDI2IEBACiAgKi8KIGNsYXNzIEV3a19JbnRlbnQgOiBw dWJsaWMgUmVmQ291bnRlZDxFd2tfSW50ZW50PiB7CiBwdWJsaWM6Ci0gICAgV0tSZXRhaW5QdHI8 V0tJbnRlbnREYXRhUmVmPiB3a0ludGVudDsKLSAgICBXS0VpbmFTaGFyZWRTdHJpbmcgYWN0aW9u OwotICAgIFdLRWluYVNoYXJlZFN0cmluZyB0eXBlOwotICAgIFdLRWluYVNoYXJlZFN0cmluZyBz ZXJ2aWNlOwotCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8RXdrX0ludGVudD4gY3JlYXRlKFdLSW50 ZW50RGF0YVJlZiBpbnRlbnRSZWYpCiAgICAgewogICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3 IEV3a19JbnRlbnQoaW50ZW50UmVmKSk7CiAgICAgfQogCisgICAgV2ViS2l0OjpXZWJJbnRlbnRE YXRhKiB3ZWJJbnRlbnREYXRhKCkgY29uc3Q7CisgICAgY29uc3QgY2hhciogYWN0aW9uKCkgY29u c3Q7CisgICAgY29uc3QgY2hhciogdHlwZSgpIGNvbnN0OworICAgIGNvbnN0IGNoYXIqIHNlcnZp Y2UoKSBjb25zdDsKKyAgICBXS1JldGFpblB0cjxXS0FycmF5UmVmPiBzdWdnZXN0aW9ucygpIGNv bnN0OworICAgIFN0cmluZyBleHRyYShjb25zdCBjaGFyKiBrZXkpIGNvbnN0OworICAgIFdLUmV0 YWluUHRyPFdLQXJyYXlSZWY+IGV4dHJhS2V5cygpIGNvbnN0OworCiBwcml2YXRlOgotICAgIGV4 cGxpY2l0IEV3a19JbnRlbnQoV0tJbnRlbnREYXRhUmVmIGludGVudFJlZikKLSAgICAgICAgOiB3 a0ludGVudChpbnRlbnRSZWYpCi0gICAgICAgICwgYWN0aW9uKEFkb3B0V0ssIFdLSW50ZW50RGF0 YUNvcHlBY3Rpb24oaW50ZW50UmVmKSkKLSAgICAgICAgLCB0eXBlKEFkb3B0V0ssIFdLSW50ZW50 RGF0YUNvcHlUeXBlKGludGVudFJlZikpCi0gICAgICAgICwgc2VydmljZShBZG9wdFdLLCBXS0lu dGVudERhdGFDb3B5U2VydmljZShpbnRlbnRSZWYpKQotICAgIHsgfQorICAgIGV4cGxpY2l0IEV3 a19JbnRlbnQoV0tJbnRlbnREYXRhUmVmIGludGVudFJlZik7CisKKyAgICBXS1JldGFpblB0cjxX S0ludGVudERhdGFSZWY+IG1fd2tJbnRlbnQ7CisgICAgV0tFaW5hU2hhcmVkU3RyaW5nIG1fYWN0 aW9uOworICAgIFdLRWluYVNoYXJlZFN0cmluZyBtX3R5cGU7CisgICAgV0tFaW5hU2hhcmVkU3Ry aW5nIG1fc2VydmljZTsKIH07CiAKICNlbmRpZiAvLyBFTkFCTEUoV0VCX0lOVEVOVFMpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfaW50ZW50X3NlcnZp Y2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2ludGVudF9zZXJ2 aWNlLmNwcAppbmRleCA5NzAyODM0Li4wMDY4MjIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfaW50ZW50X3NlcnZpY2UuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19pbnRlbnRfc2VydmljZS5jcHAKQEAgLTM1LDYg KzM1LDQxIEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKKyNpZiBFTkFCTEUoV0VCX0lO VEVOVFNfVEFHKQorRXdrX0ludGVudF9TZXJ2aWNlOjpFd2tfSW50ZW50X1NlcnZpY2UoV0tJbnRl bnRTZXJ2aWNlSW5mb1JlZiBzZXJ2aWNlUmVmKQorICAgIDogbV9hY3Rpb24oQWRvcHRXSywgV0tJ bnRlbnRTZXJ2aWNlSW5mb0NvcHlBY3Rpb24oc2VydmljZVJlZikpCisgICAgLCBtX3R5cGUoQWRv cHRXSywgV0tJbnRlbnRTZXJ2aWNlSW5mb0NvcHlUeXBlKHNlcnZpY2VSZWYpKQorICAgICwgbV9o cmVmKEFkb3B0V0ssIFdLSW50ZW50U2VydmljZUluZm9Db3B5SHJlZihzZXJ2aWNlUmVmKSkKKyAg ICAsIG1fdGl0bGUoQWRvcHRXSywgV0tJbnRlbnRTZXJ2aWNlSW5mb0NvcHlUaXRsZShzZXJ2aWNl UmVmKSkKKyAgICAsIG1fZGlzcG9zaXRpb24oQWRvcHRXSywgV0tJbnRlbnRTZXJ2aWNlSW5mb0Nv cHlEaXNwb3NpdGlvbihzZXJ2aWNlUmVmKSkKK3sgfQorCitjb25zdCBjaGFyKiBFd2tfSW50ZW50 X1NlcnZpY2U6OmFjdGlvbigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fYWN0aW9uOworfQorCitj b25zdCBjaGFyKiBFd2tfSW50ZW50X1NlcnZpY2U6OnR5cGUoKSBjb25zdAoreworICAgIHJldHVy biBtX3R5cGU7Cit9CisKK2NvbnN0IGNoYXIqIEV3a19JbnRlbnRfU2VydmljZTo6aHJlZigpIGNv bnN0Cit7CisgICAgcmV0dXJuIG1faHJlZjsKK30KKworY29uc3QgY2hhciogRXdrX0ludGVudF9T ZXJ2aWNlOjp0aXRsZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fdGl0bGU7Cit9CisKK2NvbnN0 IGNoYXIqIEV3a19JbnRlbnRfU2VydmljZTo6ZGlzcG9zaXRpb24oKSBjb25zdAoreworICAgIHJl dHVybiBtX2Rpc3Bvc2l0aW9uOworfQorI2VuZGlmCisKIEV3a19JbnRlbnRfU2VydmljZSogZXdr X2ludGVudF9zZXJ2aWNlX3JlZihFd2tfSW50ZW50X1NlcnZpY2UqIHNlcnZpY2UpCiB7CiAjaWYg RU5BQkxFKFdFQl9JTlRFTlRTX1RBRykKQEAgLTU4LDMzICs5Myw0MyBAQCBjb25zdCBjaGFyKiBl d2tfaW50ZW50X3NlcnZpY2VfYWN0aW9uX2dldChjb25zdCBFd2tfSW50ZW50X1NlcnZpY2UqIHNl cnZpY2UpCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHNlcnZpY2UsIDAp OwogCi0gICAgcmV0dXJuIHNlcnZpY2UtPmFjdGlvbjsKKyNpZiBFTkFCTEUoV0VCX0lOVEVOVFNf VEFHKQorICAgIHJldHVybiBzZXJ2aWNlLT5hY3Rpb24oKTsKKyNlbmRpZgogfQogCiBjb25zdCBj aGFyKiBld2tfaW50ZW50X3NlcnZpY2VfdHlwZV9nZXQoY29uc3QgRXdrX0ludGVudF9TZXJ2aWNl KiBzZXJ2aWNlKQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzZXJ2aWNl LCAwKTsKIAotICAgIHJldHVybiBzZXJ2aWNlLT50eXBlOworI2lmIEVOQUJMRShXRUJfSU5URU5U U19UQUcpCisgICAgcmV0dXJuIHNlcnZpY2UtPnR5cGUoKTsKKyNlbmRpZgogfQogCiBjb25zdCBj aGFyKiBld2tfaW50ZW50X3NlcnZpY2VfaHJlZl9nZXQoY29uc3QgRXdrX0ludGVudF9TZXJ2aWNl KiBzZXJ2aWNlKQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzZXJ2aWNl LCAwKTsKIAotICAgIHJldHVybiBzZXJ2aWNlLT5ocmVmOworI2lmIEVOQUJMRShXRUJfSU5URU5U U19UQUcpCisgICAgcmV0dXJuIHNlcnZpY2UtPmhyZWYoKTsKKyNlbmRpZgogfQogCiBjb25zdCBj aGFyKiBld2tfaW50ZW50X3NlcnZpY2VfdGl0bGVfZ2V0KGNvbnN0IEV3a19JbnRlbnRfU2Vydmlj ZSogc2VydmljZSkKIHsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoc2Vydmlj ZSwgMCk7CiAKLSAgICByZXR1cm4gc2VydmljZS0+dGl0bGU7CisjaWYgRU5BQkxFKFdFQl9JTlRF TlRTX1RBRykKKyAgICByZXR1cm4gc2VydmljZS0+dGl0bGUoKTsKKyNlbmRpZgogfQogCiBjb25z dCBjaGFyKiBld2tfaW50ZW50X3NlcnZpY2VfZGlzcG9zaXRpb25fZ2V0KGNvbnN0IEV3a19JbnRl bnRfU2VydmljZSogc2VydmljZSkKIHsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9W QUwoc2VydmljZSwgMCk7CiAKLSAgICByZXR1cm4gc2VydmljZS0+ZGlzcG9zaXRpb247CisjaWYg RU5BQkxFKFdFQl9JTlRFTlRTX1RBRykKKyAgICByZXR1cm4gc2VydmljZS0+ZGlzcG9zaXRpb24o KTsKKyNlbmRpZgogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2ludGVudF9zZXJ2aWNlX3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a19pbnRlbnRfc2VydmljZV9wcml2YXRlLmgKaW5kZXggMTE5ZDY3MC4uZjJl ZmRmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2lu dGVudF9zZXJ2aWNlX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfaW50ZW50X3NlcnZpY2VfcHJpdmF0ZS5oCkBAIC00MCwyNSArNDAsMjUgQEAKICAq LwogY2xhc3MgRXdrX0ludGVudF9TZXJ2aWNlIDogcHVibGljIFJlZkNvdW50ZWQ8RXdrX0ludGVu dF9TZXJ2aWNlPiB7CiBwdWJsaWM6Ci0gICAgV0tFaW5hU2hhcmVkU3RyaW5nIGFjdGlvbjsKLSAg ICBXS0VpbmFTaGFyZWRTdHJpbmcgdHlwZTsKLSAgICBXS0VpbmFTaGFyZWRTdHJpbmcgaHJlZjsK LSAgICBXS0VpbmFTaGFyZWRTdHJpbmcgdGl0bGU7Ci0gICAgV0tFaW5hU2hhcmVkU3RyaW5nIGRp c3Bvc2l0aW9uOwotCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8RXdrX0ludGVudF9TZXJ2aWNlPiBj cmVhdGUoV0tJbnRlbnRTZXJ2aWNlSW5mb1JlZiBzZXJ2aWNlUmVmKQogICAgIHsKICAgICAgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBFd2tfSW50ZW50X1NlcnZpY2Uoc2VydmljZVJlZikpOwogICAg IH0KIAorICAgIGNvbnN0IGNoYXIqIGFjdGlvbigpIGNvbnN0OworICAgIGNvbnN0IGNoYXIqIHR5 cGUoKSBjb25zdDsKKyAgICBjb25zdCBjaGFyKiBocmVmKCkgY29uc3Q7CisgICAgY29uc3QgY2hh ciogdGl0bGUoKSBjb25zdDsKKyAgICBjb25zdCBjaGFyKiBkaXNwb3NpdGlvbigpIGNvbnN0Owor CiBwcml2YXRlOgotICAgIGV4cGxpY2l0IEV3a19JbnRlbnRfU2VydmljZShXS0ludGVudFNlcnZp Y2VJbmZvUmVmIHNlcnZpY2VSZWYpCi0gICAgICAgIDogYWN0aW9uKEFkb3B0V0ssIFdLSW50ZW50 U2VydmljZUluZm9Db3B5QWN0aW9uKHNlcnZpY2VSZWYpKQotICAgICAgICAsIHR5cGUoQWRvcHRX SywgV0tJbnRlbnRTZXJ2aWNlSW5mb0NvcHlUeXBlKHNlcnZpY2VSZWYpKQotICAgICAgICAsIGhy ZWYoQWRvcHRXSywgV0tJbnRlbnRTZXJ2aWNlSW5mb0NvcHlIcmVmKHNlcnZpY2VSZWYpKQotICAg ICAgICAsIHRpdGxlKEFkb3B0V0ssIFdLSW50ZW50U2VydmljZUluZm9Db3B5VGl0bGUoc2Vydmlj ZVJlZikpCi0gICAgICAgICwgZGlzcG9zaXRpb24oQWRvcHRXSywgV0tJbnRlbnRTZXJ2aWNlSW5m b0NvcHlEaXNwb3NpdGlvbihzZXJ2aWNlUmVmKSkKLSAgICB7IH0KKyAgICBleHBsaWNpdCBFd2tf SW50ZW50X1NlcnZpY2UoV0tJbnRlbnRTZXJ2aWNlSW5mb1JlZiBzZXJ2aWNlUmVmKTsKKworICAg IFdLRWluYVNoYXJlZFN0cmluZyBtX2FjdGlvbjsKKyAgICBXS0VpbmFTaGFyZWRTdHJpbmcgbV90 eXBlOworICAgIFdLRWluYVNoYXJlZFN0cmluZyBtX2hyZWY7CisgICAgV0tFaW5hU2hhcmVkU3Ry aW5nIG1fdGl0bGU7CisgICAgV0tFaW5hU2hhcmVkU3RyaW5nIG1fZGlzcG9zaXRpb247CiB9Owog CiAjZW5kaWYgLy8gRU5BQkxFKFdFQl9JTlRFTlRTX1RBRykKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRleCBlZTQ1MDdjLi5jNjhiNDk2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC0xNDI5 LDcgKzE0MjksNyBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfaW50ZW50X2RlbGl2ZXIoRXZhc19PYmpl Y3QqIGV3a1ZpZXcsIEV3a19JbnRlbnQqIGludGVudCkKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxM X1JFVFVSTl9WQUwoaW50ZW50LCBmYWxzZSk7CiAKICAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSBw cml2LT5wYWdlUHJveHkuZ2V0KCk7Ci0gICAgcGFnZS0+ZGVsaXZlckludGVudFRvRnJhbWUocGFn ZS0+bWFpbkZyYW1lKCksIHRvSW1wbChpbnRlbnQtPndrSW50ZW50LmdldCgpKSk7CisgICAgcGFn ZS0+ZGVsaXZlckludGVudFRvRnJhbWUocGFnZS0+bWFpbkZyYW1lKCksIGludGVudC0+d2ViSW50 ZW50RGF0YSgpKTsKIAogICAgIHJldHVybiB0cnVlOwogI2Vsc2UK