232861 2021-11-08 17:28:57 -0800 [iOS] Add a position information bit to indicate whether the hit-tested element is a paused video 2021-11-09 08:12:21 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh akeerthi hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1812946 0 wenson_hsieh 2021-11-08 17:28:57 -0800 . 1812953 1 443641 wenson_hsieh 2021-11-08 17:47:04 -0800 Created attachment 443641 Patch 1813147 2 443641 wenson_hsieh 2021-11-09 07:50:13 -0800 Comment on attachment 443641 Patch Thanks for the review! 1813157 3 ews-feeder 2021-11-09 08:11:18 -0800 Committed r285500 (244024@main): <https://commits.webkit.org/244024@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443641. 1813158 4 webkit-bug-importer 2021-11-09 08:12:21 -0800 <rdar://problem/85202963> 443641 2021-11-08 17:47:04 -0800 2021-11-09 08:11:18 -0800 Patch bug-232861-20211108174703.patch text/plain 11911 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkyM2I2Y2FmOGRmZmNhMmEw MjFiMmRiN2NiMTNkMmJlOWI3NDM5MWMuLjAyMjY1MmQxZmQ3YmI1ZDljOTBlYzFjZTYyMjJkN2Rm Y2U4OGEyMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMjEtMTEtMDggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQWRkIGEgcG9z aXRpb24gaW5mb3JtYXRpb24gYml0IHRvIGluZGljYXRlIHdoZXRoZXIgdGhlIGhpdC10ZXN0ZWQg ZWxlbWVudCBpcyBhIHBhdXNlZCB2aWRlbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjMyODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIGBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbjo6 aXNQYXVzZWRWaWRlb2AsIGEgZmxhZyB0aGF0IGlzIHRydWUgd2hlbiB0aGUgcG9zaXRpb24gaW5m b3JtYXRpb24gcmVxdWVzdAorICAgICAgICBpcyBvdmVyIGEgcGF1c2VkIHZpZGVvIGVsZW1lbnQg KG9yIGluc2lkZSB0aGUgbWVkaWEgY29udHJvbCBzaGFkb3cgcm9vdCB1bmRlcm5lYXRoIHRoYXQg cGF1c2VkIHZpZGVvIGVsZW1lbnQsIGluCisgICAgICAgIHRoZSBjYXNlIHdoZXJlIG5hdGl2ZSBj b250cm9scyBhcmUgc2hvd24pLgorCisgICAgICAgICogU2hhcmVkL2lvcy9JbnRlcmFjdGlvbklu Zm9ybWF0aW9uQXRQb3NpdGlvbi5oOgorICAgICAgICAqIFNoYXJlZC9pb3MvSW50ZXJhY3Rpb25J bmZvcm1hdGlvbkF0UG9zaXRpb24ubW06CisgICAgICAgIChXZWJLaXQ6OkludGVyYWN0aW9uSW5m b3JtYXRpb25BdFBvc2l0aW9uOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpJbnRl cmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbjo6ZGVjb2RlKToKKworICAgICAgICBBbHNvIHJl bmFtZSBgaW1hZ2VFbGVtZW50Q29udGV4dGAgdG8gYGhvc3RJbWFnZU9yVmlkZW9FbGVtZW50Q29u dGV4dGAgdG8gY2xhcmlmeSB0aGF0IGl0ICgxKSBtYXkgbm93IGluY2x1ZGUKKyAgICAgICAgZWxl bWVudCBjb250ZXh0cyBmb3IgdmlkZW8gZWxlbWVudHMsIGFuZCAoMikgdW5saWtlIHRoZSByZWd1 bGFyIGBlbGVtZW50Q29udGV4dGAsIHRoaXMgaW5jbHVkZXMgdGhlIGltYWdlIG9yCisgICAgICAg IHZpZGVvIGVsZW1lbnQgdGhhdCBpcyB0aGUgaG9zdCBmb3IgaGl0LXRlc3RlZCBjb250ZW50IGlu IHRoZSBVQSBzaGFkb3cgcm9vdCBvZiB0aGUgZWxlbWVudCBjb3JyZXNwb25kaW5nIHRvCisgICAg ICAgIGBlbGVtZW50Q29udGV4dGAuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBoYXNTZWxlY3Rh YmxlUG9zaXRpb25BdFBvaW50Ol0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHRleHRJbnRl cmFjdGlvbkdlc3R1cmU6c2hvdWxkQmVnaW5BdFBvaW50Ol0pOgorICAgICAgICAoLVtXS0NvbnRl bnRWaWV3IGltYWdlQW5hbHlzaXNHZXN0dXJlRGlkQmVnaW46XSk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0Ojp2aWRlb1Bv c2l0aW9uSW5mb3JtYXRpb24pOgorCisgICAgICAgIEFkZGl0aW9uYWxseSBwb3B1bGF0ZSB0aGUg YGltYWdlYCBvZiB0aGUgcG9zaXRpb24gaW5mb3JtYXRpb24sIGluIHRoZSBjYXNlIHdoZXJlIGBp bmNsdWRlSW1hZ2VEYXRhYCBpcyBzZXQgb24KKyAgICAgICAgdGhlIGluY29taW5nIHJlcXVlc3Qu CisKKyAgICAgICAgKFdlYktpdDo6aG9zdFZpZGVvRWxlbWVudElnbm9yaW5nSW1hZ2VPdmVybGF5 KToKKyAgICAgICAgKFdlYktpdDo6aW1hZ2VQb3NpdGlvbkluZm9ybWF0aW9uKToKKyAgICAgICAg KFdlYktpdDo6ZWxlbWVudFBvc2l0aW9uSW5mb3JtYXRpb24pOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjpwb3NpdGlvbkluZm9ybWF0aW9uKToKKwogMjAyMS0xMS0wOCAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFBhcnNlIHJlZGlyZWN0 IGFuZCBtb2RpZnktaGVhZGVycyBhY3Rpb25zIGZvciBXS0NvbnRlbnRSdWxlTGlzdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBv c2l0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlv bkF0UG9zaXRpb24uaAppbmRleCA0MGY2M2ZiM2RlODQ2YzJkNTAxNDdmMGE5NmFlY2E4ODA4NjQ4 YzczLi45OGRlMzkzYWY2MDVkOGU4ZTI5YWMxODQ4NWUyYzQzZjE1ZjRiODgxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRp b24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlv bkF0UG9zaXRpb24uaApAQCAtNzAsNiArNzAsNyBAQCBzdHJ1Y3QgSW50ZXJhY3Rpb25JbmZvcm1h dGlvbkF0UG9zaXRpb24gewogICAgIGJvb2wgaXNJbWFnZSB7IGZhbHNlIH07CiAgICAgYm9vbCBp c0F0dGFjaG1lbnQgeyBmYWxzZSB9OwogICAgIGJvb2wgaXNBbmltYXRlZEltYWdlIHsgZmFsc2Ug fTsKKyAgICBib29sIGlzUGF1c2VkVmlkZW8geyBmYWxzZSB9OwogICAgIGJvb2wgaXNFbGVtZW50 IHsgZmFsc2UgfTsKICAgICBib29sIGlzQ29udGVudEVkaXRhYmxlIHsgZmFsc2UgfTsKICAgICBX ZWJDb3JlOjpTY3JvbGxpbmdOb2RlSUQgY29udGFpbmVyU2Nyb2xsaW5nTm9kZUlEIHsgMCB9OwpA QCAtMTA4LDcgKzEwOSw3IEBAIHN0cnVjdCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlv biB7CiAjZW5kaWYKIAogICAgIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6RWxlbWVudENvbnRleHQ+ IGVsZW1lbnRDb250ZXh0OwotICAgIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6RWxlbWVudENvbnRl eHQ+IGltYWdlRWxlbWVudENvbnRleHQ7CisgICAgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpFbGVt ZW50Q29udGV4dD4gaG9zdEltYWdlT3JWaWRlb0VsZW1lbnRDb250ZXh0OwogCiAgICAgLy8gQ29w eSBjb21wYXRpYmxlIG9wdGlvbmFsIGJpdHMgZm9yd2FyZCAoZm9yIGV4YW1wbGUsIGlmIHdlIGhh dmUgYSBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbgogICAgIC8vIHdpdGggc25hcHNo b3RzIGluIGl0LCBhbmQgcGVyZm9ybSBhbm90aGVyIHJlcXVlc3QgZm9yIHRoZSBzYW1lIHBvaW50 IHdpdGhvdXQgcmVxdWVzdGluZyB0aGUgc25hcHNob3RzLApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLm1tIGIvU291 cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLm1t CmluZGV4IDExZWFiNWRmMWU0Mjc0Yzc0NjI0Y2VmNjk5NjgyYjNmODFkODEwMzQuLjUxNGRlYTM1 ZjYzYmE1NmU0M2E2ODUzMDJmNDVhM2U3ZDBhYmUwNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvU2hhcmVkL2lvcy9JbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24u bW0KQEAgLTQ5LDYgKzQ5LDcgQEAgdm9pZCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlv bjo6ZW5jb2RlKElQQzo6RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IGlz SW1hZ2U7CiAgICAgZW5jb2RlciA8PCBpc0F0dGFjaG1lbnQ7CiAgICAgZW5jb2RlciA8PCBpc0Fu aW1hdGVkSW1hZ2U7CisgICAgZW5jb2RlciA8PCBpc1BhdXNlZFZpZGVvOwogICAgIGVuY29kZXIg PDwgaXNFbGVtZW50OwogICAgIGVuY29kZXIgPDwgaXNDb250ZW50RWRpdGFibGU7CiAgICAgZW5j b2RlciA8PCBjb250YWluZXJTY3JvbGxpbmdOb2RlSUQ7CkBAIC04NSw3ICs4Niw3IEBAIHZvaWQg SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb246OmVuY29kZShJUEM6OkVuY29kZXImIGVu Y29kZXIpIGNvbnN0CiAgICAgZW5jb2RlciA8PCBpc0ltYWdlT3ZlcmxheVRleHQ7CiAgICAgZW5j b2RlciA8PCBpc1ZlcnRpY2FsV3JpdGluZ01vZGU7CiAgICAgZW5jb2RlciA8PCBlbGVtZW50Q29u dGV4dDsKLSAgICBlbmNvZGVyIDw8IGltYWdlRWxlbWVudENvbnRleHQ7CisgICAgZW5jb2RlciA8 PCBob3N0SW1hZ2VPclZpZGVvRWxlbWVudENvbnRleHQ7CiB9CiAKIGJvb2wgSW50ZXJhY3Rpb25J bmZvcm1hdGlvbkF0UG9zaXRpb246OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIEludGVy YWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uJiByZXN1bHQpCkBAIC0xMjUsNiArMTI2LDkgQEAg Ym9vbCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbjo6ZGVjb2RlKElQQzo6RGVjb2Rl ciYgZGVjb2RlciwgSW50ZXJhY3Rpb24KICAgICAKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJl c3VsdC5pc0FuaW1hdGVkSW1hZ2UpKQogICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAo IWRlY29kZXIuZGVjb2RlKHJlc3VsdC5pc1BhdXNlZFZpZGVvKSkKKyAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIAogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmlzRWxlbWVudCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTIyMCw3ICsyMjQsNyBAQCBib29sIEludGVyYWN0aW9u SW5mb3JtYXRpb25BdFBvc2l0aW9uOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBJbnRl cmFjdGlvbgogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmVsZW1lbnRDb250ZXh0KSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQu aW1hZ2VFbGVtZW50Q29udGV4dCkpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaG9z dEltYWdlT3JWaWRlb0VsZW1lbnRDb250ZXh0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAg ICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCBiYTc4ZjA5ZTdmNGZmYjQ0ZmY2Yzhm NjI5YWQ0YzZmNDg5ODhiMDkyLi5hODU1MmRjYThiODk4NDcwZjYwYmIyZTdhZTc1Njg5YjBmMzY0 Yjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTI4ODUsNyArMjg4NSw3IEBAIC0gKEJPT0wpaGFzU2Vs ZWN0YWJsZVBvc2l0aW9uQXRQb2ludDooQ0dQb2ludClwb2ludAogICAgICAgICByZXR1cm4gTk87 CiAKICNpZiBFTkFCTEUoSU1BR0VfQU5BTFlTSVMpCi0gICAgaWYgKF9lbGVtZW50UGVuZGluZ0lt YWdlQW5hbHlzaXMgJiYgX3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2VFbGVtZW50Q29udGV4dCA9 PSBfZWxlbWVudFBlbmRpbmdJbWFnZUFuYWx5c2lzKQorICAgIGlmIChfZWxlbWVudFBlbmRpbmdJ bWFnZUFuYWx5c2lzICYmIF9wb3NpdGlvbkluZm9ybWF0aW9uLmhvc3RJbWFnZU9yVmlkZW9FbGVt ZW50Q29udGV4dCA9PSBfZWxlbWVudFBlbmRpbmdJbWFnZUFuYWx5c2lzKQogICAgICAgICByZXR1 cm4gWUVTOwogI2VuZGlmCiAKQEAgLTI5NjYsNyArMjk2Niw3IEBAIC0gKEJPT0wpdGV4dEludGVy YWN0aW9uR2VzdHVyZTooVUlXS0dlc3R1cmVUeXBlKWdlc3R1cmUgc2hvdWxkQmVnaW5BdFBvaW50 OihDR1BvCiAjZW5kaWYKIAogI2lmIEVOQUJMRShJTUFHRV9BTkFMWVNJUykKLSAgICBpZiAoX2Vs ZW1lbnRQZW5kaW5nSW1hZ2VBbmFseXNpcyAmJiBfcG9zaXRpb25JbmZvcm1hdGlvbi5pbWFnZUVs ZW1lbnRDb250ZXh0ID09IF9lbGVtZW50UGVuZGluZ0ltYWdlQW5hbHlzaXMpCisgICAgaWYgKF9l bGVtZW50UGVuZGluZ0ltYWdlQW5hbHlzaXMgJiYgX3Bvc2l0aW9uSW5mb3JtYXRpb24uaG9zdElt YWdlT3JWaWRlb0VsZW1lbnRDb250ZXh0ID09IF9lbGVtZW50UGVuZGluZ0ltYWdlQW5hbHlzaXMp CiAgICAgICAgIHJldHVybiBZRVM7CiAjZW5kaWYKIApAQCAtMTAxOTMsNyArMTAxOTMsNyBAQCAt ICh2b2lkKWltYWdlQW5hbHlzaXNHZXN0dXJlRGlkQmVnaW46KFdLSW1hZ2VBbmFseXNpc0dlc3R1 cmVSZWNvZ25pemVyICopZ2VzdHVyZQogICAgICAgICAgICAgaWYgKCFpbmZvcm1hdGlvbi5pbWFn ZSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgICAgIGlmICghaW5m b3JtYXRpb24uaW1hZ2VFbGVtZW50Q29udGV4dCkKKyAgICAgICAgICAgIGlmICghaW5mb3JtYXRp b24uaG9zdEltYWdlT3JWaWRlb0VsZW1lbnRDb250ZXh0KQogICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKIAogICAgICAgICAgICAgaWYgKGluZm9ybWF0aW9uLmlzQW5pbWF0ZWRJbWFnZSkK QEAgLTEwMjE4LDEwICsxMDIxOCwxMCBAQCAtICh2b2lkKWltYWdlQW5hbHlzaXNHZXN0dXJlRGlk QmVnaW46KFdLSW1hZ2VBbmFseXNpc0dlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZQogCiAgICAg ICAgIFJFTEVBU0VfTE9HKEltYWdlcywgIkltYWdlIGFuYWx5c2lzIHByZWZsaWdodCBnZXN0dXJl IGluaXRpYXRlZCAocmVxdWVzdCAlIiBQUkl1NjQgIikuIiwgcmVxdWVzdElkZW50aWZpZXIudG9V SW50NjQoKSk7CiAKLSAgICAgICAgc3Ryb25nU2VsZi0+X2VsZW1lbnRQZW5kaW5nSW1hZ2VBbmFs eXNpcyA9IGluZm9ybWF0aW9uLmltYWdlRWxlbWVudENvbnRleHQ7CisgICAgICAgIHN0cm9uZ1Nl bGYtPl9lbGVtZW50UGVuZGluZ0ltYWdlQW5hbHlzaXMgPSBpbmZvcm1hdGlvbi5ob3N0SW1hZ2VP clZpZGVvRWxlbWVudENvbnRleHQ7CiAKICAgICAgICAgYXV0byByZXF1ZXN0TG9jYXRpb24gPSBp bmZvcm1hdGlvbi5yZXF1ZXN0LnBvaW50OwotICAgICAgICBXZWJDb3JlOjpFbGVtZW50Q29udGV4 dCBlbGVtZW50Q29udGV4dCA9ICppbmZvcm1hdGlvbi5pbWFnZUVsZW1lbnRDb250ZXh0OworICAg ICAgICBXZWJDb3JlOjpFbGVtZW50Q29udGV4dCBlbGVtZW50Q29udGV4dCA9ICppbmZvcm1hdGlv bi5ob3N0SW1hZ2VPclZpZGVvRWxlbWVudENvbnRleHQ7CiAKICAgICAgICAgYXV0byByZXF1ZXN0 Rm9yVGV4dFNlbGVjdGlvbiA9IFtzdHJvbmdTZWxmIGNyZWF0ZUltYWdlQW5hbHl6ZXJSZXF1ZXN0 OlZLQW5hbHlzaXNUeXBlVGV4dCBpbWFnZTpjZ0ltYWdlLmdldCgpXTsKICAgICAgICAgYXV0byBy ZXF1ZXN0Rm9yQ29udGV4dE1lbnUgPSBbc3Ryb25nU2VsZiBjcmVhdGVJbWFnZUFuYWx5emVyUmVx dWVzdDpWS0FuYWx5c2lzVHlwZVZpc3VhbFNlYXJjaCB8IFZLQW5hbHlzaXNUeXBlTWFjaGluZVJl YWRhYmxlQ29kZSB8IFZLQW5hbHlzaXNUeXBlQXBwQ2xpcCBpbWFnZTpjZ0ltYWdlLmdldCgpXTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdl SU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1Mu bW0KaW5kZXggMDE2ZGQzNGM3NDMxNDIzMjI4OWU5ZjM2OWEzMGU2OTNmMWE4YmRjOS4uYTY4MzZh MzE0OTNiYjkwZjg4MzBjOWQ5ODM3OWRkMmRiMzk4MjAzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTEwNSw2ICsxMDUs NyBAQAogI2ltcG9ydCA8V2ViQ29yZS9IVE1MU2VsZWN0RWxlbWVudC5oPgogI2ltcG9ydCA8V2Vi Q29yZS9IVE1MU3VtbWFyeUVsZW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvSFRNTFRleHRBcmVh RWxlbWVudC5oPgorI2ltcG9ydCA8V2ViQ29yZS9IVE1MVmlkZW9FbGVtZW50Lmg+CiAjaW1wb3J0 IDxXZWJDb3JlL0hpc3RvcnlJdGVtLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0hpdFRlc3RSZXN1bHQu aD4KICNpbXBvcnQgPFdlYkNvcmUvSW5wdXRNb2RlLmg+CkBAIC0xMjksNiArMTMwLDcgQEAKICNp bXBvcnQgPFdlYkNvcmUvUmVuZGVySW1hZ2UuaD4KICNpbXBvcnQgPFdlYkNvcmUvUmVuZGVyTGF5 ZXIuaD4KICNpbXBvcnQgPFdlYkNvcmUvUmVuZGVyVGhlbWVJT1MuaD4KKyNpbXBvcnQgPFdlYkNv cmUvUmVuZGVyVmlkZW8uaD4KICNpbXBvcnQgPFdlYkNvcmUvUmVuZGVyVmlldy5oPgogI2ltcG9y dCA8V2ViQ29yZS9SZW5kZXJlZERvY3VtZW50TWFya2VyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1J1 bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oPgpAQCAtMjc4NSw2ICsyNzg3LDM4IEBAIHN0YXRpYyBz dGQ6Om9wdGlvbmFsPHN0ZDo6cGFpcjxSZW5kZXJJbWFnZSYsIEltYWdlJj4+IGltYWdlUmVuZGVy ZXJBbmRJbWFnZShFbGVtCiAgICAgcmV0dXJuIHt7IHJlbmRlckltYWdlLCAqaW1hZ2UgfX07CiB9 CiAKK3N0YXRpYyB2b2lkIHZpZGVvUG9zaXRpb25JbmZvcm1hdGlvbihXZWJQYWdlJiBwYWdlLCBI VE1MVmlkZW9FbGVtZW50JiBlbGVtZW50LCBjb25zdCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVx dWVzdCYgcmVxdWVzdCwgSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24mIGluZm8pCit7 CisgICAgaWYgKCFlbGVtZW50LnBhdXNlZCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBhdXRv IHJlbmRlclZpZGVvID0gZWxlbWVudC5yZW5kZXJlcigpOworICAgIGlmICghcmVuZGVyVmlkZW8p CisgICAgICAgIHJldHVybjsKKworICAgIGluZm8uaXNQYXVzZWRWaWRlbyA9IHRydWU7CisKKyAg ICBpZiAocmVxdWVzdC5pbmNsdWRlSW1hZ2VEYXRhKQorICAgICAgICBpbmZvLmltYWdlID0gY3Jl YXRlU2hhcmVhYmxlQml0bWFwKCpyZW5kZXJWaWRlbyk7CisKKyAgICBpbmZvLmhvc3RJbWFnZU9y VmlkZW9FbGVtZW50Q29udGV4dCA9IHBhZ2UuY29udGV4dEZvckVsZW1lbnQoZWxlbWVudCk7Cit9 CisKK3N0YXRpYyBSZWZQdHI8SFRNTFZpZGVvRWxlbWVudD4gaG9zdFZpZGVvRWxlbWVudElnbm9y aW5nSW1hZ2VPdmVybGF5KE5vZGUmIG5vZGUpCit7CisgICAgaWYgKEhUTUxFbGVtZW50Ojppc0lu c2lkZUltYWdlT3ZlcmxheShub2RlKSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIGlmIChp czxIVE1MVmlkZW9FbGVtZW50Pihub2RlKSkKKyAgICAgICAgcmV0dXJuIGRvd25jYXN0PEhUTUxW aWRlb0VsZW1lbnQ+KCZub2RlKTsKKworICAgIFJlZlB0ciBzaGFkb3dIb3N0ID0gbm9kZS5zaGFk b3dIb3N0KCk7CisgICAgaWYgKCFpczxIVE1MVmlkZW9FbGVtZW50PihzaGFkb3dIb3N0LmdldCgp KSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIHJldHVybiBkb3duY2FzdDxIVE1MVmlkZW9F bGVtZW50PihzaGFkb3dIb3N0LmdldCgpKTsKK30KKwogc3RhdGljIHZvaWQgaW1hZ2VQb3NpdGlv bkluZm9ybWF0aW9uKFdlYlBhZ2UmIHBhZ2UsIEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IEludGVy YWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0JiByZXF1ZXN0LCBJbnRlcmFjdGlvbkluZm9ybWF0aW9u QXRQb3NpdGlvbiYgaW5mbykKIHsKICAgICBhdXRvIHJlbmRlcmVyQW5kSW1hZ2UgPSBpbWFnZVJl bmRlcmVyQW5kSW1hZ2UoZWxlbWVudCk7CkBAIC0yNzk5LDcgKzI4MzMsNyBAQCBzdGF0aWMgdm9p ZCBpbWFnZVBvc2l0aW9uSW5mb3JtYXRpb24oV2ViUGFnZSYgcGFnZSwgRWxlbWVudCYgZWxlbWVu dCwgY29uc3QgSW50ZQogICAgIGlmIChyZXF1ZXN0LmluY2x1ZGVTbmFwc2hvdCB8fCByZXF1ZXN0 LmluY2x1ZGVJbWFnZURhdGEpCiAgICAgICAgIGluZm8uaW1hZ2UgPSBjcmVhdGVTaGFyZWFibGVC aXRtYXAocmVuZGVySW1hZ2UsIHsgc2NyZWVuU2l6ZSgpICogcGFnZS5jb3JlUGFnZSgpLT5kZXZp Y2VTY2FsZUZhY3RvcigpLCBBbGxvd0FuaW1hdGVkSW1hZ2VzOjpZZXMsIFVzZVNuYXBzaG90Rm9y VHJhbnNwYXJlbnRJbWFnZXM6OlllcyB9KTsKIAotICAgIGluZm8uaW1hZ2VFbGVtZW50Q29udGV4 dCA9IHBhZ2UuY29udGV4dEZvckVsZW1lbnQoZWxlbWVudCk7CisgICAgaW5mby5ob3N0SW1hZ2VP clZpZGVvRWxlbWVudENvbnRleHQgPSBwYWdlLmNvbnRleHRGb3JFbGVtZW50KGVsZW1lbnQpOwog fQogCiBzdGF0aWMgdm9pZCBib3VuZHNQb3NpdGlvbkluZm9ybWF0aW9uKFJlbmRlck9iamVjdCYg cmVuZGVyZXIsIEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uJiBpbmZvKQpAQCAtMjg2 Myw4ICsyODk3LDEyIEBAIHN0YXRpYyB2b2lkIGVsZW1lbnRQb3NpdGlvbkluZm9ybWF0aW9uKFdl YlBhZ2UmIHBhZ2UsIEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IEluCiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgICAgIGlmIChzaG91bGRDb2xsZWN0SW1h Z2VQb3NpdGlvbkluZm9ybWF0aW9uKQotICAgICAgICAgICAgaW1hZ2VQb3NpdGlvbkluZm9ybWF0 aW9uKHBhZ2UsIGVsZW1lbnQsIHJlcXVlc3QsIGluZm8pOworICAgICAgICBpZiAoc2hvdWxkQ29s bGVjdEltYWdlUG9zaXRpb25JbmZvcm1hdGlvbikgeworICAgICAgICAgICAgaWYgKGF1dG8gdmlk ZW8gPSBob3N0VmlkZW9FbGVtZW50SWdub3JpbmdJbWFnZU92ZXJsYXkoZWxlbWVudCkpCisgICAg ICAgICAgICAgICAgdmlkZW9Qb3NpdGlvbkluZm9ybWF0aW9uKHBhZ2UsICp2aWRlbywgcmVxdWVz dCwgaW5mbyk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgaW1hZ2VQb3NpdGlv bkluZm9ybWF0aW9uKHBhZ2UsIGVsZW1lbnQsIHJlcXVlc3QsIGluZm8pOworICAgICAgICB9CiAg ICAgICAgIGJvdW5kc1Bvc2l0aW9uSW5mb3JtYXRpb24oKnJlbmRlcmVyLCBpbmZvKTsKICAgICB9 CiAKQEAgLTMxMDAsOCArMzEzOCwxMiBAQCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlv biBXZWJQYWdlOjpwb3NpdGlvbkluZm9ybWF0aW9uKGNvbnN0IEludGVyYWN0aW9uSQogICAgICAg ICAgICAgaW5mby5pbWFnZSA9IHNoYXJlYWJsZUJpdG1hcFNuYXBzaG90Rm9yTm9kZShlbGVtZW50 KTsKICAgICB9CiAKLSAgICBpZiAoIWluZm8uaXNJbWFnZSAmJiByZXF1ZXN0LmluY2x1ZGVJbWFn ZURhdGEgJiYgaXM8SFRNTEltYWdlRWxlbWVudD4oaGl0VGVzdE5vZGUpKQotICAgICAgICBpbWFn ZVBvc2l0aW9uSW5mb3JtYXRpb24oKnRoaXMsIGRvd25jYXN0PEhUTUxJbWFnZUVsZW1lbnQ+KCpo aXRUZXN0Tm9kZSksIHJlcXVlc3QsIGluZm8pOworICAgIGlmICghaW5mby5pc0ltYWdlICYmIHJl cXVlc3QuaW5jbHVkZUltYWdlRGF0YSkgeworICAgICAgICBpZiAoYXV0byB2aWRlbyA9IGhvc3RW aWRlb0VsZW1lbnRJZ25vcmluZ0ltYWdlT3ZlcmxheSgqaGl0VGVzdE5vZGUpKQorICAgICAgICAg ICAgdmlkZW9Qb3NpdGlvbkluZm9ybWF0aW9uKCp0aGlzLCAqdmlkZW8sIHJlcXVlc3QsIGluZm8p OworICAgICAgICBlbHNlIGlmIChpczxIVE1MSW1hZ2VFbGVtZW50PihoaXRUZXN0Tm9kZSkpCisg ICAgICAgICAgICBpbWFnZVBvc2l0aW9uSW5mb3JtYXRpb24oKnRoaXMsIGRvd25jYXN0PEhUTUxJ bWFnZUVsZW1lbnQ+KCpoaXRUZXN0Tm9kZSksIHJlcXVlc3QsIGluZm8pOworICAgIH0KIAogICAg IHNlbGVjdGlvblBvc2l0aW9uSW5mb3JtYXRpb24oKnRoaXMsIHJlcXVlc3QsIGluZm8pOwogCg==