139423 2014-12-08 16:58:53 -0800 Copy and Lookup menu items should be disabled when something is not copyable 2014-12-08 17:30:07 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin commit-queue esprehn+autocc glenn kondapallykalyan thorton oldest_to_newest 1053586 0 bdakin 2014-12-08 16:58:53 -0800 Copy and Lookup menu items should be disabled when something is not selectable rdar://problem/19149219 1053590 1 242864 bdakin 2014-12-08 17:05:32 -0800 Created attachment 242864 Patch 1053591 2 242864 thorton 2014-12-08 17:12:45 -0800 Comment on attachment 242864 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242864&action=review > Source/WebCore/rendering/HitTestResult.cpp:549 > + Node* node = innerNode(); It seems like we need to run over all of the nodes in the range that we expand out to, not just the HitTestResult's innerNode (for user-select: none). > Source/WebKit2/UIProcess/mac/WKActionMenuController.mm:783 > + if (!hitTestResult->allowsCopy()) { You can move this into the thing that makes them. > Source/WebKit/mac/WebView/WebActionMenuController.mm:481 > + if (!_hitTestResult.allowsCopy()) { Ditto. 1053607 3 bdakin 2014-12-08 17:30:07 -0800 Thank you! http://trac.webkit.org/changeset/176999 242864 2014-12-08 17:05:32 -0800 2014-12-08 17:12:45 -0800 Patch for-review.txt text/plain 12185 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3Njk5MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTEyLTA4ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBDb3B5IGFuZCBMb29rdXAgbWVudSBp dGVtcyBzaG91bGQgYmUgZGlzYWJsZWQgd2hlbiBzb21ldGhpbmcgaXMgbm90IGNvcHlhYmxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk0MjMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZXcgZnVuY3Rp b24gYWxsb3dDb3B5KCkgaW5kaWNhdGVzIHdoZXRoZXIgdGhlIEhpdFRlc3RSZXN1bHQgd291bGQg YWxsb3cgaXRzZWxmIHRvIAorICAgICAgICBiZSBjb3BpZWQgb250byB0aGUgcGFzdGVib2FyZC4K KyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiByZW5kZXJpbmcvSGl0VGVzdFJl c3VsdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXRUZXN0UmVzdWx0OjphbGxvd3NDb3B5KToK KyAgICAgICAgKiByZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5oOgorCiAyMDE0LTEyLTA4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViU3RvcmFnZU5h bWVzcGFjZVByb3ZpZGVyIHNob3VsZCBjcmVhdGUgU3RvcmFnZU5hbWVzcGFjZUltcGxzCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbgkocmV2aXNpb24gMTc2OTg1KQorKysgU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4JKHdvcmtpbmcgY29weSkKQEAgLTE2NzYsNiArMTY3Niw3IEBAIF9fWk5L N1dlYkNvcmUxM0dyYXBoaWNzTGF5ZXIxOGdldERlYnVnQm8KIF9fWk5LN1dlYkNvcmUxM0dyYXBo aWNzTGF5ZXIyNmJhY2tpbmdTdG9yZU1lbW9yeUVzdGltYXRlRXYKIF9fWk5LN1dlYkNvcmUxM0hU VFBIZWFkZXJNYXAzZ2V0RU5TXzE0SFRUUEhlYWRlck5hbWVFCiBfX1pOSzdXZWJDb3JlMTNIVFRQ SGVhZGVyTWFwM2dldEVSS04zV1RGNlN0cmluZ0UKK19fWk5LN1dlYkNvcmUxM0hpdFRlc3RSZXN1 bHQxMGFsbG93c0NvcHlFdgogX19aTks3V2ViQ29yZTEzSGl0VGVzdFJlc3VsdDEwaXNMaXZlTGlu a0V2CiBfX1pOSzdXZWJDb3JlMTNIaXRUZXN0UmVzdWx0MTBpc1NlbGVjdGVkRXYKIF9fWk5LN1dl YkNvcmUxM0hpdFRlc3RSZXN1bHQxMXRhcmdldEZyYW1lRXYKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5jcHAJKHJldmlzaW9uIDE3Njk4NSkKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NTQ0LDYgKzU0NCwyMSBAQCBib29sIEhpdFRlc3RSZXN1bHQ6OmlzT3ZlclRleHRJbnNpZGVGb3Jt CiAgICAgcmV0dXJuICF3b3JkUmFuZ2UtPnRleHQoKS5pc0VtcHR5KCk7CiB9CiAKK2Jvb2wgSGl0 VGVzdFJlc3VsdDo6YWxsb3dzQ29weSgpIGNvbnN0Cit7CisgICAgTm9kZSogbm9kZSA9IGlubmVy Tm9kZSgpOworICAgIGlmICghbm9kZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgUmVu ZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7CisgICAgaWYgKCFyZW5kZXJl cikKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgYm9vbCBpc1VzZXJTZWxlY3ROb25lID0g cmVuZGVyZXItPnN0eWxlKCkudXNlclNlbGVjdCgpID09IFNFTEVDVF9OT05FOworICAgIGJvb2wg aXNQYXNzd29yZEZpZWxkID0gaXM8SFRNTElucHV0RWxlbWVudD4obm9kZSkgJiYgZG93bmNhc3Q8 SFRNTElucHV0RWxlbWVudD4oKm5vZGUpLmlzUGFzc3dvcmRGaWVsZCgpOworICAgIHJldHVybiAh aXNQYXNzd29yZEZpZWxkICYmICFpc1VzZXJTZWxlY3ROb25lOworfQorCiBVUkwgSGl0VGVzdFJl c3VsdDo6YWJzb2x1dGVMaW5rVVJMKCkgY29uc3QKIHsKICAgICBpZiAobV9pbm5lclVSTEVsZW1l bnQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmgJKHJldmlz aW9uIDE3Njk4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmgJ KHdvcmtpbmcgY29weSkKQEAgLTEyNiw2ICsxMjYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCB0b2dn bGVNZWRpYU11dGVTdGF0ZSgpIGNvbnN0OwogICAgIGJvb2wgaXNEb3dubG9hZGFibGVNZWRpYSgp IGNvbnN0OwogICAgIGJvb2wgaXNPdmVyVGV4dEluc2lkZUZvcm1Db250cm9sRWxlbWVudCgpIGNv bnN0OworICAgIGJvb2wgYWxsb3dzQ29weSgpIGNvbnN0OwogCiAgICAgLy8gUmV0dXJucyB0cnVl IGlmIGl0IGlzIHJlY3QtYmFzZWQgaGl0IHRlc3QgYW5kIG5lZWRzIHRvIGNvbnRpbnVlIHVudGls IHRoZSByZWN0IGlzIGZ1bGx5CiAgICAgLy8gZW5jbG9zZWQgYnkgdGhlIGJvdW5kYXJpZXMgb2Yg YSBub2RlLgpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMTc2OTkzKQorKysgU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTQtMTItMDgg IEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIENvcHkgYW5kIExvb2t1 cCBtZW51IGl0ZW1zIHNob3VsZCBiZSBkaXNhYmxlZCB3aGVuIHNvbWV0aGluZyBpcyBub3QgY29w eWFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz OTQyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBhbGxvd3NDb3B5IHRvIHRoZSBXZWJIaXRUZXN0UmVzdWx0LgorICAgICAgICAqIFNoYXJlZC9X ZWJIaXRUZXN0UmVzdWx0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSGl0VGVzdFJlc3VsdDo6 RGF0YTo6RGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYkhpdFRlc3RSZXN1bHQ6OkRhdGE6OmVu Y29kZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkhpdFRlc3RSZXN1bHQ6OkRhdGE6OmRlY29kZSk6 CisgICAgICAgICogU2hhcmVkL1dlYkhpdFRlc3RSZXN1bHQuaDoKKyAgICAgICAgKFdlYktpdDo6 V2ViSGl0VGVzdFJlc3VsdDo6YWxsb3dzQ29weSk6CisKKyAgICAgICAgU2V0IGF1dG9lbmFibGVz SXRlbXMgdG8gTk8uIEl04oCZcyBtZXNzaW5nIHdpdGggb3VyIGFiaWxpdHkgdG8gY29udHJvbCB0 aGUgZW5hYmxlLworICAgICAgICBkaXNhYmxlIHN0YXRlIG90aGVyd2lzZS4KKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBpbml0V2l0aEZy YW1lOmNvbnRleHQ6Y29uZmlndXJhdGlvbjp3ZWJWaWV3Ol0pOgorCisgICAgICAgIERpc2FibGUg Ym90aCBsb29rdXAgYW5kIGNvcHkgd2hlbiBhIFdlYkhpdFRlc3RSZXN1bHQgZG9lcyBub3QgYWxs b3cgY29weS4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIu bW06CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgX2RlZmF1bHRNZW51SXRlbXNG b3JUZXh0XSk6CisgICAgICAgICgtW1dLQWN0aW9uTWVudUNvbnRyb2xsZXIgX2RlZmF1bHRNZW51 SXRlbXNGb3JFZGl0YWJsZVRleHRdKToKKyAgICAgICAgKC1bV0tBY3Rpb25NZW51Q29udHJvbGxl ciBfZGVmYXVsdE1lbnVJdGVtc0ZvckVkaXRhYmxlVGV4dFdpdGhTdWdnZXN0aW9uc10pOgorCiAy MDE0LTEyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAg ICAgVGhlIHdlYnNpdGUgZGF0YSBzdG9yZSBzaG91bGQga25vdyBhbGwgaXRzIGFzc29jaWF0ZWQg cGFnZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJIaXRUZXN0UmVzdWx0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViSGl0VGVzdFJlc3VsdC5jcHAJ KHJldmlzaW9uIDE3Njk4NSkKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJIaXRUZXN0UmVz dWx0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTUsNiArNTUsNyBAQCBXZWJIaXRUZXN0UmVzdWx0 OjpEYXRhOjpEYXRhKGNvbnN0IEhpdFRlCiAgICAgLCBpc1NlbGVjdGVkKGhpdFRlc3RSZXN1bHQu aXNTZWxlY3RlZCgpKQogICAgICwgaXNUZXh0Tm9kZShoaXRUZXN0UmVzdWx0LmlubmVyTm9kZSgp ICYmIGhpdFRlc3RSZXN1bHQuaW5uZXJOb2RlKCktPmlzVGV4dE5vZGUoKSkKICAgICAsIGlzT3Zl clRleHRJbnNpZGVGb3JtQ29udHJvbEVsZW1lbnQoaGl0VGVzdFJlc3VsdC5pc092ZXJUZXh0SW5z aWRlRm9ybUNvbnRyb2xFbGVtZW50KCkpCisgICAgLCBhbGxvd3NDb3B5KGhpdFRlc3RSZXN1bHQu YWxsb3dzQ29weSgpKQogICAgICwgaXNEb3dubG9hZGFibGVNZWRpYShoaXRUZXN0UmVzdWx0Lmlz RG93bmxvYWRhYmxlTWVkaWEoKSkKIHsKIH0KQEAgLTc3LDYgKzc4LDcgQEAgdm9pZCBXZWJIaXRU ZXN0UmVzdWx0OjpEYXRhOjplbmNvZGUoSVBDOgogICAgIGVuY29kZXIgPDwgaXNTZWxlY3RlZDsK ICAgICBlbmNvZGVyIDw8IGlzVGV4dE5vZGU7CiAgICAgZW5jb2RlciA8PCBpc092ZXJUZXh0SW5z aWRlRm9ybUNvbnRyb2xFbGVtZW50OworICAgIGVuY29kZXIgPDwgYWxsb3dzQ29weTsKICAgICBl bmNvZGVyIDw8IGlzRG93bmxvYWRhYmxlTWVkaWE7CiB9CiAKQEAgLTk0LDYgKzk2LDcgQEAgYm9v bCBXZWJIaXRUZXN0UmVzdWx0OjpEYXRhOjpkZWNvZGUoSVBDOgogICAgICAgICB8fCAhZGVjb2Rl ci5kZWNvZGUoaGl0VGVzdFJlc3VsdERhdGEuaXNTZWxlY3RlZCkKICAgICAgICAgfHwgIWRlY29k ZXIuZGVjb2RlKGhpdFRlc3RSZXN1bHREYXRhLmlzVGV4dE5vZGUpCiAgICAgICAgIHx8ICFkZWNv ZGVyLmRlY29kZShoaXRUZXN0UmVzdWx0RGF0YS5pc092ZXJUZXh0SW5zaWRlRm9ybUNvbnRyb2xF bGVtZW50KQorICAgICAgICB8fCAhZGVjb2Rlci5kZWNvZGUoaGl0VGVzdFJlc3VsdERhdGEuYWxs b3dzQ29weSkKICAgICAgICAgfHwgIWRlY29kZXIuZGVjb2RlKGhpdFRlc3RSZXN1bHREYXRhLmlz RG93bmxvYWRhYmxlTWVkaWEpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9XZWJIaXRUZXN0UmVzdWx0LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvU2hhcmVkL1dlYkhpdFRlc3RSZXN1bHQuaAkocmV2aXNpb24gMTc2OTg1KQorKysg U291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkhpdFRlc3RSZXN1bHQuaAkod29ya2luZyBjb3B5KQpA QCAtNTUsNiArNTUsNyBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgaXNTZWxlY3RlZDsKICAgICAg ICAgYm9vbCBpc1RleHROb2RlOwogICAgICAgICBib29sIGlzT3ZlclRleHRJbnNpZGVGb3JtQ29u dHJvbEVsZW1lbnQ7CisgICAgICAgIGJvb2wgYWxsb3dzQ29weTsKICAgICAgICAgYm9vbCBpc0Rv d25sb2FkYWJsZU1lZGlhOwogCiAgICAgICAgIERhdGEoKTsKQEAgLTg5LDYgKzkwLDggQEAgcHVi bGljOgogCiAgICAgYm9vbCBpc092ZXJUZXh0SW5zaWRlRm9ybUNvbnRyb2xFbGVtZW50KCkgY29u c3QgeyByZXR1cm4gbV9kYXRhLmlzT3ZlclRleHRJbnNpZGVGb3JtQ29udHJvbEVsZW1lbnQ7IH0K IAorICAgIGJvb2wgYWxsb3dzQ29weSgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YS5hbGxvd3NDb3B5 OyB9CisKICAgICBib29sIGlzRG93bmxvYWRhYmxlTWVkaWEoKSBjb25zdCB7IHJldHVybiBtX2Rh dGEuaXNEb3dubG9hZGFibGVNZWRpYTsgfQogCiBwcml2YXRlOgpJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkocmV2aXNpb24gMTc2OTg1KQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBA IC0zNjAwLDYgKzM2MDAsNyBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhGcmFtZTooTlNSZWN0 KWZyCiAgICAgICAgIHNlbGYuYWN0aW9uTWVudSA9IG1lbnUuZ2V0KCk7CiAgICAgICAgIF9kYXRh LT5fYWN0aW9uTWVudUNvbnRyb2xsZXIgPSBhZG9wdE5TKFtbV0tBY3Rpb25NZW51Q29udHJvbGxl ciBhbGxvY10gaW5pdFdpdGhQYWdlOipfZGF0YS0+X3BhZ2UgdmlldzpzZWxmXSk7CiAgICAgICAg IHNlbGYuYWN0aW9uTWVudS5kZWxlZ2F0ZSA9IF9kYXRhLT5fYWN0aW9uTWVudUNvbnRyb2xsZXIu Z2V0KCk7CisgICAgICAgIHNlbGYuYWN0aW9uTWVudS5hdXRvZW5hYmxlc0l0ZW1zID0gTk87CiAg ICAgfQogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tBY3Rp b25NZW51Q29udHJvbGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0JKHJldmlzaW9uIDE3Njk4NSkKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5tbQkod29y a2luZyBjb3B5KQpAQCAtNzc5LDYgKzc3OSwxMiBAQCAtIChOU0FycmF5ICopX2RlZmF1bHRNZW51 SXRlbXNGb3JUZXh0CiAgICAgUmV0YWluUHRyPE5TTWVudUl0ZW0+IGNvcHlUZXh0SXRlbSA9IFtz ZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzprV0tDb250ZXh0QWN0aW9uSXRlbVRhZ0Nv cHlUZXh0XTsKICAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gbG9va3VwVGV4dEl0ZW0gPSBbc2Vs ZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6a1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdMb29r dXBUZXh0XTsKIAorICAgIFJlZlB0cjxXZWJIaXRUZXN0UmVzdWx0PiBoaXRUZXN0UmVzdWx0ID0g W3NlbGYgX3dlYkhpdFRlc3RSZXN1bHRdOworICAgIGlmICghaGl0VGVzdFJlc3VsdC0+YWxsb3dz Q29weSgpKSB7CisgICAgICAgIFtjb3B5VGV4dEl0ZW0gc2V0RW5hYmxlZDpOT107CisgICAgICAg IFtsb29rdXBUZXh0SXRlbSBzZXRFbmFibGVkOk5PXTsKKyAgICB9CisKICAgICByZXR1cm4gQFsg Y29weVRleHRJdGVtLmdldCgpLCBsb29rdXBUZXh0SXRlbS5nZXQoKSBdOwogfQogCkBAIC03ODgs NiArNzk0LDEyIEBAIC0gKE5TQXJyYXkgKilfZGVmYXVsdE1lbnVJdGVtc0ZvckVkaXRhYmwKICAg ICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gbG9va3VwVGV4dEl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0 aW9uTWVudUl0ZW1Gb3JUYWc6a1dLQ29udGV4dEFjdGlvbkl0ZW1UYWdMb29rdXBUZXh0XTsKICAg ICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gcGFzdGVJdGVtID0gW3NlbGYgX2NyZWF0ZUFjdGlvbk1l bnVJdGVtRm9yVGFnOmtXS0NvbnRleHRBY3Rpb25JdGVtVGFnUGFzdGVdOwogCisgICAgUmVmUHRy PFdlYkhpdFRlc3RSZXN1bHQ+IGhpdFRlc3RSZXN1bHQgPSBbc2VsZiBfd2ViSGl0VGVzdFJlc3Vs dF07CisgICAgaWYgKCFoaXRUZXN0UmVzdWx0LT5hbGxvd3NDb3B5KCkpIHsKKyAgICAgICAgW2Nv cHlUZXh0SXRlbSBzZXRFbmFibGVkOk5PXTsKKyAgICAgICAgW2xvb2t1cFRleHRJdGVtIHNldEVu YWJsZWQ6Tk9dOworICAgIH0KKwogICAgIHJldHVybiBAWyBjb3B5VGV4dEl0ZW0uZ2V0KCksIGxv b2t1cFRleHRJdGVtLmdldCgpLCBwYXN0ZUl0ZW0uZ2V0KCkgXTsKIH0KIApAQCAtODIxLDYgKzgz MywxMiBAQCAtIChOU0FycmF5ICopX2RlZmF1bHRNZW51SXRlbXNGb3JFZGl0YWJsCiAKICAgICBb dGV4dFN1Z2dlc3Rpb25zSXRlbSBzZXRTdWJtZW51OnNwZWxsaW5nU3ViTWVudS5nZXQoKV07CiAK KyAgICBSZWZQdHI8V2ViSGl0VGVzdFJlc3VsdD4gaGl0VGVzdFJlc3VsdCA9IFtzZWxmIF93ZWJI aXRUZXN0UmVzdWx0XTsKKyAgICBpZiAoIWhpdFRlc3RSZXN1bHQtPmFsbG93c0NvcHkoKSkgewor ICAgICAgICBbY29weVRleHRJdGVtIHNldEVuYWJsZWQ6Tk9dOworICAgICAgICBbbG9va3VwVGV4 dEl0ZW0gc2V0RW5hYmxlZDpOT107CisgICAgfQorCiAgICAgcmV0dXJuIEBbIGNvcHlUZXh0SXRl bS5nZXQoKSwgbG9va3VwVGV4dEl0ZW0uZ2V0KCksIHBhc3RlSXRlbS5nZXQoKSwgdGV4dFN1Z2dl c3Rpb25zSXRlbS5nZXQoKSBdOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiAx NzY5OTMpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwyMSBAQAorMjAxNC0xMi0wOCAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+ CisKKyAgICAgICAgQ29weSBhbmQgTG9va3VwIG1lbnUgaXRlbXMgc2hvdWxkIGJlIGRpc2FibGVk IHdoZW4gc29tZXRoaW5nIGlzIG5vdCBjb3B5YWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRGlzYWJsZSBib3RoIGxvb2t1cCBhbmQgY29weSB3aGVu IGEgSGl0VGVzdFJlc3VsdCBkb2VzIG5vdCBhbGxvdyBjb3B5LgorICAgICAgICAqIFdlYlZpZXcv V2ViQWN0aW9uTWVudUNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYkFjdGlvbk1lbnVDb250 cm9sbGVyIF9kZWZhdWx0TWVudUl0ZW1zRm9yVGV4dF0pOgorICAgICAgICAoLVtXZWJBY3Rpb25N ZW51Q29udHJvbGxlciBfZGVmYXVsdE1lbnVJdGVtc0ZvckVkaXRhYmxlVGV4dF0pOgorICAgICAg ICAoLVtXZWJBY3Rpb25NZW51Q29udHJvbGxlciBfZGVmYXVsdE1lbnVJdGVtc0ZvckVkaXRhYmxl VGV4dFdpdGhTdWdnZXN0aW9uc10pOgorCisgICAgICAgIFNldCBhdXRvZW5hYmxlc0l0ZW1zIHRv IE5PLiBJdOKAmXMgbWVzc2luZyB3aXRoIG91ciBhYmlsaXR5IHRvIGNvbnRyb2wgdGhlIGVuYWJs ZS8KKyAgICAgICAgZGlzYWJsZSBzdGF0ZSBvdGhlcndpc2UuCisgICAgICAgICogV2ViVmlldy9X ZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9jb21tb25Jbml0aWFsaXphdGlvbldpdGhG cmFtZU5hbWU6Z3JvdXBOYW1lOl0pOgorCiAyMDE0LTEyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxh bmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkaW5nIHVzZXIgY29udGVudCB0byBhIGdy b3VwIHNob3VsZCBmb3JjZSB0aGF0IGdyb3VwIHRvIGJlIGNyZWF0ZWQKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViQWN0aW9uTWVudUNvbnRyb2xsZXIubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJBY3Rpb25NZW51Q29udHJvbGxlci5tbQko cmV2aXNpb24gMTc2OTg1KQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJBY3Rpb25N ZW51Q29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtNDc4LDYgKzQ3OCwxMSBAQCAtIChO U0FycmF5ICopX2RlZmF1bHRNZW51SXRlbXNGb3JUZXh0CiAgICAgUmV0YWluUHRyPE5TTWVudUl0 ZW0+IGNvcHlUZXh0SXRlbSA9IFtzZWxmIF9jcmVhdGVBY3Rpb25NZW51SXRlbUZvclRhZzpXZWJB Y3Rpb25NZW51SXRlbVRhZ0NvcHlUZXh0XTsKICAgICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gbG9v a3VwVGV4dEl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0aW9uTWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9u TWVudUl0ZW1UYWdMb29rdXBUZXh0XTsKIAorICAgIGlmICghX2hpdFRlc3RSZXN1bHQuYWxsb3dz Q29weSgpKSB7CisgICAgICAgIFtjb3B5VGV4dEl0ZW0gc2V0RW5hYmxlZDpOT107CisgICAgICAg IFtsb29rdXBUZXh0SXRlbSBzZXRFbmFibGVkOk5PXTsKKyAgICB9CisKICAgICByZXR1cm4gQFsg Y29weVRleHRJdGVtLmdldCgpLCBsb29rdXBUZXh0SXRlbS5nZXQoKSBdOwogfQogCkBAIC00ODcs NiArNDkyLDExIEBAIC0gKE5TQXJyYXkgKilfZGVmYXVsdE1lbnVJdGVtc0ZvckVkaXRhYmwKICAg ICBSZXRhaW5QdHI8TlNNZW51SXRlbT4gbG9va3VwVGV4dEl0ZW0gPSBbc2VsZiBfY3JlYXRlQWN0 aW9uTWVudUl0ZW1Gb3JUYWc6V2ViQWN0aW9uTWVudUl0ZW1UYWdMb29rdXBUZXh0XTsKICAgICBS ZXRhaW5QdHI8TlNNZW51SXRlbT4gcGFzdGVJdGVtID0gW3NlbGYgX2NyZWF0ZUFjdGlvbk1lbnVJ dGVtRm9yVGFnOldlYkFjdGlvbk1lbnVJdGVtVGFnUGFzdGVdOwogCisgICAgaWYgKCFfaGl0VGVz dFJlc3VsdC5hbGxvd3NDb3B5KCkpIHsKKyAgICAgICAgW2NvcHlUZXh0SXRlbSBzZXRFbmFibGVk Ok5PXTsKKyAgICAgICAgW2xvb2t1cFRleHRJdGVtIHNldEVuYWJsZWQ6Tk9dOworICAgIH0KKwog ICAgIHJldHVybiBAWyBjb3B5VGV4dEl0ZW0uZ2V0KCksIGxvb2t1cFRleHRJdGVtLmdldCgpLCBw YXN0ZUl0ZW0uZ2V0KCkgXTsKIH0KIApAQCAtNTMwLDYgKzU0MCwxMSBAQCAtIChOU0FycmF5ICop X2RlZmF1bHRNZW51SXRlbXNGb3JFZGl0YWJsCiAKICAgICBbdGV4dFN1Z2dlc3Rpb25zSXRlbSBz ZXRTdWJtZW51OnNwZWxsaW5nU3ViTWVudS5nZXQoKV07CiAKKyAgICBpZiAoIV9oaXRUZXN0UmVz dWx0LmFsbG93c0NvcHkoKSkgeworICAgICAgICBbY29weVRleHRJdGVtIHNldEVuYWJsZWQ6Tk9d OworICAgICAgICBbbG9va3VwVGV4dEl0ZW0gc2V0RW5hYmxlZDpOT107CisgICAgfQorCiAgICAg cmV0dXJuIEBbIGNvcHlUZXh0SXRlbS5nZXQoKSwgbG9va3VwVGV4dEl0ZW0uZ2V0KCksIHBhc3Rl SXRlbS5nZXQoKSwgdGV4dFN1Z2dlc3Rpb25zSXRlbS5nZXQoKSBdOwogfQogCkluZGV4OiBTb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCShyZXZpc2lvbiAxNzY5ODUpCisrKyBTb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTg4Niw2ICs4 ODYsNyBAQCAtICh2b2lkKV9jb21tb25Jbml0aWFsaXphdGlvbldpdGhGcmFtZU5hCiAgICAgICAg IFJldGFpblB0cjxOU01lbnU+IGFjdGlvbk1lbnUgPSBhZG9wdE5TKFtbTlNNZW51IGFsbG9jXSBp bml0XSk7CiAgICAgICAgIHNlbGYuYWN0aW9uTWVudSA9IGFjdGlvbk1lbnUuZ2V0KCk7CiAgICAg ICAgIF9wcml2YXRlLT5hY3Rpb25NZW51Q29udHJvbGxlciA9IFtbV2ViQWN0aW9uTWVudUNvbnRy b2xsZXIgYWxsb2NdIGluaXRXaXRoV2ViVmlldzpzZWxmXTsKKyAgICAgICAgc2VsZi5hY3Rpb25N ZW51LmF1dG9lbmFibGVzSXRlbXMgPSBOTzsKICAgICB9CiAjZW5kaWYKIAo=