42056 2010-07-12 00:39:06 -0700 AX converts AtomicStrings to .string() more than needed 2010-07-12 16:54:02 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach bdakin oldest_to_newest 249705 0 cfleizach 2010-07-12 00:39:06 -0700 lots of examples like String ariaSelected = getAttribute(aria_selectedAttr).string(); when it's not needed 250143 1 61291 cfleizach 2010-07-12 16:42:53 -0700 Created attachment 61291 Patch 250152 2 cfleizach 2010-07-12 16:54:02 -0700 http://trac.webkit.org/changeset/63139 61291 2010-07-12 16:42:53 -0700 2010-07-12 16:44:51 -0700 Patch bug-42056-20100712164252.patch text/plain 9540 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MzEzNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTAtMDctMTIgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBWCBjb252ZXJ0cyBBdG9taWNTdHJpbmdzIHRvIC5zdHJpbmcoKSBtb3JlIHRoYW4gbmVlZGVk CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjA1Ngor CisgICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZS4gTm8gbmV3IHRlc3RzLgorCisgICAgICAgICog YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmlzUHJlc3NlZCk6CisgICAgICAgIChX ZWJDb3JlOjpzaWJsaW5nV2l0aEFyaWFSb2xlKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3Q6OmludFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3Q6OmFjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbik6CisgICAgICAgIChX ZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpoYXNUZXh0QWx0ZXJuYXRpdmUpOgor ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c3VwcG9ydHNBUklB Rmxvd1RvKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnN1 cHBvcnRzQVJJQURyb3BwaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3Q6OnN1cHBvcnRzQVJJQURyYWdnaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3Q6OmRldGVybWluZUFSSUFEcm9wRWZmZWN0cyk6CisgICAgICAg IChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojppc0V4cGFuZGVkKToKKyAgICAg ICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmlzUmVxdWlyZWQpOgorICAg ICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aXNTZWxlY3RlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzdXBwb3J0c0FSSUFP d25zKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmlzRW5h YmxlZCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphY3Rp dmVEZXNjZW5kYW50KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3Q6OmRldGVybWluZUFyaWFSb2xlQXR0cmlidXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3Q6Om9yaWVudGF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmNhblNldEV4cGFuZGVkQXR0cmlidXRlKToKKyAgICAg ICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmNhblNldFZhbHVlQXR0cmli dXRlKToKKwogMjAxMC0wNy0xMiAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAJKHJldmlzaW9uIDYzMTM3 KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC01NTQsNyArNTU0LDcgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0Ojppc1ByZXNzZQogCiAgICAgLy8gSWYgdGhpcyBpcyBhbiBBUklBIGJ1dHRvbiwg Y2hlY2sgdGhlIGFyaWEtcHJlc3NlZCBhdHRyaWJ1dGUgcmF0aGVyIHRoYW4gbm9kZSgpLT5hY3Rp dmUoKQogICAgIGlmIChhcmlhUm9sZUF0dHJpYnV0ZSgpID09IEJ1dHRvblJvbGUpIHsKLSAgICAg ICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGdldEF0dHJpYnV0ZShhcmlhX3ByZXNzZWRBdHRyKS5z dHJpbmcoKSwgInRydWUiKSkKKyAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGdldEF0dHJp YnV0ZShhcmlhX3ByZXNzZWRBdHRyKSwgInRydWUiKSkKICAgICAgICAgICAgIHJldHVybiB0cnVl OwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtODc4LDcgKzg3OCw3IEBAIHN0YXRp YyBFbGVtZW50KiBzaWJsaW5nV2l0aEFyaWFSb2xlKFN0cmkKICAgICBOb2RlKiBzaWJsaW5nID0g bm9kZS0+cGFyZW50KCktPmZpcnN0Q2hpbGQoKTsKICAgICB3aGlsZSAoc2libGluZykgewogICAg ICAgICBpZiAoc2libGluZy0+aXNFbGVtZW50Tm9kZSgpKSB7Ci0gICAgICAgICAgICBTdHJpbmcg c2libGluZ0FyaWFSb2xlID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KHNpYmxpbmcpLT5nZXRBdHRy aWJ1dGUocm9sZUF0dHIpLnN0cmluZygpOworICAgICAgICAgICAgY29uc3QgQXRvbWljU3RyaW5n JiBzaWJsaW5nQXJpYVJvbGUgPSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4oc2libGluZyktPmdldEF0 dHJpYnV0ZShyb2xlQXR0cik7CiAgICAgICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uoc2li bGluZ0FyaWFSb2xlLCByb2xlKSkKICAgICAgICAgICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8 RWxlbWVudCo+KHNpYmxpbmcpOwogICAgICAgICB9CkBAIC0xMDU2LDcgKzEwNTYsNyBAQCBpbnQg QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aW50VmFsdWUoCiAgICAgLy8gSWYgdGhpcyBpcyBh biBBUklBIGNoZWNrYm94IG9yIHJhZGlvLCBjaGVjayB0aGUgYXJpYS1jaGVja2VkIGF0dHJpYnV0 ZSByYXRoZXIgdGhhbiBub2RlKCktPmNoZWNrZWQoKQogICAgIEFjY2Vzc2liaWxpdHlSb2xlIGFy aWFSb2xlID0gYXJpYVJvbGVBdHRyaWJ1dGUoKTsKICAgICBpZiAoYXJpYVJvbGUgPT0gUmFkaW9C dXR0b25Sb2xlIHx8IGFyaWFSb2xlID09IENoZWNrQm94Um9sZSkgewotICAgICAgICBpZiAoZXF1 YWxJZ25vcmluZ0Nhc2UoZ2V0QXR0cmlidXRlKGFyaWFfY2hlY2tlZEF0dHIpLnN0cmluZygpLCAi dHJ1ZSIpKQorICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZ2V0QXR0cmlidXRlKGFyaWFf Y2hlY2tlZEF0dHIpLCAidHJ1ZSIpKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICB9CkBAIC0xMzQxLDcgKzEzNDEsNyBAQCBTdHJpbmcgQWNjZXNz aWJpbGl0eVJlbmRlck9iamVjdDo6YWNjZXNzCiAgICAgaWYgKCFtX3JlbmRlcmVyKQogICAgICAg ICByZXR1cm4gU3RyaW5nKCk7CiAKLSAgICBTdHJpbmcgYXJpYUxhYmVsID0gZ2V0QXR0cmlidXRl KGFyaWFfbGFiZWxBdHRyKS5zdHJpbmcoKTsKKyAgICBjb25zdCBBdG9taWNTdHJpbmcmIGFyaWFM YWJlbCA9IGdldEF0dHJpYnV0ZShhcmlhX2xhYmVsQXR0cik7CiAgICAgaWYgKCFhcmlhTGFiZWwu aXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gYXJpYUxhYmVsOwogICAgIApAQCAtMTU0Nyw3ICsx NTQ3LDcgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpoYXNUZXh0QQogewogICAg IC8vIEFSSUE6IHNlY3Rpb24gMkEsIGJ1bGxldCAjMyBzYXlzIGlmIGFyaWEtbGFiZWxlZGJ5IG9y IGFyaWEtbGFiZWwgYXBwZWFycywgaXQgc2hvdWxkCiAgICAgLy8gb3ZlcnJpZGUgdGhlICJsYWJl bCIgZWxlbWVudCBhc3NvY2lhdGlvbi4KLSAgICBpZiAoIWFyaWFMYWJlbGVkQnlBdHRyaWJ1dGUo KS5pc0VtcHR5KCkgfHwgIWdldEF0dHJpYnV0ZShhcmlhX2xhYmVsQXR0cikuc3RyaW5nKCkuaXNF bXB0eSgpKQorICAgIGlmICghYXJpYUxhYmVsZWRCeUF0dHJpYnV0ZSgpLmlzRW1wdHkoKSB8fCAh Z2V0QXR0cmlidXRlKGFyaWFfbGFiZWxBdHRyKS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiB0 cnVlOwogICAgICAgICAKICAgICByZXR1cm4gZmFsc2U7ICAgCkBAIC0xNTYwLDcgKzE1NjAsNyBA QCBib29sIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFIYXNQCiAgICAgCiBib29sIEFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnN1cHBvcnRzQVJJQUZsb3dUbygpIGNvbnN0CiB7Ci0g ICAgcmV0dXJuICFnZXRBdHRyaWJ1dGUoYXJpYV9mbG93dG9BdHRyKS5zdHJpbmcoKS5pc0VtcHR5 KCk7CisgICAgcmV0dXJuICFnZXRBdHRyaWJ1dGUoYXJpYV9mbG93dG9BdHRyKS5pc0VtcHR5KCk7 CiB9CiAgICAgCiB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFGbG93VG9FbGVt ZW50cyhBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIGZsb3dUbykgY29uc3QKQEAgLTE1ODEs MTMgKzE1ODEsMTMgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphcmlhRmxvdwog ICAgIAogYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzdXBwb3J0c0FSSUFEcm9wcGlu ZygpIGNvbnN0IAogewotICAgIGNvbnN0IEF0b21pY1N0cmluZyYgZHJvcEVmZmVjdCA9IGdldEF0 dHJpYnV0ZShhcmlhX2Ryb3BlZmZlY3RBdHRyKS5zdHJpbmcoKTsKKyAgICBjb25zdCBBdG9taWNT dHJpbmcmIGRyb3BFZmZlY3QgPSBnZXRBdHRyaWJ1dGUoYXJpYV9kcm9wZWZmZWN0QXR0cik7CiAg ICAgcmV0dXJuICFkcm9wRWZmZWN0LmlzRW1wdHkoKTsKIH0KIAogYm9vbCBBY2Nlc3NpYmlsaXR5 UmVuZGVyT2JqZWN0OjpzdXBwb3J0c0FSSUFEcmFnZ2luZygpIGNvbnN0CiB7Ci0gICAgY29uc3Qg QXRvbWljU3RyaW5nJiBncmFiYmVkID0gZ2V0QXR0cmlidXRlKGFyaWFfZ3JhYmJlZEF0dHIpLnN0 cmluZygpOworICAgIGNvbnN0IEF0b21pY1N0cmluZyYgZ3JhYmJlZCA9IGdldEF0dHJpYnV0ZShh cmlhX2dyYWJiZWRBdHRyKTsKICAgICByZXR1cm4gZXF1YWxJZ25vcmluZ0Nhc2UoZ3JhYmJlZCwg InRydWUiKSB8fCBlcXVhbElnbm9yaW5nQ2FzZShncmFiYmVkLCAiZmFsc2UiKTsgICAKIH0KIApA QCAtMTYwMywxNCArMTYwMywxNSBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNl dEFSSUFHCiAKIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6ZGV0ZXJtaW5lQVJJQURy b3BFZmZlY3RzKFZlY3RvcjxTdHJpbmc+JiBlZmZlY3RzKQogewotICAgIFN0cmluZyBkcm9wRWZm ZWN0cyA9IGdldEF0dHJpYnV0ZShhcmlhX2Ryb3BlZmZlY3RBdHRyKS5zdHJpbmcoKTsKKyAgICBj b25zdCBBdG9taWNTdHJpbmcmIGRyb3BFZmZlY3RzID0gZ2V0QXR0cmlidXRlKGFyaWFfZHJvcGVm ZmVjdEF0dHIpOwogICAgIGlmIChkcm9wRWZmZWN0cy5pc0VtcHR5KCkpIHsKICAgICAgICAgZWZm ZWN0cy5jbGVhcigpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIAotICAgIGRyb3BFZmZl Y3RzLnJlcGxhY2UoJ1xuJywgJyAnKTsKLSAgICBkcm9wRWZmZWN0cy5zcGxpdCgnICcsIGVmZmVj dHMpOworICAgIFN0cmluZyBkcm9wRWZmZWN0c1N0cmluZyA9IGRyb3BFZmZlY3RzLnN0cmluZygp OworICAgIGRyb3BFZmZlY3RzU3RyaW5nLnJlcGxhY2UoJ1xuJywgJyAnKTsKKyAgICBkcm9wRWZm ZWN0c1N0cmluZy5zcGxpdCgnICcsIGVmZmVjdHMpOwogfQogICAgIAogYm9vbCBBY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0OjpleHBvc2VzVGl0bGVVSUVsZW1lbnQoKSBjb25zdApAQCAtMjA0Niw3 ICsyMDQ3LDcgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojppc1Zpc2l0ZQogICAg IAogYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojppc0V4cGFuZGVkKCkgY29uc3QKIHsK LSAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZ2V0QXR0cmlidXRlKGFyaWFfZXhwYW5kZWRBdHRy KS5zdHJpbmcoKSwgInRydWUiKSkKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZ2V0QXR0cmli dXRlKGFyaWFfZXhwYW5kZWRBdHRyKSwgInRydWUiKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgCiAgICAgcmV0dXJuIGZhbHNlOyAgCkBAIC0yMDkxLDcgKzIwOTIsNyBAQCB2b2lkIEFjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3Q6OnNldElzRXhwCiAgICAgCiBib29sIEFjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3Q6OmlzUmVxdWlyZWQoKSBjb25zdAogewotICAgIGlmIChlcXVhbElnbm9yaW5n Q2FzZShnZXRBdHRyaWJ1dGUoYXJpYV9yZXF1aXJlZEF0dHIpLnN0cmluZygpLCAidHJ1ZSIpKQor ICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShnZXRBdHRyaWJ1dGUoYXJpYV9yZXF1aXJlZEF0dHIp LCAidHJ1ZSIpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAKICAgICByZXR1cm4gZmFsc2U7 CkBAIC0yMTA2LDcgKzIxMDcsNyBAQCBib29sIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6Omlz U2VsZWN0CiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCi0gICAg U3RyaW5nIGFyaWFTZWxlY3RlZCA9IGdldEF0dHJpYnV0ZShhcmlhX3NlbGVjdGVkQXR0cikuc3Ry aW5nKCk7CisgICAgY29uc3QgQXRvbWljU3RyaW5nJiBhcmlhU2VsZWN0ZWQgPSBnZXRBdHRyaWJ1 dGUoYXJpYV9zZWxlY3RlZEF0dHIpOwogICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShhcmlhU2Vs ZWN0ZWQsICJ0cnVlIikpCiAgICAgICAgIHJldHVybiB0cnVlOyAgICAKICAgICAKQEAgLTIyNjIs NyArMjI2Myw3IEBAIGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c3VwcG9ydHMKIHsK ICAgICBpZiAoIW1fcmVuZGVyZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBjb25zdCBB dG9taWNTdHJpbmcmIGFyaWFPd25zID0gZ2V0QXR0cmlidXRlKGFyaWFfb3duc0F0dHIpLnN0cmlu ZygpOworICAgIGNvbnN0IEF0b21pY1N0cmluZyYgYXJpYU93bnMgPSBnZXRBdHRyaWJ1dGUoYXJp YV9vd25zQXR0cik7CiAKICAgICByZXR1cm4gIWFyaWFPd25zLmlzRW1wdHkoKTsKIH0KQEAgLTIy NzEsNyArMjI3Miw3IEBAIGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aXNFbmFibGUK IHsKICAgICBBU1NFUlQobV9yZW5kZXJlcik7CiAgICAgCi0gICAgaWYgKGVxdWFsSWdub3JpbmdD YXNlKGdldEF0dHJpYnV0ZShhcmlhX2Rpc2FibGVkQXR0cikuc3RyaW5nKCksICJ0cnVlIikpCisg ICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGdldEF0dHJpYnV0ZShhcmlhX2Rpc2FibGVkQXR0ciks ICJ0cnVlIikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAKICAgICBOb2RlKiBub2RlID0g bV9yZW5kZXJlci0+bm9kZSgpOwpAQCAtMjgxNiw3ICsyODE3LDcgQEAgQWNjZXNzaWJpbGl0eU9i amVjdCogQWNjZXNzaWJpbGl0eVJlbmRlcgogICAgICAgICByZXR1cm4gMDsKICAgICBFbGVtZW50 KiBlbGVtZW50ID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG1fcmVuZGVyZXItPm5vZGUoKSk7CiAg ICAgICAgIAotICAgIFN0cmluZyBhY3RpdmVEZXNjZW5kYW50QXR0clN0ciA9IGVsZW1lbnQtPmdl dEF0dHJpYnV0ZShhcmlhX2FjdGl2ZWRlc2NlbmRhbnRBdHRyKS5zdHJpbmcoKTsKKyAgICBjb25z dCBBdG9taWNTdHJpbmcmIGFjdGl2ZURlc2NlbmRhbnRBdHRyU3RyID0gZWxlbWVudC0+Z2V0QXR0 cmlidXRlKGFyaWFfYWN0aXZlZGVzY2VuZGFudEF0dHIpOwogICAgIGlmIChhY3RpdmVEZXNjZW5k YW50QXR0clN0ci5pc051bGwoKSB8fCBhY3RpdmVEZXNjZW5kYW50QXR0clN0ci5pc0VtcHR5KCkp CiAgICAgICAgIHJldHVybiAwOwogICAgIApAQCAtMjkzOSw3ICsyOTQwLDcgQEAgQWNjZXNzaWJp bGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRlcgogCiBBY2Nlc3NpYmlsaXR5Um9sZSBBY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpkZXRlcm1pbmVBcmlhUm9sZUF0dHJpYnV0ZSgpIGNvbnN0 CiB7Ci0gICAgU3RyaW5nIGFyaWFSb2xlID0gZ2V0QXR0cmlidXRlKHJvbGVBdHRyKS5zdHJpbmco KTsKKyAgICBjb25zdCBBdG9taWNTdHJpbmcmIGFyaWFSb2xlID0gZ2V0QXR0cmlidXRlKHJvbGVB dHRyKTsKICAgICBpZiAoYXJpYVJvbGUuaXNOdWxsKCkgfHwgYXJpYVJvbGUuaXNFbXB0eSgpKQog ICAgICAgICByZXR1cm4gVW5rbm93blJvbGU7CiAgICAgCkBAIC0zMDg1LDcgKzMwODYsNyBAQCBB Y2Nlc3NpYmlsaXR5Um9sZSBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqCiAKIEFjY2Vzc2liaWxpdHlP cmllbnRhdGlvbiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpvcmllbnRhdGlvbigpIGNvbnN0 CiB7Ci0gICAgY29uc3QgQXRvbWljU3RyaW5nJiBhcmlhT3JpZW50YXRpb24gPSBnZXRBdHRyaWJ1 dGUoYXJpYV9vcmllbnRhdGlvbkF0dHIpLnN0cmluZygpOworICAgIGNvbnN0IEF0b21pY1N0cmlu ZyYgYXJpYU9yaWVudGF0aW9uID0gZ2V0QXR0cmlidXRlKGFyaWFfb3JpZW50YXRpb25BdHRyKTsK ICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoYXJpYU9yaWVudGF0aW9uLCAiaG9yaXpvbnRhbCIp KQogICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eU9yaWVudGF0aW9uSG9yaXpvbnRhbDsKICAg ICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoYXJpYU9yaWVudGF0aW9uLCAidmVydGljYWwiKSkKQEAg LTMxOTQsMTMgKzMxOTUsMTMgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpjYW5T ZXRGbwogYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpjYW5TZXRFeHBhbmRlZEF0dHJp YnV0ZSgpIGNvbnN0CiB7CiAgICAgLy8gQW4gb2JqZWN0IGNhbiBiZSBleHBhbmRlZCBpZiBpdCBh cmlhLWV4cGFuZGVkIGlzIHRydWUgb3IgZmFsc2UuCi0gICAgU3RyaW5nIGFyaWFFeHBhbmRlZCA9 IGdldEF0dHJpYnV0ZShhcmlhX2V4cGFuZGVkQXR0cikuc3RyaW5nKCk7CisgICAgY29uc3QgQXRv bWljU3RyaW5nJiBhcmlhRXhwYW5kZWQgPSBnZXRBdHRyaWJ1dGUoYXJpYV9leHBhbmRlZEF0dHIp OwogICAgIHJldHVybiBlcXVhbElnbm9yaW5nQ2FzZShhcmlhRXhwYW5kZWQsICJ0cnVlIikgfHwg ZXF1YWxJZ25vcmluZ0Nhc2UoYXJpYUV4cGFuZGVkLCAiZmFsc2UiKTsKIH0KIAogYm9vbCBBY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpjYW5TZXRWYWx1ZUF0dHJpYnV0ZSgpIGNvbnN0CiB7Ci0g ICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGdldEF0dHJpYnV0ZShhcmlhX3JlYWRvbmx5QXR0ciku c3RyaW5nKCksICJ0cnVlIikpCisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGdldEF0dHJpYnV0 ZShhcmlhX3JlYWRvbmx5QXR0ciksICJ0cnVlIikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAog ICAgIC8vIEFueSBub2RlIGNvdWxkIGJlIGNvbnRlbnRlZGl0YWJsZSwgc28gaXNSZWFkT25seSBz aG91bGQgYmUgcmVsaWVkIHVwb24K