239406 2022-04-15 14:28:50 -0700 Optimize id matching in AccessibilityObject::ariaElementsReferencedByAttribute() 2022-04-17 00:02:24 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=239430 InRadar P2 Normal --- 1 cdumez cdumez aboxhall achristensen andresg_22 apinheiro cfleizach darin dmazzoni esprehn+autocc ews-watchlist jcraig jdiggs kangil.han samuel_white sam tyler_w webkit-bug-importer oldest_to_newest 1861917 0 cdumez 2022-04-15 14:28:50 -0700 Optimize id matching in AccessibilityObject::ariaElementsReferencedByAttribute(). 1861918 1 webkit-bug-importer 2022-04-15 14:28:59 -0700 <rdar://problem/91829358> 1861921 2 457726 cdumez 2022-04-15 14:35:39 -0700 Created attachment 457726 Patch 1861956 3 457726 darin 2022-04-15 16:13:09 -0700 Comment on attachment 457726 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457726&action=review > Source/WebCore/accessibility/AccessibilityObject.cpp:3932 > + if (!SpaceSplitString::spaceSplitStringContainsValue(idList, id)) > continue; If we are going to walk an entire DOM tree and check every attribute value against a set, I think we should probably convert it into a HashSet<AtomString>, don’t you? 1861963 4 457726 cdumez 2022-04-15 16:19:27 -0700 Comment on attachment 457726 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457726&action=review >> Source/WebCore/accessibility/AccessibilityObject.cpp:3932 >> continue; > > If we are going to walk an entire DOM tree and check every attribute value against a set, I think we should probably convert it into a HashSet<AtomString>, don’t you? I don't understand the comment and how I can leverage a HashSet<AtomString>. We have a string stored in the variable 'id', we want to iterate the whole DOM tree and find all Elements that have that id string in their attribute |attribute| (which is one of the few aria- attributes). Another tricky thing is that apparently, the value of |attribute| is a HTMLSpace-separated string and we want to know if any of the substrings in that attribute value match the string stored in id. Seems to me that the implementation I have now is pretty efficient given the current constraints? Ideally, at some point, we wouldn't need to iterate the whole DOM tree and we'd know which elements may match ahead of time. I talked to Tyler about that and he said that's on his TODO list. 1861973 5 457726 darin 2022-04-15 16:46:02 -0700 Comment on attachment 457726 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457726&action=review >>> Source/WebCore/accessibility/AccessibilityObject.cpp:3932 >>> continue; >> >> If we are going to walk an entire DOM tree and check every attribute value against a set, I think we should probably convert it into a HashSet<AtomString>, don’t you? > > I don't understand the comment and how I can leverage a HashSet<AtomString>. > > We have a string stored in the variable 'id', we want to iterate the whole DOM tree and find all Elements that have that id string in their attribute |attribute| (which is one of the few aria- attributes). Another tricky thing is that apparently, the value of |attribute| is a HTMLSpace-separated string and we want to know if any of the substrings in that attribute value match the string stored in id. > Seems to me that the implementation I have now is pretty efficient given the current constraints? > > Ideally, at some point, we wouldn't need to iterate the whole DOM tree and we'd know which elements may match ahead of time. I talked to Tyler about that and he said that's on his TODO list. Oh, I didn’t realize that the attributes from each element were the things we're splitting! 1861974 6 cdumez 2022-04-15 16:46:23 -0700 (In reply to Chris Dumez from comment #4) > Comment on attachment 457726 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=457726&action=review > > >> Source/WebCore/accessibility/AccessibilityObject.cpp:3932 > >> continue; > > > > If we are going to walk an entire DOM tree and check every attribute value against a set, I think we should probably convert it into a HashSet<AtomString>, don’t you? > > I don't understand the comment and how I can leverage a HashSet<AtomString>. > > We have a string stored in the variable 'id', we want to iterate the whole > DOM tree and find all Elements that have that id string in their attribute > |attribute| (which is one of the few aria- attributes). Another tricky thing > is that apparently, the value of |attribute| is a HTMLSpace-separated string > and we want to know if any of the substrings in that attribute value match > the string stored in id. > Seems to me that the implementation I have now is pretty efficient given the > current constraints? > > Ideally, at some point, we wouldn't need to iterate the whole DOM tree and > we'd know which elements may match ahead of time. I talked to Tyler about > that and he said that's on his TODO list. I think the misunderstanding may be that each Element in the DOM tree has a list of ids as a space-separate attribute value, and we're matching them against a single id string. If it was the other way around (each element has a single id and we need to match against a list of ids we have), then a HashSet<AtomString> for the list of ids we have would totally make sense. 1861977 7 darin 2022-04-15 16:55:42 -0700 (In reply to Chris Dumez from comment #6) > I think the misunderstanding may be that each Element in the DOM tree has a > list of ids as a space-separate attribute value, and we're matching them > against a single id string. Yes, that was it. 1862092 8 ews-feeder 2022-04-16 16:00:27 -0700 Committed r292943 (249708@main): <https://commits.webkit.org/249708@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457726. 457726 2022-04-15 14:35:39 -0700 2022-04-16 16:00:29 -0700 Patch bug-239406-20220415143538.patch text/plain 9247 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyOTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2ZlYzU1ZmIwN2UyODgw NGI1MzIxOWQ4NTJkYWU1ZDAyMDA5MzhkZS4uNzQ4ODdlNTc3ZjY5YTQ1Mjc4OWU5YTk4OTQ3Yzdk MDkwOWNlYzM5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIyLTA0LTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgT3B0aW1pemUgaWQgbWF0Y2hp bmcgaW4gQWNjZXNzaWJpbGl0eU9iamVjdDo6YXJpYUVsZW1lbnRzUmVmZXJlbmNlZEJ5QXR0cmli dXRlKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz OTQwNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vOTE4MjkzNTg+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9yIGV2ZXJ5IGVsZW1lbnQgaW4gdGhl IERPTSB0cmVlLCB0aGUgZnVuY3Rpb24gd291bGQgZ2V0IHRoZSB2YWx1ZSBvZiBvbmVzIG9mIGl0 cyBhdHRyaWJ1dGVzLAorICAgICAgICB0aGVuIGNvbnN0cnVjdCBhIFNwYWNlU3BsaXRTdHJpbmcg KHdoaWNoIHdvdWxkIHRva2VuaXplIGFuZCBhdG9taXplIGV2ZXJ5IHNwYWNlLXNlcGFyYXRlZAor ICAgICAgICBjb21wb25lbnQgaW4gdGhlIHZhbHVlKSwgYW5kIGZpbmFsbHkgc2VlIGlmIHRoZSBT cGFjZVNwbGl0U3RyaW5nIGNvbnRhaW5zIHRoZSBpZCB3ZSdyZSBsb29raW5nCisgICAgICAgIGZv ci4gVGhpcyB3YXMgdW5uZWNlc3NhcmlseSBleHBlbnNpdmUuCisKKyAgICAgICAgVGhpcyBwYXRj aCByZXZpdmVzIFNwYWNlU3BsaXRTdHJpbmc6OnNwYWNlU3BsaXRTdHJpbmdDb250YWluc1ZhbHVl KCkgd2hpY2ggd2FzIHVudXNlZCBhbmQgbWFrZXMKKyAgICAgICAgaXQgd29yayB3aXRoIGEgU3Ry aW5nVmlldyBpbnB1dCBpbnN0ZWFkIG9mIG9ubHkgYSBjb25zdCBjaGFyKi9MQ2hhciouIFdlIG5v dyB1c2UgdGhpcyBmdW5jdGlvbgorICAgICAgICBpbnNpZGUgQWNjZXNzaWJpbGl0eU9iamVjdDo6 YXJpYUVsZW1lbnRzUmVmZXJlbmNlZEJ5QXR0cmlidXRlKCkgdG8gYXZvaWQgdGhlIGNvbnN0cnVj dGlvbiBvZgorICAgICAgICBhIFNwYWNlU3BsaXRTdHJpbmcuIHNwYWNlU3BsaXRTdHJpbmdDb250 YWluc1ZhbHVlKCkgc2ltcGx5IGl0ZXJhdGVzIHRoZSBzdHJpbmcgdW50aWwgaXQgZmluZHMKKyAg ICAgICAgYW4gSFRNTCBzcGFjZSwgdGhlbiBjb21wYXJlIHRoZSBjaHVuayBvZiBjaGFyYWN0ZXJz IHdpdGggdGhlIHByb3ZpZGVkIFN0cmluZ1ZpZXcuIElmIGl0IG1hdGNoZXMsCisgICAgICAgIGl0 IHJldHVybnMgZWFybHksIG90aGVyd2lzZSwgaXQga2VlcHMgc2VhcmNoaW5nIHRpbGwgdGhlIGVu ZCBvZiB0aGUgU3RyaW5nLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFF bGVtZW50c1JlZmVyZW5jZWRCeUF0dHJpYnV0ZSBjb25zdCk6CisgICAgICAgICogZG9tL1NwYWNl U3BsaXRTdHJpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9rZW5pemVTcGFjZVNwbGl0U3Ry aW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlRva2VuSXNFcXVhbFRvQ2hhcmFjdGVyc1Rva2VuUHJv Y2Vzc29yOjpUb2tlbklzRXF1YWxUb0NoYXJhY3RlcnNUb2tlblByb2Nlc3Nvcik6CisgICAgICAg IChXZWJDb3JlOjpUb2tlbklzRXF1YWxUb0NoYXJhY3RlcnNUb2tlblByb2Nlc3Nvcjo6cHJvY2Vz c1Rva2VuKToKKyAgICAgICAgKFdlYkNvcmU6OnNwYWNlU3BsaXRTdHJpbmdDb250YWluc1ZhbHVl SW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6U3BhY2VTcGxpdFN0cmluZzo6c3BhY2VTcGxp dFN0cmluZ0NvbnRhaW5zVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6VG9rZW5Jc0VxdWFsVG9D U3RyaW5nVG9rZW5Qcm9jZXNzb3I6OlRva2VuSXNFcXVhbFRvQ1N0cmluZ1Rva2VuUHJvY2Vzc29y KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlRva2VuSXNFcXVhbFRvQ1N0cmluZ1Rva2Vu UHJvY2Vzc29yOjpwcm9jZXNzVG9rZW4pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6VG9r ZW5Jc0VxdWFsVG9DU3RyaW5nVG9rZW5Qcm9jZXNzb3I6OnJlZmVyZW5jZVN0cmluZ1dhc0ZvdW5k IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBkb20vU3BhY2VTcGxpdFN0cmluZy5oOgorICAg ICAgICAoV2ViQ29yZTo6U3BhY2VTcGxpdFN0cmluZzo6c3BhY2VTcGxpdFN0cmluZ0NvbnRhaW5z VmFsdWUpOiBEZWxldGVkLgorCiAyMDIyLTA0LTE1ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0 b25AYXBwbGUuY29tPgogCiAgICAgICAgIE5vbi1mYXRhbCBmYXVsdCB1bmRlciBSZW5kZXJUaGVt ZUlPUzo6cGFpbnRBdHRhY2htZW50IGR1ZSB0byB1c2Ugb2YgZHluYW1pYyBVSUNvbG9ycwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5j cHAKaW5kZXggODllMTkyZDNjOGEyZGJlNmY4Y2RiYjRiYWVjY2Q0M2RlOTMxNzY0NS4uNzIzYzA3 N2QwYWNmZWI2NTc0Njk1MjBmNzBmOWZkOWU3YWM0M2ZmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC0zOTE0LDIy ICszOTE0LDI0IEBAIHZvaWQgQWNjZXNzaWJpbGl0eU9iamVjdDo6YXJpYUVsZW1lbnRzRnJvbUF0 dHJpYnV0ZShBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImCiAgICAgfQogfQogCisvLyBGSVhN RTogVGhpcyBmdW5jdGlvbiBpdGVyYXRlcyB0aGUgd2hvbGUgRE9NIHRyZWUgYW5kIHRyaWVzIHRv IG1hdGNoIGV2ZXJ5IEVsZW1lbnQgaW4gdGhlIHRyZWUsIHdoaWNoIGlzIHZlcnkgZXhwZW5zaXZl LgorLy8gV2Ugc2hvdWxkIGZpbmQgYSBiZXR0ZXIgd2F5IHRvIGFjaGlldmUgdGhpcy4KIHZvaWQg QWNjZXNzaWJpbGl0eU9iamVjdDo6YXJpYUVsZW1lbnRzUmVmZXJlbmNlZEJ5QXR0cmlidXRlKEFj Y2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYgZWxlbWVudHMsIGNvbnN0IFF1YWxpZmllZE5hbWUm IGF0dHJpYnV0ZSkgY29uc3QKIHsKICAgICBhdXRvIGlkID0gaWRlbnRpZmllckF0dHJpYnV0ZSgp OwogICAgIGlmIChpZC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEFYT2JqZWN0 Q2FjaGUqIGNhY2hlID0gYXhPYmplY3RDYWNoZSgpOworICAgIGF1dG8qIGNhY2hlID0gYXhPYmpl Y3RDYWNoZSgpOwogICAgIGlmICghY2FjaGUpCiAgICAgICAgIHJldHVybjsKIAogICAgIGZvciAo YXV0byYgZWxlbWVudCA6IGRlc2NlbmRhbnRzT2ZUeXBlPEVsZW1lbnQ+KG5vZGUoKS0+dHJlZVNj b3BlKCkucm9vdE5vZGUoKSkpIHsKLSAgICAgICAgY29uc3QgQXRvbVN0cmluZyYgaWRMaXN0ID0g ZWxlbWVudC5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKGF0dHJpYnV0ZSk7Ci0gICAg ICAgIGlmICghU3BhY2VTcGxpdFN0cmluZyhpZExpc3QsIGZhbHNlKS5jb250YWlucyhpZCkpCisg ICAgICAgIGF1dG8mIGlkTGlzdCA9IGVsZW1lbnQuYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXph dGlvbihhdHRyaWJ1dGUpOworICAgICAgICBpZiAoIVNwYWNlU3BsaXRTdHJpbmc6OnNwYWNlU3Bs aXRTdHJpbmdDb250YWluc1ZhbHVlKGlkTGlzdCwgaWQpKQogICAgICAgICAgICAgY29udGludWU7 CiAKLSAgICAgICAgaWYgKEFjY2Vzc2liaWxpdHlPYmplY3QqIGF4T2JqZWN0ID0gY2FjaGUtPmdl dE9yQ3JlYXRlKCZlbGVtZW50KSkKKyAgICAgICAgaWYgKGF1dG8qIGF4T2JqZWN0ID0gY2FjaGUt PmdldE9yQ3JlYXRlKCZlbGVtZW50KSkKICAgICAgICAgICAgIGVsZW1lbnRzLmFwcGVuZChheE9i amVjdCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1NwYWNlU3Bs aXRTdHJpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1NwYWNlU3BsaXRTdHJpbmcuY3BwCmlu ZGV4IGMzZjExYjNmZDZhY2RhNGY4YTBjYTNkNDNlMzU1ZTBjNTJjZmRmNDguLjljMTU3ODIzNDBm ZDYzMGVjZTE3Y2RiMjlmMjUwYTg0ZjViMjM4OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9TcGFjZVNwbGl0U3RyaW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU3BhY2VT cGxpdFN0cmluZy5jcHAKQEAgLTUwLDE1ICs1MCwxNCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgdG9r ZW5pemVTcGFjZVNwbGl0U3RyaW5nKFRva2VuUHJvY2Vzc29yJiB0b2tlblByb2Nlc3NvciwgY29u cwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBUb2tlblByb2Nlc3Nvcj4KLXN0YXRpYyBpbmxpbmUg dm9pZCB0b2tlbml6ZVNwYWNlU3BsaXRTdHJpbmcoVG9rZW5Qcm9jZXNzb3ImIHRva2VuUHJvY2Vz c29yLCBjb25zdCBTdHJpbmcmIHN0cmluZykKK3N0YXRpYyBpbmxpbmUgdm9pZCB0b2tlbml6ZVNw YWNlU3BsaXRTdHJpbmcoVG9rZW5Qcm9jZXNzb3ImIHRva2VuUHJvY2Vzc29yLCBTdHJpbmdWaWV3 IHN0cmluZykKIHsKICAgICBBU1NFUlQoIXN0cmluZy5pc051bGwoKSk7CiAKLSAgICBjb25zdCBT dHJpbmdJbXBsJiBzdHJpbmdJbXBsID0gKnN0cmluZy5pbXBsKCk7Ci0gICAgaWYgKHN0cmluZ0lt cGwuaXM4Qml0KCkpCi0gICAgICAgIHRva2VuaXplU3BhY2VTcGxpdFN0cmluZyh0b2tlblByb2Nl c3Nvciwgc3RyaW5nSW1wbC5jaGFyYWN0ZXJzOCgpLCBzdHJpbmdJbXBsLmxlbmd0aCgpKTsKKyAg ICBpZiAoc3RyaW5nLmlzOEJpdCgpKQorICAgICAgICB0b2tlbml6ZVNwYWNlU3BsaXRTdHJpbmco dG9rZW5Qcm9jZXNzb3IsIHN0cmluZy5jaGFyYWN0ZXJzOCgpLCBzdHJpbmcubGVuZ3RoKCkpOwog ICAgIGVsc2UKLSAgICAgICAgdG9rZW5pemVTcGFjZVNwbGl0U3RyaW5nKHRva2VuUHJvY2Vzc29y LCBzdHJpbmdJbXBsLmNoYXJhY3RlcnMxNigpLCBzdHJpbmdJbXBsLmxlbmd0aCgpKTsKKyAgICAg ICAgdG9rZW5pemVTcGFjZVNwbGl0U3RyaW5nKHRva2VuUHJvY2Vzc29yLCBzdHJpbmcuY2hhcmFj dGVyczE2KCksIHN0cmluZy5sZW5ndGgoKSk7CiB9CiAKIGJvb2wgU3BhY2VTcGxpdFN0cmluZ0Rh dGE6OmNvbnRhaW5zQWxsKFNwYWNlU3BsaXRTdHJpbmdEYXRhJiBvdGhlcikKQEAgLTEwMSwxOSAr MTAwLDE5IEBAIHZvaWQgU3BhY2VTcGxpdFN0cmluZzo6c2V0KGNvbnN0IEF0b21TdHJpbmcmIGlu cHV0U3RyaW5nLCBib29sIHNob3VsZEZvbGRDYXNlKQogICAgIG1fZGF0YSA9IFNwYWNlU3BsaXRT dHJpbmdEYXRhOjpjcmVhdGUoc2hvdWxkRm9sZENhc2UgPyBpbnB1dFN0cmluZy5jb252ZXJ0VG9B U0NJSUxvd2VyY2FzZSgpIDogaW5wdXRTdHJpbmcpOwogfQogCi1jbGFzcyBUb2tlbklzRXF1YWxU b0NTdHJpbmdUb2tlblByb2Nlc3NvciB7Cit0ZW1wbGF0ZTx0eXBlbmFtZSBSZWZlcmVuY2VDaGFy YWN0ZXJUeXBlPgorY2xhc3MgVG9rZW5Jc0VxdWFsVG9DaGFyYWN0ZXJzVG9rZW5Qcm9jZXNzb3Ig ewogcHVibGljOgotICAgIGV4cGxpY2l0IFRva2VuSXNFcXVhbFRvQ1N0cmluZ1Rva2VuUHJvY2Vz c29yKGNvbnN0IGNoYXIqIHJlZmVyZW5jZVN0cmluZywgdW5zaWduZWQgcmVmZXJlbmNlU3RyaW5n TGVuZ3RoKQotICAgICAgICA6IG1fcmVmZXJlbmNlU3RyaW5nKHJlZmVyZW5jZVN0cmluZykKLSAg ICAgICAgLCBtX3JlZmVyZW5jZVN0cmluZ0xlbmd0aChyZWZlcmVuY2VTdHJpbmdMZW5ndGgpCi0g ICAgICAgICwgbV9yZWZlcmVuY2VTdHJpbmdXYXNGb3VuZChmYWxzZSkKKyAgICBleHBsaWNpdCBU b2tlbklzRXF1YWxUb0NoYXJhY3RlcnNUb2tlblByb2Nlc3Nvcihjb25zdCBSZWZlcmVuY2VDaGFy YWN0ZXJUeXBlKiByZWZlcmVuY2VDaGFyYWN0ZXJzLCB1bnNpZ25lZCBsZW5ndGgpCisgICAgICAg IDogbV9yZWZlcmVuY2VDaGFyYWN0ZXJzKHJlZmVyZW5jZUNoYXJhY3RlcnMpCisgICAgICAgICwg bV9yZWZlcmVuY2VMZW5ndGgobGVuZ3RoKQogICAgIHsKICAgICB9CiAKLSAgICB0ZW1wbGF0ZSA8 dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KLSAgICBib29sIHByb2Nlc3NUb2tlbihjb25zdCBDaGFy YWN0ZXJUeXBlKiBjaGFyYWN0ZXJzLCB1bnNpZ25lZCBsZW5ndGgpCisgICAgdGVtcGxhdGUgPHR5 cGVuYW1lIFRva2VuQ2hhcmFjdGVyVHlwZT4KKyAgICBib29sIHByb2Nlc3NUb2tlbihjb25zdCBU b2tlbkNoYXJhY3RlclR5cGUqIGNoYXJhY3RlcnMsIHVuc2lnbmVkIGxlbmd0aCkKICAgICB7Ci0g ICAgICAgIGlmIChsZW5ndGggPT0gbV9yZWZlcmVuY2VTdHJpbmdMZW5ndGggJiYgZXF1YWwoY2hh cmFjdGVycywgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBMQ2hhcio+KG1fcmVmZXJlbmNlU3RyaW5n KSwgbGVuZ3RoKSkgeworICAgICAgICBpZiAobGVuZ3RoID09IG1fcmVmZXJlbmNlTGVuZ3RoICYm IGVxdWFsKGNoYXJhY3RlcnMsIG1fcmVmZXJlbmNlQ2hhcmFjdGVycywgbGVuZ3RoKSkgewogICAg ICAgICAgICAgbV9yZWZlcmVuY2VTdHJpbmdXYXNGb3VuZCA9IHRydWU7CiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KQEAgLTEyMywxOSArMTIyLDI3IEBAIHB1YmxpYzoKICAg ICBib29sIHJlZmVyZW5jZVN0cmluZ1dhc0ZvdW5kKCkgY29uc3QgeyByZXR1cm4gbV9yZWZlcmVu Y2VTdHJpbmdXYXNGb3VuZDsgfQogCiBwcml2YXRlOgotICAgIGNvbnN0IGNoYXIqIG1fcmVmZXJl bmNlU3RyaW5nOwotICAgIHVuc2lnbmVkIG1fcmVmZXJlbmNlU3RyaW5nTGVuZ3RoOwotICAgIGJv b2wgbV9yZWZlcmVuY2VTdHJpbmdXYXNGb3VuZDsKKyAgICBjb25zdCBSZWZlcmVuY2VDaGFyYWN0 ZXJUeXBlKiBtX3JlZmVyZW5jZUNoYXJhY3RlcnM7CisgICAgdW5zaWduZWQgbV9yZWZlcmVuY2VM ZW5ndGg7CisgICAgYm9vbCBtX3JlZmVyZW5jZVN0cmluZ1dhc0ZvdW5kIHsgZmFsc2UgfTsKIH07 CiAKLWJvb2wgU3BhY2VTcGxpdFN0cmluZzo6c3BhY2VTcGxpdFN0cmluZ0NvbnRhaW5zVmFsdWUo Y29uc3QgU3RyaW5nJiBpbnB1dFN0cmluZywgY29uc3QgY2hhciogdmFsdWUsIHVuc2lnbmVkIHZh bHVlTGVuZ3RoLCBib29sIHNob3VsZEZvbGRDYXNlKQordGVtcGxhdGUgPHR5cGVuYW1lIFZhbHVl Q2hhcmFjdGVyVHlwZT4KK3N0YXRpYyBib29sIHNwYWNlU3BsaXRTdHJpbmdDb250YWluc1ZhbHVl SW50ZXJuYWwoU3RyaW5nVmlldyBzcGFjZVNwbGl0U3RyaW5nLCBTdHJpbmdWaWV3IHZhbHVlKQog ewotICAgIGlmIChpbnB1dFN0cmluZy5pc051bGwoKSkKKyAgICBUb2tlbklzRXF1YWxUb0NoYXJh Y3RlcnNUb2tlblByb2Nlc3NvcjxWYWx1ZUNoYXJhY3RlclR5cGU+IHRva2VuUHJvY2Vzc29yKHZh bHVlLmNoYXJhY3RlcnM8VmFsdWVDaGFyYWN0ZXJUeXBlPigpLCB2YWx1ZS5sZW5ndGgoKSk7Cisg ICAgdG9rZW5pemVTcGFjZVNwbGl0U3RyaW5nKHRva2VuUHJvY2Vzc29yLCBzcGFjZVNwbGl0U3Ry aW5nKTsKKyAgICByZXR1cm4gdG9rZW5Qcm9jZXNzb3IucmVmZXJlbmNlU3RyaW5nV2FzRm91bmQo KTsKK30KKworYm9vbCBTcGFjZVNwbGl0U3RyaW5nOjpzcGFjZVNwbGl0U3RyaW5nQ29udGFpbnNW YWx1ZShTdHJpbmdWaWV3IHNwYWNlU3BsaXRTdHJpbmcsIFN0cmluZ1ZpZXcgdmFsdWUpCit7Cisg ICAgaWYgKHNwYWNlU3BsaXRTdHJpbmcuaXNOdWxsKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAotICAgIFRva2VuSXNFcXVhbFRvQ1N0cmluZ1Rva2VuUHJvY2Vzc29yIHRva2VuUHJvY2Vzc29y KHZhbHVlLCB2YWx1ZUxlbmd0aCk7Ci0gICAgdG9rZW5pemVTcGFjZVNwbGl0U3RyaW5nKHRva2Vu UHJvY2Vzc29yLCBzaG91bGRGb2xkQ2FzZSA/IGlucHV0U3RyaW5nLmltcGwoKS0+Y29udmVydFRv QVNDSUlMb3dlcmNhc2UoKSA6IGlucHV0U3RyaW5nKTsKLSAgICByZXR1cm4gdG9rZW5Qcm9jZXNz b3IucmVmZXJlbmNlU3RyaW5nV2FzRm91bmQoKTsKKyAgICBpZiAodmFsdWUuaXM4Qml0KCkpCisg ICAgICAgIHJldHVybiBzcGFjZVNwbGl0U3RyaW5nQ29udGFpbnNWYWx1ZUludGVybmFsPExDaGFy PihzcGFjZVNwbGl0U3RyaW5nLCB2YWx1ZSk7CisgICAgcmV0dXJuIHNwYWNlU3BsaXRTdHJpbmdD b250YWluc1ZhbHVlSW50ZXJuYWw8VUNoYXI+KHNwYWNlU3BsaXRTdHJpbmcsIHZhbHVlKTsKIH0K IAogY2xhc3MgVG9rZW5Db3VudGVyIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9T cGFjZVNwbGl0U3RyaW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vU3BhY2VTcGxpdFN0cmluZy5o CmluZGV4IDZhMTg1NjRiNDllN2VkYTY5YjVhNTg2NDc3ZGU0MjY5OGQ0YjgxZWEuLmQxODE1NzE5 Y2U0NWI5NTRhYzlhMGNiMjhkMzBhNjgzODdmM2I4OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9TcGFjZVNwbGl0U3RyaW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NwYWNl U3BsaXRTdHJpbmcuaApAQCAtMTE3LDEyICsxMTcsNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVy biAoKm1fZGF0YSlbaV07CiAgICAgfQogCi0gICAgc3RhdGljIGJvb2wgc3BhY2VTcGxpdFN0cmlu Z0NvbnRhaW5zVmFsdWUoY29uc3QgU3RyaW5nJiBzcGFjZVNwbGl0U3RyaW5nLCBjb25zdCBjaGFy KiB2YWx1ZSwgdW5zaWduZWQgbGVuZ3RoLCBib29sIHNob3VsZEZvbGRDYXNlKTsKLSAgICB0ZW1w bGF0ZTxzaXplX3QgbGVuZ3RoPgotICAgIHN0YXRpYyBib29sIHNwYWNlU3BsaXRTdHJpbmdDb250 YWluc1ZhbHVlKGNvbnN0IFN0cmluZyYgc3BhY2VTcGxpdFN0cmluZywgY29uc3QgY2hhciAoJnZh bHVlKVtsZW5ndGhdLCBib29sIHNob3VsZEZvbGRDYXNlKQotICAgIHsKLSAgICAgICAgcmV0dXJu IHNwYWNlU3BsaXRTdHJpbmdDb250YWluc1ZhbHVlKHNwYWNlU3BsaXRTdHJpbmcsIHZhbHVlLCBs ZW5ndGggLSAxLCBzaG91bGRGb2xkQ2FzZSk7Ci0gICAgfQorICAgIHN0YXRpYyBib29sIHNwYWNl U3BsaXRTdHJpbmdDb250YWluc1ZhbHVlKFN0cmluZ1ZpZXcgc3BhY2VTcGxpdFN0cmluZywgU3Ry aW5nVmlldyB2YWx1ZSk7CiAKIHByaXZhdGU6CiAgICAgUmVmUHRyPFNwYWNlU3BsaXRTdHJpbmdE YXRhPiBtX2RhdGE7Cg==