226794 2021-06-08 17:03:42 -0700 Upstream AppHighlight Observer code 2021-06-08 20:29:26 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner hi thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1767966 0 megan_gardner 2021-06-08 17:03:42 -0700 Upstream AppHighlight Observer code 1767968 1 430914 megan_gardner 2021-06-08 17:05:42 -0700 Created attachment 430914 Patch 1767975 2 430914 thorton 2021-06-08 17:10:52 -0700 Comment on attachment 430914 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430914&action=review > Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm:70 > +#import <Synapse/SYNotesActivationObserver.h> This will eventually need an SPI header > Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm:73 > +SOFT_LINK_CLASS_OPTIONAL(Synapse, SYNotesActivationObserver) Oddly we don't really seem to deal with the optional-ness elegantly? Maybe it's OK because alloc returns nil and then -isVisible on nil returns NO and we updateAppHighlightsVisibility with NO? But it would be nice if it were an early return instead. > Source/WebKit/UIProcess/WebPageProxy.h:3047 > + void setUpHighlightsObserver(); There shouldn't be random methods in amongst the members, move this above. > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:9325 > + if ([menuItem action] == @selector(createHighlightInCurrentGroupWithRange:)) > + return; Should this be checking for /either/ selector? 1767982 3 wenson_hsieh 2021-06-08 17:16:12 -0700 rdar://79043357 1768007 4 430929 megan_gardner 2021-06-08 18:02:57 -0700 Created attachment 430929 Patch for landing 1768039 5 ews-feeder 2021-06-08 20:29:25 -0700 Committed r278644 (238626@main): <https://commits.webkit.org/238626@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430929. 430914 2021-06-08 17:05:42 -0700 2021-06-08 18:02:55 -0700 Patch bug-226794-20210608170541.patch text/plain 6809 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE5YjllZGExZTAxZjEzZmIw MDhiOWYzMWNiM2EyMDUyNWJhYjIzZGQuLmE3ZTBhZmJlOTZlMjc0YTE4ZDhkZmU1YTdmZTc2M2Jk ZDdiMGEwMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDYtMDggIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBVcHN0cmVhbSBBcHBI aWdobGlnaHQgT2JzZXJ2ZXIgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjI2Nzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW06Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6YXBwSGlnaGxpZ2h0c1Zpc2liaWxpdHkpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldFVwSGlnaGxpZ2h0c09ic2VydmVyKToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZp ZXcgc2V0VXBBcHBIaWdobGlnaHRNZW51c0lmTmVlZGVkXSk6CisKIDIwMjEtMDYtMDggIFRydWl0 dCBTYXZlbGwgIDx0c2F2ZWxsQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZl cnRpbmcgcjI3ODYwOS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29h L1dlYlBhZ2VQcm94eUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi UGFnZVByb3h5Q29jb2EubW0KaW5kZXggNTE2N2JkYjhhNTBhZjNkMzNlOTk3MWVmZTI4OGZiMmM2 ODQwZWZmMy4uYWI5YmEwZDliYjllMDFkNWEyMWUwYTU0MTYyYWVlOWQ3ZDgwZmEyYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0K QEAgLTQ5LDYgKzQ5LDcgQEAKICNpbXBvcnQgIldLRXJyb3JJbnRlcm5hbC5oIgogI2ltcG9ydCA8 V2ViQ29yZS9EcmFnSXRlbS5oPgogI2ltcG9ydCA8V2ViQ29yZS9HZW9tZXRyeVV0aWxpdGllcy5o PgorI2ltcG9ydCA8V2ViQ29yZS9IaWdobGlnaHRWaXNpYmlsaXR5Lmg+CiAjaW1wb3J0IDxXZWJD b3JlL0xvY2FsQ3VycmVudEdyYXBoaWNzQ29udGV4dC5oPgogI2ltcG9ydCA8V2ViQ29yZS9OZXR3 b3JrRXh0ZW5zaW9uQ29udGVudEZpbHRlci5oPgogI2ltcG9ydCA8V2ViQ29yZS9Ob3RJbXBsZW1l bnRlZC5oPgpAQCAtNjUsNiArNjYsMTMgQEAKICNpbXBvcnQgIk1lZGlhVXNhZ2VNYW5hZ2VyQ29j b2EuaCIKICNlbmRpZgogCisjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQorI2ltcG9ydCA8U3lu YXBzZS9TWU5vdGVzQWN0aXZhdGlvbk9ic2VydmVyLmg+CisKK1NPRlRfTElOS19QUklWQVRFX0ZS QU1FV09SS19PUFRJT05BTChTeW5hcHNlKQorU09GVF9MSU5LX0NMQVNTX09QVElPTkFMKFN5bmFw c2UsIFNZTm90ZXNBY3RpdmF0aW9uT2JzZXJ2ZXIpCisjZW5kaWYgLy8gRU5BQkxFKEFQUF9ISUdI TElHSFRTKQorCiAjaWYgVVNFKEFQUEtJVCkKICNpbXBvcnQgPEFwcEtpdC9OU0ltYWdlLmg+CiAj ZWxzZQpAQCAtNTkyLDYgKzYwMCwyNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0QXBwSGlnaGxp Z2h0c1Zpc2liaWxpdHkoV2ViQ29yZTo6SGlnaGxpZ2h0VmlzaWJpbGl0eSBhcHBIaQogICAgIHNl bmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldEFwcEhpZ2hsaWdodHNWaXNpYmlsaXR5KGFwcEhpZ2hs aWdodHNWaXNpYmlsaXR5KSk7CiB9CiAKK2Jvb2wgV2ViUGFnZVByb3h5OjphcHBIaWdobGlnaHRz VmlzaWJpbGl0eSgpCit7CisgICAgaWYgKCFtX2FwcEhpZ2hsaWdodHNPYnNlcnZlcikKKyAgICAg ICAgc2V0VXBIaWdobGlnaHRzT2JzZXJ2ZXIoKTsKKyAgICByZXR1cm4gW21fYXBwSGlnaGxpZ2h0 c09ic2VydmVyIGlzVmlzaWJsZV07Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRVcEhpZ2hs aWdodHNPYnNlcnZlcigpCit7CisgICAgaWYgKG1fYXBwSGlnaGxpZ2h0c09ic2VydmVyKQorICAg ICAgICByZXR1cm47CisgICAgYXV0byB1cGRhdGVBcHBIaWdobGlnaHRzVmlzaWJpbGl0eSA9IF4o Qk9PTCBpc1Zpc2libGUpIHsKKyAgICAgICAgc2V0QXBwSGlnaGxpZ2h0c1Zpc2liaWxpdHkoaXNW aXNpYmxlID8gV2ViQ29yZTo6SGlnaGxpZ2h0VmlzaWJpbGl0eTo6VmlzaWJsZSA6IFdlYkNvcmU6 OkhpZ2hsaWdodFZpc2liaWxpdHk6OkhpZGRlbik7CisgICAgfTsKKyAgICBtX2FwcEhpZ2hsaWdo dHNPYnNlcnZlciA9IGFkb3B0TlMoW2FsbG9jU1lOb3Rlc0FjdGl2YXRpb25PYnNlcnZlckluc3Rh bmNlKCkgaW5pdFdpdGhIYW5kbGVyOnVwZGF0ZUFwcEhpZ2hsaWdodHNWaXNpYmlsaXR5XSk7Cisg ICAgdXBkYXRlQXBwSGlnaGxpZ2h0c1Zpc2liaWxpdHkoW21fYXBwSGlnaGxpZ2h0c09ic2VydmVy IGlzVmlzaWJsZV0pOworfQorCiAjZW5kaWYKIAogU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJy YXkgV2ViUGFnZVByb3h5OjpjcmVhdGVOZXR3b3JrRXh0ZW5zaW9uc1NhbmRib3hFeHRlbnNpb25z KFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcykKQEAgLTY5Miw5ICs3MTgsNSBAQCBOU0RpY3Rpb25h cnkgKldlYlBhZ2VQcm94eTo6Y29udGVudHNPZlVzZXJJbnRlcmZhY2VJdGVtKE5TU3RyaW5nICp1 c2VySW50ZXJmYWNlSQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAotI2lmIFVTRShBUFBMRV9J TlRFUk5BTF9TREspCi0jaW1wb3J0IDxXZWJLaXRBZGRpdGlvbnMvV2ViUGFnZVByb3h5Q29jb2FB ZGRpdGlvbnNBZnRlci5tbT4KLSNlbmRpZgotCiAjdW5kZWYgTUVTU0FHRV9DSEVDS19DT01QTEVU SU9OCiAjdW5kZWYgTUVTU0FHRV9DSEVDSwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAppbmRleCA2ZDA1ZDZmYzc5MDhlNGIyZGI4NWE2NDIzYzRmY2U2OTY2NjAwYzRhLi5lNjIy ZDU2YzNlMDkxOWMxMDNmMmQ1MDI2NGE3N2UwZGUzMWJkZmZmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMTg5LDEwICsxODksNiBAQCBpbnRlcmZhY2UgSUQzRDEx RGV2aWNlMTsKICNpbmNsdWRlICJQbGF0Zm9ybVhSU3lzdGVtLmgiCiAjZW5kaWYKIAotI2lmIFVT RShBUFBMRV9JTlRFUk5BTF9TREspCi0jaW1wb3J0IDxXZWJLaXRBZGRpdGlvbnMvV2ViUGFnZVBy b3h5QWRkaXRpb25zQmVmb3JlLmg+Ci0jZW5kaWYKLQogbmFtZXNwYWNlIEFQSSB7CiBjbGFzcyBB dHRhY2htZW50OwogY2xhc3MgQ29udGVudFdvcmxkOwpAQCAtMjMwLDYgKzIyNiw3IEBAIE9CSkNf Q0xBU1MgTlNNZW51OwogT0JKQ19DTEFTUyBOU1RleHRBbHRlcm5hdGl2ZXM7CiBPQkpDX0NMQVNT IE5TVmlldzsKIE9CSkNfQ0xBU1MgUUxQcmV2aWV3UGFuZWw7CitPQkpDX0NMQVNTIFNZTm90ZXNB Y3RpdmF0aW9uT2JzZXJ2ZXI7CiBPQkpDX0NMQVNTIFdLUUxUaHVtYm5haWxMb2FkT3BlcmF0aW9u OwogT0JKQ19DTEFTUyBXS1Zpc3VhbFNlYXJjaFByZXZpZXdDb250cm9sbGVyOwogT0JKQ19DTEFT UyBXS1dlYlZpZXc7CkBAIC0xODk3LDYgKzE4OTQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdG9y ZUFwcEhpZ2hsaWdodChjb25zdCBXZWJDb3JlOjpBcHBIaWdobGlnaHQmKTsKICAgICB2b2lkIHJl c3RvcmVBcHBIaWdobGlnaHRzQW5kU2Nyb2xsVG9JbmRleChjb25zdCBWZWN0b3I8UmVmPFdlYktp dDo6U2hhcmVkTWVtb3J5Pj4mIGhpZ2hsaWdodHMsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8dW5zaWdu ZWQ+IGluZGV4KTsKICAgICB2b2lkIHNldEFwcEhpZ2hsaWdodHNWaXNpYmlsaXR5KGNvbnN0IFdl YkNvcmU6OkhpZ2hsaWdodFZpc2liaWxpdHkpOworICAgIGJvb2wgYXBwSGlnaGxpZ2h0c1Zpc2li aWxpdHkoKTsKICNlbmRpZgogCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKQEAgLTMwNDUsOCAr MzA0MywxMCBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybVhSU3lzdGVt PiBtX3hyU3lzdGVtOwogI2VuZGlmCiAKLSNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQotI2lt cG9ydCA8V2ViS2l0QWRkaXRpb25zL1dlYlBhZ2VQcm94eUFkZGl0aW9uc0FmdGVyLmg+CisjaWYg RU5BQkxFKEFQUF9ISUdITElHSFRTKQorICAgIHZvaWQgc2V0VXBIaWdobGlnaHRzT2JzZXJ2ZXIo KTsKKworICAgIFJldGFpblB0cjxTWU5vdGVzQWN0aXZhdGlvbk9ic2VydmVyPiBtX2FwcEhpZ2hs aWdodHNPYnNlcnZlcjsKICNlbmRpZgogCiAjaWYgRU5BQkxFKElNQUdFX0FOQUxZU0lTKSAmJiBQ TEFURk9STShNQUMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCA3YTg0ODEwZWFhZTgyOWRlMjQ1NzE2NmQ5 NDc5ODY3ODY1M2U1MzRlLi40NWM2MTcyMmZlNDY2M2E3NGUyYTNjNDczMDhjYzYxODRkMGYyZDk2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0KQEAgLTkzMTUsNiArOTMxNSwyMSBAQCAtICh2b2lkKV9sb29rdXBH ZXN0dXJlUmVjb2duaXplZDooVUlHZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmVSZWNvZ25pemVy CiAKIAogI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykKKy0gKHZvaWQpc2V0VXBBcHBIaWdobGln aHRNZW51c0lmTmVlZGVkCit7CisgICAgaWYgKCFfcGFnZS0+cHJlZmVyZW5jZXMoKS5hcHBIaWdo bGlnaHRzRW5hYmxlZCgpIHx8ICFzZWxmLndpbmRvdyB8fCAhX3BhZ2UtPmVkaXRvclN0YXRlKCku c2VsZWN0aW9uSXNSYW5nZSkKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIGZvciAoVUlNZW51 SXRlbSAqbWVudUl0ZW0gaW4gW1tVSU1lbnVDb250cm9sbGVyIHNoYXJlZE1lbnVDb250cm9sbGVy XSBtZW51SXRlbXNdKSB7CisgICAgICAgIGlmIChbbWVudUl0ZW0gYWN0aW9uXSA9PSBAc2VsZWN0 b3IoY3JlYXRlSGlnaGxpZ2h0SW5DdXJyZW50R3JvdXBXaXRoUmFuZ2U6KSkKKyAgICAgICAgICAg IHJldHVybjsKKyAgICB9CisgICAgCisgICAgYXV0byBhZGRIaWdobGlnaHRDdXJyZW50R3JvdXBJ dGVtID0gYWRvcHROUyhbW1VJTWVudUl0ZW0gYWxsb2NdIGluaXRXaXRoVGl0bGU6V2ViQ29yZTo6 Y29udGV4dE1lbnVJdGVtVGFnQWRkSGlnaGxpZ2h0VG9DdXJyZW50R3JvdXAoKSBhY3Rpb246QHNl bGVjdG9yKGNyZWF0ZUhpZ2hsaWdodEluQ3VycmVudEdyb3VwV2l0aFJhbmdlOildKTsKKyAgICBh dXRvIGFkZEhpZ2hsaWdodE5ld0dyb3VwSXRlbSA9IGFkb3B0TlMoW1tVSU1lbnVJdGVtIGFsbG9j XSBpbml0V2l0aFRpdGxlOldlYkNvcmU6OmNvbnRleHRNZW51SXRlbVRhZ0FkZEhpZ2hsaWdodFRv TmV3R3JvdXAoKSBhY3Rpb246QHNlbGVjdG9yKGNyZWF0ZUhpZ2hsaWdodEluTmV3R3JvdXBXaXRo UmFuZ2U6KV0pOworICAgIFtbVUlNZW51Q29udHJvbGxlciBzaGFyZWRNZW51Q29udHJvbGxlcl0g c2V0TWVudUl0ZW1zOkBbIGFkZEhpZ2hsaWdodEN1cnJlbnRHcm91cEl0ZW0uZ2V0KCksIGFkZEhp Z2hsaWdodE5ld0dyb3VwSXRlbS5nZXQoKSBdXTsKK30KKwogLSAodm9pZCljcmVhdGVIaWdobGln aHRJbkN1cnJlbnRHcm91cFdpdGhSYW5nZTooaWQpc2VuZGVyCiB7CiAgICAgX3BhZ2UtPmNyZWF0 ZUFwcEhpZ2hsaWdodEluU2VsZWN0ZWRSYW5nZShXZWJDb3JlOjpDcmVhdGVOZXdHcm91cEZvckhp Z2hsaWdodDo6Tm8sIFdlYkNvcmU6OkhpZ2hsaWdodFJlcXVlc3RPcmlnaW5hdGVkSW5BcHA6Ok5v KTsKQEAgLTkzMjUsNyArOTM0MCw3IEBAIC0gKHZvaWQpY3JlYXRlSGlnaGxpZ2h0SW5OZXdHcm91 cFdpdGhSYW5nZTooaWQpc2VuZGVyCiAgICAgX3BhZ2UtPmNyZWF0ZUFwcEhpZ2hsaWdodEluU2Vs ZWN0ZWRSYW5nZShXZWJDb3JlOjpDcmVhdGVOZXdHcm91cEZvckhpZ2hsaWdodDo6WWVzLCBXZWJD b3JlOjpIaWdobGlnaHRSZXF1ZXN0T3JpZ2luYXRlZEluQXBwOjpObyk7CiB9CiAKLSNlbmRpZgor I2VuZGlmIC8vIEVOQUJMRShBUFBfSElHSExJR0hUUykKIAogLSAodm9pZClzZXRDb250aW51b3Vz U3BlbGxDaGVja2luZ0VuYWJsZWQ6KEJPT0wpZW5hYmxlZAogewpAQCAtMTAyMzUsMTAgKzEwMjUw LDYgQEAgLSAodm9pZCljYXB0dXJlVGV4dEZyb21DYW1lcmFGb3JXZWJWaWV3OihpZClzZW5kZXIK IAogI2VuZGlmIC8vIEVOQUJMRShJTUFHRV9BTkFMWVNJUykKIAotI2lmIFVTRShBUFBMRV9JTlRF Uk5BTF9TREspCi0jaW1wb3J0IDxXZWJLaXRBZGRpdGlvbnMvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uQWRkaXRpb25zQWZ0ZXIubW0+Ci0jZW5kaWYKLQogQGVuZAogCiBAaW1wbGVtZW50YXRpb24g V0tDb250ZW50VmlldyAoV0tUZXN0aW5nKQo= 430929 2021-06-08 18:02:57 -0700 2021-06-08 20:29:25 -0700 Patch for landing bug-226794-20210608180256.patch text/plain 7205 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE5YjllZGExZTAxZjEzZmIw MDhiOWYzMWNiM2EyMDUyNWJhYjIzZGQuLmM4ZjJjMWY5NTA5OTU5NTEyYWU4ZjA1OTc1OTEyMTc0 ZGRjNDQzZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDYtMDggIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBVcHN0cmVhbSBBcHBI aWdobGlnaHQgT2JzZXJ2ZXIgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjI2Nzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4K KworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5tbToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjphcHBIaWdobGlnaHRzVmlzaWJpbGl0eSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0VXBIaWdobGlnaHRzT2JzZXJ2ZXIpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBz ZXRVcEFwcEhpZ2hsaWdodE1lbnVzSWZOZWVkZWRdKToKKwogMjAyMS0wNi0wOCAgVHJ1aXR0IFNh dmVsbCAgPHRzYXZlbGxAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGlu ZyByMjc4NjA5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi UGFnZVByb3h5Q29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQYWdl UHJveHlDb2NvYS5tbQppbmRleCA1MTY3YmRiOGE1MGFmM2QzM2U5OTcxZWZlMjg4ZmIyYzY4NDBl ZmYzLi5hYjliYTBkOWJiOWUwMWQ1YTIxZTBhNTQxNjJhZWU5ZDdkODBmYTJiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5tbQpAQCAt NDksNiArNDksNyBAQAogI2ltcG9ydCAiV0tFcnJvckludGVybmFsLmgiCiAjaW1wb3J0IDxXZWJD b3JlL0RyYWdJdGVtLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0dlb21ldHJ5VXRpbGl0aWVzLmg+Cisj aW1wb3J0IDxXZWJDb3JlL0hpZ2hsaWdodFZpc2liaWxpdHkuaD4KICNpbXBvcnQgPFdlYkNvcmUv TG9jYWxDdXJyZW50R3JhcGhpY3NDb250ZXh0Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL05ldHdvcmtF eHRlbnNpb25Db250ZW50RmlsdGVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL05vdEltcGxlbWVudGVk Lmg+CkBAIC02NSw2ICs2NiwxMyBAQAogI2ltcG9ydCAiTWVkaWFVc2FnZU1hbmFnZXJDb2NvYS5o IgogI2VuZGlmCiAKKyNpZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCisjaW1wb3J0IDxTeW5hcHNl L1NZTm90ZXNBY3RpdmF0aW9uT2JzZXJ2ZXIuaD4KKworU09GVF9MSU5LX1BSSVZBVEVfRlJBTUVX T1JLX09QVElPTkFMKFN5bmFwc2UpCitTT0ZUX0xJTktfQ0xBU1NfT1BUSU9OQUwoU3luYXBzZSwg U1lOb3Rlc0FjdGl2YXRpb25PYnNlcnZlcikKKyNlbmRpZiAvLyBFTkFCTEUoQVBQX0hJR0hMSUdI VFMpCisKICNpZiBVU0UoQVBQS0lUKQogI2ltcG9ydCA8QXBwS2l0L05TSW1hZ2UuaD4KICNlbHNl CkBAIC01OTIsNiArNjAwLDI0IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRBcHBIaWdobGlnaHRz VmlzaWJpbGl0eShXZWJDb3JlOjpIaWdobGlnaHRWaXNpYmlsaXR5IGFwcEhpCiAgICAgc2VuZChN ZXNzYWdlczo6V2ViUGFnZTo6U2V0QXBwSGlnaGxpZ2h0c1Zpc2liaWxpdHkoYXBwSGlnaGxpZ2h0 c1Zpc2liaWxpdHkpKTsKIH0KIAorYm9vbCBXZWJQYWdlUHJveHk6OmFwcEhpZ2hsaWdodHNWaXNp YmlsaXR5KCkKK3sKKyAgICBpZiAoIW1fYXBwSGlnaGxpZ2h0c09ic2VydmVyKQorICAgICAgICBz ZXRVcEhpZ2hsaWdodHNPYnNlcnZlcigpOworICAgIHJldHVybiBbbV9hcHBIaWdobGlnaHRzT2Jz ZXJ2ZXIgaXNWaXNpYmxlXTsKK30KKwordm9pZCBXZWJQYWdlUHJveHk6OnNldFVwSGlnaGxpZ2h0 c09ic2VydmVyKCkKK3sKKyAgICBpZiAobV9hcHBIaWdobGlnaHRzT2JzZXJ2ZXIpCisgICAgICAg IHJldHVybjsKKyAgICBhdXRvIHVwZGF0ZUFwcEhpZ2hsaWdodHNWaXNpYmlsaXR5ID0gXihCT09M IGlzVmlzaWJsZSkgeworICAgICAgICBzZXRBcHBIaWdobGlnaHRzVmlzaWJpbGl0eShpc1Zpc2li bGUgPyBXZWJDb3JlOjpIaWdobGlnaHRWaXNpYmlsaXR5OjpWaXNpYmxlIDogV2ViQ29yZTo6SGln aGxpZ2h0VmlzaWJpbGl0eTo6SGlkZGVuKTsKKyAgICB9OworICAgIG1fYXBwSGlnaGxpZ2h0c09i c2VydmVyID0gYWRvcHROUyhbYWxsb2NTWU5vdGVzQWN0aXZhdGlvbk9ic2VydmVySW5zdGFuY2Uo KSBpbml0V2l0aEhhbmRsZXI6dXBkYXRlQXBwSGlnaGxpZ2h0c1Zpc2liaWxpdHldKTsKKyAgICB1 cGRhdGVBcHBIaWdobGlnaHRzVmlzaWJpbGl0eShbbV9hcHBIaWdobGlnaHRzT2JzZXJ2ZXIgaXNW aXNpYmxlXSk7Cit9CisKICNlbmRpZgogCiBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSBX ZWJQYWdlUHJveHk6OmNyZWF0ZU5ldHdvcmtFeHRlbnNpb25zU2FuZGJveEV4dGVuc2lvbnMoV2Vi UHJvY2Vzc1Byb3h5JiBwcm9jZXNzKQpAQCAtNjkyLDkgKzcxOCw1IEBAIE5TRGljdGlvbmFyeSAq V2ViUGFnZVByb3h5Ojpjb250ZW50c09mVXNlckludGVyZmFjZUl0ZW0oTlNTdHJpbmcgKnVzZXJJ bnRlcmZhY2VJCiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCi0jaWYgVVNFKEFQUExFX0lOVEVS TkFMX1NESykKLSNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy9XZWJQYWdlUHJveHlDb2NvYUFkZGl0 aW9uc0FmdGVyLm1tPgotI2VuZGlmCi0KICN1bmRlZiBNRVNTQUdFX0NIRUNLX0NPTVBMRVRJT04K ICN1bmRlZiBNRVNTQUdFX0NIRUNLCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CmluZGV4IDZkMDVkNmZjNzkwOGU0YjJkYjg1YTY0MjNjNGZjZTY5NjY2MDBjNGEuLjQ4NWY3NGI0 ZWJmYWU4YWRkOWYyOTA2MWNjZGUzZmJiZjY3YjAwZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCkBAIC0xODksMTAgKzE4OSw2IEBAIGludGVyZmFjZSBJRDNEMTFEZXZp Y2UxOwogI2luY2x1ZGUgIlBsYXRmb3JtWFJTeXN0ZW0uaCIKICNlbmRpZgogCi0jaWYgVVNFKEFQ UExFX0lOVEVSTkFMX1NESykKLSNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy9XZWJQYWdlUHJveHlB ZGRpdGlvbnNCZWZvcmUuaD4KLSNlbmRpZgotCiBuYW1lc3BhY2UgQVBJIHsKIGNsYXNzIEF0dGFj aG1lbnQ7CiBjbGFzcyBDb250ZW50V29ybGQ7CkBAIC0yMzAsNiArMjI2LDcgQEAgT0JKQ19DTEFT UyBOU01lbnU7CiBPQkpDX0NMQVNTIE5TVGV4dEFsdGVybmF0aXZlczsKIE9CSkNfQ0xBU1MgTlNW aWV3OwogT0JKQ19DTEFTUyBRTFByZXZpZXdQYW5lbDsKK09CSkNfQ0xBU1MgU1lOb3Rlc0FjdGl2 YXRpb25PYnNlcnZlcjsKIE9CSkNfQ0xBU1MgV0tRTFRodW1ibmFpbExvYWRPcGVyYXRpb247CiBP QkpDX0NMQVNTIFdLVmlzdWFsU2VhcmNoUHJldmlld0NvbnRyb2xsZXI7CiBPQkpDX0NMQVNTIFdL V2ViVmlldzsKQEAgLTE4OTcsNiArMTg5NCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHN0b3JlQXBw SGlnaGxpZ2h0KGNvbnN0IFdlYkNvcmU6OkFwcEhpZ2hsaWdodCYpOwogICAgIHZvaWQgcmVzdG9y ZUFwcEhpZ2hsaWdodHNBbmRTY3JvbGxUb0luZGV4KGNvbnN0IFZlY3RvcjxSZWY8V2ViS2l0OjpT aGFyZWRNZW1vcnk+PiYgaGlnaGxpZ2h0cywgY29uc3Qgc3RkOjpvcHRpb25hbDx1bnNpZ25lZD4g aW5kZXgpOwogICAgIHZvaWQgc2V0QXBwSGlnaGxpZ2h0c1Zpc2liaWxpdHkoY29uc3QgV2ViQ29y ZTo6SGlnaGxpZ2h0VmlzaWJpbGl0eSk7CisgICAgYm9vbCBhcHBIaWdobGlnaHRzVmlzaWJpbGl0 eSgpOwogI2VuZGlmCiAKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQpAQCAtMjQ5Nyw2ICsyNDk1 LDEwIEBAIHByaXZhdGU6CiAjaWYgRU5BQkxFKElNQUdFX0FOQUxZU0lTKSAmJiBQTEFURk9STShN QUMpCiAgICAgdm9pZCBzaG93SW1hZ2VJblZpc3VhbFNlYXJjaFByZXZpZXdQYW5lbChTaGFyZWFi bGVCaXRtYXAmIGltYWdlQml0bWFwLCBjb25zdCBTdHJpbmcmIHRvb2x0aXAsIGNvbnN0IFVSTCYg aW1hZ2VVUkwpOwogI2VuZGlmCisgICAgICAgIAorI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykK KyAgICB2b2lkIHNldFVwSGlnaGxpZ2h0c09ic2VydmVyKCk7CisjZW5kaWYKIAogICAgIGNvbnN0 IElkZW50aWZpZXIgbV9pZGVudGlmaWVyOwogICAgIFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyIG1f d2ViUGFnZUlEOwpAQCAtMzA0NSw4ICszMDQ3LDggQEAgcHJpdmF0ZToKICAgICBzdGQ6OnVuaXF1 ZV9wdHI8UGxhdGZvcm1YUlN5c3RlbT4gbV94clN5c3RlbTsKICNlbmRpZgogCi0jaWYgVVNFKEFQ UExFX0lOVEVSTkFMX1NESykKLSNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy9XZWJQYWdlUHJveHlB ZGRpdGlvbnNBZnRlci5oPgorI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykKKyAgICBSZXRhaW5Q dHI8U1lOb3Rlc0FjdGl2YXRpb25PYnNlcnZlcj4gbV9hcHBIaWdobGlnaHRzT2JzZXJ2ZXI7CiAj ZW5kaWYKIAogI2lmIEVOQUJMRShJTUFHRV9BTkFMWVNJUykgJiYgUExBVEZPUk0oTUFDKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24ubW0KaW5kZXggN2E4NDgxMGVhYWU4MjlkZTI0NTcxNjZkOTQ3OTg2Nzg2NTNlNTM0ZS4u ZjRkNTQzYzNjM2M0ODUyM2U1MWE4ODI1NWY3OGY2YTAzYWRlY2VkYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1t CkBAIC05MzE1LDYgKzkzMTUsMjEgQEAgLSAodm9pZClfbG9va3VwR2VzdHVyZVJlY29nbml6ZWQ6 KFVJR2VzdHVyZVJlY29nbml6ZXIgKilnZXN0dXJlUmVjb2duaXplcgogCiAKICNpZiBFTkFCTEUo QVBQX0hJR0hMSUdIVFMpCistICh2b2lkKXNldFVwQXBwSGlnaGxpZ2h0TWVudXNJZk5lZWRlZAor eworICAgIGlmICghX3BhZ2UtPnByZWZlcmVuY2VzKCkuYXBwSGlnaGxpZ2h0c0VuYWJsZWQoKSB8 fCAhc2VsZi53aW5kb3cgfHwgIV9wYWdlLT5lZGl0b3JTdGF0ZSgpLnNlbGVjdGlvbklzUmFuZ2Up CisgICAgICAgIHJldHVybjsKKyAgICAKKyAgICBmb3IgKFVJTWVudUl0ZW0gKm1lbnVJdGVtIGlu IFtbVUlNZW51Q29udHJvbGxlciBzaGFyZWRNZW51Q29udHJvbGxlcl0gbWVudUl0ZW1zXSkgewor ICAgICAgICBpZiAoW21lbnVJdGVtIGFjdGlvbl0gPT0gQHNlbGVjdG9yKGNyZWF0ZUhpZ2hsaWdo dEluQ3VycmVudEdyb3VwV2l0aFJhbmdlOikgfHwgW21lbnVJdGVtIGFjdGlvbl0gPT0gQHNlbGVj dG9yKGNyZWF0ZUhpZ2hsaWdodEluTmV3R3JvdXBXaXRoUmFuZ2U6KSkKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICB9CisgICAgCisgICAgYXV0byBhZGRIaWdobGlnaHRDdXJyZW50R3JvdXBJdGVt ID0gYWRvcHROUyhbW1VJTWVudUl0ZW0gYWxsb2NdIGluaXRXaXRoVGl0bGU6V2ViQ29yZTo6Y29u dGV4dE1lbnVJdGVtVGFnQWRkSGlnaGxpZ2h0VG9DdXJyZW50R3JvdXAoKSBhY3Rpb246QHNlbGVj dG9yKGNyZWF0ZUhpZ2hsaWdodEluQ3VycmVudEdyb3VwV2l0aFJhbmdlOildKTsKKyAgICBhdXRv IGFkZEhpZ2hsaWdodE5ld0dyb3VwSXRlbSA9IGFkb3B0TlMoW1tVSU1lbnVJdGVtIGFsbG9jXSBp bml0V2l0aFRpdGxlOldlYkNvcmU6OmNvbnRleHRNZW51SXRlbVRhZ0FkZEhpZ2hsaWdodFRvTmV3 R3JvdXAoKSBhY3Rpb246QHNlbGVjdG9yKGNyZWF0ZUhpZ2hsaWdodEluTmV3R3JvdXBXaXRoUmFu Z2U6KV0pOworICAgIFtbVUlNZW51Q29udHJvbGxlciBzaGFyZWRNZW51Q29udHJvbGxlcl0gc2V0 TWVudUl0ZW1zOkBbIGFkZEhpZ2hsaWdodEN1cnJlbnRHcm91cEl0ZW0uZ2V0KCksIGFkZEhpZ2hs aWdodE5ld0dyb3VwSXRlbS5nZXQoKSBdXTsKK30KKwogLSAodm9pZCljcmVhdGVIaWdobGlnaHRJ bkN1cnJlbnRHcm91cFdpdGhSYW5nZTooaWQpc2VuZGVyCiB7CiAgICAgX3BhZ2UtPmNyZWF0ZUFw cEhpZ2hsaWdodEluU2VsZWN0ZWRSYW5nZShXZWJDb3JlOjpDcmVhdGVOZXdHcm91cEZvckhpZ2hs aWdodDo6Tm8sIFdlYkNvcmU6OkhpZ2hsaWdodFJlcXVlc3RPcmlnaW5hdGVkSW5BcHA6Ok5vKTsK QEAgLTkzMjUsNyArOTM0MCw3IEBAIC0gKHZvaWQpY3JlYXRlSGlnaGxpZ2h0SW5OZXdHcm91cFdp dGhSYW5nZTooaWQpc2VuZGVyCiAgICAgX3BhZ2UtPmNyZWF0ZUFwcEhpZ2hsaWdodEluU2VsZWN0 ZWRSYW5nZShXZWJDb3JlOjpDcmVhdGVOZXdHcm91cEZvckhpZ2hsaWdodDo6WWVzLCBXZWJDb3Jl OjpIaWdobGlnaHRSZXF1ZXN0T3JpZ2luYXRlZEluQXBwOjpObyk7CiB9CiAKLSNlbmRpZgorI2Vu ZGlmIC8vIEVOQUJMRShBUFBfSElHSExJR0hUUykKIAogLSAodm9pZClzZXRDb250aW51b3VzU3Bl bGxDaGVja2luZ0VuYWJsZWQ6KEJPT0wpZW5hYmxlZAogewpAQCAtMTAyMzUsMTAgKzEwMjUwLDYg QEAgLSAodm9pZCljYXB0dXJlVGV4dEZyb21DYW1lcmFGb3JXZWJWaWV3OihpZClzZW5kZXIKIAog I2VuZGlmIC8vIEVOQUJMRShJTUFHRV9BTkFMWVNJUykKIAotI2lmIFVTRShBUFBMRV9JTlRFUk5B TF9TREspCi0jaW1wb3J0IDxXZWJLaXRBZGRpdGlvbnMvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u QWRkaXRpb25zQWZ0ZXIubW0+Ci0jZW5kaWYKLQogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gV0tD b250ZW50VmlldyAoV0tUZXN0aW5nKQo=