257045 2023-05-19 12:11:03 -0700 AX: Schedule the accessibility regions paint before building the isolated tree. 2023-05-22 09:31:35 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white tyler_w webkit-bug-importer oldest_to_newest 1956555 0 andresg_22 2023-05-19 12:11:03 -0700 This is important during the creation of the isolated tree in order to cache RelativeFrames as the isolated objects are created. 1956556 1 webkit-bug-importer 2023-05-19 12:11:20 -0700 <rdar://problem/109577190> 1956562 2 466425 andresg_22 2023-05-19 12:33:02 -0700 Created attachment 466425 Patch 1956582 3 466425 tyler_w 2023-05-19 14:09:16 -0700 Comment on attachment 466425 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=466425&action=review > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:177 > + else if (object.isScrollView() || object.isWebArea() || object.isScrollbar()) { Scrollbars currently aren't handled in PaintPhase::Accessibility, so by caching this here we will never update it, which probably isn't right. 1956929 4 466447 andresg_22 2023-05-22 06:04:11 -0700 Created attachment 466447 Patch 1956930 5 andresg_22 2023-05-22 06:22:35 -0700 (In reply to Tyler Wilcock from comment #3) > Comment on attachment 466425 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=466425&action=review > > > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:177 > > + else if (object.isScrollView() || object.isWebArea() || object.isScrollbar()) { > > Scrollbars currently aren't handled in PaintPhase::Accessibility, so by > caching this here we will never update it, which probably isn't right. Removed that change and filed rdar://109655440 to handle scrollbars in PaintPhase::Accessibility. 1956939 6 ews-feeder 2023-05-22 06:57:21 -0700 Committed 264320@main (1e29a8fa8f79): <https://commits.webkit.org/264320@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 466447. 1956972 7 tyler_w 2023-05-22 09:31:35 -0700 (In reply to Andres Gonzalez from comment #5) > (In reply to Tyler Wilcock from comment #3) > > Comment on attachment 466425 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=466425&action=review > > > > > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp:177 > > > + else if (object.isScrollView() || object.isWebArea() || object.isScrollbar()) { > > > > Scrollbars currently aren't handled in PaintPhase::Accessibility, so by > > caching this here we will never update it, which probably isn't right. > > Removed that change and filed rdar://109655440 to handle scrollbars in > PaintPhase::Accessibility. The patch you landed is still caching the frame for object.isScrollbar(), so I think that's not right. 466425 2023-05-19 12:33:02 -0700 2023-05-22 06:04:08 -0700 Patch bug-257045-20230519153301.patch text/plain 5862 andresg_22 RnJvbSBkZTg5MmVjMTk2ZmVjZmMyNTgxYzNlZTllNzE5MWMxN2I2MjI3ODEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBGcmksIDE5IE1heSAyMDIzIDE1OjA0OjQwIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IFNjaGVkdWxlIHRoZSBhY2Nlc3NpYmlsaXR5IHJlZ2lvbnMgcGFpbnQgYmVmb3JlIGJ1aWxk aW5nCiB0aGUgaXNvbGF0ZWQgdHJlZS4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI1NzA0NQogPHJkYXI6Ly9wcm9ibGVtLzEwOTU3NzE5MD4KClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2Fj aGUuY3BwOgooV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6Z2V0T3JDcmVhdGVJc29sYXRlZFRyZWUp OgpNb3ZlZCB0aGUgY2FsbCB0byBzY2hlZHVsZU9iamVjdFJlZ2lvbnNVcGRhdGUgYmVmb3JlIHRo ZSBjcmVhdGlvbiBvZiB0aGUgaXNvbGF0ZWQgdHJlZSBzbyB0aGF0IHRoZSByZWxhdGl2ZSBmcmFt ZSBjYW4gYmUgY2FjaGVkIGluIHRoZSBpc29sYXRlZCBvYmplY3RzIHRoYXQgYXJlIGFib3V0IHRv IGJlIGNyZWF0ZWQuCgooV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6YnVpbGRJc29sYXRlZFRyZWUp OgpGaXhlZCB0aGUgbm90aWZpY2F0aW9ucyBzZW50IGFmdGVyIHRoZSB3aG9sZSBpc29sYXRlZCB0 cmVlIGlzIGJ1aWx0LgoKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJl ZS9BWElzb2xhdGVkT2JqZWN0LmNwcDoKKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmluaXRp YWxpemVQcm9wZXJ0aWVzKToKQ2FjaGUgdGhlIFJlbGF0aXZlRnJhbWUgZm9yIFNjcm9sbGJhcnMg aW4gYWRkaXRpb24gdG8gU2Nyb2xsdmlld3MgYW5kIFdlYkFyZWFzIGlmIHRoZSByZWxhdGl2ZSBm cmFtZSBpcyBub3QgeWV0IGF2YWlsYWJsZSBmcm9tIHRoZSBHZW9tZXRyeU1hbmFnZXIuCgoqIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNw cDoKKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpjcmVhdGVFbXB0eUNvbnRlbnQpOgpTZXQgdGhl IGluaXRpYWwgZm9jdXNlZCBvYmplY3QgaW4gdGhlIG5ld2x5IGNyZWF0ZWQgZW1wdHkgaXNvbGF0 ZWQgdHJlZSB0byB0aGUgV2ViQXJlYS4KLS0tCiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FYT2JqZWN0Q2FjaGUuY3BwICAgICAgICB8IDExICsrKysrKystLS0tCiAuLi4vYWNjZXNzaWJp bGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAgICB8ICAyICstCiAuLi4vYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwICAgICB8ICA1ICsrKyst CiAzIGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKaW5kZXggMmEy ZjgzMWYxZmZkLi41YWI3YjI2Yzk3NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BWE9iamVjdENhY2hlLmNwcApAQCAtODQyLDIwICs4NDIsMjAgQEAgUmVmUHRyPEFYSXNv bGF0ZWRUcmVlPiBBWE9iamVjdENhY2hlOjpnZXRPckNyZWF0ZUlzb2xhdGVkVHJlZSgpCiAKICAg ICAvLyBBIG5ldyBpc29sYXRlZCB0cmVlIG5lZWRzIHRvIGJlIGNyZWF0ZWQuIEluaXRpYWxpemUg dGhlIEdlb21ldHJ5TWFuYWdlciBwcmltYXJ5IHNjcmVlbiByZWN0IHRvIGJlIHJlYWR5IHdoZW4g bmVlZGVkLgogICAgIG1fZ2VvbWV0cnlNYW5hZ2VyLT5pbml0aWFsaXplUHJpbWFyeVNjcmVlblJl Y3QoKTsKKyAgICAvLyBTY2hlZHVsZSBhIHBhaW50IHRvIGNhY2hlIHRoZSByZWN0cyBmb3IgdGhl IG9iamVjdHMgaW4gdGhpcyBuZXcgaXNvbGF0ZWQgdHJlZS4KKyAgICBzY2hlZHVsZU9iamVjdFJl Z2lvbnNVcGRhdGUodHJ1ZSAvKiBzY2hlZHVsZUltbWVkaWF0ZWx5ICovKTsKIAogICAgIC8vIFRo aXMgbWV0aG9kIGNhbiBiZSBjYWxsZWQgYXMgdGhlIHJlc3VsdCBvZiBhIGNsaWVudCByZXF1ZXN0 LiBTaW5jZSBjcmVhdGluZyB0aGUgaXNvbGF0ZWQgdHJlZSBjYW4gdGFrZSBsb25nLAogICAgIC8v IGVzcGVjaWFsbHkgZm9yIGxhcmdlIGRvY3VtZW50cywgZm9yIHJlYWwgY2xpZW50cyB3ZSBidWls ZCBhIHRlbXBvcmFyeSAiZW1wdHkiIGlzb2xhdGVkIHRyZWUgY29uc2lzdGluZyBvbmx5IG9mIHRo ZSBTY3JvbGxWaWV3IGFuZCB0aGUgV2ViQXJlYSBvYmplY3RzLgogICAgIC8vIFRoZW4gd2Ugc2No ZWR1bGUgYnVpbGRpbmcgdGhlIGVudGlyZSBpc29sYXRlZCB0cmVlIG9uIGEgVGltZXIuCiAgICAg Ly8gRm9yIHRlc3QgY2xpZW50cywgTGF5b3V0VGVzdHMgb3IgWENUZXN0cywgYnVpbGQgdGhlIHdo b2xlIGlzb2xhdGVkIHRyZWUuCi0gICAgaWYgKCFpc1Rlc3RDbGllbnQoKSkgeworICAgIGlmIChM SUtFTFkoIWlzVGVzdENsaWVudCgpKSkgewogICAgICAgICB0cmVlID0gQVhJc29sYXRlZFRyZWU6 OmNyZWF0ZUVtcHR5KCp0aGlzKTsKICAgICAgICAgaWYgKCFtX2J1aWxkSXNvbGF0ZWRUcmVlVGlt ZXIuaXNBY3RpdmUoKSkKICAgICAgICAgICAgIG1fYnVpbGRJc29sYXRlZFRyZWVUaW1lci5zdGFy dE9uZVNob3QoMF9zKTsKICAgICB9IGVsc2UKICAgICAgICAgdHJlZSA9IEFYSXNvbGF0ZWRUcmVl OjpjcmVhdGUoKnRoaXMpOwogICAgIHNldElzb2xhdGVkVHJlZVJvb3QodHJlZS0+cm9vdE5vZGUo KS5nZXQoKSk7Ci0gICAgLy8gU2NoZWR1bGUgYSBwYWludCB0byBjYWNoZSB0aGUgcmVjdHMgZm9y IHRoZSBvYmplY3RzIGluIHRoaXMgbmV3IGlzb2xhdGVkIHRyZWUuCi0gICAgc2NoZWR1bGVPYmpl Y3RSZWdpb25zVXBkYXRlKHRydWUgLyogc2NoZWR1bGVJbW1lZGlhdGVseSAqLyk7CiAKICAgICBB WE9iamVjdENhY2hlOjppbml0aWFsaXplU2Vjb25kYXJ5QVhUaHJlYWQoKTsKIApAQCAtODcyLDcg Kzg3MiwxMCBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmJ1aWxkSXNvbGF0ZWRUcmVlKCkKICAgICBh dXRvIHRyZWUgPSBBWElzb2xhdGVkVHJlZTo6Y3JlYXRlKCp0aGlzKTsKICAgICBzZXRJc29sYXRl ZFRyZWVSb290KHRyZWUtPnJvb3ROb2RlKCkuZ2V0KCkpOwogCi0gICAgcG9zdFBsYXRmb3JtTm90 aWZpY2F0aW9uKHRyZWUtPnJvb3ROb2RlKCkuZ2V0KCksIEFYTm90aWZpY2F0aW9uOjpBWExvYWRD b21wbGV0ZSk7CisgICAgaWYgKFJlZlB0ciB3ZWJBcmVhID0gcm9vdFdlYkFyZWEoKSkgeworICAg ICAgICBwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24od2ViQXJlYS5nZXQoKSwgQVhOb3RpZmljYXRp b246OkFYTG9hZENvbXBsZXRlKTsKKyAgICAgICAgcG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKHdl YkFyZWEuZ2V0KCksIEFYTm90aWZpY2F0aW9uOjpBWEZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkKTsK KyAgICB9CiB9CiAKIEFYQ29yZU9iamVjdCogQVhPYmplY3RDYWNoZTo6aXNvbGF0ZWRUcmVlUm9v dE9iamVjdCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xh dGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4IDMzOTg3ZWE1NmFiYS4u NGExZjcyZDdhNzg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lz b2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcApAQCAtMTc0LDcgKzE3 NCw3IEBAIHZvaWQgQVhJc29sYXRlZE9iamVjdDo6aW5pdGlhbGl6ZVByb3BlcnRpZXMoY29uc3Qg UmVmPEFjY2Vzc2liaWxpdHlPYmplY3Q+JiBheE9iCiAgICAgc3RkOjpvcHRpb25hbCBmcmFtZSA9 IGdlb21ldHJ5TWFuYWdlciA/IGdlb21ldHJ5TWFuYWdlci0+cGFpbnRSZWN0Rm9ySUQob2JqZWN0 Lm9iamVjdElEKCkpIDogc3RkOjpudWxsb3B0OwogICAgIGlmIChmcmFtZSkKICAgICAgICAgc2V0 UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OlJlbGF0aXZlRnJhbWUsIFdURk1vdmUoKmZyYW1lKSk7 Ci0gICAgZWxzZSBpZiAob2JqZWN0LmlzU2Nyb2xsVmlldygpIHx8IG9iamVjdC5pc1dlYkFyZWEo KSkgeworICAgIGVsc2UgaWYgKG9iamVjdC5pc1Njcm9sbFZpZXcoKSB8fCBvYmplY3QuaXNXZWJB cmVhKCkgfHwgb2JqZWN0LmlzU2Nyb2xsYmFyKCkpIHsKICAgICAgICAgLy8gVGhlIEdlb21ldHJ5 TWFuYWdlciBkb2VzIG5vdCBoYXZlIGEgcmVsYXRpdmUgZnJhbWUgZm9yIHRoZSBTY3JvbGxWaWV3 IG9yIHRoZSBXZWJBcmVhIHlldC4gV2UgbmVlZCB0byBnZXQgaXQgZnJvbSB0aGUgbGl2ZSBvYmpl Y3Qgc28gdGhhdCB3ZSBkb24ndCBuZWVkIHRvIGhpdCB0aGUgbWFpbiB0aHJlYWQgaW4gdGhlIGNh c2UgYSByZXF1ZXN0IGNvbWVzIGluIHdoaWxlIHRoZSB3aG9sZSBpc29sYXRlZCB0cmVlIGlzIGJl aW5nIGJ1aWx0LgogICAgICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6UmVsYXRpdmVG cmFtZSwgZW5jbG9zaW5nSW50UmVjdChvYmplY3QucmVsYXRpdmVGcmFtZSgpKSk7CiAgICAgfSBl bHNlIGlmICghb2JqZWN0LnJlbmRlcmVyKCkgJiYgb2JqZWN0Lm5vZGUoKSAmJiBpczxBY2Nlc3Np YmlsaXR5Tm9kZU9iamVjdD4ob2JqZWN0KSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4 IGQ4YTY2NTU3NTM2MS4uNTgwYzA3M2U0NDI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCkBA IC05OSw4ICs5OSwxMSBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjpjcmVhdGVFbXB0eUNvbnRlbnQo QWNjZXNzaWJpbGl0eU9iamVjdCYgYXhSb290KQogICAgIGF1dG8gYXBwZW5kcyA9IHJlc29sdmVB cHBlbmRzKCk7CiAKICAgICAvLyBTZXQgdGhlIFNjcmVlblJlbGF0aXZlUG9zaXRpb24gZm9yIHRo ZSBvYmplY3RzIHNvIHRoYXQgdGhlcmUgaXMgbm8gbmVlZCB0byBoaXQgdGhlIG1haW4gdGhyZWFk IG9uIGNsaWVudCdzIHJlcXVlc3QuCi0gICAgZm9yIChhdXRvJiBhcHBlbmQgOiBhcHBlbmRzKQor ICAgIGZvciAoYXV0byYgYXBwZW5kIDogYXBwZW5kcykgewogICAgICAgICBhcHBlbmQuaXNvbGF0 ZWRPYmplY3QtPnNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lOjpTY3JlZW5SZWxhdGl2ZVBvc2l0 aW9uLCBheFJvb3Quc2NyZWVuUmVsYXRpdmVQb3NpdGlvbigpKTsKKyAgICAgICAgaWYgKGFwcGVu ZC5pc29sYXRlZE9iamVjdC0+aXNXZWJBcmVhKCkpCisgICAgICAgICAgICBzZXRGb2N1c2VkTm9k ZUlEKGFwcGVuZC5pc29sYXRlZE9iamVjdC0+b2JqZWN0SUQoKSk7CisgICAgfQogCiAgICAgLy8g UXVldWUgdGhlIGFwcGVuZHMgdG8gYmUgcGVyZm9ybWVkIG9uIHRoZSBBWCB0aHJlYWQuCiAgICAg cXVldWVBcHBlbmRzQW5kUmVtb3ZhbHMoV1RGTW92ZShhcHBlbmRzKSwgeyB9KTsK 466447 2023-05-22 06:04:11 -0700 2023-05-22 06:57:23 -0700 Patch bug-257045-20230522090410.patch text/plain 5595 andresg_22 RnJvbSBiZjVkYTUzZTZhOWRlZDZkYTJmMDRhOWFlNzQzNTk2MDlhY2MyNTBmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBGcmksIDE5IE1heSAyMDIzIDE1OjA0OjQwIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IFNjaGVkdWxlIHRoZSBhY2Nlc3NpYmlsaXR5IHJlZ2lvbnMgcGFpbnQgYmVmb3JlIGJ1aWxk aW5nCiB0aGUgaXNvbGF0ZWQgdHJlZS4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI1NzA0NQogPHJkYXI6Ly9wcm9ibGVtLzEwOTU3NzE5MD4KClJldmlld2VkIGJ5IFR5 bGVyIFdpbGNvY2suCgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNo ZS5jcHA6CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpnZXRPckNyZWF0ZUlzb2xhdGVkVHJlZSk6 Ck1vdmVkIHRoZSBjYWxsIHRvIHNjaGVkdWxlT2JqZWN0UmVnaW9uc1VwZGF0ZSBiZWZvcmUgdGhl IGNyZWF0aW9uIG9mIHRoZSBpc29sYXRlZCB0cmVlIHNvIHRoYXQgdGhlIHJlbGF0aXZlIGZyYW1l IGNhbiBiZSBjYWNoZWQgaW4gdGhlIGlzb2xhdGVkIG9iamVjdHMgdGhhdCBhcmUgYWJvdXQgdG8g YmUgY3JlYXRlZC4KCihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpidWlsZElzb2xhdGVkVHJlZSk6 CkZpeGVkIHRoZSBub3RpZmljYXRpb25zIHNlbnQgYWZ0ZXIgdGhlIHdob2xlIGlzb2xhdGVkIHRy ZWUgaXMgYnVpbHQuCgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVl L0FYSXNvbGF0ZWRUcmVlLmNwcDoKKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpjcmVhdGVFbXB0 eUNvbnRlbnQpOgpTZXQgdGhlIGluaXRpYWwgZm9jdXNlZCBvYmplY3QgaW4gdGhlIG5ld2x5IGNy ZWF0ZWQgZW1wdHkgaXNvbGF0ZWQgdHJlZSB0byB0aGUgV2ViQXJlYS4KLS0tCiBTb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwICAgICAgICB8IDExICsrKysrKyst LS0tCiAuLi4vYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAg ICB8ICAyICstCiAuLi4vYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUu Y3BwICAgICB8ICA1ICsrKystCiAzIGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDYg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B WE9iamVjdENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RD YWNoZS5jcHAKaW5kZXggMmEyZjgzMWYxZmZkLi41YWI3YjI2Yzk3NGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcApAQCAtODQyLDIwICs4NDIs MjAgQEAgUmVmUHRyPEFYSXNvbGF0ZWRUcmVlPiBBWE9iamVjdENhY2hlOjpnZXRPckNyZWF0ZUlz b2xhdGVkVHJlZSgpCiAKICAgICAvLyBBIG5ldyBpc29sYXRlZCB0cmVlIG5lZWRzIHRvIGJlIGNy ZWF0ZWQuIEluaXRpYWxpemUgdGhlIEdlb21ldHJ5TWFuYWdlciBwcmltYXJ5IHNjcmVlbiByZWN0 IHRvIGJlIHJlYWR5IHdoZW4gbmVlZGVkLgogICAgIG1fZ2VvbWV0cnlNYW5hZ2VyLT5pbml0aWFs aXplUHJpbWFyeVNjcmVlblJlY3QoKTsKKyAgICAvLyBTY2hlZHVsZSBhIHBhaW50IHRvIGNhY2hl IHRoZSByZWN0cyBmb3IgdGhlIG9iamVjdHMgaW4gdGhpcyBuZXcgaXNvbGF0ZWQgdHJlZS4KKyAg ICBzY2hlZHVsZU9iamVjdFJlZ2lvbnNVcGRhdGUodHJ1ZSAvKiBzY2hlZHVsZUltbWVkaWF0ZWx5 ICovKTsKIAogICAgIC8vIFRoaXMgbWV0aG9kIGNhbiBiZSBjYWxsZWQgYXMgdGhlIHJlc3VsdCBv ZiBhIGNsaWVudCByZXF1ZXN0LiBTaW5jZSBjcmVhdGluZyB0aGUgaXNvbGF0ZWQgdHJlZSBjYW4g dGFrZSBsb25nLAogICAgIC8vIGVzcGVjaWFsbHkgZm9yIGxhcmdlIGRvY3VtZW50cywgZm9yIHJl YWwgY2xpZW50cyB3ZSBidWlsZCBhIHRlbXBvcmFyeSAiZW1wdHkiIGlzb2xhdGVkIHRyZWUgY29u c2lzdGluZyBvbmx5IG9mIHRoZSBTY3JvbGxWaWV3IGFuZCB0aGUgV2ViQXJlYSBvYmplY3RzLgog ICAgIC8vIFRoZW4gd2Ugc2NoZWR1bGUgYnVpbGRpbmcgdGhlIGVudGlyZSBpc29sYXRlZCB0cmVl IG9uIGEgVGltZXIuCiAgICAgLy8gRm9yIHRlc3QgY2xpZW50cywgTGF5b3V0VGVzdHMgb3IgWENU ZXN0cywgYnVpbGQgdGhlIHdob2xlIGlzb2xhdGVkIHRyZWUuCi0gICAgaWYgKCFpc1Rlc3RDbGll bnQoKSkgeworICAgIGlmIChMSUtFTFkoIWlzVGVzdENsaWVudCgpKSkgewogICAgICAgICB0cmVl ID0gQVhJc29sYXRlZFRyZWU6OmNyZWF0ZUVtcHR5KCp0aGlzKTsKICAgICAgICAgaWYgKCFtX2J1 aWxkSXNvbGF0ZWRUcmVlVGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgICAgIG1fYnVpbGRJc29s YXRlZFRyZWVUaW1lci5zdGFydE9uZVNob3QoMF9zKTsKICAgICB9IGVsc2UKICAgICAgICAgdHJl ZSA9IEFYSXNvbGF0ZWRUcmVlOjpjcmVhdGUoKnRoaXMpOwogICAgIHNldElzb2xhdGVkVHJlZVJv b3QodHJlZS0+cm9vdE5vZGUoKS5nZXQoKSk7Ci0gICAgLy8gU2NoZWR1bGUgYSBwYWludCB0byBj YWNoZSB0aGUgcmVjdHMgZm9yIHRoZSBvYmplY3RzIGluIHRoaXMgbmV3IGlzb2xhdGVkIHRyZWUu Ci0gICAgc2NoZWR1bGVPYmplY3RSZWdpb25zVXBkYXRlKHRydWUgLyogc2NoZWR1bGVJbW1lZGlh dGVseSAqLyk7CiAKICAgICBBWE9iamVjdENhY2hlOjppbml0aWFsaXplU2Vjb25kYXJ5QVhUaHJl YWQoKTsKIApAQCAtODcyLDcgKzg3MiwxMCBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmJ1aWxkSXNv bGF0ZWRUcmVlKCkKICAgICBhdXRvIHRyZWUgPSBBWElzb2xhdGVkVHJlZTo6Y3JlYXRlKCp0aGlz KTsKICAgICBzZXRJc29sYXRlZFRyZWVSb290KHRyZWUtPnJvb3ROb2RlKCkuZ2V0KCkpOwogCi0g ICAgcG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKHRyZWUtPnJvb3ROb2RlKCkuZ2V0KCksIEFYTm90 aWZpY2F0aW9uOjpBWExvYWRDb21wbGV0ZSk7CisgICAgaWYgKFJlZlB0ciB3ZWJBcmVhID0gcm9v dFdlYkFyZWEoKSkgeworICAgICAgICBwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24od2ViQXJlYS5n ZXQoKSwgQVhOb3RpZmljYXRpb246OkFYTG9hZENvbXBsZXRlKTsKKyAgICAgICAgcG9zdFBsYXRm b3JtTm90aWZpY2F0aW9uKHdlYkFyZWEuZ2V0KCksIEFYTm90aWZpY2F0aW9uOjpBWEZvY3VzZWRV SUVsZW1lbnRDaGFuZ2VkKTsKKyAgICB9CiB9CiAKIEFYQ29yZU9iamVjdCogQVhPYmplY3RDYWNo ZTo6aXNvbGF0ZWRUcmVlUm9vdE9iamVjdCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCmlu ZGV4IDMzOTg3ZWE1NmFiYS4uNGExZjcyZDdhNzg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0 LmNwcApAQCAtMTc0LDcgKzE3NCw3IEBAIHZvaWQgQVhJc29sYXRlZE9iamVjdDo6aW5pdGlhbGl6 ZVByb3BlcnRpZXMoY29uc3QgUmVmPEFjY2Vzc2liaWxpdHlPYmplY3Q+JiBheE9iCiAgICAgc3Rk OjpvcHRpb25hbCBmcmFtZSA9IGdlb21ldHJ5TWFuYWdlciA/IGdlb21ldHJ5TWFuYWdlci0+cGFp bnRSZWN0Rm9ySUQob2JqZWN0Lm9iamVjdElEKCkpIDogc3RkOjpudWxsb3B0OwogICAgIGlmIChm cmFtZSkKICAgICAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OlJlbGF0aXZlRnJhbWUs IFdURk1vdmUoKmZyYW1lKSk7Ci0gICAgZWxzZSBpZiAob2JqZWN0LmlzU2Nyb2xsVmlldygpIHx8 IG9iamVjdC5pc1dlYkFyZWEoKSkgeworICAgIGVsc2UgaWYgKG9iamVjdC5pc1Njcm9sbFZpZXco KSB8fCBvYmplY3QuaXNXZWJBcmVhKCkgfHwgb2JqZWN0LmlzU2Nyb2xsYmFyKCkpIHsKICAgICAg ICAgLy8gVGhlIEdlb21ldHJ5TWFuYWdlciBkb2VzIG5vdCBoYXZlIGEgcmVsYXRpdmUgZnJhbWUg Zm9yIHRoZSBTY3JvbGxWaWV3IG9yIHRoZSBXZWJBcmVhIHlldC4gV2UgbmVlZCB0byBnZXQgaXQg ZnJvbSB0aGUgbGl2ZSBvYmplY3Qgc28gdGhhdCB3ZSBkb24ndCBuZWVkIHRvIGhpdCB0aGUgbWFp biB0aHJlYWQgaW4gdGhlIGNhc2UgYSByZXF1ZXN0IGNvbWVzIGluIHdoaWxlIHRoZSB3aG9sZSBp c29sYXRlZCB0cmVlIGlzIGJlaW5nIGJ1aWx0LgogICAgICAgICBzZXRQcm9wZXJ0eShBWFByb3Bl cnR5TmFtZTo6UmVsYXRpdmVGcmFtZSwgZW5jbG9zaW5nSW50UmVjdChvYmplY3QucmVsYXRpdmVG cmFtZSgpKSk7CiAgICAgfSBlbHNlIGlmICghb2JqZWN0LnJlbmRlcmVyKCkgJiYgb2JqZWN0Lm5v ZGUoKSAmJiBpczxBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdD4ob2JqZWN0KSkgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRy ZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29s YXRlZFRyZWUuY3BwCmluZGV4IGQ4YTY2NTU3NTM2MS4uNTgwYzA3M2U0NDI5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJl ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZFRyZWUuY3BwCkBAIC05OSw4ICs5OSwxMSBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjpj cmVhdGVFbXB0eUNvbnRlbnQoQWNjZXNzaWJpbGl0eU9iamVjdCYgYXhSb290KQogICAgIGF1dG8g YXBwZW5kcyA9IHJlc29sdmVBcHBlbmRzKCk7CiAKICAgICAvLyBTZXQgdGhlIFNjcmVlblJlbGF0 aXZlUG9zaXRpb24gZm9yIHRoZSBvYmplY3RzIHNvIHRoYXQgdGhlcmUgaXMgbm8gbmVlZCB0byBo aXQgdGhlIG1haW4gdGhyZWFkIG9uIGNsaWVudCdzIHJlcXVlc3QuCi0gICAgZm9yIChhdXRvJiBh cHBlbmQgOiBhcHBlbmRzKQorICAgIGZvciAoYXV0byYgYXBwZW5kIDogYXBwZW5kcykgewogICAg ICAgICBhcHBlbmQuaXNvbGF0ZWRPYmplY3QtPnNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lOjpT Y3JlZW5SZWxhdGl2ZVBvc2l0aW9uLCBheFJvb3Quc2NyZWVuUmVsYXRpdmVQb3NpdGlvbigpKTsK KyAgICAgICAgaWYgKGFwcGVuZC5pc29sYXRlZE9iamVjdC0+aXNXZWJBcmVhKCkpCisgICAgICAg ICAgICBzZXRGb2N1c2VkTm9kZUlEKGFwcGVuZC5pc29sYXRlZE9iamVjdC0+b2JqZWN0SUQoKSk7 CisgICAgfQogCiAgICAgLy8gUXVldWUgdGhlIGFwcGVuZHMgdG8gYmUgcGVyZm9ybWVkIG9uIHRo ZSBBWCB0aHJlYWQuCiAgICAgcXVldWVBcHBlbmRzQW5kUmVtb3ZhbHMoV1RGTW92ZShhcHBlbmRz KSwgeyB9KTsK