223446 2021-03-18 09:26:25 -0700 Handle empty bound size during animated resize 2021-03-19 15:34:49 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu ggaren kkinnunen sihui_liu simon.fraser thorton webkit-bug-importer oldest_to_newest 1741221 0 sihui_liu 2021-03-18 09:26:25 -0700 ... 1741239 1 423612 sihui_liu 2021-03-18 10:01:03 -0700 Created attachment 423612 Patch 1741390 2 423612 thorton 2021-03-18 13:44:15 -0700 Comment on attachment 423612 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423612&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h:254 > + CGRect _validOldBounds; Probably worth giving these names that make it clear they're just about (rare, SPI) animated resize; these names seem... more generic. Maybe stick them up with _animatedResizeOriginalContentWidth? > Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm:-2910 > - ASSERT_WITH_MESSAGE(!(_viewLayoutSizeOverride && newViewLayoutSize.isEmpty()), "Clients controlling the layout size should maintain a valid layout size to minimize layouts."); Is there a reason we're not just fixing the clients? (and maybe making this louder?). Since it's SPI, it should be achievable, and it is wasted work otherwise. 1741426 3 423658 sihui_liu 2021-03-18 14:31:49 -0700 Created attachment 423658 Patch 1741514 4 423671 sihui_liu 2021-03-18 16:56:08 -0700 Created attachment 423671 Patch for landing 1741520 5 ews-feeder 2021-03-18 17:25:21 -0700 Committed r274692: <https://commits.webkit.org/r274692> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423671. 1741521 6 webkit-bug-importer 2021-03-18 17:26:17 -0700 <rdar://problem/75598829> 1741769 7 ggaren 2021-03-19 10:24:58 -0700 > Is there a reason we're not just fixing the clients? (and maybe making this > louder?). Since it's SPI, it should be achievable, and it is wasted work > otherwise. I think the answer -- based on ChangeLog and conversation with Sihui -- is that auto layout just sometimes does this (very temporarily), outside of direct client control. Maybe this means we should file a Radar for auto layout. 1741934 8 thorton 2021-03-19 15:34:49 -0700 (In reply to Geoffrey Garen from comment #7) > > Is there a reason we're not just fixing the clients? (and maybe making this > > louder?). Since it's SPI, it should be achievable, and it is wasted work > > otherwise. > > I think the answer -- based on ChangeLog and conversation with Sihui -- is > that auto layout just sometimes does this (very temporarily), outside of > direct client control. > > Maybe this means we should file a Radar for auto layout. Yeah, she explained offline (and updated the changelog)! I do think we should make sure there is a radar, since it seems wasteful. 423612 2021-03-18 10:01:03 -0700 2021-03-18 14:31:48 -0700 Patch bug-223446-20210318100103.patch text/plain 7224 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJiMDAyYzI5OWI3MGMxMzBi MmI5YzgzZGM1MmI0ZDRiYTkyZjY2ZTAuLjBhODNkNzczOWFkNmQxZmQ4YzAyNGE4MDlmNDhiOWVh MmU3NWMxOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDMtMTggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBlLmNvbT4KKworICAgICAgICBIYW5kbGUgZW1wdHkgYm91bmQgc2l6 ZSBkdXJpbmcgYW5pbWF0ZWQgcmVzaXppbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMzQ0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlIGRvbid0IGFsbG93IGVtcHR5IGJvdW5kcyBpbiBhbmltYXRl ZCByZXNpemluZzogd2hlbiB0aGF0IGhhcHBlbnMsIHdlIHdvdWxkIGNhbmNlbCBpdC4gSG93ZXZl ciwgYSBzZXQgb2YgCisgICAgICAgIHVwZGF0ZXMgaW52b2x2aW5nIGVtcHR5IGJvdW5kcyBjYW4g YmUgbWVyZ2VkIHRvIGEgdmFsaWQgdXBkYXRlLiBGb3IgZXhhbXBsZSwgdHdvIGNoYW5nZXMgb2Yg ZnJhbWUgc2l6ZSAKKyAgICAgICAgWzFdICgwLCAwLCAxMDAsIDEwMCkgPT4gKDAsIDAsIDAsIDUw KSBbMl0gKDAsIDAsIDAsIDUwKSA9PiAoMCwgMCwgNTAsIDUwKSBjYW4gYmUgdmlld2VkIGFzIHNp bmdsZSBjaGFuZ2UgCisgICAgICAgICgwLCAwLCAxMDAsIDEwMCkgPT4gKDAsIDAsIDUwLCA1MCks IHdoaWNoIGlzIHZhbGlkLgorCisgICAgICAgIFRvIGhhbmRsZSB0aGlzIGNhc2UsIHdlIGNhbiBz dG9yZSB0aGUgb2xkIGJvdW5kcywgYW5kIGFjdHVhbGx5IHBlcmZvcm0gYW5pbWF0ZWQgcmVzaXpl IG9uIHdoZW4gbmV3IHZhbGlkIGJvdW5kcyAKKyAgICAgICAgc2hvdyB1cC4gRm9yIHRoZSBleGFt cGxlIGFib3ZlLCB3ZSB3b3VsZCBzdG9yZSAoMCwgMCwgMTAwLCAxMDApIG9uIFsxXSBhbmQgcmVz aXplIGZyb20gKDAsIDAsIDEwMCwgMTAwKSB0byAKKyAgICAgICAgKDAsIDAsIDUwLCA1MCkgb24g WzJdLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbToKKyAgICAgICAg KC1bV0tXZWJWaWV3IF9wcm9jZXNzV2lsbFN3YXBPckRpZEV4aXRdKToKKyAgICAgICAgKC1bV0tX ZWJWaWV3IF91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzXSk6IElmIHdlIHN0aWxsIGhhdmUgc3Rv cmVkIG9sZCBib3VuZHMgaW4gX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHMsIGl0IAorICAgICAg ICBtZWFucyB0aGV5IGFyZSBub3QgY29uc3VtZWQgaW4gdGhpcyBjeWNsZS4gSW4gdGhpcyBjYXNl IGxldCdzIGp1c3QgY2FuY2VsIGFuaW1hdGVkIHJlc2l6aW5nIGFuZCBzZW5kIG91dCB1cGRhdGVz LiAKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9jYW5jZWxBbmltYXRlZFJlc2l6ZV0pOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX2RpZENvbXBsZXRlQW5pbWF0ZWRSZXNpemVdKToKKyAgICAgICAgKC1b V0tXZWJWaWV3IF9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6XSk6CisKIDIwMjEtMDMt MTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAg IFtXUEVdIEJ1bXAgQVBJIHZlcnNpb24gd2hlbiBidWlsZGluZyB3aXRoIGxpYnNvdXAzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJu YWwuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5h bC5oCmluZGV4IDE3Nzg3ZmQ1MDJkMTk4YTMwYzAwY2ZjNTY1NDMxNTAwZWU2YTZiZDkuLmQxNTkx YWIyOGM2NjhlMThlZmM2ODE3NzQ4ZTM3N2U1MjNmOGE5YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCkBAIC0yNTAs NiArMjUwLDExIEBAIGNsYXNzIFZpZXdHZXN0dXJlQ29udHJvbGxlcjsKIAogICAgIE5TVUludGVn ZXIgX2ZvY3VzUHJlc2VydmF0aW9uQ291bnQ7CiAgICAgTlNVSW50ZWdlciBfYWN0aXZlRm9jdXNl ZFN0YXRlUmV0YWluQ291bnQ7CisKKyAgICBDR1JlY3QgX3ZhbGlkT2xkQm91bmRzOworICAgIENH RmxvYXQgX3ZhbGlkT2xkTWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoOworICAgIGludDMyX3Qg X3ZhbGlkT2xkT3JpZW50YXRpb247CisgICAgVUlFZGdlSW5zZXRzIF92YWxpZE9sZE9ic2N1cmVk SW5zZXRzOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lv cy9XS1dlYlZpZXdJT1MubW0KaW5kZXggOGJlNDRjNmZiYjU4ZjE3NjM5ODNkYTUwMzFiY2MxZGZm MjNmOGIzNS4uYmFjYTdkMTgxMzNiN2MyMGJmMTc3MzY1ZmE0ZmUyMTY3NmJjMDIyYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KQEAgLTY1 NSw2ICs2NTUsNyBAQCAtICh2b2lkKV9wcm9jZXNzV2lsbFN3YXBPckRpZEV4aXQKICAgICBfd2Fp dGluZ0ZvckVuZEFuaW1hdGVkUmVzaXplID0gTk87CiAgICAgX3dhaXRpbmdGb3JDb21taXRBZnRl ckFuaW1hdGVkUmVzaXplID0gTk87CiAgICAgX2FuaW1hdGVkUmVzaXplT3JpZ2luYWxDb250ZW50 V2lkdGggPSAwOworICAgIF92YWxpZE9sZEJvdW5kcyA9IHsgfTsKICAgICBbX2NvbnRlbnRWaWV3 IHNldEhpZGRlbjpOT107CiAgICAgX3Njcm9sbE9mZnNldFRvUmVzdG9yZSA9IFdURjo6bnVsbG9w dDsKICAgICBfdW5vYnNjdXJlZENlbnRlclRvUmVzdG9yZSA9IFdURjo6bnVsbG9wdDsKQEAgLTIw OTIsNiArMjA5Myw5IEBAIC0gKHZvaWQpX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHMKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIAorICAgIGlmICghQ0dSZWN0SXNFbXB0eShfdmFsaWRPbGRCb3Vu ZHMpKQorICAgICAgICBbc2VsZiBfY2FuY2VsQW5pbWF0ZWRSZXNpemVdOworCiAgICAgaWYgKF9k eW5hbWljVmlld3BvcnRVcGRhdGVNb2RlICE9IFdlYktpdDo6RHluYW1pY1ZpZXdwb3J0VXBkYXRl TW9kZTo6Tm90UmVzaXppbmcKICAgICAgICAgfHwgKF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJD b21taXRMb2FkRm9yTWFpbkZyYW1lICYmICFbX2NvbnRlbnRWaWV3IHNpemVDaGFuZ2VkU2luY2VM YXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlXSkKICAgICAgICAgfHwgW19zY3JvbGxWaWV3IGlz Wm9vbUJvdW5jaW5nXQpAQCAtMjIwMyw2ICsyMjA3LDcgQEAgLSAodm9pZClfY2FuY2VsQW5pbWF0 ZWRSZXNpemUKICAgICB9CiAKICAgICBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSA9IFdlYktp dDo6RHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZTo6Tm90UmVzaXppbmc7CisgICAgX3ZhbGlkT2xk Qm91bmRzID0geyB9OwogICAgIFtzZWxmIF9zY2hlZHVsZVZpc2libGVDb250ZW50UmVjdFVwZGF0 ZV07CiB9CiAKQEAgLTIyNTUsNiArMjI2MCw3IEBAIC0gKHZvaWQpX2RpZENvbXBsZXRlQW5pbWF0 ZWRSZXNpemUKICAgICBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHMgPSBDQVRy YW5zZm9ybTNESWRlbnRpdHk7CiAKICAgICBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSA9IFdl YktpdDo6RHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZTo6Tm90UmVzaXppbmc7CisgICAgX3ZhbGlk T2xkQm91bmRzID0geyB9OwogICAgIFtzZWxmIF9zY2hlZHVsZVZpc2libGVDb250ZW50UmVjdFVw ZGF0ZV07CiAKICAgICBDR1JlY3QgbmV3Qm91bmRzID0gc2VsZi5ib3VuZHM7CkBAIC0yODc4LDcg KzI4ODQsOCBAQCAtICh2b2lkKV9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6KHZvaWQg KF4pKHZvaWQpKXVwZGF0ZUJsb2NrCiAgICAgQ0dSZWN0IG9sZEJvdW5kcyA9IHNlbGYuYm91bmRz OwogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBvbGRVbm9ic2N1cmVkQ29udGVudFJlY3QgPSBfcGFn ZS0+dW5vYnNjdXJlZENvbnRlbnRSZWN0KCk7CiAKLSAgICBpZiAoIVtzZWxmIHVzZXNTdGFuZGFy ZENvbnRlbnRWaWV3XSB8fCAhX2hhc0NvbW1pdHRlZExvYWRGb3JNYWluRnJhbWUgfHwgQ0dSZWN0 SXNFbXB0eShvbGRCb3VuZHMpIHx8IG9sZFVub2JzY3VyZWRDb250ZW50UmVjdC5pc0VtcHR5KCkp IHsKKyAgICBhdXRvIGlzT2xkQm91bmRzVmFsaWQgPSAhQ0dSZWN0SXNFbXB0eShvbGRCb3VuZHMp IHx8ICFDR1JlY3RJc0VtcHR5KF92YWxpZE9sZEJvdW5kcyk7CisgICAgaWYgKCFbc2VsZiB1c2Vz U3RhbmRhcmRDb250ZW50Vmlld10gfHwgIV9oYXNDb21taXR0ZWRMb2FkRm9yTWFpbkZyYW1lIHx8 ICFpc09sZEJvdW5kc1ZhbGlkIHx8IG9sZFVub2JzY3VyZWRDb250ZW50UmVjdC5pc0VtcHR5KCkp IHsKICAgICAgICAgaWYgKFtfY3VzdG9tQ29udGVudFZpZXcgcmVzcG9uZHNUb1NlbGVjdG9yOkBz ZWxlY3Rvcih3ZWJfYmVnaW5BbmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVzOildKQogICAgICAgICAg ICAgW19jdXN0b21Db250ZW50VmlldyB3ZWJfYmVnaW5BbmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVz OnVwZGF0ZUJsb2NrXTsKICAgICAgICAgZWxzZQpAQCAtMjg5MCwxMSArMjg5NywyMiBAQCAtICh2 b2lkKV9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6KHZvaWQgKF4pKHZvaWQpKXVwZGF0 ZUJsb2NrCiAKICAgICBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSA9IFdlYktpdDo6RHluYW1p Y1ZpZXdwb3J0VXBkYXRlTW9kZTo6UmVzaXppbmdXaXRoQW5pbWF0aW9uOwogCi0gICAgYXV0byBv bGRNaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGggPSBbc2VsZiBfbWluaW11bUVmZmVjdGl2ZURl dmljZVdpZHRoXTsKLSAgICBhdXRvIG9sZFZpZXdMYXlvdXRTaXplID0gW3NlbGYgYWN0aXZlVmll d0xheW91dFNpemU6c2VsZi5ib3VuZHNdOworICAgIENHRmxvYXQgb2xkTWluaW11bUVmZmVjdGl2 ZURldmljZVdpZHRoOworICAgIGludDMyX3Qgb2xkT3JpZW50YXRpb247CisgICAgVUlFZGdlSW5z ZXRzIG9sZE9ic2N1cmVkSW5zZXRzOworICAgIGlmICghQ0dSZWN0SXNFbXB0eShfdmFsaWRPbGRC b3VuZHMpKSB7CisgICAgICAgIG9sZEJvdW5kcyA9IF92YWxpZE9sZEJvdW5kczsKKyAgICAgICAg b2xkTWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoID0gX3ZhbGlkT2xkTWluaW11bUVmZmVjdGl2 ZURldmljZVdpZHRoOworICAgICAgICBvbGRPcmllbnRhdGlvbiA9IF92YWxpZE9sZE9yaWVudGF0 aW9uOworICAgICAgICBvbGRPYnNjdXJlZEluc2V0cyA9IF92YWxpZE9sZE9ic2N1cmVkSW5zZXRz OworICAgICAgICBfdmFsaWRPbGRCb3VuZHMgPSB7IH07CisgICAgfSBlbHNlIHsKKyAgICAgICAg b2xkTWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoID0gW3NlbGYgX21pbmltdW1FZmZlY3RpdmVE ZXZpY2VXaWR0aF07CisgICAgICAgIG9sZE9yaWVudGF0aW9uID0gYWN0aXZlT3JpZW50YXRpb24o c2VsZik7CisgICAgICAgIG9sZE9ic2N1cmVkSW5zZXRzID0gX29ic2N1cmVkSW5zZXRzOworICAg IH0KKyAgICBhdXRvIG9sZFZpZXdMYXlvdXRTaXplID0gW3NlbGYgYWN0aXZlVmlld0xheW91dFNp emU6b2xkQm91bmRzXTsKICAgICBhdXRvIG9sZE1heGltdW1Vbm9ic2N1cmVkU2l6ZSA9IGFjdGl2 ZU1heGltdW1Vbm9ic2N1cmVkU2l6ZShzZWxmLCBvbGRCb3VuZHMpOwotICAgIGludDMyX3Qgb2xk T3JpZW50YXRpb24gPSBhY3RpdmVPcmllbnRhdGlvbihzZWxmKTsKLSAgICBVSUVkZ2VJbnNldHMg b2xkT2JzY3VyZWRJbnNldHMgPSBfb2JzY3VyZWRJbnNldHM7CiAKICAgICB1cGRhdGVCbG9jaygp OwogCkBAIC0yOTA3LDkgKzI5MjUsMTYgQEAgLSAodm9pZClfYmVnaW5BbmltYXRlZFJlc2l6ZVdp dGhVcGRhdGVzOih2b2lkICheKSh2b2lkKSl1cGRhdGVCbG9jawogICAgIENHUmVjdCBmdXR1cmVV bm9ic2N1cmVkUmVjdEluU2VsZkNvb3JkaW5hdGVzID0gVUlFZGdlSW5zZXRzSW5zZXRSZWN0KG5l d0JvdW5kcywgX29ic2N1cmVkSW5zZXRzKTsKICAgICBDR1JlY3QgY29udGVudFZpZXdCb3VuZHMg PSBbX2NvbnRlbnRWaWV3IGJvdW5kc107CiAKLSAgICBBU1NFUlRfV0lUSF9NRVNTQUdFKCEoX3Zp ZXdMYXlvdXRTaXplT3ZlcnJpZGUgJiYgbmV3Vmlld0xheW91dFNpemUuaXNFbXB0eSgpKSwgIkNs aWVudHMgY29udHJvbGxpbmcgdGhlIGxheW91dCBzaXplIHNob3VsZCBtYWludGFpbiBhIHZhbGlk IGxheW91dCBzaXplIHRvIG1pbmltaXplIGxheW91dHMuIik7CiAgICAgaWYgKENHUmVjdElzRW1w dHkobmV3Qm91bmRzKSB8fCBuZXdWaWV3TGF5b3V0U2l6ZS5pc0VtcHR5KCkgfHwgQ0dSZWN0SXNF bXB0eShmdXR1cmVVbm9ic2N1cmVkUmVjdEluU2VsZkNvb3JkaW5hdGVzKSB8fCBDR1JlY3RJc0Vt cHR5KGNvbnRlbnRWaWV3Qm91bmRzKSkgewotICAgICAgICBbc2VsZiBfY2FuY2VsQW5pbWF0ZWRS ZXNpemVdOworICAgICAgICBpZiAoQ0dSZWN0SXNFbXB0eShuZXdCb3VuZHMpKQorICAgICAgICAg ICAgW3NlbGYgX2NhbmNlbEFuaW1hdGVkUmVzaXplXTsKKyAgICAgICAgZWxzZSB7CisgICAgICAg ICAgICBfdmFsaWRPbGRCb3VuZHMgPSBvbGRCb3VuZHM7CisgICAgICAgICAgICBfdmFsaWRPbGRN aW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGggPSBvbGRNaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lk dGg7CisgICAgICAgICAgICBfdmFsaWRPbGRPcmllbnRhdGlvbiA9IG9sZE9yaWVudGF0aW9uOwor ICAgICAgICAgICAgX3ZhbGlkT2xkT2JzY3VyZWRJbnNldHMgPSBvbGRPYnNjdXJlZEluc2V0czsK KyAgICAgICAgfQorCiAgICAgICAgIFtzZWxmIF9mcmFtZU9yQm91bmRzQ2hhbmdlZF07CiAgICAg ICAgIGlmIChfdmlld0xheW91dFNpemVPdmVycmlkZSkKICAgICAgICAgICAgIFtzZWxmIF9kaXNw YXRjaFNldFZpZXdMYXlvdXRTaXplOm5ld1ZpZXdMYXlvdXRTaXplXTsK 423658 2021-03-18 14:31:49 -0700 2021-03-18 16:56:05 -0700 Patch bug-223446-20210318143149.patch text/plain 7855 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJiMDAyYzI5OWI3MGMxMzBi MmI5YzgzZGM1MmI0ZDRiYTkyZjY2ZTAuLjQ1MzFiNDQwYzQwMDdhN2Y1ZjNhMmU2NGRhN2UyNzQz ZTg1NGQ1OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjEtMDMtMTggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBlLmNvbT4KKworICAgICAgICBIYW5kbGUgZW1wdHkgYm91bmQgc2l6 ZSBkdXJpbmcgYW5pbWF0ZWQgcmVzaXppbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMzQ0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlIGRvbid0IGFsbG93IGVtcHR5IGJvdW5kcyBpbiBhbmltYXRl ZCByZXNpemluZzogd2hlbiB0aGF0IGhhcHBlbnMsIHdlIHdvdWxkIGNhbmNlbCBpdC4gSG93ZXZl ciwgYSBzZXQgb2YgCisgICAgICAgIHVwZGF0ZXMgaW52b2x2aW5nIGVtcHR5IGJvdW5kcyBjYW4g YmUgbWVyZ2VkIHRvIGEgdmFsaWQgdXBkYXRlLiBGb3IgZXhhbXBsZSwgdHdvIGNoYW5nZXMgb2Yg ZnJhbWUgc2l6ZSAKKyAgICAgICAgWzFdICgwLCAwLCAxMDAsIDEwMCkgPT4gKDAsIDAsIDAsIDUw KSBbMl0gKDAsIDAsIDAsIDUwKSA9PiAoMCwgMCwgNTAsIDUwKSBjYW4gYmUgdmlld2VkIGFzIHNp bmdsZSBjaGFuZ2UgCisgICAgICAgICgwLCAwLCAxMDAsIDEwMCkgPT4gKDAsIDAsIDUwLCA1MCks IHdoaWNoIGlzIHZhbGlkLiBXZSB1c2VkIHRvIGFzayBTUEkgY2xpZW50cyB0byBlbnN1cmUgZWFj aCB1cGRhdGUgaXMgdmFsaWQsIAorICAgICAgICBidXQgc29tZXRpbWVzIHRoZSBmcmFtZSBjaGFu Z2UgaXMgbm90IHVuZGVyIGNsaWVudCdzIGNvbnRyb2wuIEZvciBleGFtcGxlIHdoZW4gY2xpZW50 IHVzZXMgYXV0byBsYXlvdXQsIHdoZXJlIAorICAgICAgICBlbXB0eSBmcmFtZSBzZWVtcyB0byBi ZSBhIHZhbGlkIG1pZCBwcm9kdWN0LgorCisgICAgICAgIFRvIGhhbmRsZSB0aGlzIGNhc2UsIHdl IGNhbiBzdG9yZSB0aGUgb2xkIGJvdW5kcywgYW5kIGFjdHVhbGx5IHBlcmZvcm0gYW5pbWF0ZWQg cmVzaXppbmcgb24gd2hlbiBuZXcgdmFsaWQgCisgICAgICAgIGJvdW5kcyBzaG93IHVwLiBGb3Ig dGhlIGV4YW1wbGUgYWJvdmUsIHdlIHdvdWxkIHN0b3JlICgwLCAwLCAxMDAsIDEwMCkgb24gWzFd IGFuZCB1c2UgaXQgdG8gcmVzaXplIGZyb20gCisgICAgICAgICgwLCAwLCAxMDAsIDEwMCkgdG8g KDAsIDAsIDUwLCA1MCkgb24gWzJdLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXdJbnRlcm5hbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmll d0lPUy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9wcm9jZXNzV2lsbFN3YXBPckRpZEV4aXRd KToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzXSk6IElm IHdlIHN0aWxsIGhhdmUgc3RvcmVkIG9sZCBib3VuZHMgaW4gX3VwZGF0ZVZpc2libGVDb250ZW50 UmVjdHMsIGl0IAorICAgICAgICBtZWFucyB0aGV5IGFyZSBub3QgY29uc3VtZWQgaW4gdGhpcyBj eWNsZS4gSW4gdGhpcyBjYXNlIGxldCdzIGp1c3QgY2FuY2VsIGFuaW1hdGVkIHJlc2l6aW5nIGFu ZCBzZW5kIG91dCB1cGRhdGVzLiAKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9jYW5jZWxBbmltYXRl ZFJlc2l6ZV0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbXBsZXRlQW5pbWF0ZWRSZXNp emVdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0 ZXM6XSk6CisKIDIwMjEtMDMtMTggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtXUEVdIEJ1bXAgQVBJIHZlcnNpb24gd2hlbiBidWlsZGluZyB3 aXRoIGxpYnNvdXAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3SW50ZXJuYWwuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdJbnRlcm5hbC5oCmluZGV4IDE3Nzg3ZmQ1MDJkMTk4YTMwYzAwY2ZjNTY1NDMx NTAwZWU2YTZiZDkuLjg4NTJmZWUzYmExNmUzOWE0YjZhMTc1YzhhMzhhYzFmNTIyZjRkZTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRl cm5hbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJ bnRlcm5hbC5oCkBAIC0xOTAsNiArMTkwLDEwIEBAIGNsYXNzIFZpZXdHZXN0dXJlQ29udHJvbGxl cjsKICAgICBXZWJLaXQ6OkR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGVJRCBfY3VycmVudER5bmFt aWNWaWV3cG9ydFNpemVVcGRhdGVJRDsKICAgICBDQVRyYW5zZm9ybTNEIF9yZXNpemVBbmltYXRp b25UcmFuc2Zvcm1BZGp1c3RtZW50czsKICAgICBDR0Zsb2F0IF9hbmltYXRlZFJlc2l6ZU9yaWdp bmFsQ29udGVudFdpZHRoOworICAgIENHUmVjdCBfYW5pbWF0ZWRSZXNpemVPbGRCb3VuZHM7Cisg ICAgQ0dGbG9hdCBfYW5pbWF0ZWRSZXNpemVPbGRNaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGg7 CisgICAgaW50MzJfdCBfYW5pbWF0ZWRSZXNpemVPbGRPcmllbnRhdGlvbjsKKyAgICBVSUVkZ2VJ bnNldHMgX2FuaW1hdGVkUmVzaXplT2xkT2JzY3VyZWRJbnNldHM7CiAgICAgUmV0YWluUHRyPFVJ Vmlldz4gX3Jlc2l6ZUFuaW1hdGlvblZpZXc7CiAgICAgQ0dGbG9hdCBfbGFzdEFkanVzdG1lbnRG b3JTY3JvbGxlcjsKICAgICBPcHRpb25hbDxDR1JlY3Q+IF9mcm96ZW5WaXNpYmxlQ29udGVudFJl Y3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmll d0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1t CmluZGV4IDhiZTQ0YzZmYmI1OGYxNzYzOTgzZGE1MDMxYmNjMWRmZjIzZjhiMzUuLjE0NWYyZGVk YzZhZDNiM2NhNzcxMzYzM2M4ZjBkMDM4ODVkZjhiZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCkBAIC02NTUsNiArNjU1LDcgQEAgLSAo dm9pZClfcHJvY2Vzc1dpbGxTd2FwT3JEaWRFeGl0CiAgICAgX3dhaXRpbmdGb3JFbmRBbmltYXRl ZFJlc2l6ZSA9IE5POwogICAgIF93YWl0aW5nRm9yQ29tbWl0QWZ0ZXJBbmltYXRlZFJlc2l6ZSA9 IE5POwogICAgIF9hbmltYXRlZFJlc2l6ZU9yaWdpbmFsQ29udGVudFdpZHRoID0gMDsKKyAgICBf YW5pbWF0ZWRSZXNpemVPbGRCb3VuZHMgPSB7IH07CiAgICAgW19jb250ZW50VmlldyBzZXRIaWRk ZW46Tk9dOwogICAgIF9zY3JvbGxPZmZzZXRUb1Jlc3RvcmUgPSBXVEY6Om51bGxvcHQ7CiAgICAg X3Vub2JzY3VyZWRDZW50ZXJUb1Jlc3RvcmUgPSBXVEY6Om51bGxvcHQ7CkBAIC0yMDkyLDYgKzIw OTMsOSBAQCAtICh2b2lkKV91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzCiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKKyAgICBpZiAoIUNHUmVjdElzRW1wdHkoX2FuaW1hdGVkUmVzaXplT2xkQm91 bmRzKSkKKyAgICAgICAgW3NlbGYgX2NhbmNlbEFuaW1hdGVkUmVzaXplXTsKKwogICAgIGlmIChf ZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSAhPSBXZWJLaXQ6OkR5bmFtaWNWaWV3cG9ydFVwZGF0 ZU1vZGU6Ok5vdFJlc2l6aW5nCiAgICAgICAgIHx8IChfbmVlZHNSZXNldFZpZXdTdGF0ZUFmdGVy Q29tbWl0TG9hZEZvck1haW5GcmFtZSAmJiAhW19jb250ZW50VmlldyBzaXplQ2hhbmdlZFNpbmNl TGFzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZV0pCiAgICAgICAgIHx8IFtfc2Nyb2xsVmlldyBp c1pvb21Cb3VuY2luZ10KQEAgLTIyMDMsNiArMjIwNyw3IEBAIC0gKHZvaWQpX2NhbmNlbEFuaW1h dGVkUmVzaXplCiAgICAgfQogCiAgICAgX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgPSBXZWJL aXQ6OkR5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGU6Ok5vdFJlc2l6aW5nOworICAgIF9hbmltYXRl ZFJlc2l6ZU9sZEJvdW5kcyA9IHsgfTsKICAgICBbc2VsZiBfc2NoZWR1bGVWaXNpYmxlQ29udGVu dFJlY3RVcGRhdGVdOwogfQogCkBAIC0yMjU1LDYgKzIyNjAsNyBAQCAtICh2b2lkKV9kaWRDb21w bGV0ZUFuaW1hdGVkUmVzaXplCiAgICAgX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1l bnRzID0gQ0FUcmFuc2Zvcm0zRElkZW50aXR5OwogCiAgICAgX2R5bmFtaWNWaWV3cG9ydFVwZGF0 ZU1vZGUgPSBXZWJLaXQ6OkR5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGU6Ok5vdFJlc2l6aW5nOwor ICAgIF9hbmltYXRlZFJlc2l6ZU9sZEJvdW5kcyA9IHsgfTsKICAgICBbc2VsZiBfc2NoZWR1bGVW aXNpYmxlQ29udGVudFJlY3RVcGRhdGVdOwogCiAgICAgQ0dSZWN0IG5ld0JvdW5kcyA9IHNlbGYu Ym91bmRzOwpAQCAtMjg3OCw3ICsyODg0LDggQEAgLSAodm9pZClfYmVnaW5BbmltYXRlZFJlc2l6 ZVdpdGhVcGRhdGVzOih2b2lkICheKSh2b2lkKSl1cGRhdGVCbG9jawogICAgIENHUmVjdCBvbGRC b3VuZHMgPSBzZWxmLmJvdW5kczsKICAgICBXZWJDb3JlOjpGbG9hdFJlY3Qgb2xkVW5vYnNjdXJl ZENvbnRlbnRSZWN0ID0gX3BhZ2UtPnVub2JzY3VyZWRDb250ZW50UmVjdCgpOwogCi0gICAgaWYg KCFbc2VsZiB1c2VzU3RhbmRhcmRDb250ZW50Vmlld10gfHwgIV9oYXNDb21taXR0ZWRMb2FkRm9y TWFpbkZyYW1lIHx8IENHUmVjdElzRW1wdHkob2xkQm91bmRzKSB8fCBvbGRVbm9ic2N1cmVkQ29u dGVudFJlY3QuaXNFbXB0eSgpKSB7CisgICAgYXV0byBpc09sZEJvdW5kc1ZhbGlkID0gIUNHUmVj dElzRW1wdHkob2xkQm91bmRzKSB8fCAhQ0dSZWN0SXNFbXB0eShfYW5pbWF0ZWRSZXNpemVPbGRC b3VuZHMpOworICAgIGlmICghW3NlbGYgdXNlc1N0YW5kYXJkQ29udGVudFZpZXddIHx8ICFfaGFz Q29tbWl0dGVkTG9hZEZvck1haW5GcmFtZSB8fCAhaXNPbGRCb3VuZHNWYWxpZCB8fCBvbGRVbm9i c2N1cmVkQ29udGVudFJlY3QuaXNFbXB0eSgpKSB7CiAgICAgICAgIGlmIChbX2N1c3RvbUNvbnRl bnRWaWV3IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViX2JlZ2luQW5pbWF0ZWRSZXNp emVXaXRoVXBkYXRlczopXSkKICAgICAgICAgICAgIFtfY3VzdG9tQ29udGVudFZpZXcgd2ViX2Jl Z2luQW5pbWF0ZWRSZXNpemVXaXRoVXBkYXRlczp1cGRhdGVCbG9ja107CiAgICAgICAgIGVsc2UK QEAgLTI4OTAsMTEgKzI4OTcsMjIgQEAgLSAodm9pZClfYmVnaW5BbmltYXRlZFJlc2l6ZVdpdGhV cGRhdGVzOih2b2lkICheKSh2b2lkKSl1cGRhdGVCbG9jawogCiAgICAgX2R5bmFtaWNWaWV3cG9y dFVwZGF0ZU1vZGUgPSBXZWJLaXQ6OkR5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGU6OlJlc2l6aW5n V2l0aEFuaW1hdGlvbjsKIAotICAgIGF1dG8gb2xkTWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRo ID0gW3NlbGYgX21pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aF07Ci0gICAgYXV0byBvbGRWaWV3 TGF5b3V0U2l6ZSA9IFtzZWxmIGFjdGl2ZVZpZXdMYXlvdXRTaXplOnNlbGYuYm91bmRzXTsKKyAg ICBDR0Zsb2F0IG9sZE1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aDsKKyAgICBpbnQzMl90IG9s ZE9yaWVudGF0aW9uOworICAgIFVJRWRnZUluc2V0cyBvbGRPYnNjdXJlZEluc2V0czsKKyAgICBp ZiAoIUNHUmVjdElzRW1wdHkoX2FuaW1hdGVkUmVzaXplT2xkQm91bmRzKSkgeworICAgICAgICBv bGRCb3VuZHMgPSBfYW5pbWF0ZWRSZXNpemVPbGRCb3VuZHM7CisgICAgICAgIG9sZE1pbmltdW1F ZmZlY3RpdmVEZXZpY2VXaWR0aCA9IF9hbmltYXRlZFJlc2l6ZU9sZE1pbmltdW1FZmZlY3RpdmVE ZXZpY2VXaWR0aDsKKyAgICAgICAgb2xkT3JpZW50YXRpb24gPSBfYW5pbWF0ZWRSZXNpemVPbGRP cmllbnRhdGlvbjsKKyAgICAgICAgb2xkT2JzY3VyZWRJbnNldHMgPSBfYW5pbWF0ZWRSZXNpemVP bGRPYnNjdXJlZEluc2V0czsKKyAgICAgICAgX2FuaW1hdGVkUmVzaXplT2xkQm91bmRzID0geyB9 OworICAgIH0gZWxzZSB7CisgICAgICAgIG9sZE1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aCA9 IFtzZWxmIF9taW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhdOworICAgICAgICBvbGRPcmllbnRh dGlvbiA9IGFjdGl2ZU9yaWVudGF0aW9uKHNlbGYpOworICAgICAgICBvbGRPYnNjdXJlZEluc2V0 cyA9IF9vYnNjdXJlZEluc2V0czsKKyAgICB9CisgICAgYXV0byBvbGRWaWV3TGF5b3V0U2l6ZSA9 IFtzZWxmIGFjdGl2ZVZpZXdMYXlvdXRTaXplOm9sZEJvdW5kc107CiAgICAgYXV0byBvbGRNYXhp bXVtVW5vYnNjdXJlZFNpemUgPSBhY3RpdmVNYXhpbXVtVW5vYnNjdXJlZFNpemUoc2VsZiwgb2xk Qm91bmRzKTsKLSAgICBpbnQzMl90IG9sZE9yaWVudGF0aW9uID0gYWN0aXZlT3JpZW50YXRpb24o c2VsZik7Ci0gICAgVUlFZGdlSW5zZXRzIG9sZE9ic2N1cmVkSW5zZXRzID0gX29ic2N1cmVkSW5z ZXRzOwogCiAgICAgdXBkYXRlQmxvY2soKTsKIApAQCAtMjkwNyw5ICsyOTI1LDE2IEBAIC0gKHZv aWQpX2JlZ2luQW5pbWF0ZWRSZXNpemVXaXRoVXBkYXRlczoodm9pZCAoXikodm9pZCkpdXBkYXRl QmxvY2sKICAgICBDR1JlY3QgZnV0dXJlVW5vYnNjdXJlZFJlY3RJblNlbGZDb29yZGluYXRlcyA9 IFVJRWRnZUluc2V0c0luc2V0UmVjdChuZXdCb3VuZHMsIF9vYnNjdXJlZEluc2V0cyk7CiAgICAg Q0dSZWN0IGNvbnRlbnRWaWV3Qm91bmRzID0gW19jb250ZW50VmlldyBib3VuZHNdOwogCi0gICAg QVNTRVJUX1dJVEhfTUVTU0FHRSghKF92aWV3TGF5b3V0U2l6ZU92ZXJyaWRlICYmIG5ld1ZpZXdM YXlvdXRTaXplLmlzRW1wdHkoKSksICJDbGllbnRzIGNvbnRyb2xsaW5nIHRoZSBsYXlvdXQgc2l6 ZSBzaG91bGQgbWFpbnRhaW4gYSB2YWxpZCBsYXlvdXQgc2l6ZSB0byBtaW5pbWl6ZSBsYXlvdXRz LiIpOwogICAgIGlmIChDR1JlY3RJc0VtcHR5KG5ld0JvdW5kcykgfHwgbmV3Vmlld0xheW91dFNp emUuaXNFbXB0eSgpIHx8IENHUmVjdElzRW1wdHkoZnV0dXJlVW5vYnNjdXJlZFJlY3RJblNlbGZD b29yZGluYXRlcykgfHwgQ0dSZWN0SXNFbXB0eShjb250ZW50Vmlld0JvdW5kcykpIHsKLSAgICAg ICAgW3NlbGYgX2NhbmNlbEFuaW1hdGVkUmVzaXplXTsKKyAgICAgICAgaWYgKENHUmVjdElzRW1w dHkobmV3Qm91bmRzKSkKKyAgICAgICAgICAgIFtzZWxmIF9jYW5jZWxBbmltYXRlZFJlc2l6ZV07 CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgX2FuaW1hdGVkUmVzaXplT2xkQm91bmRzID0g b2xkQm91bmRzOworICAgICAgICAgICAgX2FuaW1hdGVkUmVzaXplT2xkTWluaW11bUVmZmVjdGl2 ZURldmljZVdpZHRoID0gb2xkTWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoOworICAgICAgICAg ICAgX2FuaW1hdGVkUmVzaXplT2xkT3JpZW50YXRpb24gPSBvbGRPcmllbnRhdGlvbjsKKyAgICAg ICAgICAgIF9hbmltYXRlZFJlc2l6ZU9sZE9ic2N1cmVkSW5zZXRzID0gb2xkT2JzY3VyZWRJbnNl dHM7CisgICAgICAgIH0KKwogICAgICAgICBbc2VsZiBfZnJhbWVPckJvdW5kc0NoYW5nZWRdOwog ICAgICAgICBpZiAoX3ZpZXdMYXlvdXRTaXplT3ZlcnJpZGUpCiAgICAgICAgICAgICBbc2VsZiBf ZGlzcGF0Y2hTZXRWaWV3TGF5b3V0U2l6ZTpuZXdWaWV3TGF5b3V0U2l6ZV07Cg== 423671 2021-03-18 16:56:08 -0700 2021-03-18 17:25:22 -0700 Patch for landing bug-223446-20210318165607.patch text/plain 7952 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJiMDAyYzI5OWI3MGMxMzBi MmI5YzgzZGM1MmI0ZDRiYTkyZjY2ZTAuLmJiYzBiZmMzOTJjYjc1MGE5ZTdmNDZmMjk3ZmIzM2I4 YzYxYzgwYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjEtMDMtMTggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBlLmNvbT4KKworICAgICAgICBIYW5kbGUgZW1wdHkgYm91bmQgc2l6 ZSBkdXJpbmcgYW5pbWF0ZWQgcmVzaXppbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMzQ0NgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0 b24uCisKKyAgICAgICAgV2UgZG9uJ3QgYWxsb3cgZW1wdHkgYm91bmRzIGluIGFuaW1hdGVkIHJl c2l6aW5nOiB3aGVuIHRoYXQgaGFwcGVucywgd2Ugd291bGQgY2FuY2VsIGl0LiBIb3dldmVyLCBh IHNldCBvZiAKKyAgICAgICAgdXBkYXRlcyBpbnZvbHZpbmcgZW1wdHkgYm91bmRzIGNhbiBiZSBt ZXJnZWQgdG8gYSB2YWxpZCB1cGRhdGUuIEZvciBleGFtcGxlLCB0d28gY2hhbmdlcyBvZiBmcmFt ZSBzaXplIAorICAgICAgICBbMV0gKDAsIDAsIDEwMCwgMTAwKSA9PiAoMCwgMCwgMCwgNTApIFsy XSAoMCwgMCwgMCwgNTApID0+ICgwLCAwLCA1MCwgNTApIGNhbiBiZSB2aWV3ZWQgYXMgc2luZ2xl IGNoYW5nZSAKKyAgICAgICAgKDAsIDAsIDEwMCwgMTAwKSA9PiAoMCwgMCwgNTAsIDUwKSwgd2hp Y2ggaXMgdmFsaWQuIFdlIHVzZWQgdG8gYXNrIFNQSSBjbGllbnRzIHRvIGVuc3VyZSBlYWNoIHVw ZGF0ZSBpcyB2YWxpZCwgCisgICAgICAgIGJ1dCBzb21ldGltZXMgdGhlIGZyYW1lIGNoYW5nZSBp cyBub3QgdW5kZXIgY2xpZW50J3MgY29udHJvbC4gRm9yIGV4YW1wbGUgd2hlbiBjbGllbnQgdXNl cyBhdXRvIGxheW91dCwgZW1wdHkgCisgICAgICAgIGZyYW1lIHNlZW1zIHRvIGJlIGEgdmFsaWQg bWlkIHByb2R1Y3QuCisKKyAgICAgICAgVG8gaGFuZGxlIHRoaXMgY2FzZSwgd2UgY2FuIHN0b3Jl IHRoZSBvbGQgYm91bmRzLCBhbmQgYWN0dWFsbHkgcGVyZm9ybSBhbmltYXRlZCByZXNpemluZyBv biB3aGVuIG5ldyB2YWxpZCAKKyAgICAgICAgYm91bmRzIHNob3cgdXAuIEZvciB0aGUgZXhhbXBs ZSBhYm92ZSwgd2Ugd291bGQgc3RvcmUgKDAsIDAsIDEwMCwgMTAwKSBvbiBbMV0gYW5kIHVzZSBp dCB0byByZXNpemUgZnJvbSAKKyAgICAgICAgKDAsIDAsIDEwMCwgMTAwKSB0byAoMCwgMCwgNTAs IDUwKSBvbiBbMl0uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0lu dGVybmFsLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tOgor ICAgICAgICAoLVtXS1dlYlZpZXcgX3Byb2Nlc3NXaWxsU3dhcE9yRGlkRXhpdF0pOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHNdKTogSWYgd2Ugc3RpbGwg aGF2ZSBzdG9yZWQgb2xkIGJvdW5kcyBpbiBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cywgaXQg CisgICAgICAgIG1lYW5zIHRoZXkgYXJlIG5vdCBjb25zdW1lZCBpbiB0aGlzIGN5Y2xlLiBJbiB0 aGlzIGNhc2UgbGV0J3MganVzdCBjYW5jZWwgYW5pbWF0ZWQgcmVzaXppbmcgYW5kIHNlbmQgb3V0 IHVwZGF0ZXMuIAorICAgICAgICAoLVtXS1dlYlZpZXcgX2NhbmNlbEFuaW1hdGVkUmVzaXplXSk6 CisgICAgICAgICgtW1dLV2ViVmlldyBfZGlkQ29tcGxldGVBbmltYXRlZFJlc2l6ZV0pOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2JlZ2luQW5pbWF0ZWRSZXNpemVXaXRoVXBkYXRlczpdKToKKwog MjAyMS0wMy0xOCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW1dQRV0gQnVtcCBBUEkgdmVyc2lvbiB3aGVuIGJ1aWxkaW5nIHdpdGggbGlic291 cDMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXdJbnRlcm5hbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll d0ludGVybmFsLmgKaW5kZXggMTc3ODdmZDUwMmQxOThhMzBjMDBjZmM1NjU0MzE1MDBlZTZhNmJk OS4uODg1MmZlZTNiYTE2ZTM5YTRiNmExNzVjOGEzOGFjMWY1MjJmNGRlMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgK QEAgLTE5MCw2ICsxOTAsMTAgQEAgY2xhc3MgVmlld0dlc3R1cmVDb250cm9sbGVyOwogICAgIFdl YktpdDo6RHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZUlEIF9jdXJyZW50RHluYW1pY1ZpZXdwb3J0 U2l6ZVVwZGF0ZUlEOwogICAgIENBVHJhbnNmb3JtM0QgX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9y bUFkanVzdG1lbnRzOwogICAgIENHRmxvYXQgX2FuaW1hdGVkUmVzaXplT3JpZ2luYWxDb250ZW50 V2lkdGg7CisgICAgQ0dSZWN0IF9hbmltYXRlZFJlc2l6ZU9sZEJvdW5kczsKKyAgICBDR0Zsb2F0 IF9hbmltYXRlZFJlc2l6ZU9sZE1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aDsKKyAgICBpbnQz Ml90IF9hbmltYXRlZFJlc2l6ZU9sZE9yaWVudGF0aW9uOworICAgIFVJRWRnZUluc2V0cyBfYW5p bWF0ZWRSZXNpemVPbGRPYnNjdXJlZEluc2V0czsKICAgICBSZXRhaW5QdHI8VUlWaWV3PiBfcmVz aXplQW5pbWF0aW9uVmlldzsKICAgICBDR0Zsb2F0IF9sYXN0QWRqdXN0bWVudEZvclNjcm9sbGVy OwogICAgIE9wdGlvbmFsPENHUmVjdD4gX2Zyb3plblZpc2libGVDb250ZW50UmVjdDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KaW5kZXggOGJl NDRjNmZiYjU4ZjE3NjM5ODNkYTUwMzFiY2MxZGZmMjNmOGIzNS4uMzYzYWM0NDg2OTBlZTUxMjJh M2NlNmE4NzQ5MmEzOTZjOTA0YTVmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KQEAgLTY1NSw2ICs2NTUsNyBAQCAtICh2b2lkKV9wcm9j ZXNzV2lsbFN3YXBPckRpZEV4aXQKICAgICBfd2FpdGluZ0ZvckVuZEFuaW1hdGVkUmVzaXplID0g Tk87CiAgICAgX3dhaXRpbmdGb3JDb21taXRBZnRlckFuaW1hdGVkUmVzaXplID0gTk87CiAgICAg X2FuaW1hdGVkUmVzaXplT3JpZ2luYWxDb250ZW50V2lkdGggPSAwOworICAgIF9hbmltYXRlZFJl c2l6ZU9sZEJvdW5kcyA9IHsgfTsKICAgICBbX2NvbnRlbnRWaWV3IHNldEhpZGRlbjpOT107CiAg ICAgX3Njcm9sbE9mZnNldFRvUmVzdG9yZSA9IFdURjo6bnVsbG9wdDsKICAgICBfdW5vYnNjdXJl ZENlbnRlclRvUmVzdG9yZSA9IFdURjo6bnVsbG9wdDsKQEAgLTIwOTIsNiArMjA5Myw5IEBAIC0g KHZvaWQpX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHMKICAgICAgICAgcmV0dXJuOwogICAgIH0K IAorICAgIGlmICghQ0dSZWN0SXNFbXB0eShfYW5pbWF0ZWRSZXNpemVPbGRCb3VuZHMpKQorICAg ICAgICBbc2VsZiBfY2FuY2VsQW5pbWF0ZWRSZXNpemVdOworCiAgICAgaWYgKF9keW5hbWljVmll d3BvcnRVcGRhdGVNb2RlICE9IFdlYktpdDo6RHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZTo6Tm90 UmVzaXppbmcKICAgICAgICAgfHwgKF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2Fk Rm9yTWFpbkZyYW1lICYmICFbX2NvbnRlbnRWaWV3IHNpemVDaGFuZ2VkU2luY2VMYXN0VmlzaWJs ZUNvbnRlbnRSZWN0VXBkYXRlXSkKICAgICAgICAgfHwgW19zY3JvbGxWaWV3IGlzWm9vbUJvdW5j aW5nXQpAQCAtMjIwMyw2ICsyMjA3LDcgQEAgLSAodm9pZClfY2FuY2VsQW5pbWF0ZWRSZXNpemUK ICAgICB9CiAKICAgICBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSA9IFdlYktpdDo6RHluYW1p Y1ZpZXdwb3J0VXBkYXRlTW9kZTo6Tm90UmVzaXppbmc7CisgICAgX2FuaW1hdGVkUmVzaXplT2xk Qm91bmRzID0geyB9OwogICAgIFtzZWxmIF9zY2hlZHVsZVZpc2libGVDb250ZW50UmVjdFVwZGF0 ZV07CiB9CiAKQEAgLTIyNTUsNiArMjI2MCw3IEBAIC0gKHZvaWQpX2RpZENvbXBsZXRlQW5pbWF0 ZWRSZXNpemUKICAgICBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHMgPSBDQVRy YW5zZm9ybTNESWRlbnRpdHk7CiAKICAgICBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSA9IFdl YktpdDo6RHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZTo6Tm90UmVzaXppbmc7CisgICAgX2FuaW1h dGVkUmVzaXplT2xkQm91bmRzID0geyB9OwogICAgIFtzZWxmIF9zY2hlZHVsZVZpc2libGVDb250 ZW50UmVjdFVwZGF0ZV07CiAKICAgICBDR1JlY3QgbmV3Qm91bmRzID0gc2VsZi5ib3VuZHM7CkBA IC0yODc4LDcgKzI4ODQsOCBAQCAtICh2b2lkKV9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0 ZXM6KHZvaWQgKF4pKHZvaWQpKXVwZGF0ZUJsb2NrCiAgICAgQ0dSZWN0IG9sZEJvdW5kcyA9IHNl bGYuYm91bmRzOwogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBvbGRVbm9ic2N1cmVkQ29udGVudFJl Y3QgPSBfcGFnZS0+dW5vYnNjdXJlZENvbnRlbnRSZWN0KCk7CiAKLSAgICBpZiAoIVtzZWxmIHVz ZXNTdGFuZGFyZENvbnRlbnRWaWV3XSB8fCAhX2hhc0NvbW1pdHRlZExvYWRGb3JNYWluRnJhbWUg fHwgQ0dSZWN0SXNFbXB0eShvbGRCb3VuZHMpIHx8IG9sZFVub2JzY3VyZWRDb250ZW50UmVjdC5p c0VtcHR5KCkpIHsKKyAgICBhdXRvIGlzT2xkQm91bmRzVmFsaWQgPSAhQ0dSZWN0SXNFbXB0eShv bGRCb3VuZHMpIHx8ICFDR1JlY3RJc0VtcHR5KF9hbmltYXRlZFJlc2l6ZU9sZEJvdW5kcyk7Cisg ICAgaWYgKCFbc2VsZiB1c2VzU3RhbmRhcmRDb250ZW50Vmlld10gfHwgIV9oYXNDb21taXR0ZWRM b2FkRm9yTWFpbkZyYW1lIHx8ICFpc09sZEJvdW5kc1ZhbGlkIHx8IG9sZFVub2JzY3VyZWRDb250 ZW50UmVjdC5pc0VtcHR5KCkpIHsKICAgICAgICAgaWYgKFtfY3VzdG9tQ29udGVudFZpZXcgcmVz cG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3ZWJfYmVnaW5BbmltYXRlZFJlc2l6ZVdpdGhVcGRh dGVzOildKQogICAgICAgICAgICAgW19jdXN0b21Db250ZW50VmlldyB3ZWJfYmVnaW5BbmltYXRl ZFJlc2l6ZVdpdGhVcGRhdGVzOnVwZGF0ZUJsb2NrXTsKICAgICAgICAgZWxzZQpAQCAtMjg5MCwx MSArMjg5NywyMiBAQCAtICh2b2lkKV9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6KHZv aWQgKF4pKHZvaWQpKXVwZGF0ZUJsb2NrCiAKICAgICBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9k ZSA9IFdlYktpdDo6RHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZTo6UmVzaXppbmdXaXRoQW5pbWF0 aW9uOwogCi0gICAgYXV0byBvbGRNaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGggPSBbc2VsZiBf bWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoXTsKLSAgICBhdXRvIG9sZFZpZXdMYXlvdXRTaXpl ID0gW3NlbGYgYWN0aXZlVmlld0xheW91dFNpemU6c2VsZi5ib3VuZHNdOworICAgIENHRmxvYXQg b2xkTWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoOworICAgIGludDMyX3Qgb2xkT3JpZW50YXRp b247CisgICAgVUlFZGdlSW5zZXRzIG9sZE9ic2N1cmVkSW5zZXRzOworICAgIGlmICghQ0dSZWN0 SXNFbXB0eShfYW5pbWF0ZWRSZXNpemVPbGRCb3VuZHMpKSB7CisgICAgICAgIG9sZEJvdW5kcyA9 IF9hbmltYXRlZFJlc2l6ZU9sZEJvdW5kczsKKyAgICAgICAgb2xkTWluaW11bUVmZmVjdGl2ZURl dmljZVdpZHRoID0gX2FuaW1hdGVkUmVzaXplT2xkTWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRo OworICAgICAgICBvbGRPcmllbnRhdGlvbiA9IF9hbmltYXRlZFJlc2l6ZU9sZE9yaWVudGF0aW9u OworICAgICAgICBvbGRPYnNjdXJlZEluc2V0cyA9IF9hbmltYXRlZFJlc2l6ZU9sZE9ic2N1cmVk SW5zZXRzOworICAgICAgICBfYW5pbWF0ZWRSZXNpemVPbGRCb3VuZHMgPSB7IH07CisgICAgfSBl bHNlIHsKKyAgICAgICAgb2xkTWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoID0gW3NlbGYgX21p bmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aF07CisgICAgICAgIG9sZE9yaWVudGF0aW9uID0gYWN0 aXZlT3JpZW50YXRpb24oc2VsZik7CisgICAgICAgIG9sZE9ic2N1cmVkSW5zZXRzID0gX29ic2N1 cmVkSW5zZXRzOworICAgIH0KKyAgICBhdXRvIG9sZFZpZXdMYXlvdXRTaXplID0gW3NlbGYgYWN0 aXZlVmlld0xheW91dFNpemU6b2xkQm91bmRzXTsKICAgICBhdXRvIG9sZE1heGltdW1Vbm9ic2N1 cmVkU2l6ZSA9IGFjdGl2ZU1heGltdW1Vbm9ic2N1cmVkU2l6ZShzZWxmLCBvbGRCb3VuZHMpOwot ICAgIGludDMyX3Qgb2xkT3JpZW50YXRpb24gPSBhY3RpdmVPcmllbnRhdGlvbihzZWxmKTsKLSAg ICBVSUVkZ2VJbnNldHMgb2xkT2JzY3VyZWRJbnNldHMgPSBfb2JzY3VyZWRJbnNldHM7CiAKICAg ICB1cGRhdGVCbG9jaygpOwogCkBAIC0yOTA3LDkgKzI5MjUsMTggQEAgLSAodm9pZClfYmVnaW5B bmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVzOih2b2lkICheKSh2b2lkKSl1cGRhdGVCbG9jawogICAg IENHUmVjdCBmdXR1cmVVbm9ic2N1cmVkUmVjdEluU2VsZkNvb3JkaW5hdGVzID0gVUlFZGdlSW5z ZXRzSW5zZXRSZWN0KG5ld0JvdW5kcywgX29ic2N1cmVkSW5zZXRzKTsKICAgICBDR1JlY3QgY29u dGVudFZpZXdCb3VuZHMgPSBbX2NvbnRlbnRWaWV3IGJvdW5kc107CiAKLSAgICBBU1NFUlRfV0lU SF9NRVNTQUdFKCEoX3ZpZXdMYXlvdXRTaXplT3ZlcnJpZGUgJiYgbmV3Vmlld0xheW91dFNpemUu aXNFbXB0eSgpKSwgIkNsaWVudHMgY29udHJvbGxpbmcgdGhlIGxheW91dCBzaXplIHNob3VsZCBt YWludGFpbiBhIHZhbGlkIGxheW91dCBzaXplIHRvIG1pbmltaXplIGxheW91dHMuIik7CiAgICAg aWYgKENHUmVjdElzRW1wdHkobmV3Qm91bmRzKSB8fCBuZXdWaWV3TGF5b3V0U2l6ZS5pc0VtcHR5 KCkgfHwgQ0dSZWN0SXNFbXB0eShmdXR1cmVVbm9ic2N1cmVkUmVjdEluU2VsZkNvb3JkaW5hdGVz KSB8fCBDR1JlY3RJc0VtcHR5KGNvbnRlbnRWaWV3Qm91bmRzKSkgewotICAgICAgICBbc2VsZiBf Y2FuY2VsQW5pbWF0ZWRSZXNpemVdOworICAgICAgICBpZiAoIUNHUmVjdElzRW1wdHkobmV3Qm91 bmRzKSkKKyAgICAgICAgICAgIFtzZWxmIF9jYW5jZWxBbmltYXRlZFJlc2l6ZV07CisgICAgICAg IGVsc2UgeworICAgICAgICAgICAgX2FuaW1hdGVkUmVzaXplT2xkQm91bmRzID0gb2xkQm91bmRz OworICAgICAgICAgICAgX2FuaW1hdGVkUmVzaXplT2xkTWluaW11bUVmZmVjdGl2ZURldmljZVdp ZHRoID0gb2xkTWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoOworICAgICAgICAgICAgX2FuaW1h dGVkUmVzaXplT2xkT3JpZW50YXRpb24gPSBvbGRPcmllbnRhdGlvbjsKKyAgICAgICAgICAgIF9h bmltYXRlZFJlc2l6ZU9sZE9ic2N1cmVkSW5zZXRzID0gb2xkT2JzY3VyZWRJbnNldHM7CisgICAg ICAgICAgICBfd2FpdGluZ0ZvckNvbW1pdEFmdGVyQW5pbWF0ZWRSZXNpemUgPSBZRVM7CisgICAg ICAgICAgICBfd2FpdGluZ0ZvckVuZEFuaW1hdGVkUmVzaXplID0gWUVTOworICAgICAgICB9CisK ICAgICAgICAgW3NlbGYgX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkXTsKICAgICAgICAgaWYgKF92aWV3 TGF5b3V0U2l6ZU92ZXJyaWRlKQogICAgICAgICAgICAgW3NlbGYgX2Rpc3BhdGNoU2V0Vmlld0xh eW91dFNpemU6bmV3Vmlld0xheW91dFNpemVdOwo=