209792 2020-03-30 18:48:35 -0700 The relative frame and hit test of isolated objects must be dispatched to the main thread. 2020-03-31 07:53:14 -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 1635908 0 andresg_22 2020-03-30 18:48:35 -0700 The relative frame and hit test of isolated objects must be dispatched to the main thread. 1635913 1 395003 andresg_22 2020-03-30 19:03:22 -0700 Created attachment 395003 Patch 1636015 2 ews-feeder 2020-03-31 07:52:45 -0700 Committed r259288: <https://trac.webkit.org/changeset/259288> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395003. 1636017 3 webkit-bug-importer 2020-03-31 07:53:14 -0700 <rdar://problem/61106914> 395003 2020-03-30 19:03:22 -0700 2020-03-31 07:52:46 -0700 Patch bug-209792-20200330220320.patch text/plain 8558 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDRkZGE4MmM1ZmJhMGM4 Y2UzYzA3MzkyM2U3MTM5M2FmYzc3MTA3MC4uMTlhYmJjOTY3NzEwZTc2YzQ3NGJiNjY3YmRmNWQx NDY5NjBmMWVlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTAzLTMwICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBUaGUgcmVsYXRp dmUgZnJhbWUgYW5kIGhpdCB0ZXN0IG9mIGlzb2xhdGVkIG9iamVjdHMgbXVzdCBiZSBkaXNwYXRj aGVkIHRvIHRoZSBtYWluIHRocmVhZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwOTc5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoZSByZWxhdGl2ZSBmcmFtZSBvZiBpc29sYXRlZCBvYmplY3RzIG11 c3QgYmUgY2FsY3VsYXRlZCBvbiB0aGUgbWFpbgorICAgICAgICB0aHJlYWQgYmVjYXVzZSBpdCBy ZXF1aXJlcyB0aGUgc2Nyb2xsIGFuY2VzdG9yIHRvIGNvbnZlcnQgdG8gdGhlCisgICAgICAgIGFw cHJvcHJpYXRlIHNjcm9sbCBvZmZzZXQuIFRoZSByZWxhdGl2ZSBmcmFtZSBjYW5ub3QgYmUgY2Fj aGVkIGJlY2F1c2UKKyAgICAgICAgdGhlIHNjcm9sbCBvZmZzZXQgY2FuIGNoYW5nZS4KKyAgICAg ICAgQWNjb3JkaW5nbHksIHRoZSBoaXQgdGVzdCBjYW5ub3QgcmVseSBvbiBhIGNhY2hlZCByZWxh dGl2ZSBmcmFtZSBhbmQKKyAgICAgICAgbXVzdCBiZSBkaXNwYXRjaGVkIHRvIGJlIGNvbXB1dGVk IG9uIHRoZSBtYWluIHRocmVhZCBhcyB3ZWxsLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9B WE9iamVjdENhY2hlLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0Ojpp bml0aWFsaXplQXR0cmlidXRlRGF0YSk6IERvIG5vdCBjYWNoZSB0aGUgcmVsYXRpdmUgZnJhbWUg YW55IGxvbmdlci4KKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmFjY2Vzc2li aWxpdHlIaXRUZXN0IGNvbnN0KTogRGlzcGF0Y2hlZCB0byB0aGUgbWFpbiB0aHJlYWQuCisgICAg ICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0OjpyZWxhdGl2ZUZyYW1lIGNvbnN0KTogRGlz cGF0Y2hlZCB0byB0aGUgbWFpbiB0aHJlYWQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFj L1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tOgorICAgICAgICAoLVtXZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlciBwb3NpdGlvbl0pOgorICAgICAgICAoLVtXZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6XSk6CisgICAg ICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlIaXRUZXN0 Ol0pOgorCiAyMDIwLTAzLTMwICBBbmRyZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNv bT4KIAogICAgICAgICBbV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgcmVtb3RlQWNjZXNz aWJpbGl0eVBhcmVudE9iamVjdCBzaG91bGQgYmUgY2FjaGVkIHRvIGF2b2lkIGhpdHRpbmcgdGhl IG1haW4gdGhyZWFkIG9mdGVuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BWE9iamVjdENhY2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2Jq ZWN0Q2FjaGUuaAppbmRleCA2NDRmYmQzN2E1Y2E3YWJkNzk3NmM5YWU2YWI4NzljOWQ3NmY0ZjRh Li5hMzliMTczNzkyMWIzZmQzYWU1NjBjODc0ZWZkMjRhN2VjM2JmMTc4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaApAQCAtMzU4LDggKzM1OCw4IEBA IHByaXZhdGU6CiAgICAgQVhDb3JlT2JqZWN0KiBpc29sYXRlZFRyZWVSb290T2JqZWN0KCk7CiAg ICAgQVhDb3JlT2JqZWN0KiBpc29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KCk7CiAgICAgdm9pZCBz ZXRJc29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KE5vZGUqKTsKLSAgICBSZWZQdHI8QVhJc29sYXRl ZFRyZWU+IGdldE9yQ3JlYXRlSXNvbGF0ZWRUcmVlKCkgY29uc3Q7CiAgICAgc3RhdGljIFJlZjxB WElzb2xhdGVkVHJlZT4gZ2VuZXJhdGVJc29sYXRlZFRyZWUoUGFnZUlkZW50aWZpZXIsIERvY3Vt ZW50Jik7CisgICAgUmVmUHRyPEFYSXNvbGF0ZWRUcmVlPiBnZXRPckNyZWF0ZUlzb2xhdGVkVHJl ZSgpIGNvbnN0OwogICAgIHZvaWQgdXBkYXRlSXNvbGF0ZWRUcmVlKEFYQ29yZU9iamVjdCYsIEFY Tm90aWZpY2F0aW9uKTsKICAgICB2b2lkIHVwZGF0ZUlzb2xhdGVkVHJlZShjb25zdCBWZWN0b3I8 c3RkOjpwYWlyPFJlZlB0cjxBWENvcmVPYmplY3Q+LCBBWE5vdGlmaWNhdGlvbj4+Jik7CiAgICAg c3RhdGljIHZvaWQgaW5pdGlhbGl6ZVNlY29uZGFyeUFYVGhyZWFkKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuY3BwCmluZGV4IGM2MzdmZjhjY2YxNzk2MWYzMjZlZDc3NjA4NDc4MWVmOTQ3Yjk3 NmQuLjY3NDVlZTU4ZDA4NWYxMGZmZTYyNDU1MGIzZGQ1MWMwOWE0ZWVjODEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRPYmplY3QuY3BwCkBAIC0xMjEsNyArMTIxLDYgQEAgdm9pZCBBWElzb2xhdGVkT2Jq ZWN0Ojppbml0aWFsaXplQXR0cmlidXRlRGF0YShBWENvcmVPYmplY3QmIG9iamVjdCwgYm9vbCBp c1Jvb3QKICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SXNWYWx1ZUF1dG9maWxsZWQs IG9iamVjdC5pc1ZhbHVlQXV0b2ZpbGxlZCgpKTsKICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5 TmFtZTo6SXNWaXNpYmxlLCBvYmplY3QuaXNWaXNpYmxlKCkpOwogICAgIHNldFByb3BlcnR5KEFY UHJvcGVydHlOYW1lOjpJc1Zpc2l0ZWQsIG9iamVjdC5pc1Zpc2l0ZWQoKSk7Ci0gICAgc2V0UHJv cGVydHkoQVhQcm9wZXJ0eU5hbWU6OlJlbGF0aXZlRnJhbWUsIG9iamVjdC5yZWxhdGl2ZUZyYW1l KCkpOwogICAgIHNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lOjpSb2xlRGVzY3JpcHRpb24sIG9i amVjdC5yb2xlRGVzY3JpcHRpb24oKS5pc29sYXRlZENvcHkoKSk7CiAgICAgc2V0UHJvcGVydHko QVhQcm9wZXJ0eU5hbWU6OlJvbGVQbGF0Zm9ybVN0cmluZywgb2JqZWN0LnJvbGVQbGF0Zm9ybVN0 cmluZygpLmlzb2xhdGVkQ29weSgpKTsKICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6 Um9sZVZhbHVlLCBzdGF0aWNfY2FzdDxpbnQ+KG9iamVjdC5yb2xlVmFsdWUoKSkpOwpAQCAtNzAw LDE1ICs2OTksMTcgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0Ojpjb2xvclZhbHVlKGludCYgciwg aW50JiBnLCBpbnQmIGIpIGNvbnN0CiAKIEFYQ29yZU9iamVjdCogQVhJc29sYXRlZE9iamVjdDo6 YWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zdAogewotICAg IGlmICghcmVsYXRpdmVGcmFtZSgpLmNvbnRhaW5zKHBvaW50KSkKLSAgICAgICAgcmV0dXJuIG51 bGxwdHI7Ci0gICAgZm9yIChjb25zdCBhdXRvJiBjaGlsZElEIDogbV9jaGlsZHJlbklEcykgewot ICAgICAgICBhdXRvIGNoaWxkID0gdHJlZSgpLT5ub2RlRm9ySUQoY2hpbGRJRCk7Ci0gICAgICAg IEFTU0VSVChjaGlsZCk7Ci0gICAgICAgIGlmIChjaGlsZCAmJiBjaGlsZC0+cmVsYXRpdmVGcmFt ZSgpLmNvbnRhaW5zKHBvaW50KSkKLSAgICAgICAgICAgIHJldHVybiBjaGlsZC0+YWNjZXNzaWJp bGl0eUhpdFRlc3QocG9pbnQpOwotICAgIH0KLSAgICByZXR1cm4gY29uc3RfY2FzdDxBWElzb2xh dGVkT2JqZWN0Kj4odGhpcyk7CisgICAgQVhJRCBheElEID0gQWNjZXNzaWJpbGl0eTo6cmV0cmll dmVWYWx1ZUZyb21NYWluVGhyZWFkPEFYSUQ+KFsmcG9pbnQsIHRoaXNdICgpIC0+IEFYSUQgewor ICAgICAgICBpZiAoYXV0byogb2JqZWN0ID0gYXNzb2NpYXRlZEFYT2JqZWN0KCkpIHsKKyAgICAg ICAgICAgIG9iamVjdC0+dXBkYXRlQ2hpbGRyZW5JZk5lY2Vzc2FyeSgpOworICAgICAgICAgICAg aWYgKGF1dG8qIGF4T2JqZWN0ID0gb2JqZWN0LT5hY2Nlc3NpYmlsaXR5SGl0VGVzdChwb2ludCkp CisgICAgICAgICAgICAgICAgcmV0dXJuIGF4T2JqZWN0LT5vYmplY3RJRCgpOworICAgICAgICB9 CisKKyAgICAgICAgcmV0dXJuIEludmFsaWRBWElEOworICAgIH0pOworCisgICAgcmV0dXJuIHRy ZWUoKS0+bm9kZUZvcklEKGF4SUQpLmdldCgpOwogfQogCiBJbnRQb2ludCBBWElzb2xhdGVkT2Jq ZWN0OjppbnRQb2ludEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSkg Y29uc3QKQEAgLTkxMCw2ICs5MTEsMTYgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0OjpmaW5kTWF0 Y2hpbmdPYmplY3RzKEFjY2Vzc2liaWxpdHlTZWFyY2hDcml0ZXJpYSogY3JpdGVyaWEKICAgICBB Y2Nlc3NpYmlsaXR5OjpmaW5kTWF0Y2hpbmdPYmplY3RzKCpjcml0ZXJpYSwgcmVzdWx0cyk7CiB9 CiAKK0Zsb2F0UmVjdCBBWElzb2xhdGVkT2JqZWN0OjpyZWxhdGl2ZUZyYW1lKCkgY29uc3QKK3sK KyAgICAvLyBSZXRyaWV2ZSB0aGlzIG9uIHRoZSBtYWluIHRocmVhZCBiZWNhdXNlIHdlIHJlcXVp cmUgdGhlIHNjcm9sbCBhbmNlc3RvciB0byBjb252ZXJ0IHRvIHRoZSByaWdodCBzY3JvbGwgb2Zm c2V0LgorICAgIHJldHVybiBBY2Nlc3NpYmlsaXR5OjpyZXRyaWV2ZVZhbHVlRnJvbU1haW5UaHJl YWQ8RmxvYXRSZWN0PihbdGhpc10gKCkgLT4gRmxvYXRSZWN0IHsKKyAgICAgICAgaWYgKGF1dG8q IGF4T2JqZWN0ID0gYXNzb2NpYXRlZEFYT2JqZWN0KCkpCisgICAgICAgICAgICByZXR1cm4gYXhP YmplY3QtPnJlbGF0aXZlRnJhbWUoKTsKKyAgICAgICAgcmV0dXJuIHsgfTsKKyAgICB9KTsKK30K KwogYm9vbCBBWElzb2xhdGVkT2JqZWN0OjpyZXBsYWNlVGV4dEluUmFuZ2UoY29uc3QgU3RyaW5n JiwgY29uc3QgUGxhaW5UZXh0UmFuZ2UmKQogewogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZE9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRy ZWUvQVhJc29sYXRlZE9iamVjdC5oCmluZGV4IDgwYmE4YmE0ODRjNTEwZjU4YTljNWMyODRhYzIx OTc3NGQzMWNmNjMuLmJmNTcxNGFiOTY1YTIzN2QyMmNlMWI2M2RhMGJiMWY4OTliODZiYmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVk dHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKQEAgLTI4Miw3ICsyODIsNiBAQCBwcml2YXRlOgogICAg ICAgICBQb3NJblNldCwKICAgICAgICAgUHJldmVudEtleWJvYXJkRE9NRXZlbnREaXNwYXRjaCwK ICAgICAgICAgUmVhZE9ubHlWYWx1ZSwKLSAgICAgICAgUmVsYXRpdmVGcmFtZSwKICNpZiBQTEFU Rk9STShDT0NPQSkKICAgICAgICAgUmVtb3RlUGFyZW50T2JqZWN0LAogI2VuZGlmCkBAIC00NjMs NyArNDYyLDcgQEAgcHJpdmF0ZToKICAgICBib29sIGlzUmVxdWlyZWQoKSBjb25zdCBvdmVycmlk ZSB7IHJldHVybiBib29sQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OklzUmVxdWlyZWQp OyB9CiAgICAgYm9vbCBzdXBwb3J0c1JlcXVpcmVkQXR0cmlidXRlKCkgY29uc3Qgb3ZlcnJpZGUg eyByZXR1cm4gYm9vbEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpTdXBwb3J0c1JlcXVp cmVkQXR0cmlidXRlKTsgfQogICAgIGJvb2wgaXNFeHBhbmRlZCgpIGNvbnN0IG92ZXJyaWRlIHsg cmV0dXJuIGJvb2xBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZTo6SXNFeHBhbmRlZCk7IH0K LSAgICBGbG9hdFJlY3QgcmVsYXRpdmVGcmFtZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHJl Y3RBdHRyaWJ1dGVWYWx1ZTxGbG9hdFJlY3Q+KEFYUHJvcGVydHlOYW1lOjpSZWxhdGl2ZUZyYW1l KTsgfQorICAgIEZsb2F0UmVjdCByZWxhdGl2ZUZyYW1lKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAg Ym9vbCBzdXBwb3J0c0RhdGV0aW1lQXR0cmlidXRlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4g Ym9vbEF0dHJpYnV0ZVZhbHVlKEFYUHJvcGVydHlOYW1lOjpTdXBwb3J0c0RhdGV0aW1lQXR0cmli dXRlKTsgfQogICAgIFN0cmluZyBkYXRldGltZUF0dHJpYnV0ZVZhbHVlKCkgY29uc3Qgb3ZlcnJp ZGUgeyByZXR1cm4gc3RyaW5nQXR0cmlidXRlVmFsdWUoQVhQcm9wZXJ0eU5hbWU6OkRhdGV0aW1l QXR0cmlidXRlVmFsdWUpOyB9CiAgICAgYm9vbCBjYW5TZXRGb2N1c0F0dHJpYnV0ZSgpIGNvbnN0 IG92ZXJyaWRlIHsgcmV0dXJuIGJvb2xBdHRyaWJ1dGVWYWx1ZShBWFByb3BlcnR5TmFtZTo6Q2Fu U2V0Rm9jdXNBdHRyaWJ1dGUpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbSBiL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFj Lm1tCmluZGV4IDNkNGIxYTQ4MmM3OTgzMmM1OGEzZTM4MmY1YTdkOTUwZTkzNTQ4MTguLmY2YTcy MzE2YTY3NzM3Y2I2NWI5ZGIyOGQ1MTMyNDE1NDdiNmIzNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFj Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyTWFjLm1tCkBAIC0xOTgyLDcgKzE5ODIsNyBAQCBzdGF0aWMgdm9pZCBX ZWJUcmFuc2Zvcm1DR1BhdGhUb05TQmV6aWVyUGF0aCh2b2lkKiBpbmZvLCBjb25zdCBDR1BhdGhF bGVtZW50ICplbAogICAgIGlmIChfQVhVSUVsZW1lbnRSZXF1ZXN0U2VydmljZWRCeVNlY29uZGFy eUFYVGhyZWFkKCkpCiAgICAgICAgIHJldHVybiBbTlNWYWx1ZSB2YWx1ZVdpdGhQb2ludDooTlNQ b2ludClzZWxmLmF4QmFja2luZ09iamVjdC0+cmVsYXRpdmVGcmFtZSgpLmxvY2F0aW9uKCldOwog I2VuZGlmCi0gICAgICAgIAorCiAgICAgYXV0byByZWN0ID0gc25hcHBlZEludFJlY3Qoc2VsZi5h eEJhY2tpbmdPYmplY3QtPmVsZW1lbnRSZWN0KCkpOwogICAgIAogICAgIC8vIFRoZSBDb2NvYSBh Y2Nlc3NpYmlsaXR5IEFQSSB3YW50cyB0aGUgbG93ZXItbGVmdCBjb3JuZXIuCkBAIC0zMDYzLDcg KzMwNjMsNyBAQCBBTExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKICAgICB9CiAK ICAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eVJl bGF0aXZlRnJhbWVBdHRyaWJ1dGVdKQotICAgICAgICByZXR1cm4gW05TVmFsdWUgdmFsdWVXaXRo UmVjdDpOU1JlY3RGcm9tQ0dSZWN0KGJhY2tpbmdPYmplY3QtPnJlbGF0aXZlRnJhbWUoKSldOwor ICAgICAgICByZXR1cm4gW05TVmFsdWUgdmFsdWVXaXRoUmVjdDooTlNSZWN0KWJhY2tpbmdPYmpl Y3QtPnJlbGF0aXZlRnJhbWUoKV07CiAKICAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRv U3RyaW5nOkAiQVhFcnJvck1lc3NhZ2VFbGVtZW50cyJdKSB7CiAgICAgICAgIEFjY2Vzc2liaWxp dHlPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBlcnJvck1lc3NhZ2VzOwpAQCAt MzEzNSw2ICszMTM1LDcgQEAgQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElPTlNfRU5ECiAK ICAgICBiYWNraW5nT2JqZWN0LT51cGRhdGVDaGlsZHJlbklmTmVjZXNzYXJ5KCk7CiAgICAgQVhD b3JlT2JqZWN0KiBheE9iamVjdCA9IGJhY2tpbmdPYmplY3QtPmFjY2Vzc2liaWxpdHlIaXRUZXN0 KEludFBvaW50KHBvaW50KSk7CisKICAgICBpZiAoYXhPYmplY3QpIHsKICAgICAgICAgaWYgKGF4 T2JqZWN0LT5pc0F0dGFjaG1lbnQoKSAmJiBbYXhPYmplY3QtPndyYXBwZXIoKSBhdHRhY2htZW50 Vmlld10pCiAgICAgICAgICAgICByZXR1cm4gW2F4T2JqZWN0LT53cmFwcGVyKCkgYXR0YWNobWVu dFZpZXddOwo=