217745 2020-10-14 19:05:06 -0700 Fix for multiple accessibility layout tests in isolated tree mode. 2020-10-15 11:44:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1697994 0 andresg_22 2020-10-14 19:05:06 -0700 Fix for multiple accessibility layout tests in isolated tree mode. 1697995 1 411394 andresg_22 2020-10-14 19:16:24 -0700 Created attachment 411394 Patch 1698021 2 411394 cfleizach 2020-10-14 22:41:09 -0700 Comment on attachment 411394 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411394&action=review > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:1142 > + auto* axObject = associatedAXObject(); I think we would need to retrieve this on the main thread > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:1971 > + auto* backingObject = self.axBackingObject; so are we no longer able to use a cached frame? 1698058 3 andresg_22 2020-10-15 04:11:03 -0700 (In reply to chris fleizach from comment #2) > Comment on attachment 411394 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=411394&action=review > > > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:1142 > > + auto* axObject = associatedAXObject(); > > I think we would need to retrieve this on the main thread The caller needs to dispatch this call the main thread because it returns a SimpleRange. So it doesn't make sense to dispatch here. in Debug mode this is enforced with the assert in associatedAXObject. > > > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:1971 > > + auto* backingObject = self.axBackingObject; > > so are we no longer able to use a cached frame? At least not to compute the position. It seems that the only rect we are able to cache is the elementRect, which in my understanding is the intrinsic coordinates of the element in the layout. Coordinates relative to a view or to the screen need to be corrected by their corresponding offsets and that cannot be cached in the isolated object. 1698061 4 andresg_22 2020-10-15 04:16:18 -0700 Caching the layout coordinates and making the necessary transformation to other coordinate system on demand, will also eliminate the need of special casing the handling of the returned coordinates in Appkit when in isolated tree mode. 1698209 5 411394 cfleizach 2020-10-15 11:31:18 -0700 Comment on attachment 411394 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411394&action=review >>> Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:1142 >>> + auto* axObject = associatedAXObject(); >> >> I think we would need to retrieve this on the main thread > > The caller needs to dispatch this call the main thread because it returns a SimpleRange. So it doesn't make sense to dispatch here. in Debug mode this is enforced with the assert in associatedAXObject. should we put an assert mainThread() here just in case? it wasn't clear to me this method would require main thread usage already 1698212 6 ews-feeder 2020-10-15 11:43:34 -0700 Committed r268541: <https://trac.webkit.org/changeset/268541> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411394. 1698213 7 webkit-bug-importer 2020-10-15 11:44:18 -0700 <rdar://problem/70345631> 411394 2020-10-14 19:16:24 -0700 2020-10-15 11:43:35 -0700 Patch bug-217745-20201014221623.patch text/plain 10263 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGQzZGZkYmMxODg5Mjlk NGI1OTliNjY5MzRkYzdkZDQ0YTk4MzFhMS4uOWI4YTc0M2UyMmQzZTYwNjgwY2E2NWU5ZmM3MDYz ZjVkYjU4ZjY3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDIwLTEwLTE0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIG11 bHRpcGxlIGFjY2Vzc2liaWxpdHkgbGF5b3V0IHRlc3RzIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzc0NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBmb3Ig dGhlIGZvbGxvd2luZyB0ZXN0cyBpbiBhY2Nlc3NpYmlsaXR5IGlzb2xhdGVkIHRyZWUgbW9kZToK KyAgICAgICAgYWNjZXNzaWJpbGl0eS9tYWMvYWJici1hY3JvbnltLXRhZ3MuaHRtbAorICAgICAg ICBhY2Nlc3NpYmlsaXR5L21hYy9hcmlhLWltYWdlLWVtaXRzLW9iamVjdC1yZXBsYWNlbWVudC5o dG1sCisgICAgICAgIGFjY2Vzc2liaWxpdHkvbWFjL2F0dHJpYnV0ZWQtc3RyaW5nLWluY2x1ZGVz LWhpZ2hsaWdodGluZy5odG1sCisgICAgICAgIGFjY2Vzc2liaWxpdHkvbWFjL2F0dHJpYnV0ZWQt c3RyaW5nL2F0dHJpYnV0ZWQtc3RyaW5nLWZvci1yYW5nZS13aXRoLW9wdGlvbnMuaHRtbAorICAg ICAgICBhY2Nlc3NpYmlsaXR5L21hYy9hdHRyaWJ1dGVkLXN0cmluZy9hdHRyaWJ1dGVkLXN0cmlu Zy1mb3ItcmFuZ2UuaHRtbAorICAgICAgICBhY2Nlc3NpYmlsaXR5L21hYy9jaGFyYWN0ZXItb2Zm c2V0LXZpc2libGUtcG9zaXRpb24tY29udmVyc2lvbi13aXRoLWVtb2ppLmh0bWwKKyAgICAgICAg YWNjZXNzaWJpbGl0eS9tYWMvZWxlbWVudC1mb3ItdGV4dC1tYXJrZXIuaHRtbAorICAgICAgICBh Y2Nlc3NpYmlsaXR5L21hYy9saXN0bWFya2VyLXN1ZmZpeC5odG1sCisgICAgICAgIGFjY2Vzc2li aWxpdHkvbWFjL21lZGlhLWVtaXRzLW9iamVjdC1yZXBsYWNlbWVudC5odG1sCisgICAgICAgIGFj Y2Vzc2liaWxpdHkvbWFjL3N0YWxlLXRleHRtYXJrZXItY3Jhc2guaHRtbAorICAgICAgICBhY2Nl c3NpYmlsaXR5L21hYy9zdHJpbmctcmFuZ2UtY29udGFpbnMtbGlzdG1hcmtlci5odG1sCisgICAg ICAgIGFjY2Vzc2liaWxpdHkvbWFjL3RleHQtbWFya2VyLWZvci1pbmRleC5odG1sCisgICAgICAg IGFjY2Vzc2liaWxpdHkvbWFjL3RleHQtbWFya2VyLWxlbmd0aC5odG1sCisgICAgICAgIGFjY2Vz c2liaWxpdHkvbWFjL3RleHQtbWFya2VyLXBhcmFncmFwaC1uYXYuaHRtbAorICAgICAgICBhY2Nl c3NpYmlsaXR5L21hYy90ZXh0LW1hcmtlci1yYW5nZS1mb3Itbm9kZS13aXRob3V0LWNoaWxkcmVu Lmh0bWwKKyAgICAgICAgYWNjZXNzaWJpbGl0eS9tYWMvdGV4dC1tYXJrZXItc2VudGVuY2UtbmF2 Lmh0bWwKKyAgICAgICAgYWNjZXNzaWJpbGl0eS9tYWMvdGV4dC1tYXJrZXItd29yZC1uYXYtY29s bGFwc2VkLXdoaXRlc3BhY2UuaHRtbAorICAgICAgICBhY2Nlc3NpYmlsaXR5L21hYy90ZXh0LW1h cmtlci13b3JkLW5hdi5odG1sCisgICAgICAgIGFjY2Vzc2liaWxpdHkvbWFjL3RleHQtbWFya2Vy cy1mb3ItaW5wdXQtd2l0aC1wbGFjZWhvbGRlci5odG1sCisgICAgICAgIGFjY2Vzc2liaWxpdHkv bWFjL3dlYmtpdC1zY3JvbGxhcmVhLXBvc2l0aW9uLmh0bWwKKyAgICAgICAgYWNjZXNzaWJpbGl0 eS90ZXh0LW1hcmtlci90ZXh0LW1hcmtlci1wcmV2aW91cy1uZXh0Lmh0bWwKKyAgICAgICAgYWNj ZXNzaWJpbGl0eS90ZXh0LW1hcmtlci90ZXh0LW1hcmtlci1yYW5nZS1zdGFsZS1ub2RlLWNyYXNo Lmh0bWwKKyAgICAgICAgYWNjZXNzaWJpbGl0eS90ZXh0LW1hcmtlci90ZXh0LW1hcmtlci1yYW5n ZS13aXRoLXJlbW92ZWQtbm9kZS1jcmFzaC5odG1sCisgICAgICAgIGFjY2Vzc2liaWxpdHkvdGV4 dC1tYXJrZXIvdGV4dC1tYXJrZXItd2l0aC11c2VyLXNlbGVjdC1ub25lLmh0bWwKKworICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6Y29udmVydEZyYW1lVG9TcGFjZSBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjplbGVtZW50UmFuZ2UgY29u c3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlck1hYy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIg cG9zaXRpb25dKToKKwogMjAyMC0xMC0xNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtMRkNdIFVzZSB0aGUgdGVybSBvdmVycmlkZGVuIGluc3RlYWQgb2Ygb3Zl cnJpZGUgdG8gaW5kaWNhdGUgcHJpb3JpdHkgdmFsdWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3Qu Y3BwCmluZGV4IGJiMzY2ODVlNzI1NDE1NGNkY2QzZmJlODFmN2RlNzUxN2U0MDlkZWYuLjg1Mjcx YTc2NTM5ZGFjYTMwOThlZjU5YjNiODJlZjQxNzhlN2QyZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRP YmplY3QuY3BwCkBAIC05NTYsNiArOTU2LDE1IEBAIEZsb2F0UmVjdCBBWElzb2xhdGVkT2JqZWN0 OjpyZWxhdGl2ZUZyYW1lKCkgY29uc3QKICAgICB9KTsKIH0KIAorRmxvYXRSZWN0IEFYSXNvbGF0 ZWRPYmplY3Q6OmNvbnZlcnRGcmFtZVRvU3BhY2UoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBBY2Nl c3NpYmlsaXR5Q29udmVyc2lvblNwYWNlIHNwYWNlKSBjb25zdAoreworICAgIHJldHVybiBBY2Nl c3NpYmlsaXR5OjpyZXRyaWV2ZVZhbHVlRnJvbU1haW5UaHJlYWQ8RmxvYXRSZWN0PihbJnJlY3Qs ICZzcGFjZSwgdGhpc10gKCkgLT4gRmxvYXRSZWN0IHsKKyAgICAgICAgaWYgKGF1dG8qIGF4T2Jq ZWN0ID0gYXNzb2NpYXRlZEFYT2JqZWN0KCkpCisgICAgICAgICAgICByZXR1cm4gYXhPYmplY3Qt PmNvbnZlcnRGcmFtZVRvU3BhY2UocmVjdCwgc3BhY2UpOworICAgICAgICByZXR1cm4geyB9Owor ICAgIH0pOworfQorCiBib29sIEFYSXNvbGF0ZWRPYmplY3Q6OnJlcGxhY2VUZXh0SW5SYW5nZShj b25zdCBTdHJpbmcmIHJlcGxhY2VtZW50VGV4dCwgY29uc3QgUGxhaW5UZXh0UmFuZ2UmIHRleHRS YW5nZSkKIHsKICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eTo6cmV0cmlldmVWYWx1ZUZyb21NYWlu VGhyZWFkPGJvb2w+KFsmcmVwbGFjZW1lbnRUZXh0LCAmdGV4dFJhbmdlLCB0aGlzXSAoKSAtPiBi b29sIHsKQEAgLTExMjgsNiArMTEzNywxMiBAQCB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OnNldFNl bGVjdGVkVmlzaWJsZVBvc2l0aW9uUmFuZ2UoY29uc3QgVmlzaWJsZVBvc2l0aW9uUmFuZwogICAg ICAgICBvYmplY3QtPnNldFNlbGVjdGVkVmlzaWJsZVBvc2l0aW9uUmFuZ2UodmlzaWJsZVBvc2l0 aW9uUmFuZ2UpOwogfQogCitPcHRpb25hbDxTaW1wbGVSYW5nZT4gQVhJc29sYXRlZE9iamVjdDo6 ZWxlbWVudFJhbmdlKCkgY29uc3QKK3sKKyAgICBhdXRvKiBheE9iamVjdCA9IGFzc29jaWF0ZWRB WE9iamVjdCgpOworICAgIHJldHVybiBheE9iamVjdCA/IGF4T2JqZWN0LT5lbGVtZW50UmFuZ2Uo KSA6IFdURjo6bnVsbG9wdDsKK30KKwogYm9vbCBBWElzb2xhdGVkT2JqZWN0Ojppc0xpc3RCb3hP cHRpb24oKSBjb25zdAogewogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVj dC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZE9iamVjdC5oCmluZGV4IDdiNzVlM2NlNjg1ZjllNDM2ZTA1YzkzNjY1ZDNiNmRiYTkyODE0YmQu LjBjNDQ0OGM5NjY0MGNjNzk4MmQzNWI4MWU5OWJiNzFmNWIxYWEwZmEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3Qu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkT2JqZWN0LmgKQEAgLTM4OCw3ICszODgsNyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBzZWxl Y3RlZFRleHQoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBTdHJpbmcoKTsgfQogICAgIFZpc2li bGVQb3NpdGlvblJhbmdlIHZpc2libGVQb3NpdGlvblJhbmdlKCkgY29uc3Qgb3ZlcnJpZGUgeyBy ZXR1cm4gVmlzaWJsZVBvc2l0aW9uUmFuZ2UoKTsgfQogICAgIFZpc2libGVQb3NpdGlvblJhbmdl IHZpc2libGVQb3NpdGlvblJhbmdlRm9yTGluZSh1bnNpZ25lZCkgY29uc3Qgb3ZlcnJpZGUgeyBy ZXR1cm4gVmlzaWJsZVBvc2l0aW9uUmFuZ2UoKTsgfQotICAgIE9wdGlvbmFsPFNpbXBsZVJhbmdl PiBlbGVtZW50UmFuZ2UoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBXVEY6Om51bGxvcHQ7IH0K KyAgICBPcHRpb25hbDxTaW1wbGVSYW5nZT4gZWxlbWVudFJhbmdlKCkgY29uc3Qgb3ZlcnJpZGU7 CiAgICAgVmlzaWJsZVBvc2l0aW9uUmFuZ2UgdmlzaWJsZVBvc2l0aW9uUmFuZ2VGb3JVbm9yZGVy ZWRQb3NpdGlvbnMoY29uc3QgVmlzaWJsZVBvc2l0aW9uJiwgY29uc3QgVmlzaWJsZVBvc2l0aW9u JikgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gVmlzaWJsZVBvc2l0aW9uUmFuZ2UoKTsgfQogICAg IFZpc2libGVQb3NpdGlvblJhbmdlIHBvc2l0aW9uT2ZMZWZ0V29yZChjb25zdCBWaXNpYmxlUG9z aXRpb24mKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBWaXNpYmxlUG9zaXRpb25SYW5nZSgpOyB9 CiAgICAgVmlzaWJsZVBvc2l0aW9uUmFuZ2UgcG9zaXRpb25PZlJpZ2h0V29yZChjb25zdCBWaXNp YmxlUG9zaXRpb24mKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBWaXNpYmxlUG9zaXRpb25SYW5n ZSgpOyB9CkBAIC00NTEsNyArNDUxLDcgQEAgcHJpdmF0ZToKICAgICAvLyBUT0RPOiBGdW5jdGlv bnMKICAgICBTdHJpbmcgdGV4dFVuZGVyRWxlbWVudChBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxl bWVudE1vZGUgPSBBY2Nlc3NpYmlsaXR5VGV4dFVuZGVyRWxlbWVudE1vZGUoKSkgY29uc3Qgb3Zl cnJpZGUgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAgICBPcHRpb25hbDxTaW1wbGVSYW5nZT4gbWlz c3BlbGxpbmdSYW5nZShjb25zdCBTaW1wbGVSYW5nZSYsIEFjY2Vzc2liaWxpdHlTZWFyY2hEaXJl Y3Rpb24pIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIFdURjo6bnVsbG9wdDsgfQotICAgIEZsb2F0 UmVjdCBjb252ZXJ0RnJhbWVUb1NwYWNlKGNvbnN0IEZsb2F0UmVjdCYsIEFjY2Vzc2liaWxpdHlD b252ZXJzaW9uU3BhY2UpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIEZsb2F0UmVjdCgpOyB9Cisg ICAgRmxvYXRSZWN0IGNvbnZlcnRGcmFtZVRvU3BhY2UoY29uc3QgRmxvYXRSZWN0JiwgQWNjZXNz aWJpbGl0eUNvbnZlcnNpb25TcGFjZSkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdm9pZCBpbmNyZW1l bnQoKSBvdmVycmlkZTsKICAgICB2b2lkIGRlY3JlbWVudCgpIG92ZXJyaWRlOwogICAgIGJvb2wg cGVyZm9ybURpc21pc3NBY3Rpb24oKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1t IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXJNYWMubW0KaW5kZXggZTgzZjBhMWJhNWIwNjg3NGIyMGVlNGI1MjVjZmMwODBiNGQ3 MmEwYy4uN2NkNGQ4NDk0MGEwMzY1NzVhZWVjMzE3MmVlMTM3OGZjYzAxNzZkMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2Vi QWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KQEAgLTE5NjgsMTMgKzE5NjgsMTIgQEAg c3RhdGljIHZvaWQgV2ViVHJhbnNmb3JtQ0dQYXRoVG9OU0JlemllclBhdGgodm9pZCogaW5mbywg Y29uc3QgQ0dQYXRoRWxlbWVudCAqZWwKIAogLSAoTlNWYWx1ZSAqKXBvc2l0aW9uCiB7Ci0jaWYg RU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKLSAgICBpZiAoQVhPYmplY3RDYWNo ZTo6aXNJc29sYXRlZFRyZWVFbmFibGVkKCkpCi0gICAgICAgIHJldHVybiBbTlNWYWx1ZSB2YWx1 ZVdpdGhQb2ludDpzZWxmLmF4QmFja2luZ09iamVjdC0+cmVsYXRpdmVGcmFtZSgpLmxvY2F0aW9u KCldOwotI2VuZGlmCisgICAgYXV0byogYmFja2luZ09iamVjdCA9IHNlbGYuYXhCYWNraW5nT2Jq ZWN0OworICAgIGlmICghYmFja2luZ09iamVjdCkKKyAgICAgICAgcmV0dXJuIG5pbDsKKworICAg IGF1dG8gcmVjdCA9IHNuYXBwZWRJbnRSZWN0KGJhY2tpbmdPYmplY3QtPmVsZW1lbnRSZWN0KCkp OwogCi0gICAgYXV0byByZWN0ID0gc25hcHBlZEludFJlY3Qoc2VsZi5heEJhY2tpbmdPYmplY3Qt PmVsZW1lbnRSZWN0KCkpOwotICAgIAogICAgIC8vIFRoZSBDb2NvYSBhY2Nlc3NpYmlsaXR5IEFQ SSB3YW50cyB0aGUgbG93ZXItbGVmdCBjb3JuZXIuCiAgICAgYXV0byBmbG9hdFBvaW50ID0gRmxv YXRQb2ludChyZWN0LngoKSwgcmVjdC5tYXhZKCkpOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOGIxNWZlMDQwMGNiMzEw NTkwYmJkNjZmNmNmMGQ3Nzg1MmVmMjg1Mi4uNGVlOGQwZDc5ZjIyNjVjYzNlODdkOGQyOTc0ODU3 ZDU4OWNkYmEzYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIwLTEwLTE0ICBBbmRyZXMgR29u emFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIG11bHRpcGxl IGFjY2Vzc2liaWxpdHkgbGF5b3V0IHRlc3RzIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzc0NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0 eS9tYWMvYXR0cmlidXRlZC1zdHJpbmctaW5jbHVkZXMtaGlnaGxpZ2h0aW5nLmh0bWw6IE1pbm9y IGNvZGUgY2xlYW51cC4KKwogMjAyMC0xMC0xNCAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18y MkBhcHBsZS5jb20+CiAKICAgICAgICAgWyBtYWNPUyBdIGFjY2Vzc2liaWxpdHkvbWFjL3NlbGVj dC1lbGVtZW50LXNlbGVjdGlvbi13aXRoLW9wdGdyb3Vwcy5odG1sIGlzIGEgZmxha3kgZmFpbHVy ZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9tYWMvYXR0cmlidXRlZC1z dHJpbmctaW5jbHVkZXMtaGlnaGxpZ2h0aW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmls aXR5L21hYy9hdHRyaWJ1dGVkLXN0cmluZy1pbmNsdWRlcy1oaWdobGlnaHRpbmcuaHRtbAppbmRl eCA1ZmE3NTFiMzRkMGNhMDE4YmZhNWM0NDFjOTQyYWMyNTRkODAzOWU4Li4zZjYyZjExYTU5YThh ZTA0NmE4ZjhjZThhNThmZWMzYThkNzY3ZmQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9hY2Nl c3NpYmlsaXR5L21hYy9hdHRyaWJ1dGVkLXN0cmluZy1pbmNsdWRlcy1oaWdobGlnaHRpbmcuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hdHRyaWJ1dGVkLXN0cmluZy1p bmNsdWRlcy1oaWdobGlnaHRpbmcuaHRtbApAQCAtMSw0MiArMSwzNSBAQAogPCFET0NUWVBFIEhU TUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgogPGh0bWw+Cis8aGVhZD4KIDxzY3Jp cHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgotPGJvZHkg aWQ9ImJvZHkiIHRhYmluZGV4PSIwIj4KLQotPGRpdiB0YWJpbmRleD0iMCIgaWQ9Iml0ZW0wIj5p dGVtMDwvZGl2PgotPGRpdiB0YWJpbmRleD0iMCIgaWQ9Iml0ZW0xIj48bWFyaz5pdGVtIDE8L21h cms+PC9kaXY+Ci08ZGl2IHRhYmluZGV4PSIwIiBpZD0iaXRlbTIiPml0ZW0yPC9kaXY+Cis8L2hl YWQ+Cis8Ym9keSBpZD0iYm9keSIgcm9sZT0iZ3JvdXAiPgogCis8ZGl2IGlkPSJpdGVtMCI+aXRl bTA8L2Rpdj4KKzxkaXYgaWQ9Iml0ZW0xIj48bWFyaz5pdGVtIDE8L21hcms+PC9kaXY+Cis8ZGl2 IGlkPSJpdGVtMiI+aXRlbTI8L2Rpdj4KIAogPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+CiA8ZGl2 IGlkPSJjb25zb2xlIj48L2Rpdj4KIAogPHNjcmlwdD4KLQogICAgIGRlc2NyaXB0aW9uKCJUaGlz IHZlcmlmaWVzIHRoYXQgdXNpbmcgdGhlIG1hcmsgdGFnIHdpbGwgYWRkIHRoZSBhcHByb3ByaWF0 ZSBhdHRyaWJ1dGUgdG8gdGhlIGF0dHJpYnV0ZWQgc3RyaW5nIGFuZCB0aGF0IHdlIGNhbiBmaW5k IGVsZW1lbnRzIHdpdGggaGlnaGxpZ2h0aW5nIHVzaW5nIHNlYXJjaGluZy4iKTsKIAogICAgIGlm ICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKLSAgICAgICAgZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoIml0ZW0xIikuZm9jdXMoKTsKLSAgICAgICAgdmFyIGl0ZW0xID0gYWNjZXNz aWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQ7CisgICAgICAgIHZhciBpdGVtMSA9IGFj Y2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiaXRlbTEiKTsKICAg ICAgICAgdmFyIG1hcmtlclJhbmdlID0gaXRlbTEudGV4dE1hcmtlclJhbmdlRm9yRWxlbWVudChp dGVtMSk7CiAgICAgICAgIHNob3VsZEJlVHJ1ZSgiaXRlbTEuYXR0cmlidXRlZFN0cmluZ0ZvclRl eHRNYXJrZXJSYW5nZUNvbnRhaW5zQXR0cmlidXRlKCdBWEhpZ2hsaWdodCcsIG1hcmtlclJhbmdl KSIpOwogCi0gICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJpdGVtMiIpLmZvY3VzKCk7 Ci0gICAgICAgIHZhciBpdGVtMiA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVt ZW50OworICAgICAgICB2YXIgaXRlbTIgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3Np YmxlRWxlbWVudEJ5SWQoIml0ZW0yIik7CiAgICAgICAgIG1hcmtlclJhbmdlID0gaXRlbTIudGV4 dE1hcmtlclJhbmdlRm9yRWxlbWVudChpdGVtMik7CiAgICAgICAgIHNob3VsZEJlRmFsc2UoIml0 ZW0yLmF0dHJpYnV0ZWRTdHJpbmdGb3JUZXh0TWFya2VyUmFuZ2VDb250YWluc0F0dHJpYnV0ZSgn QVhIaWdobGlnaHQnLCBtYXJrZXJSYW5nZSkiKTsKIAogICAgICAgICAvLyBTZWFyY2ggZm9yIGEg aGlnaGxpZ2h0ZWQgZWxlbWVudCBmcm9tIHRoZSB0b3Agb2YgdGhlIHdlYnBhZ2UuCi0gICAgICAg IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJib2R5IikuZm9jdXMoKTsKLSAgICAgICAgdmFyIGJv ZHkgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudDsKKyAgICAgICAgdmFy IGJvZHkgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImJv ZHkiKTsKICAgICAgICAgdmFyIHJlc3VsdEVsZW1lbnQgPSBib2R5LnVpRWxlbWVudEZvclNlYXJj aFByZWRpY2F0ZSgiIiwgdHJ1ZSwgIkFYSGlnaGxpZ2h0ZWRTZWFyY2hLZXkiLCAiIiwgZmFsc2Up OwogICAgICAgICBzaG91bGRCZVRydWUoInJlc3VsdEVsZW1lbnQuaXNFcXVhbChpdGVtMS5jaGls ZEF0SW5kZXgoMCkpIik7CiAgICAgfQotCiA8L3NjcmlwdD4KLQogPHNjcmlwdCBzcmM9Ii4uLy4u L3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgotCiA8L2JvZHk+CiA8L2h0bWw+ Ci0K