212156 2020-05-20 11:28:24 -0700 [Mac,WK2] Fullscreen animation missing a few frames at beginning 2020-05-29 16:03:51 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble eric.carlson peng.liu6 webkit-bug-importer oldest_to_newest 1654545 0 jer.noble 2020-05-20 11:28:24 -0700 Fullscreen animation missing a few frames at beginning 1654547 1 jer.noble 2020-05-20 11:32:56 -0700 <rdar://problem/54799415> 1654556 2 399863 jer.noble 2020-05-20 11:43:52 -0700 Created attachment 399863 Patch 1655086 3 399863 eric.carlson 2020-05-21 14:42:42 -0700 Comment on attachment 399863 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=399863&action=review > Source/WebKit/ChangeLog:9 > + When starting the animation, ensure that the fullscreen window is ordered front, and on top s/the animation/the enter fullscreen animation/ > Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:325 > + [clipLayer addAnimation:zoomAnimation(_initialFrame, _finalFrame, self.window.screen.frame, 1e10, AnimateIn) forKey:@"fullscreen"]; > + clipLayer.mask = createMask(contentView.bounds); > + [clipLayer.mask addAnimation:maskAnimation(_initialFrame, _finalFrame, self.window.screen.frame, 1e10, AnimateIn) forKey:@"fullscreen"]; `1e10` probably deserves a named constant to make it clear why we use it. 1656482 4 400360 jer.noble 2020-05-27 11:46:55 -0700 Created attachment 400360 Patch for landing Addressed Eric's comments. Rather than giving the duration an arbitrarily long duration, we just give the animations a duration value of 1 and a speed of 0. 1657481 5 ews-feeder 2020-05-29 16:03:50 -0700 Committed r262322: <https://trac.webkit.org/changeset/262322> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400360. 399863 2020-05-20 11:43:52 -0700 2020-05-21 14:42:42 -0700 Patch bug-212156-20200520114352.patch text/plain 6047 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxNzA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk1Y2ViNzlmOTQ3ODUyNzAz YjVjMzg5MGNhYmYzNzFkZjM5YTE5MzkuLmQ0NDBhMjZlNjZkNTM5MjkyOWU3NjBiMjM2YTQzODcz MDg4YWY2MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjAtMDUtMjAgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgW01hYyxXSzJdIEZ1bGxzY3JlZW4g YW5pbWF0aW9uIG1pc3NpbmcgYSBmZXcgZnJhbWVzIGF0IGJlZ2lubmluZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMTU2CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS81NDc5OTQxNT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaGVuIHN0YXJ0aW5nIHRoZSBhbmltYXRpb24sIGVuc3VyZSB0aGF0IHRo ZSBmdWxsc2NyZWVuIHdpbmRvdyBpcyBvcmRlcmVkIGZyb250LCBhbmQgb24gdG9wCisgICAgICAg IG9mIHRoZSBjb250ZW50LCBhcyB3ZWxsIGFzIGhhdmluZyBhbGwgdGhlIGFuaW1hdGlvbnMgY29u ZmlndXJlZCBzbyB0aGF0IHRoZWlyIHN0YXJ0aW5nIHN0YXRlIGlzIGluIHBsYWNlIGJlZm9yZQor ICAgICAgICBjYWxsaW5nIC1bTlNXaW5kb3cgZW50ZXJGdWxsc2NyZWVuTW9kZTpdLiBNb3ZlIGFs bCB0aGUgd2luZG93IGNyZWF0aW9uIGNvZGUgaW50bworICAgICAgICAtYmVnYW5FbnRlckZ1bGxT Y3JlZW5XaXRoSW5pdGlhbEZyYW1lOmZpbmFsRnJhbWU6IGZyb20gX3N0YXJ0RW50ZXJGdWxsU2Ny ZWVuQW5pbWF0aW9uV2l0aER1cmF0aW9uOi4gUmUtdXNlIHRoZQorICAgICAgICBleGlzdGluZyB6 b29tQW5pbWF0aW9uKCkgYW5kIG1hc2tBbmltYXRpb24oKSB1dGlsaXR5IG1ldGhvZHMsIGJ1dCBn aXZlIHRoZSBhbmltYXRpb25zIGEgdmVyeSBsb25nIGR1cmF0aW9uCisgICAgICAgIChzaW5jZSB0 aGVyZSBpcyBubyBleHBsaWNpdCB3YXkgdG8gc3RhcnQgYW5kIHN0b3AgYSBDQUFuaW1hdGlvbiku IFRoaXMgaW5pdGlhbCBhbmltYXRpb24gd2lsbCBiZSByZXBsYWNlZCB3aXRoCisgICAgICAgIHRo ZSBmaW5hbCBvbmUgaW5zaWRlIC1fc3RhcnRFbnRlckZ1bGxTY3JlZW5BbmltYXRpb25XaXRoRHVy YXRpb246LiBTZXBhcmF0ZWx5LCBleHBsaWN0bHkgZGlzYWJsZSBpbXBsaWNpdAorICAgICAgICBh bmltYXRpb25zIG9mIHRoZSBmdWxsc2NyZWVuIHdpbmRvdyBkdXJpbmcgLW9yZGVySW46IGFuZCAt b3JkZXJPdXQ6LgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dD b250cm9sbGVyLm1tOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGlu aXRXaXRoV2luZG93OndlYlZpZXc6cGFnZTppbXBsOl0pOgorICAgICAgICAoLVtXS0Z1bGxTY3Jl ZW5XaW5kb3dDb250cm9sbGVyIGJlZ2FuRW50ZXJGdWxsU2NyZWVuV2l0aEluaXRpYWxGcmFtZTpm aW5hbEZyYW1lOl0pOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIF9z dGFydEVudGVyRnVsbFNjcmVlbkFuaW1hdGlvbldpdGhEdXJhdGlvbjpdKToKKwogMjAyMC0wNC0z MCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWR1Y2UgZGF0 YSBjb3BpZXMgaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyBjdXN0b20gVVJMIHNjaGVtZSBoYW5k bGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVu V2luZG93Q29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCmluZGV4IDkxOWVmNzlhMmVlYzY4ZmU3NTllYWVlZjNm MWNhNGZjYWU5NzgxMjUuLjI1MDdhZGI5ZjI4NGNhMWUxMDdiOGRmNmM0NjgzMmRmYjc3YTM2OTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5k b3dDb250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCkBAIC0xMjgsNiArMTI4LDcgQEAgLSAoaWQpaW5pdFdp dGhXaW5kb3c6KE5TV2luZG93ICopd2luZG93IHdlYlZpZXc6KE5TVmlldyAqKXdlYlZpZXcgcGFn ZTooTmFrZWRSZWYKIAogICAgIC8vIEhpZGUgdGhlIHRpdGxlYmFyIGR1cmluZyB0aGUgYW5pbWF0 aW9uIHRvIGZ1bGwgc2NyZWVuIHNvIHRoYXQgb25seSB0aGUgV0tXZWJWaWV3IGNvbnRlbnQgaXMg dmlzaWJsZS4KICAgICB3aW5kb3cudGl0bGViYXJBbHBoYVZhbHVlID0gMDsKKyAgICB3aW5kb3cu YW5pbWF0aW9uQmVoYXZpb3IgPSBOU1dpbmRvd0FuaW1hdGlvbkJlaGF2aW9yTm9uZTsKIAogICAg IE5TVmlldyAqY29udGVudFZpZXcgPSBbd2luZG93IGNvbnRlbnRWaWV3XTsKICAgICBjb250ZW50 Vmlldy5oaWRkZW4gPSBZRVM7CkBAIC0zMTMsOCArMzE0LDMwIEBAIC0gKHZvaWQpYmVnYW5FbnRl ckZ1bGxTY3JlZW5XaXRoSW5pdGlhbEZyYW1lOihOU1JlY3QpaW5pdGlhbEZyYW1lIGZpbmFsRnJh bWU6KE5TCiAgICAgX2luaXRpYWxGcmFtZSA9IGluaXRpYWxGcmFtZTsKICAgICBfZmluYWxGcmFt ZSA9IGZpbmFsRnJhbWU7CiAKLSAgICBbc2VsZi53aW5kb3cgb3JkZXJCYWNrOiBzZWxmXTsgLy8g TWFrZSBzdXJlIHRoZSBmdWxsIHNjcmVlbiB3aW5kb3cgaXMgcGFydCBvZiB0aGUgY29ycmVjdCBT cGFjZS4KLSAgICBbW3NlbGYgd2luZG93XSBlbnRlckZ1bGxTY3JlZW5Nb2RlOnNlbGZdOworICAg IFtDQVRyYW5zYWN0aW9uIGJlZ2luXTsKKyAgICBbQ0FUcmFuc2FjdGlvbiBzZXREaXNhYmxlQWN0 aW9uczpZRVNdOworCisgICAgYXV0byBjbGlwTGF5ZXIgPSBfY2xpcFZpZXcuZ2V0KCkubGF5ZXI7 CisgICAgTlNWaWV3ICpjb250ZW50VmlldyA9IFtbc2VsZiB3aW5kb3ddIGNvbnRlbnRWaWV3XTsK KworICAgIFtjbGlwTGF5ZXIgYWRkQW5pbWF0aW9uOnpvb21BbmltYXRpb24oX2luaXRpYWxGcmFt ZSwgX2ZpbmFsRnJhbWUsIHNlbGYud2luZG93LnNjcmVlbi5mcmFtZSwgMWUxMCwgQW5pbWF0ZUlu KSBmb3JLZXk6QCJmdWxsc2NyZWVuIl07CisgICAgY2xpcExheWVyLm1hc2sgPSBjcmVhdGVNYXNr KGNvbnRlbnRWaWV3LmJvdW5kcyk7CisgICAgW2NsaXBMYXllci5tYXNrIGFkZEFuaW1hdGlvbjpt YXNrQW5pbWF0aW9uKF9pbml0aWFsRnJhbWUsIF9maW5hbEZyYW1lLCBzZWxmLndpbmRvdy5zY3Jl ZW4uZnJhbWUsIDFlMTAsIEFuaW1hdGVJbikgZm9yS2V5OkAiZnVsbHNjcmVlbiJdOworICAgIGNv bnRlbnRWaWV3LmhpZGRlbiA9IE5POworCisgICAgTlNXaW5kb3cqIHdpbmRvdyA9IHNlbGYud2lu ZG93OworICAgIE5TV2luZG93Q29sbGVjdGlvbkJlaGF2aW9yIGJlaGF2aW9yID0gW3dpbmRvdyBj b2xsZWN0aW9uQmVoYXZpb3JdOworICAgIFt3aW5kb3cgc2V0Q29sbGVjdGlvbkJlaGF2aW9yOihi ZWhhdmlvciB8IE5TV2luZG93Q29sbGVjdGlvbkJlaGF2aW9yQ2FuSm9pbkFsbFNwYWNlcyldOwor ICAgIFt3aW5kb3cgbWFrZUtleUFuZE9yZGVyRnJvbnQ6c2VsZl07CisgICAgW3dpbmRvdyBzZXRD b2xsZWN0aW9uQmVoYXZpb3I6YmVoYXZpb3JdOworICAgIFt3aW5kb3cgbWFrZUZpcnN0UmVzcG9u ZGVyOl93ZWJWaWV3XTsKKworICAgIF9wYWdlLT5zZXRTdXBwcmVzc1Zpc2liaWxpdHlVcGRhdGVz KGZhbHNlKTsKKyAgICBbW3NlbGYgd2luZG93XSBkaXNwbGF5SWZOZWVkZWRdOworCisgICAgW0NB VHJhbnNhY3Rpb24gY29tbWl0XTsKKworICAgIFtzZWxmLndpbmRvdyBlbnRlckZ1bGxTY3JlZW5N b2RlOnNlbGZdOwogfQogCiBzdGF0aWMgY29uc3QgZmxvYXQgbWluVmlkZW9XaWR0aCA9IDQ4MCAr IDIwICsgMjA7IC8vIE5vdGU6IEtlZXAgaW4gc3luYyB3aXRoIG1lZGlhQ29udHJvbHNBcHBsZS5j c3MgKHZpZGVvOi13ZWJraXQtZnVsbC1zY3JlZW46Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFu ZWwpCkBAIC03NjgsMzEgKzc5MSwxNSBAQCBzdGF0aWMgQ0FBbmltYXRpb24gKmZhZGVBbmltYXRp b24oQ0ZUaW1lSW50ZXJ2YWwgZHVyYXRpb24sIEFuaW1hdGlvbkRpcmVjdGlvbiBkaQogCiAtICh2 b2lkKV9zdGFydEVudGVyRnVsbFNjcmVlbkFuaW1hdGlvbldpdGhEdXJhdGlvbjooTlNUaW1lSW50 ZXJ2YWwpZHVyYXRpb24KIHsKLSAgICBOU1ZpZXcqIGNvbnRlbnRWaWV3ID0gW1tzZWxmIHdpbmRv d10gY29udGVudFZpZXddOwotCi0gICAgW1tfY2xpcFZpZXcgbGF5ZXJdIGFkZEFuaW1hdGlvbjp6 b29tQW5pbWF0aW9uKF9pbml0aWFsRnJhbWUsIF9maW5hbEZyYW1lLCBzZWxmLndpbmRvdy5zY3Jl ZW4uZnJhbWUsIGR1cmF0aW9uLCBBbmltYXRlSW4pIGZvcktleTpAImZ1bGxzY3JlZW4iXTsKLSAg ICBDQUxheWVyICptYXNrTGF5ZXIgPSBjcmVhdGVNYXNrKGNvbnRlbnRWaWV3LmJvdW5kcyk7Ci0g ICAgW21hc2tMYXllciBhZGRBbmltYXRpb246bWFza0FuaW1hdGlvbihfaW5pdGlhbEZyYW1lLCBf ZmluYWxGcmFtZSwgc2VsZi53aW5kb3cuc2NyZWVuLmZyYW1lLCBkdXJhdGlvbiwgQW5pbWF0ZUlu KSBmb3JLZXk6QCJmdWxsc2NyZWVuIl07Ci0gICAgW19jbGlwVmlldyBsYXllcl0ubWFzayA9IG1h c2tMYXllcjsKKyAgICBbQ0FUcmFuc2FjdGlvbiBiZWdpbl07CisgICAgW0NBVHJhbnNhY3Rpb24g c2V0RGlzYWJsZUFjdGlvbnM6WUVTXTsKIAotICAgIGNvbnRlbnRWaWV3LmhpZGRlbiA9IE5POwor ICAgIGF1dG8gY2xpcExheWVyID0gX2NsaXBWaWV3LmdldCgpLmxheWVyOworICAgIFtjbGlwTGF5 ZXIgYWRkQW5pbWF0aW9uOnpvb21BbmltYXRpb24oX2luaXRpYWxGcmFtZSwgX2ZpbmFsRnJhbWUs IHNlbGYud2luZG93LnNjcmVlbi5mcmFtZSwgZHVyYXRpb24sIEFuaW1hdGVJbikgZm9yS2V5OkAi ZnVsbHNjcmVlbiJdOworICAgIFtjbGlwTGF5ZXIubWFzayBhZGRBbmltYXRpb246bWFza0FuaW1h dGlvbihfaW5pdGlhbEZyYW1lLCBfZmluYWxGcmFtZSwgc2VsZi53aW5kb3cuc2NyZWVuLmZyYW1l LCBkdXJhdGlvbiwgQW5pbWF0ZUluKSBmb3JLZXk6QCJmdWxsc2NyZWVuIl07CiAgICAgW19iYWNr Z3JvdW5kVmlldy5nZXQoKS5sYXllciBhZGRBbmltYXRpb246ZmFkZUFuaW1hdGlvbihkdXJhdGlv biwgQW5pbWF0ZUluKSBmb3JLZXk6QCJmdWxsc2NyZWVuIl07CiAKLSAgICBOU1dpbmRvdyogd2lu ZG93ID0gW3NlbGYgd2luZG93XTsKLSAgICBOU1dpbmRvd0NvbGxlY3Rpb25CZWhhdmlvciBiZWhh dmlvciA9IFt3aW5kb3cgY29sbGVjdGlvbkJlaGF2aW9yXTsKLSAgICBbd2luZG93IHNldENvbGxl Y3Rpb25CZWhhdmlvcjooYmVoYXZpb3IgfCBOU1dpbmRvd0NvbGxlY3Rpb25CZWhhdmlvckNhbkpv aW5BbGxTcGFjZXMpXTsKLSAgICBbd2luZG93IG1ha2VLZXlBbmRPcmRlckZyb250OnNlbGZdOwot ICAgIFt3aW5kb3cgc2V0Q29sbGVjdGlvbkJlaGF2aW9yOmJlaGF2aW9yXTsKLSAgICBbd2luZG93 IG1ha2VGaXJzdFJlc3BvbmRlcjpfd2ViVmlld107Ci0KLSAgICBfcGFnZS0+c2V0U3VwcHJlc3NW aXNpYmlsaXR5VXBkYXRlcyhmYWxzZSk7Ci0gICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElP TlNfQkVHSU4KLSAgICBbW3NlbGYgd2luZG93XSBzZXRBdXRvZGlzcGxheTpZRVNdOwotICAgIEFM TE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAotICAgIFtbc2VsZiB3aW5kb3ddIGRpc3Bs YXlJZk5lZWRlZF07Ci0gICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KLSAg ICBOU0VuYWJsZVNjcmVlblVwZGF0ZXMoKTsKLSAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFU SU9OU19FTkQKKyAgICBbQ0FUcmFuc2FjdGlvbiBjb21taXRdOwogfQogCiAtICh2b2lkKV9zdGFy dEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uV2l0aER1cmF0aW9uOihOU1RpbWVJbnRlcnZhbClkdXJh dGlvbgo= 400360 2020-05-27 11:46:55 -0700 2020-05-29 16:03:51 -0700 Patch for landing bug-212156-20200527114655.patch text/plain 8903 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAyN2RiMzVhNzY5MTMwZmM2 YjcyYzBmZDUzZGQ4MmQwZWJlMDFhOTcuLjc3ODQ5OTc2YWEyMDkzNTk2YjU4MzMwZWY0N2YzZWJh YTM0N2U4OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjAtMDUtMjAgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgW01hYyxXSzJdIEZ1bGxzY3JlZW4g YW5pbWF0aW9uIG1pc3NpbmcgYSBmZXcgZnJhbWVzIGF0IGJlZ2lubmluZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMTU2CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS81NDc5OTQxNT4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24u CisKKyAgICAgICAgV2hlbiBzdGFydGluZyB0aGUgZW50ZXIgZnVsbHNjcmVlbiBhbmltYXRpb24s IGVuc3VyZSB0aGF0IHRoZSBmdWxsc2NyZWVuIHdpbmRvdyBpcyBvcmRlcmVkIGZyb250LCBhbmQg b24gdG9wCisgICAgICAgIG9mIHRoZSBjb250ZW50LCBhcyB3ZWxsIGFzIGhhdmluZyBhbGwgdGhl IGFuaW1hdGlvbnMgY29uZmlndXJlZCBzbyB0aGF0IHRoZWlyIHN0YXJ0aW5nIHN0YXRlIGlzIGlu IHBsYWNlIGJlZm9yZQorICAgICAgICBjYWxsaW5nIC1bTlNXaW5kb3cgZW50ZXJGdWxsc2NyZWVu TW9kZTpdLiBNb3ZlIGFsbCB0aGUgd2luZG93IGNyZWF0aW9uIGNvZGUgaW50bworICAgICAgICAt YmVnYW5FbnRlckZ1bGxTY3JlZW5XaXRoSW5pdGlhbEZyYW1lOmZpbmFsRnJhbWU6IGZyb20gX3N0 YXJ0RW50ZXJGdWxsU2NyZWVuQW5pbWF0aW9uV2l0aER1cmF0aW9uOi4gUmUtdXNlIHRoZQorICAg ICAgICBleGlzdGluZyB6b29tQW5pbWF0aW9uKCkgYW5kIG1hc2tBbmltYXRpb24oKSB1dGlsaXR5 IG1ldGhvZHMsIGJ1dCBnaXZlIHRoZSBhbmltYXRpb25zIGEgdmVyeSBsb25nIGR1cmF0aW9uCisg ICAgICAgIChzaW5jZSB0aGVyZSBpcyBubyBleHBsaWNpdCB3YXkgdG8gc3RhcnQgYW5kIHN0b3Ag YSBDQUFuaW1hdGlvbikuIFRoaXMgaW5pdGlhbCBhbmltYXRpb24gd2lsbCBiZSByZXBsYWNlZCB3 aXRoCisgICAgICAgIHRoZSBmaW5hbCBvbmUgaW5zaWRlIC1fc3RhcnRFbnRlckZ1bGxTY3JlZW5B bmltYXRpb25XaXRoRHVyYXRpb246LiBTZXBhcmF0ZWx5LCBleHBsaWN0bHkgZGlzYWJsZSBpbXBs aWNpdAorICAgICAgICBhbmltYXRpb25zIG9mIHRoZSBmdWxsc2NyZWVuIHdpbmRvdyBkdXJpbmcg LW9yZGVySW46IGFuZCAtb3JkZXJPdXQ6LgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0Z1 bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5k b3dDb250cm9sbGVyIGluaXRXaXRoV2luZG93OndlYlZpZXc6cGFnZTppbXBsOl0pOgorICAgICAg ICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGJlZ2FuRW50ZXJGdWxsU2NyZWVuV2l0 aEluaXRpYWxGcmFtZTpmaW5hbEZyYW1lOl0pOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5k b3dDb250cm9sbGVyIF9zdGFydEVudGVyRnVsbFNjcmVlbkFuaW1hdGlvbldpdGhEdXJhdGlvbjpd KToKKwogMjAyMC0wNC0zMCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZWR1Y2UgZGF0YSBjb3BpZXMgaW4gdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyBjdXN0b20g VVJMIHNjaGVtZSBoYW5kbGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9t YWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCmluZGV4IDkxOWVmNzlhMmVl YzY4ZmU3NTllYWVlZjNmMWNhNGZjYWU5NzgxMjUuLjU2YWVmM2ZlZTVkZmM1MTYwNjBlMWRjYmI2 YmViMDhmZjM1NDU0YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9X S0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCkBAIC0xMjgsNiArMTI4LDcg QEAgLSAoaWQpaW5pdFdpdGhXaW5kb3c6KE5TV2luZG93ICopd2luZG93IHdlYlZpZXc6KE5TVmll dyAqKXdlYlZpZXcgcGFnZTooTmFrZWRSZWYKIAogICAgIC8vIEhpZGUgdGhlIHRpdGxlYmFyIGR1 cmluZyB0aGUgYW5pbWF0aW9uIHRvIGZ1bGwgc2NyZWVuIHNvIHRoYXQgb25seSB0aGUgV0tXZWJW aWV3IGNvbnRlbnQgaXMgdmlzaWJsZS4KICAgICB3aW5kb3cudGl0bGViYXJBbHBoYVZhbHVlID0g MDsKKyAgICB3aW5kb3cuYW5pbWF0aW9uQmVoYXZpb3IgPSBOU1dpbmRvd0FuaW1hdGlvbkJlaGF2 aW9yTm9uZTsKIAogICAgIE5TVmlldyAqY29udGVudFZpZXcgPSBbd2luZG93IGNvbnRlbnRWaWV3 XTsKICAgICBjb250ZW50Vmlldy5oaWRkZW4gPSBZRVM7CkBAIC0zMTMsOCArMzE0LDM0IEBAIC0g KHZvaWQpYmVnYW5FbnRlckZ1bGxTY3JlZW5XaXRoSW5pdGlhbEZyYW1lOihOU1JlY3QpaW5pdGlh bEZyYW1lIGZpbmFsRnJhbWU6KE5TCiAgICAgX2luaXRpYWxGcmFtZSA9IGluaXRpYWxGcmFtZTsK ICAgICBfZmluYWxGcmFtZSA9IGZpbmFsRnJhbWU7CiAKLSAgICBbc2VsZi53aW5kb3cgb3JkZXJC YWNrOiBzZWxmXTsgLy8gTWFrZSBzdXJlIHRoZSBmdWxsIHNjcmVlbiB3aW5kb3cgaXMgcGFydCBv ZiB0aGUgY29ycmVjdCBTcGFjZS4KLSAgICBbW3NlbGYgd2luZG93XSBlbnRlckZ1bGxTY3JlZW5N b2RlOnNlbGZdOworICAgIFtDQVRyYW5zYWN0aW9uIGJlZ2luXTsKKyAgICBbQ0FUcmFuc2FjdGlv biBzZXREaXNhYmxlQWN0aW9uczpZRVNdOworCisgICAgYXV0byBjbGlwTGF5ZXIgPSBfY2xpcFZp ZXcuZ2V0KCkubGF5ZXI7CisgICAgTlNWaWV3ICpjb250ZW50VmlldyA9IFtbc2VsZiB3aW5kb3dd IGNvbnRlbnRWaWV3XTsKKworICAgIC8vIEdpdmUgdGhlIGluaXRpYWwgYW5pbWF0aW9ucyBhIHNw ZWVkIG9mICIwIi4gV2Ugd2FudCB0aGUgYW5pbWF0aW9ucyBpbiBwbGFjZSB3aGVuIHdlIG9yZGVy IGluCisgICAgLy8gdGhlIHdpbmRvdywgYnV0IHRvIG5vdCBzdGFydCBhbmltYXRpbmcgdW50aWwg d2UgZ2V0IHRoZSBjYWxsYmFjayBmcm9tIEFwcEtpdCB3aXRoIHRoZSByZXF1aXJlZAorICAgIC8v IGFuaW1hdGlvbiBkdXJhdGlvbi4gVGhlc2UgYW5pbWF0aW9ucyB3aWxsIGJlIHJlcGxhY2VkIHdp dGggdGhlIGZpbmFsIGFuaW1hdGlvbnMgaW4KKyAgICAvLyAtX3N0YXJ0RW50ZXJGdWxsU2NyZWVu QW5pbWF0aW9uV2l0aER1cmF0aW9uOgorICAgIFtjbGlwTGF5ZXIgYWRkQW5pbWF0aW9uOnpvb21B bmltYXRpb24oX2luaXRpYWxGcmFtZSwgX2ZpbmFsRnJhbWUsIHNlbGYud2luZG93LnNjcmVlbi5m cmFtZSwgMSwgMCwgQW5pbWF0ZUluKSBmb3JLZXk6QCJmdWxsc2NyZWVuIl07CisgICAgY2xpcExh eWVyLm1hc2sgPSBjcmVhdGVNYXNrKGNvbnRlbnRWaWV3LmJvdW5kcyk7CisgICAgW2NsaXBMYXll ci5tYXNrIGFkZEFuaW1hdGlvbjptYXNrQW5pbWF0aW9uKF9pbml0aWFsRnJhbWUsIF9maW5hbEZy YW1lLCBzZWxmLndpbmRvdy5zY3JlZW4uZnJhbWUsIDEsIDAsIEFuaW1hdGVJbikgZm9yS2V5OkAi ZnVsbHNjcmVlbiJdOworICAgIGNvbnRlbnRWaWV3LmhpZGRlbiA9IE5POworCisgICAgTlNXaW5k b3cqIHdpbmRvdyA9IHNlbGYud2luZG93OworICAgIE5TV2luZG93Q29sbGVjdGlvbkJlaGF2aW9y IGJlaGF2aW9yID0gW3dpbmRvdyBjb2xsZWN0aW9uQmVoYXZpb3JdOworICAgIFt3aW5kb3cgc2V0 Q29sbGVjdGlvbkJlaGF2aW9yOihiZWhhdmlvciB8IE5TV2luZG93Q29sbGVjdGlvbkJlaGF2aW9y Q2FuSm9pbkFsbFNwYWNlcyldOworICAgIFt3aW5kb3cgbWFrZUtleUFuZE9yZGVyRnJvbnQ6c2Vs Zl07CisgICAgW3dpbmRvdyBzZXRDb2xsZWN0aW9uQmVoYXZpb3I6YmVoYXZpb3JdOworICAgIFt3 aW5kb3cgbWFrZUZpcnN0UmVzcG9uZGVyOl93ZWJWaWV3XTsKKworICAgIF9wYWdlLT5zZXRTdXBw cmVzc1Zpc2liaWxpdHlVcGRhdGVzKGZhbHNlKTsKKyAgICBbW3NlbGYgd2luZG93XSBkaXNwbGF5 SWZOZWVkZWRdOworCisgICAgW0NBVHJhbnNhY3Rpb24gY29tbWl0XTsKKworICAgIFtzZWxmLndp bmRvdyBlbnRlckZ1bGxTY3JlZW5Nb2RlOnNlbGZdOwogfQogCiBzdGF0aWMgY29uc3QgZmxvYXQg bWluVmlkZW9XaWR0aCA9IDQ4MCArIDIwICsgMjA7IC8vIE5vdGU6IEtlZXAgaW4gc3luYyB3aXRo IG1lZGlhQ29udHJvbHNBcHBsZS5jc3MgKHZpZGVvOi13ZWJraXQtZnVsbC1zY3JlZW46Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtcGFuZWwpCkBAIC02OTQsNyArNzIxLDcgQEAgc3RhdGljIENBTWVk aWFUaW1pbmdGdW5jdGlvbiAqdGltaW5nRnVuY3Rpb25Gb3JEdXJhdGlvbihDRlRpbWVJbnRlcnZh bCBkdXJhdGlvbikKIH0KIAogZW51bSBBbmltYXRpb25EaXJlY3Rpb24geyBBbmltYXRlSW4sIEFu aW1hdGVPdXQgfTsKLXN0YXRpYyBDQUFuaW1hdGlvbiAqem9vbUFuaW1hdGlvbihjb25zdCBXZWJD b3JlOjpGbG9hdFJlY3QmIGluaXRpYWxGcmFtZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBm aW5hbEZyYW1lLCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHNjcmVlbkZyYW1lLCBDRlRpbWVJ bnRlcnZhbCBkdXJhdGlvbiwgQW5pbWF0aW9uRGlyZWN0aW9uIGRpcmVjdGlvbikKK3N0YXRpYyBD QUFuaW1hdGlvbiAqem9vbUFuaW1hdGlvbihjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGluaXRp YWxGcmFtZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBmaW5hbEZyYW1lLCBjb25zdCBXZWJD b3JlOjpGbG9hdFJlY3QmIHNjcmVlbkZyYW1lLCBDRlRpbWVJbnRlcnZhbCBkdXJhdGlvbiwgZmxv YXQgc3BlZWQsIEFuaW1hdGlvbkRpcmVjdGlvbiBkaXJlY3Rpb24pCiB7CiAgICAgQ0FCYXNpY0Fu aW1hdGlvbiAqc2NhbGVBbmltYXRpb24gPSBbQ0FCYXNpY0FuaW1hdGlvbiBhbmltYXRpb25XaXRo S2V5UGF0aDpAInRyYW5zZm9ybSJdOwogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBzY2FsZVJlY3Qg PSBzbWFsbGVzdFJlY3RXaXRoQXNwZWN0UmF0aW9Bcm91bmRSZWN0KGZpbmFsRnJhbWUuc2l6ZSgp LmFzcGVjdFJhdGlvKCksIGluaXRpYWxGcmFtZSk7CkBAIC03MjYsNyArNzUzLDcgQEAgc3RhdGlj IENBTGF5ZXIgKmNyZWF0ZU1hc2soY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBib3VuZHMpCiAg ICAgcmV0dXJuIG1hc2tMYXllcjsKIH0KIAotc3RhdGljIENBQW5pbWF0aW9uICptYXNrQW5pbWF0 aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgaW5pdGlhbEZyYW1lLCBjb25zdCBXZWJDb3Jl OjpGbG9hdFJlY3QmIGZpbmFsRnJhbWUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgc2NyZWVu RnJhbWUsIENGVGltZUludGVydmFsIGR1cmF0aW9uLCBBbmltYXRpb25EaXJlY3Rpb24gZGlyZWN0 aW9uKQorc3RhdGljIENBQW5pbWF0aW9uICptYXNrQW5pbWF0aW9uKGNvbnN0IFdlYkNvcmU6OkZs b2F0UmVjdCYgaW5pdGlhbEZyYW1lLCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGZpbmFsRnJh bWUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgc2NyZWVuRnJhbWUsIENGVGltZUludGVydmFs IGR1cmF0aW9uLCBmbG9hdCBzcGVlZCwgQW5pbWF0aW9uRGlyZWN0aW9uIGRpcmVjdGlvbikKIHsK ICAgICBDQUJhc2ljQW5pbWF0aW9uICpib3VuZHNBbmltYXRpb24gPSBbQ0FCYXNpY0FuaW1hdGlv biBhbmltYXRpb25XaXRoS2V5UGF0aDpAImJvdW5kcyJdOwogICAgIFdlYkNvcmU6OkZsb2F0UmVj dCBib3VuZHNSZWN0ID0gbGFyZ2VzdFJlY3RXaXRoQXNwZWN0UmF0aW9JbnNpZGVSZWN0KGluaXRp YWxGcmFtZS5zaXplKCkuYXNwZWN0UmF0aW8oKSwgZmluYWxGcmFtZSk7CkBAIC03NjgsMzEgKzc5 NSwxNSBAQCBzdGF0aWMgQ0FBbmltYXRpb24gKmZhZGVBbmltYXRpb24oQ0ZUaW1lSW50ZXJ2YWwg ZHVyYXRpb24sIEFuaW1hdGlvbkRpcmVjdGlvbiBkaQogCiAtICh2b2lkKV9zdGFydEVudGVyRnVs bFNjcmVlbkFuaW1hdGlvbldpdGhEdXJhdGlvbjooTlNUaW1lSW50ZXJ2YWwpZHVyYXRpb24KIHsK LSAgICBOU1ZpZXcqIGNvbnRlbnRWaWV3ID0gW1tzZWxmIHdpbmRvd10gY29udGVudFZpZXddOwot Ci0gICAgW1tfY2xpcFZpZXcgbGF5ZXJdIGFkZEFuaW1hdGlvbjp6b29tQW5pbWF0aW9uKF9pbml0 aWFsRnJhbWUsIF9maW5hbEZyYW1lLCBzZWxmLndpbmRvdy5zY3JlZW4uZnJhbWUsIGR1cmF0aW9u LCBBbmltYXRlSW4pIGZvcktleTpAImZ1bGxzY3JlZW4iXTsKLSAgICBDQUxheWVyICptYXNrTGF5 ZXIgPSBjcmVhdGVNYXNrKGNvbnRlbnRWaWV3LmJvdW5kcyk7Ci0gICAgW21hc2tMYXllciBhZGRB bmltYXRpb246bWFza0FuaW1hdGlvbihfaW5pdGlhbEZyYW1lLCBfZmluYWxGcmFtZSwgc2VsZi53 aW5kb3cuc2NyZWVuLmZyYW1lLCBkdXJhdGlvbiwgQW5pbWF0ZUluKSBmb3JLZXk6QCJmdWxsc2Ny ZWVuIl07Ci0gICAgW19jbGlwVmlldyBsYXllcl0ubWFzayA9IG1hc2tMYXllcjsKKyAgICBbQ0FU cmFuc2FjdGlvbiBiZWdpbl07CisgICAgW0NBVHJhbnNhY3Rpb24gc2V0RGlzYWJsZUFjdGlvbnM6 WUVTXTsKIAotICAgIGNvbnRlbnRWaWV3LmhpZGRlbiA9IE5POworICAgIGF1dG8gY2xpcExheWVy ID0gX2NsaXBWaWV3LmdldCgpLmxheWVyOworICAgIFtjbGlwTGF5ZXIgYWRkQW5pbWF0aW9uOnpv b21BbmltYXRpb24oX2luaXRpYWxGcmFtZSwgX2ZpbmFsRnJhbWUsIHNlbGYud2luZG93LnNjcmVl bi5mcmFtZSwgZHVyYXRpb24sIDEsIEFuaW1hdGVJbikgZm9yS2V5OkAiZnVsbHNjcmVlbiJdOwor ICAgIFtjbGlwTGF5ZXIubWFzayBhZGRBbmltYXRpb246bWFza0FuaW1hdGlvbihfaW5pdGlhbEZy YW1lLCBfZmluYWxGcmFtZSwgc2VsZi53aW5kb3cuc2NyZWVuLmZyYW1lLCBkdXJhdGlvbiwgMSwg QW5pbWF0ZUluKSBmb3JLZXk6QCJmdWxsc2NyZWVuIl07CiAgICAgW19iYWNrZ3JvdW5kVmlldy5n ZXQoKS5sYXllciBhZGRBbmltYXRpb246ZmFkZUFuaW1hdGlvbihkdXJhdGlvbiwgQW5pbWF0ZUlu KSBmb3JLZXk6QCJmdWxsc2NyZWVuIl07CiAKLSAgICBOU1dpbmRvdyogd2luZG93ID0gW3NlbGYg d2luZG93XTsKLSAgICBOU1dpbmRvd0NvbGxlY3Rpb25CZWhhdmlvciBiZWhhdmlvciA9IFt3aW5k b3cgY29sbGVjdGlvbkJlaGF2aW9yXTsKLSAgICBbd2luZG93IHNldENvbGxlY3Rpb25CZWhhdmlv cjooYmVoYXZpb3IgfCBOU1dpbmRvd0NvbGxlY3Rpb25CZWhhdmlvckNhbkpvaW5BbGxTcGFjZXMp XTsKLSAgICBbd2luZG93IG1ha2VLZXlBbmRPcmRlckZyb250OnNlbGZdOwotICAgIFt3aW5kb3cg c2V0Q29sbGVjdGlvbkJlaGF2aW9yOmJlaGF2aW9yXTsKLSAgICBbd2luZG93IG1ha2VGaXJzdFJl c3BvbmRlcjpfd2ViVmlld107Ci0KLSAgICBfcGFnZS0+c2V0U3VwcHJlc3NWaXNpYmlsaXR5VXBk YXRlcyhmYWxzZSk7Ci0gICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KLSAg ICBbW3NlbGYgd2luZG93XSBzZXRBdXRvZGlzcGxheTpZRVNdOwotICAgIEFMTE9XX0RFUFJFQ0FU RURfREVDTEFSQVRJT05TX0VORAotICAgIFtbc2VsZiB3aW5kb3ddIGRpc3BsYXlJZk5lZWRlZF07 Ci0gICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KLSAgICBOU0VuYWJsZVNj cmVlblVwZGF0ZXMoKTsKLSAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKKyAg ICBbQ0FUcmFuc2FjdGlvbiBjb21taXRdOwogfQogCiAtICh2b2lkKV9zdGFydEV4aXRGdWxsU2Ny ZWVuQW5pbWF0aW9uV2l0aER1cmF0aW9uOihOU1RpbWVJbnRlcnZhbClkdXJhdGlvbgpAQCAtODA1 LDEwICs4MTYsMTAgQEAgLSAodm9pZClfc3RhcnRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbldpdGhE dXJhdGlvbjooTlNUaW1lSW50ZXJ2YWwpZHVyYXRpb24KICAgICAgICAgX2Z1bGxTY3JlZW5TdGF0 ZSA9IEV4aXRpbmdGdWxsU2NyZWVuOwogICAgIH0KIAotICAgIFtbX2NsaXBWaWV3IGxheWVyXSBh ZGRBbmltYXRpb246em9vbUFuaW1hdGlvbihfaW5pdGlhbEZyYW1lLCBfZmluYWxGcmFtZSwgc2Vs Zi53aW5kb3cuc2NyZWVuLmZyYW1lLCBkdXJhdGlvbiwgQW5pbWF0ZU91dCkgZm9yS2V5OkAiZnVs bHNjcmVlbiJdOworICAgIFtbX2NsaXBWaWV3IGxheWVyXSBhZGRBbmltYXRpb246em9vbUFuaW1h dGlvbihfaW5pdGlhbEZyYW1lLCBfZmluYWxGcmFtZSwgc2VsZi53aW5kb3cuc2NyZWVuLmZyYW1l LCBkdXJhdGlvbiwgMSwgQW5pbWF0ZU91dCkgZm9yS2V5OkAiZnVsbHNjcmVlbiJdOwogICAgIE5T VmlldyogY29udGVudFZpZXcgPSBbW3NlbGYgd2luZG93XSBjb250ZW50Vmlld107CiAgICAgQ0FM YXllciAqbWFza0xheWVyID0gY3JlYXRlTWFzayhjb250ZW50Vmlldy5ib3VuZHMpOwotICAgIFtt YXNrTGF5ZXIgYWRkQW5pbWF0aW9uOm1hc2tBbmltYXRpb24oX2luaXRpYWxGcmFtZSwgX2ZpbmFs RnJhbWUsIHNlbGYud2luZG93LnNjcmVlbi5mcmFtZSwgZHVyYXRpb24sIEFuaW1hdGVPdXQpIGZv cktleTpAImZ1bGxzY3JlZW4iXTsKKyAgICBbbWFza0xheWVyIGFkZEFuaW1hdGlvbjptYXNrQW5p bWF0aW9uKF9pbml0aWFsRnJhbWUsIF9maW5hbEZyYW1lLCBzZWxmLndpbmRvdy5zY3JlZW4uZnJh bWUsIGR1cmF0aW9uLCAxLCBBbmltYXRlT3V0KSBmb3JLZXk6QCJmdWxsc2NyZWVuIl07CiAgICAg W19jbGlwVmlldyBsYXllcl0ubWFzayA9IG1hc2tMYXllcjsKIAogICAgIGNvbnRlbnRWaWV3Lmhp ZGRlbiA9IE5POwo=