39880 2010-05-28 09:31:25 -0700 AX: stop prepping value conversion in accessibilityAttributeValueForParameter 2010-05-28 11:52:38 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach abarth bdakin eric webkit.review.bot oldest_to_newest 231747 0 cfleizach 2010-05-28 09:31:25 -0700 There's a FIXME in AXObjectWrapperMac.mm that says to stop doing value conversion when its unncessary. this does such a thing 231777 1 57342 cfleizach 2010-05-28 10:31:15 -0700 Created attachment 57342 patch 231799 2 cfleizach 2010-05-28 11:11:27 -0700 http://trac.webkit.org/changeset/60368 231837 3 webkit.review.bot 2010-05-28 11:47:15 -0700 http://trac.webkit.org/changeset/60368 might have broken Tiger Intel Release The following changes are on the blame list: http://trac.webkit.org/changeset/60368 http://trac.webkit.org/changeset/60369 http://trac.webkit.org/changeset/60370 http://trac.webkit.org/changeset/60366 http://trac.webkit.org/changeset/60367 231846 4 abarth 2010-05-28 11:52:38 -0700 cfleizach fixed the break in http://trac.webkit.org/changeset/60372 57342 2010-05-28 10:31:15 -0700 2010-05-28 11:03:51 -0700 patch p1 text/plain 14247 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDM2NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDUtMjggIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBWDogc3RvcCBwcmVwcGluZyB2YWx1ZSBjb252ZXJzaW9uIGluIGFjY2Vzc2liaWxpdHlBdHRy aWJ1dGVWYWx1ZUZvclBhcmFtZXRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Mzk4ODAKKworICAgICAgICBDbGVhbmluZyB1cCBhIEZJWE1FIHNvIHRo YXQgYWxsIHZhbHVlcyBhcmUgbm90IGNvbnZlcnRlZCBiZWZvcmUgdGhleSdyZSBuZWVkZWQgaW4g YWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOmZvclBhcmFtZXRlcjoKKworICAgICAgICAqIGFj Y2Vzc2liaWxpdHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tOgorICAgICAgICAo dmlzaWJsZVBvc2l0aW9uRm9yVGV4dE1hcmtlcik6CisgICAgICAgICgtW0FjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyIHZpc2libGVQb3NpdGlvblJhbmdlRm9yVGV4dE1hcmtlclJhbmdlOl0pOgor ICAgICAgICAoLVtBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5QXR0cmli dXRlVmFsdWU6Zm9yUGFyYW1ldGVyOl0pOgorCiAyMDEwLTA1LTI3ICBEYXJpbiBBZGxlciAgPGRh cmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KSW5kZXg6 IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlci5tbQkocmV2aXNpb24gNjAzNjQpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkv bWFjL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yMjAs NiArMjIwLDggQEAgc3RhdGljIFdlYkNvcmVUZXh0TWFya2VyKiB0ZXh0TWFya2VyRm9yVgogCiBz dGF0aWMgVmlzaWJsZVBvc2l0aW9uIHZpc2libGVQb3NpdGlvbkZvclRleHRNYXJrZXIoV2ViQ29y ZVRleHRNYXJrZXIqIHRleHRNYXJrZXIpCiB7CisgICAgaWYgKCF0ZXh0TWFya2VyKQorICAgICAg ICByZXR1cm4gVmlzaWJsZVBvc2l0aW9uKCk7CiAgICAgVGV4dE1hcmtlckRhdGEgdGV4dE1hcmtl ckRhdGE7CiAgICAgaWYgKCFbW1dlYkNvcmVWaWV3RmFjdG9yeSBzaGFyZWRGYWN0b3J5XSBnZXRC eXRlczomdGV4dE1hcmtlckRhdGEgZnJvbVRleHRNYXJrZXI6dGV4dE1hcmtlciBsZW5ndGg6c2l6 ZW9mKHRleHRNYXJrZXJEYXRhKV0pCiAgICAgICAgIHJldHVybiBWaXNpYmxlUG9zaXRpb24oKTsK QEAgLTk3OCw2ICs5ODAsOCBAQCAtIChOU0FycmF5KilhY2Nlc3NpYmlsaXR5QXR0cmlidXRlTmFt ZXMKIAogLSAoVmlzaWJsZVBvc2l0aW9uUmFuZ2UpdmlzaWJsZVBvc2l0aW9uUmFuZ2VGb3JUZXh0 TWFya2VyUmFuZ2U6KFdlYkNvcmVUZXh0TWFya2VyUmFuZ2UqKSB0ZXh0TWFya2VyUmFuZ2UKIHsK KyAgICBpZiAoIXRleHRNYXJrZXJSYW5nZSkKKyAgICAgICAgcmV0dXJuIFZpc2libGVQb3NpdGlv blJhbmdlKCk7CiAgICAgcmV0dXJuIFZpc2libGVQb3NpdGlvblJhbmdlKHZpc2libGVQb3NpdGlv bkZvclN0YXJ0T2ZUZXh0TWFya2VyUmFuZ2UodGV4dE1hcmtlclJhbmdlKSwgdmlzaWJsZVBvc2l0 aW9uRm9yRW5kT2ZUZXh0TWFya2VyUmFuZ2UodGV4dE1hcmtlclJhbmdlKSk7CiB9CiAKQEAgLTIz MzUsNDQgKzIzMzksMzkgQEAgLSAoaWQpYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOihOU1N0 cgogICAgICAgICByZXR1cm4gbmlsOwogICAgIH0KICAgICAKLSAgICAvLyBDb252ZXJ0IHZhbHVl cyB0byBXZWJDb3JlIHR5cGVzCi0gICAgLy8gRklYTUU6IHByZXBwaW5nIGFsbCBvZiB0aGVzZSB2 YWx1ZXMgYXMgV2ViQ29yZSB0eXBlcyBpcyB1bm5lY2Vzc2FyeSBpbiBtYW55IAotICAgIC8vIGNh c2VzLiBSZS1vcmdhbml6YXRpb24gb2YgdGhpcyBmdW5jdGlvbiBvciBwZXJmb3JtaW5nIHRoZSBj b252ZXJzaW9uIG9uIGEgCi0gICAgLy8gbmVlZCBiYXNpcyBhcmUgcG9zc2libGUgaW1wcm92ZW1l bnRzLiAKLSAgICBWaXNpYmxlUG9zaXRpb24gdmlzaWJsZVBvczsKLSAgICBpZiAodGV4dE1hcmtl cikKLSAgICAgICAgdmlzaWJsZVBvcyA9IHZpc2libGVQb3NpdGlvbkZvclRleHRNYXJrZXIodGV4 dE1hcmtlcik7Ci0gICAgaW50IGludE51bWJlciA9IFtudW1iZXIgaW50VmFsdWVdOwotICAgIFZp c2libGVQb3NpdGlvblJhbmdlIHZpc2libGVQb3NSYW5nZTsKLSAgICBpZiAodGV4dE1hcmtlclJh bmdlKQotICAgICAgICB2aXNpYmxlUG9zUmFuZ2UgPSBbc2VsZiB2aXNpYmxlUG9zaXRpb25SYW5n ZUZvclRleHRNYXJrZXJSYW5nZTp0ZXh0TWFya2VyUmFuZ2VdOwotICAgIEludFBvaW50IHdlYkNv cmVQb2ludCA9IEludFBvaW50KHBvaW50KTsKLSAgICBQbGFpblRleHRSYW5nZSBwbGFpblRleHRS YW5nZSA9IFBsYWluVGV4dFJhbmdlKHJhbmdlLmxvY2F0aW9uLCByYW5nZS5sZW5ndGgpOwotCiAg ICAgLy8gZGlzcGF0Y2gKLSAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhV SUVsZW1lbnRGb3JUZXh0TWFya2VyIl0pCisgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3Ry aW5nOiBAIkFYVUlFbGVtZW50Rm9yVGV4dE1hcmtlciJdKSB7CisgICAgICAgIFZpc2libGVQb3Np dGlvbiB2aXNpYmxlUG9zID0gdmlzaWJsZVBvc2l0aW9uRm9yVGV4dE1hcmtlcih0ZXh0TWFya2Vy KTsKICAgICAgICAgcmV0dXJuIG1fb2JqZWN0LT5hY2Nlc3NpYmlsaXR5T2JqZWN0Rm9yUG9zaXRp b24odmlzaWJsZVBvcyktPndyYXBwZXIoKTsKKyAgICB9CiAKICAgICBpZiAoW2F0dHJpYnV0ZSBp c0VxdWFsVG9TdHJpbmc6IEAiQVhUZXh0TWFya2VyUmFuZ2VGb3JVSUVsZW1lbnQiXSkgewogICAg ICAgICBWaXNpYmxlUG9zaXRpb25SYW5nZSB2cFJhbmdlID0gdWlFbGVtZW50LmdldCgpLT52aXNp YmxlUG9zaXRpb25SYW5nZSgpOwogICAgICAgICByZXR1cm4gKGlkKXRleHRNYXJrZXJSYW5nZUZy b21WaXNpYmxlUG9zaXRpb25zKHZwUmFuZ2Uuc3RhcnQsIHZwUmFuZ2UuZW5kKTsKICAgICB9CiAK LSAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhMaW5lRm9yVGV4dE1hcmtl ciJdKQorICAgIGlmIChbYXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzogQCJBWExpbmVGb3JUZXh0 TWFya2VyIl0pIHsKKyAgICAgICAgVmlzaWJsZVBvc2l0aW9uIHZpc2libGVQb3MgPSB2aXNpYmxl UG9zaXRpb25Gb3JUZXh0TWFya2VyKHRleHRNYXJrZXIpOwogICAgICAgICByZXR1cm4gW05TTnVt YmVyIG51bWJlcldpdGhVbnNpZ25lZEludDptX29iamVjdC0+bGluZUZvclBvc2l0aW9uKHZpc2li bGVQb3MpXTsKKyAgICB9CiAKICAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6IEAi QVhUZXh0TWFya2VyUmFuZ2VGb3JMaW5lIl0pIHsKLSAgICAgICAgVmlzaWJsZVBvc2l0aW9uUmFu Z2UgdnBSYW5nZSA9IG1fb2JqZWN0LT52aXNpYmxlUG9zaXRpb25SYW5nZUZvckxpbmUoaW50TnVt YmVyKTsKKyAgICAgICAgVmlzaWJsZVBvc2l0aW9uUmFuZ2UgdnBSYW5nZSA9IG1fb2JqZWN0LT52 aXNpYmxlUG9zaXRpb25SYW5nZUZvckxpbmUoW251bWJlciBpbnRWYWx1ZV0pOwogICAgICAgICBy ZXR1cm4gKGlkKXRleHRNYXJrZXJSYW5nZUZyb21WaXNpYmxlUG9zaXRpb25zKHZwUmFuZ2Uuc3Rh cnQsIHZwUmFuZ2UuZW5kKTsKICAgICB9CiAKLSAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9T dHJpbmc6IEAiQVhTdHJpbmdGb3JUZXh0TWFya2VyUmFuZ2UiXSkKKyAgICBpZiAoW2F0dHJpYnV0 ZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhTdHJpbmdGb3JUZXh0TWFya2VyUmFuZ2UiXSkgeworICAg ICAgICBWaXNpYmxlUG9zaXRpb25SYW5nZSB2aXNpYmxlUG9zUmFuZ2UgPSBbc2VsZiB2aXNpYmxl UG9zaXRpb25SYW5nZUZvclRleHRNYXJrZXJSYW5nZTp0ZXh0TWFya2VyUmFuZ2VdOwogICAgICAg ICByZXR1cm4gbV9vYmplY3QtPnN0cmluZ0ZvclZpc2libGVQb3NpdGlvblJhbmdlKHZpc2libGVQ b3NSYW5nZSk7CisgICAgfQogCi0gICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOiBA IkFYVGV4dE1hcmtlckZvclBvc2l0aW9uIl0pCisgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRv U3RyaW5nOiBAIkFYVGV4dE1hcmtlckZvclBvc2l0aW9uIl0pIHsKKyAgICAgICAgSW50UG9pbnQg d2ViQ29yZVBvaW50ID0gSW50UG9pbnQocG9pbnQpOwogICAgICAgICByZXR1cm4gcG9pbnRTZXQg PyB0ZXh0TWFya2VyRm9yVmlzaWJsZVBvc2l0aW9uKG1fb2JqZWN0LT52aXNpYmxlUG9zaXRpb25G b3JQb2ludCh3ZWJDb3JlUG9pbnQpKSA6IG5pbDsKKyAgICB9CiAKICAgICBpZiAoW2F0dHJpYnV0 ZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhCb3VuZHNGb3JUZXh0TWFya2VyUmFuZ2UiXSkgeworICAg ICAgICBWaXNpYmxlUG9zaXRpb25SYW5nZSB2aXNpYmxlUG9zUmFuZ2UgPSBbc2VsZiB2aXNpYmxl UG9zaXRpb25SYW5nZUZvclRleHRNYXJrZXJSYW5nZTp0ZXh0TWFya2VyUmFuZ2VdOwogICAgICAg ICBOU1JlY3QgcmVjdCA9IG1fb2JqZWN0LT5ib3VuZHNGb3JWaXNpYmxlUG9zaXRpb25SYW5nZSh2 aXNpYmxlUG9zUmFuZ2UpOwogICAgICAgICByZXR1cm4gW05TVmFsdWUgdmFsdWVXaXRoUmVjdDpy ZWN0XTsKICAgICB9CkBAIC0yNDEzLDcyICsyNDEyLDEwMCBAQCAtIChpZClhY2Nlc3NpYmlsaXR5 QXR0cmlidXRlVmFsdWU6KE5TU3RyCiAgICAgICAgIHJldHVybiAoaWQpdGV4dE1hcmtlclJhbmdl RnJvbVZpc2libGVQb3NpdGlvbnModnBSYW5nZS5zdGFydCwgdnBSYW5nZS5lbmQpOwogICAgIH0K IAotICAgIGlmIChbYXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzogQCJBWE5leHRUZXh0TWFya2Vy Rm9yVGV4dE1hcmtlciJdKQorICAgIGlmIChbYXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzogQCJB WE5leHRUZXh0TWFya2VyRm9yVGV4dE1hcmtlciJdKSB7CisgICAgICAgIFZpc2libGVQb3NpdGlv biB2aXNpYmxlUG9zID0gdmlzaWJsZVBvc2l0aW9uRm9yVGV4dE1hcmtlcih0ZXh0TWFya2VyKTsK ICAgICAgICAgcmV0dXJuIHRleHRNYXJrZXJGb3JWaXNpYmxlUG9zaXRpb24obV9vYmplY3QtPm5l eHRWaXNpYmxlUG9zaXRpb24odmlzaWJsZVBvcykpOworICAgIH0KIAotICAgIGlmIChbYXR0cmli dXRlIGlzRXF1YWxUb1N0cmluZzogQCJBWFByZXZpb3VzVGV4dE1hcmtlckZvclRleHRNYXJrZXIi XSkKKyAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhQcmV2aW91c1RleHRN YXJrZXJGb3JUZXh0TWFya2VyIl0pIHsKKyAgICAgICAgVmlzaWJsZVBvc2l0aW9uIHZpc2libGVQ b3MgPSB2aXNpYmxlUG9zaXRpb25Gb3JUZXh0TWFya2VyKHRleHRNYXJrZXIpOwogICAgICAgICBy ZXR1cm4gdGV4dE1hcmtlckZvclZpc2libGVQb3NpdGlvbihtX29iamVjdC0+cHJldmlvdXNWaXNp YmxlUG9zaXRpb24odmlzaWJsZVBvcykpOworICAgIH0KIAogICAgIGlmIChbYXR0cmlidXRlIGlz RXF1YWxUb1N0cmluZzogQCJBWExlZnRXb3JkVGV4dE1hcmtlclJhbmdlRm9yVGV4dE1hcmtlciJd KSB7CisgICAgICAgIFZpc2libGVQb3NpdGlvbiB2aXNpYmxlUG9zID0gdmlzaWJsZVBvc2l0aW9u Rm9yVGV4dE1hcmtlcih0ZXh0TWFya2VyKTsKICAgICAgICAgVmlzaWJsZVBvc2l0aW9uUmFuZ2Ug dnBSYW5nZSA9IG1fb2JqZWN0LT5wb3NpdGlvbk9mTGVmdFdvcmQodmlzaWJsZVBvcyk7CiAgICAg ICAgIHJldHVybiAoaWQpdGV4dE1hcmtlclJhbmdlRnJvbVZpc2libGVQb3NpdGlvbnModnBSYW5n ZS5zdGFydCwgdnBSYW5nZS5lbmQpOwogICAgIH0KIAogICAgIGlmIChbYXR0cmlidXRlIGlzRXF1 YWxUb1N0cmluZzogQCJBWFJpZ2h0V29yZFRleHRNYXJrZXJSYW5nZUZvclRleHRNYXJrZXIiXSkg eworICAgICAgICBWaXNpYmxlUG9zaXRpb24gdmlzaWJsZVBvcyA9IHZpc2libGVQb3NpdGlvbkZv clRleHRNYXJrZXIodGV4dE1hcmtlcik7CiAgICAgICAgIFZpc2libGVQb3NpdGlvblJhbmdlIHZw UmFuZ2UgPSBtX29iamVjdC0+cG9zaXRpb25PZlJpZ2h0V29yZCh2aXNpYmxlUG9zKTsKICAgICAg ICAgcmV0dXJuIChpZCl0ZXh0TWFya2VyUmFuZ2VGcm9tVmlzaWJsZVBvc2l0aW9ucyh2cFJhbmdl LnN0YXJ0LCB2cFJhbmdlLmVuZCk7CiAgICAgfQogCiAgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVh bFRvU3RyaW5nOiBAIkFYTGVmdExpbmVUZXh0TWFya2VyUmFuZ2VGb3JUZXh0TWFya2VyIl0pIHsK KyAgICAgICAgVmlzaWJsZVBvc2l0aW9uIHZpc2libGVQb3MgPSB2aXNpYmxlUG9zaXRpb25Gb3JU ZXh0TWFya2VyKHRleHRNYXJrZXIpOwogICAgICAgICBWaXNpYmxlUG9zaXRpb25SYW5nZSB2cFJh bmdlID0gbV9vYmplY3QtPmxlZnRMaW5lVmlzaWJsZVBvc2l0aW9uUmFuZ2UodmlzaWJsZVBvcyk7 CiAgICAgICAgIHJldHVybiAoaWQpdGV4dE1hcmtlclJhbmdlRnJvbVZpc2libGVQb3NpdGlvbnMo dnBSYW5nZS5zdGFydCwgdnBSYW5nZS5lbmQpOwogICAgIH0KIAogICAgIGlmIChbYXR0cmlidXRl IGlzRXF1YWxUb1N0cmluZzogQCJBWFJpZ2h0TGluZVRleHRNYXJrZXJSYW5nZUZvclRleHRNYXJr ZXIiXSkgeworICAgICAgICBWaXNpYmxlUG9zaXRpb24gdmlzaWJsZVBvcyA9IHZpc2libGVQb3Np dGlvbkZvclRleHRNYXJrZXIodGV4dE1hcmtlcik7CiAgICAgICAgIFZpc2libGVQb3NpdGlvblJh bmdlIHZwUmFuZ2UgPSBtX29iamVjdC0+cmlnaHRMaW5lVmlzaWJsZVBvc2l0aW9uUmFuZ2Uodmlz aWJsZVBvcyk7CiAgICAgICAgIHJldHVybiAoaWQpdGV4dE1hcmtlclJhbmdlRnJvbVZpc2libGVQ b3NpdGlvbnModnBSYW5nZS5zdGFydCwgdnBSYW5nZS5lbmQpOwogICAgIH0KIAogICAgIGlmIChb YXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzogQCJBWFNlbnRlbmNlVGV4dE1hcmtlclJhbmdlRm9y VGV4dE1hcmtlciJdKSB7CisgICAgICAgIFZpc2libGVQb3NpdGlvbiB2aXNpYmxlUG9zID0gdmlz aWJsZVBvc2l0aW9uRm9yVGV4dE1hcmtlcih0ZXh0TWFya2VyKTsKICAgICAgICAgVmlzaWJsZVBv c2l0aW9uUmFuZ2UgdnBSYW5nZSA9IG1fb2JqZWN0LT5zZW50ZW5jZUZvclBvc2l0aW9uKHZpc2li bGVQb3MpOwogICAgICAgICByZXR1cm4gKGlkKXRleHRNYXJrZXJSYW5nZUZyb21WaXNpYmxlUG9z aXRpb25zKHZwUmFuZ2Uuc3RhcnQsIHZwUmFuZ2UuZW5kKTsKICAgICB9CiAKICAgICBpZiAoW2F0 dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhQYXJhZ3JhcGhUZXh0TWFya2VyUmFuZ2VGb3JU ZXh0TWFya2VyIl0pIHsKKyAgICAgICAgVmlzaWJsZVBvc2l0aW9uIHZpc2libGVQb3MgPSB2aXNp YmxlUG9zaXRpb25Gb3JUZXh0TWFya2VyKHRleHRNYXJrZXIpOwogICAgICAgICBWaXNpYmxlUG9z aXRpb25SYW5nZSB2cFJhbmdlID0gbV9vYmplY3QtPnBhcmFncmFwaEZvclBvc2l0aW9uKHZpc2li bGVQb3MpOwogICAgICAgICByZXR1cm4gKGlkKXRleHRNYXJrZXJSYW5nZUZyb21WaXNpYmxlUG9z aXRpb25zKHZwUmFuZ2Uuc3RhcnQsIHZwUmFuZ2UuZW5kKTsKICAgICB9CiAKLSAgICBpZiAoW2F0 dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhOZXh0V29yZEVuZFRleHRNYXJrZXJGb3JUZXh0 TWFya2VyIl0pCisgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOiBAIkFYTmV4dFdv cmRFbmRUZXh0TWFya2VyRm9yVGV4dE1hcmtlciJdKSB7CisgICAgICAgIFZpc2libGVQb3NpdGlv biB2aXNpYmxlUG9zID0gdmlzaWJsZVBvc2l0aW9uRm9yVGV4dE1hcmtlcih0ZXh0TWFya2VyKTsK ICAgICAgICAgcmV0dXJuIHRleHRNYXJrZXJGb3JWaXNpYmxlUG9zaXRpb24obV9vYmplY3QtPm5l eHRXb3JkRW5kKHZpc2libGVQb3MpKTsKLQotICAgIGlmIChbYXR0cmlidXRlIGlzRXF1YWxUb1N0 cmluZzogQCJBWFByZXZpb3VzV29yZFN0YXJ0VGV4dE1hcmtlckZvclRleHRNYXJrZXIiXSkKKyAg ICB9CisgICAgCisgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOiBAIkFYUHJldmlv dXNXb3JkU3RhcnRUZXh0TWFya2VyRm9yVGV4dE1hcmtlciJdKSB7CisgICAgICAgIFZpc2libGVQ b3NpdGlvbiB2aXNpYmxlUG9zID0gdmlzaWJsZVBvc2l0aW9uRm9yVGV4dE1hcmtlcih0ZXh0TWFy a2VyKTsKICAgICAgICAgcmV0dXJuIHRleHRNYXJrZXJGb3JWaXNpYmxlUG9zaXRpb24obV9vYmpl Y3QtPnByZXZpb3VzV29yZFN0YXJ0KHZpc2libGVQb3MpKTsKKyAgICB9CiAKLSAgICBpZiAoW2F0 dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhOZXh0TGluZUVuZFRleHRNYXJrZXJGb3JUZXh0 TWFya2VyIl0pCisgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOiBAIkFYTmV4dExp bmVFbmRUZXh0TWFya2VyRm9yVGV4dE1hcmtlciJdKSB7CisgICAgICAgIFZpc2libGVQb3NpdGlv biB2aXNpYmxlUG9zID0gdmlzaWJsZVBvc2l0aW9uRm9yVGV4dE1hcmtlcih0ZXh0TWFya2VyKTsK ICAgICAgICAgcmV0dXJuIHRleHRNYXJrZXJGb3JWaXNpYmxlUG9zaXRpb24obV9vYmplY3QtPm5l eHRMaW5lRW5kUG9zaXRpb24odmlzaWJsZVBvcykpOworICAgIH0KIAotICAgIGlmIChbYXR0cmli dXRlIGlzRXF1YWxUb1N0cmluZzogQCJBWFByZXZpb3VzTGluZVN0YXJ0VGV4dE1hcmtlckZvclRl eHRNYXJrZXIiXSkKKyAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhQcmV2 aW91c0xpbmVTdGFydFRleHRNYXJrZXJGb3JUZXh0TWFya2VyIl0pIHsKKyAgICAgICAgVmlzaWJs ZVBvc2l0aW9uIHZpc2libGVQb3MgPSB2aXNpYmxlUG9zaXRpb25Gb3JUZXh0TWFya2VyKHRleHRN YXJrZXIpOwogICAgICAgICByZXR1cm4gdGV4dE1hcmtlckZvclZpc2libGVQb3NpdGlvbihtX29i amVjdC0+cHJldmlvdXNMaW5lU3RhcnRQb3NpdGlvbih2aXNpYmxlUG9zKSk7CisgICAgfQogCi0g ICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOiBAIkFYTmV4dFNlbnRlbmNlRW5kVGV4 dE1hcmtlckZvclRleHRNYXJrZXIiXSkKKyAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJp bmc6IEAiQVhOZXh0U2VudGVuY2VFbmRUZXh0TWFya2VyRm9yVGV4dE1hcmtlciJdKSB7CisgICAg ICAgIFZpc2libGVQb3NpdGlvbiB2aXNpYmxlUG9zID0gdmlzaWJsZVBvc2l0aW9uRm9yVGV4dE1h cmtlcih0ZXh0TWFya2VyKTsKICAgICAgICAgcmV0dXJuIHRleHRNYXJrZXJGb3JWaXNpYmxlUG9z aXRpb24obV9vYmplY3QtPm5leHRTZW50ZW5jZUVuZFBvc2l0aW9uKHZpc2libGVQb3MpKTsKKyAg ICB9CiAKLSAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhQcmV2aW91c1Nl bnRlbmNlU3RhcnRUZXh0TWFya2VyRm9yVGV4dE1hcmtlciJdKQorICAgIGlmIChbYXR0cmlidXRl IGlzRXF1YWxUb1N0cmluZzogQCJBWFByZXZpb3VzU2VudGVuY2VTdGFydFRleHRNYXJrZXJGb3JU ZXh0TWFya2VyIl0pIHsKKyAgICAgICAgVmlzaWJsZVBvc2l0aW9uIHZpc2libGVQb3MgPSB2aXNp YmxlUG9zaXRpb25Gb3JUZXh0TWFya2VyKHRleHRNYXJrZXIpOwogICAgICAgICByZXR1cm4gdGV4 dE1hcmtlckZvclZpc2libGVQb3NpdGlvbihtX29iamVjdC0+cHJldmlvdXNTZW50ZW5jZVN0YXJ0 UG9zaXRpb24odmlzaWJsZVBvcykpOworICAgIH0KIAotICAgIGlmIChbYXR0cmlidXRlIGlzRXF1 YWxUb1N0cmluZzogQCJBWE5leHRQYXJhZ3JhcGhFbmRUZXh0TWFya2VyRm9yVGV4dE1hcmtlciJd KQorICAgIGlmIChbYXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzogQCJBWE5leHRQYXJhZ3JhcGhF bmRUZXh0TWFya2VyRm9yVGV4dE1hcmtlciJdKSB7CisgICAgICAgIFZpc2libGVQb3NpdGlvbiB2 aXNpYmxlUG9zID0gdmlzaWJsZVBvc2l0aW9uRm9yVGV4dE1hcmtlcih0ZXh0TWFya2VyKTsKICAg ICAgICAgcmV0dXJuIHRleHRNYXJrZXJGb3JWaXNpYmxlUG9zaXRpb24obV9vYmplY3QtPm5leHRQ YXJhZ3JhcGhFbmRQb3NpdGlvbih2aXNpYmxlUG9zKSk7CisgICAgfQogCi0gICAgaWYgKFthdHRy aWJ1dGUgaXNFcXVhbFRvU3RyaW5nOiBAIkFYUHJldmlvdXNQYXJhZ3JhcGhTdGFydFRleHRNYXJr ZXJGb3JUZXh0TWFya2VyIl0pCisgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOiBA IkFYUHJldmlvdXNQYXJhZ3JhcGhTdGFydFRleHRNYXJrZXJGb3JUZXh0TWFya2VyIl0pIHsKKyAg ICAgICAgVmlzaWJsZVBvc2l0aW9uIHZpc2libGVQb3MgPSB2aXNpYmxlUG9zaXRpb25Gb3JUZXh0 TWFya2VyKHRleHRNYXJrZXIpOwogICAgICAgICByZXR1cm4gdGV4dE1hcmtlckZvclZpc2libGVQ b3NpdGlvbihtX29iamVjdC0+cHJldmlvdXNQYXJhZ3JhcGhTdGFydFBvc2l0aW9uKHZpc2libGVQ b3MpKTsKKyAgICB9CiAKICAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhT dHlsZVRleHRNYXJrZXJSYW5nZUZvclRleHRNYXJrZXIiXSkgeworICAgICAgICBWaXNpYmxlUG9z aXRpb24gdmlzaWJsZVBvcyA9IHZpc2libGVQb3NpdGlvbkZvclRleHRNYXJrZXIodGV4dE1hcmtl cik7CiAgICAgICAgIFZpc2libGVQb3NpdGlvblJhbmdlIHZwUmFuZ2UgPSBtX29iamVjdC0+c3R5 bGVSYW5nZUZvclBvc2l0aW9uKHZpc2libGVQb3MpOwogICAgICAgICByZXR1cm4gKGlkKXRleHRN YXJrZXJSYW5nZUZyb21WaXNpYmxlUG9zaXRpb25zKHZwUmFuZ2Uuc3RhcnQsIHZwUmFuZ2UuZW5k KTsKICAgICB9CiAKICAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6IEAiQVhMZW5n dGhGb3JUZXh0TWFya2VyUmFuZ2UiXSkgeworICAgICAgICBWaXNpYmxlUG9zaXRpb25SYW5nZSB2 aXNpYmxlUG9zUmFuZ2UgPSBbc2VsZiB2aXNpYmxlUG9zaXRpb25SYW5nZUZvclRleHRNYXJrZXJS YW5nZTp0ZXh0TWFya2VyUmFuZ2VdOwogICAgICAgICBpbnQgbGVuZ3RoID0gbV9vYmplY3QtPmxl bmd0aEZvclZpc2libGVQb3NpdGlvblJhbmdlKHZpc2libGVQb3NSYW5nZSk7CiAgICAgICAgIGlm IChsZW5ndGggPCAwKQogICAgICAgICAgICAgcmV0dXJuIG5pbDsKQEAgLTI0OTksMzUgKzI1MjYs MzkgQEAgLSAoaWQpYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOihOU1N0cgogCiAgICAgaWYg KG1fb2JqZWN0LT5pc1RleHRDb250cm9sKCkpIHsKICAgICAgICAgaWYgKFthdHRyaWJ1dGUgaXNF cXVhbFRvU3RyaW5nOiAoTlNTdHJpbmcgKilrQVhMaW5lRm9ySW5kZXhQYXJhbWV0ZXJpemVkQXR0 cmlidXRlXSkgewotICAgICAgICAgICAgaW50IGxpbmVOdW1iZXIgPSBtX29iamVjdC0+ZG9BWExp bmVGb3JJbmRleChpbnROdW1iZXIpOworICAgICAgICAgICAgaW50IGxpbmVOdW1iZXIgPSBtX29i amVjdC0+ZG9BWExpbmVGb3JJbmRleChbbnVtYmVyIGludFZhbHVlXSk7CiAgICAgICAgICAgICBp ZiAobGluZU51bWJlciA8IDApCiAgICAgICAgICAgICAgICAgcmV0dXJuIG5pbDsKICAgICAgICAg ICAgIHJldHVybiBbTlNOdW1iZXIgbnVtYmVyV2l0aFVuc2lnbmVkSW50OmxpbmVOdW1iZXJdOwog ICAgICAgICB9CiAKICAgICAgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOiAoTlNT dHJpbmcgKilrQVhSYW5nZUZvckxpbmVQYXJhbWV0ZXJpemVkQXR0cmlidXRlXSkgewotICAgICAg ICAgICAgUGxhaW5UZXh0UmFuZ2UgdGV4dFJhbmdlID0gbV9vYmplY3QtPmRvQVhSYW5nZUZvckxp bmUoaW50TnVtYmVyKTsKKyAgICAgICAgICAgIFBsYWluVGV4dFJhbmdlIHRleHRSYW5nZSA9IG1f b2JqZWN0LT5kb0FYUmFuZ2VGb3JMaW5lKFtudW1iZXIgaW50VmFsdWVdKTsKICAgICAgICAgICAg IHJldHVybiBbTlNWYWx1ZSB2YWx1ZVdpdGhSYW5nZTogTlNNYWtlUmFuZ2UodGV4dFJhbmdlLnN0 YXJ0LCB0ZXh0UmFuZ2UubGVuZ3RoKV07CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoW2F0dHJp YnV0ZSBpc0VxdWFsVG9TdHJpbmc6IChOU1N0cmluZyopa0FYU3RyaW5nRm9yUmFuZ2VQYXJhbWV0 ZXJpemVkQXR0cmlidXRlXSkKKyAgICAgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5n OiAoTlNTdHJpbmcqKWtBWFN0cmluZ0ZvclJhbmdlUGFyYW1ldGVyaXplZEF0dHJpYnV0ZV0pIHsK KyAgICAgICAgICAgIFBsYWluVGV4dFJhbmdlIHBsYWluVGV4dFJhbmdlID0gUGxhaW5UZXh0UmFu Z2UocmFuZ2UubG9jYXRpb24sIHJhbmdlLmxlbmd0aCk7CiAgICAgICAgICAgICByZXR1cm4gcmFu Z2VTZXQgPyAoaWQpKG1fb2JqZWN0LT5kb0FYU3RyaW5nRm9yUmFuZ2UocGxhaW5UZXh0UmFuZ2Up KSA6IG5pbDsKKyAgICAgICAgfQogCiAgICAgICAgIGlmIChbYXR0cmlidXRlIGlzRXF1YWxUb1N0 cmluZzogKE5TU3RyaW5nKilrQVhSYW5nZUZvclBvc2l0aW9uUGFyYW1ldGVyaXplZEF0dHJpYnV0 ZV0pIHsKICAgICAgICAgICAgIGlmICghcG9pbnRTZXQpCiAgICAgICAgICAgICAgICAgcmV0dXJu IG5pbDsKKyAgICAgICAgICAgIEludFBvaW50IHdlYkNvcmVQb2ludCA9IEludFBvaW50KHBvaW50 KTsKICAgICAgICAgICAgIFBsYWluVGV4dFJhbmdlIHRleHRSYW5nZSA9IG1fb2JqZWN0LT5kb0FY UmFuZ2VGb3JQb3NpdGlvbih3ZWJDb3JlUG9pbnQpOwogICAgICAgICAgICAgcmV0dXJuIFtOU1Zh bHVlIHZhbHVlV2l0aFJhbmdlOiBOU01ha2VSYW5nZSh0ZXh0UmFuZ2Uuc3RhcnQsIHRleHRSYW5n ZS5sZW5ndGgpXTsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChbYXR0cmlidXRlIGlzRXF1YWxU b1N0cmluZzogKE5TU3RyaW5nKilrQVhSYW5nZUZvckluZGV4UGFyYW1ldGVyaXplZEF0dHJpYnV0 ZV0pIHsKLSAgICAgICAgICAgIFBsYWluVGV4dFJhbmdlIHRleHRSYW5nZSA9IG1fb2JqZWN0LT5k b0FYUmFuZ2VGb3JJbmRleChpbnROdW1iZXIpOworICAgICAgICAgICAgUGxhaW5UZXh0UmFuZ2Ug dGV4dFJhbmdlID0gbV9vYmplY3QtPmRvQVhSYW5nZUZvckluZGV4KFtudW1iZXIgaW50VmFsdWVd KTsKICAgICAgICAgICAgIHJldHVybiBbTlNWYWx1ZSB2YWx1ZVdpdGhSYW5nZTogTlNNYWtlUmFu Z2UodGV4dFJhbmdlLnN0YXJ0LCB0ZXh0UmFuZ2UubGVuZ3RoKV07CiAgICAgICAgIH0KIAogICAg ICAgICBpZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6IChOU1N0cmluZyopa0FYQm91bmRz Rm9yUmFuZ2VQYXJhbWV0ZXJpemVkQXR0cmlidXRlXSkgewogICAgICAgICAgICAgaWYgKCFyYW5n ZVNldCkKICAgICAgICAgICAgICAgICByZXR1cm4gbmlsOworICAgICAgICAgICAgUGxhaW5UZXh0 UmFuZ2UgcGxhaW5UZXh0UmFuZ2UgPSBQbGFpblRleHRSYW5nZShyYW5nZS5sb2NhdGlvbiwgcmFu Z2UubGVuZ3RoKTsKICAgICAgICAgICAgIE5TUmVjdCByZWN0ID0gbV9vYmplY3QtPmRvQVhCb3Vu ZHNGb3JSYW5nZShwbGFpblRleHRSYW5nZSk7CiAgICAgICAgICAgICByZXR1cm4gW05TVmFsdWUg dmFsdWVXaXRoUmVjdDpyZWN0XTsKICAgICAgICAgfQpAQCAtMjUzOSw3ICsyNTcwLDcgQEAgLSAo aWQpYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOihOU1N0cgogICAgICAgICAgICAgcmV0dXJu IHJhbmdlU2V0ID8gW3NlbGYgZG9BWEF0dHJpYnV0ZWRTdHJpbmdGb3JSYW5nZTpyYW5nZV0gOiBu aWw7CiAKICAgICAgICAgaWYgKFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5nOiAoTlNTdHJpbmcq KWtBWFN0eWxlUmFuZ2VGb3JJbmRleFBhcmFtZXRlcml6ZWRBdHRyaWJ1dGVdKSB7Ci0gICAgICAg ICAgICBQbGFpblRleHRSYW5nZSB0ZXh0UmFuZ2UgPSBtX29iamVjdC0+ZG9BWFN0eWxlUmFuZ2VG b3JJbmRleChpbnROdW1iZXIpOworICAgICAgICAgICAgUGxhaW5UZXh0UmFuZ2UgdGV4dFJhbmdl ID0gbV9vYmplY3QtPmRvQVhTdHlsZVJhbmdlRm9ySW5kZXgoW251bWJlciBpbnRWYWx1ZV0pOwog ICAgICAgICAgICAgcmV0dXJuIFtOU1ZhbHVlIHZhbHVlV2l0aFJhbmdlOiBOU01ha2VSYW5nZSh0 ZXh0UmFuZ2Uuc3RhcnQsIHRleHRSYW5nZS5sZW5ndGgpXTsKICAgICAgICAgfQogICAgIH0K