230024 2021-09-07 15:17:47 -0700 [macOS] -[WKFullScreenWindowController exitFullScreenImmediately] does not exit fullscreen immediately 2021-09-08 15:03:40 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 peng.liu6 peng.liu6 eric.carlson jer.noble webkit-bug-importer oldest_to_newest 1791241 0 peng.liu6 2021-09-07 15:17:47 -0700 [macOS] -[WKFullScreenWindowController exitFullScreenImmediately] does not exit fullscreen immediately 1791249 1 437566 peng.liu6 2021-09-07 15:51:51 -0700 Created attachment 437566 Patch 1791250 2 peng.liu6 2021-09-07 15:53:04 -0700 <rdar://82526303> 1791537 3 437566 jer.noble 2021-09-08 10:39:06 -0700 Comment on attachment 437566 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437566&action=review LGTM. I'd take this opportunity to rename -finishedExitFullScreenAnimation: to something that says what the parameter is, like -finishedExitFullScreenAnimationAndExitImmediately:(BOOL)immediately. > Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:572 > + if (immediately) > + [self completeFinishExitFullScreenAnimationAfterRepaint]; > + else { > + _page->forceRepaint([weakSelf = WeakObjCPtr<WKFullScreenWindowController>(self)] { > + [weakSelf completeFinishExitFullScreenAnimationAfterRepaint]; > + }); > + } Nit: I'd have an early return here, rather than an else. 1791556 4 437651 peng.liu6 2021-09-08 11:37:23 -0700 Created attachment 437651 Revise the patch based on Jer's comments 1791559 5 peng.liu6 2021-09-08 11:40:02 -0700 (In reply to Jer Noble from comment #3) > Comment on attachment 437566 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=437566&action=review > > LGTM. I'd take this opportunity to rename -finishedExitFullScreenAnimation: > to something that says what the parameter is, like > -finishedExitFullScreenAnimationAndExitImmediately:(BOOL)immediately. Good idea! Fixed. > > > Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm:572 > > + if (immediately) > > + [self completeFinishExitFullScreenAnimationAfterRepaint]; > > + else { > > + _page->forceRepaint([weakSelf = WeakObjCPtr<WKFullScreenWindowController>(self)] { > > + [weakSelf completeFinishExitFullScreenAnimationAfterRepaint]; > > + }); > > + } > > Nit: I'd have an early return here, rather than an else. Fixed. I also renamed `completeFinishExitFullScreenAnimationAfterRepaint` to `completeFinishExitFullScreenAnimation` because it is not always called "after repaint". 1791634 6 ews-feeder 2021-09-08 15:03:39 -0700 Committed r282175 (241467@main): <https://commits.webkit.org/241467@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437651. 437566 2021-09-07 15:51:51 -0700 2021-09-08 10:39:06 -0700 Patch bug-230024-20210907155151.patch text/plain 7035 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQyM2IzMjE3MjY3YWM1OGNj OGQyMzE3OWIyNTY1ZGI3ODZiMTY5NjcuLjA4NTg1MjQwYmEzOTA5YWIyYmQyY2I0NGU1ZDI0NjQ1 MDE4Y2MxYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDggQEAKKzIwMjEtMDktMDcgIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIC1bV0tGdWxsU2NyZWVu V2luZG93Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkltbWVkaWF0ZWx5XSBkb2VzIG5vdCBleGl0 IGZ1bGxzY3JlZW4gaW1tZWRpYXRlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzMDAyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEEgV2ViQ29udGVudCBwcm9jZXNzIG1heSBhc2sgdGhlIGBXS0Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyYCBpbgorICAgICAgICB0aGUgVUkgcHJvY2VzcyB0byBleGl0 IGZ1bGxzY3JlZW4gaW1tZWRpYXRlbHkgd2l0aG91dCB3YWxraW5nIHRocm91Z2gKKyAgICAgICAg dGhlIG5vcm1hbCBleGl0IGZ1bGxzY3JlZW4gc2VxdWVuY2UsIGFuZCB0aGUgV2ViQ29udGVudCBw cm9jZXNzIHdvbid0CisgICAgICAgIGV4cGVjdCBhbnkgSVBDIG1lc3NhZ2UgcmVsYXRlZCB0byBm dWxsc2NyZWVuIHRvIGNvbWUgYmFjayBmcm9tIHRoZQorICAgICAgICBVSSBwcm9jZXNzLiBJZiB0 aGUgVUkgcHJvY2VzcyBzZW5kcyBhbiBJUEMgbWVzc2FnZSB0byB0aGUgV2ViQ29udGVudAorICAg ICAgICBwcm9jZXNzIGFuZCBleHBlY3RzIHRoZSByZXNwb25zZSBmcm9tIHRoZSBXZWJDb250ZW50 IHByb2Nlc3MgKGUuZy4sIGluCisgICAgICAgIGBXZWJQYWdlUHJveHk6OmZvcmNlUmVwYWludCgp YCksIHRoZSBVSSBwcm9jZXNzIHdpbGwgYmUgc3R1Y2suCisKKyAgICAgICAgVGhhdCB3aWxsIGhh cHBlbiB3aGVuIGEgdGFiIG5hdmlnYXRlcyB0byB0aGUgcHJldmlvdXMgcGFnZSB3aGlsZSBhIHZp ZGVvCisgICAgICAgIGVsZW1lbnQgaW4gdGhlIGN1cnJlbnQgcGFnZSBpcyBwbGF5aW5nIGluIGZ1 bGxzY3JlZW4uIFRoZSByZWFzb24gaXMgdGhhdAorICAgICAgICBgLVtXS0Z1bGxTY3JlZW5XaW5k b3dDb250cm9sbGVyIGV4aXRGdWxsU2NyZWVuXWAgaXMgY2FsbGVkIGJlZm9yZQorICAgICAgICBg LVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGV4aXRGdWxsU2NyZWVuSW1tZWRpYXRlbHld YC4KKyAgICAgICAgYC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBleGl0RnVsbFNjcmVl bl1gIGNoYW5nZXMgYF9mdWxsU2NyZWVuU3RhdGVgCisgICAgICAgIHRvIGBXYWl0aW5nVG9FeGl0 RnVsbFNjcmVlbmAsIHNvIGAtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZXhpdEZ1bGxT Y3JlZW5JbW1lZGlhdGVseV1gCisgICAgICAgIHdpbGwgcmV0dXJuIGVhcmx5LiBUaGlzIHBhdGNo IGZpeGVzIHRoaXMgaXNzdWUgYnkgY2hhbmdpbmcgdGhlIGVhcmx5IHJldHVybiBjb25kaXRpb24u CisKKyAgICAgICAgSW4gYWRkaXRpb24sIGAtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIg ZXhpdEZ1bGxTY3JlZW5JbW1lZGlhdGVseV1gCisgICAgICAgIGRvZXMgbm90IHJlYWxseSBleGl0 IGZ1bGxzY3JlZW4gaW1tZWRpYXRlbHkuIEluc3RlYWQsIGl0IGNhbGxzCisgICAgICAgIGAtW1dL RnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlv bjpdYCwKKyAgICAgICAgd2hpY2ggYWx3YXlzIGNhbGxzIGBXZWJQYWdlUHJveHk6OmZvcmNlUmVw YWludCgpYCBhbmQgZXhwZWN0cyBhIHJlc3BvbnNlCisgICAgICAgIGZyb20gdGhlIFdlYkNvbnRl dCBwcm9jZXNzLiBUaGlzIHBhdGNoIGZpeGVzIHRoaXMgaXNzdWUgYXMgd2VsbC4KKworICAgICAg ICBUZXN0ZWQgbWFudWFsbHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVl bldpbmRvd0NvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRy b2xsZXIgZXhpdEZ1bGxTY3JlZW5JbW1lZGlhdGVseV0pOgorICAgICAgICBVcGRhdGUgdGhlIGVh cmx5IHJldHVybiBjb25kaXRpb24gdG8gbWFrZSBzdXJlIHRoZSBVSSBwcm9jZXNzIHdpbGwgcHJv Y2VlZAorICAgICAgICB0byBleGl0IGZ1bGxzY3JlZW4gdW5sZXNzIHRoZSBjdXJyZW50IHN0YXRl IGlzIGBOb3RJbkZ1bGxTY3JlZW5gLgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250 cm9sbGVyIGJlZ2FuRXhpdEZ1bGxTY3JlZW5XaXRoSW5pdGlhbEZyYW1lOmZpbmFsRnJhbWU6XSk6 CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZmluaXNoZWRFeGl0RnVs bFNjcmVlbkFuaW1hdGlvbjpdKToKKyAgICAgICAgVGhlIGBjb21wbGV0ZWRgIHBhcmFtZXRlciB3 YXMgbm90IHVzZWQuIFRoaXMgcGF0Y2ggcmVuYW1lcyBpdCB0byBgaW1tZWRpYXRlbHlgIHRvCisg ICAgICAgIGluZGljYXRlIHdoZXRoZXIgYFdLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXJgIHdh bnRzIHRvIGV4aXQgZnVsbHNjcmVlbiBpbW1lZGlhdGVseS4KKyAgICAgICAgKC1bV0tGdWxsU2Ny ZWVuV2luZG93Q29udHJvbGxlciBjbG9zZV0pOgorICAgICAgICBDbGVhbiB1cCB0aGlzIGZ1bmN0 aW9uIGFmdGVyIHJldmlzaW5nIGAtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZXhpdEZ1 bGxTY3JlZW5JbW1lZGlhdGVseV1gLgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250 cm9sbGVyIHdpbmRvd0RpZEZhaWxUb0V4aXRGdWxsU2NyZWVuOl0pOgorICAgICAgICBVcGRhdGUg dGhlIGFyZ3VtZW50IGFjY29yZGluZyB0byB0aGUgY2hhbmdlIG9mIGAtW1dLRnVsbFNjcmVlbldp bmRvd0NvbnRyb2xsZXIgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpdYC4KKyAgICAg ICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciB3aW5kb3dEaWRFeGl0RnVsbFNjcmVl bjpdKTogRGl0dG8uCisKIDIwMjEtMDktMDcgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBh cHBsZS5jb20+CiAKICAgICAgICAgUG9zdC1sYXlvdXQgYEVkaXRvclN0YXRlYCB1cGRhdGVzIHNo b3VsZCBiZSBzY2hlZHVsZWQgdXNpbmcgYFJlbmRlcmluZ1VwZGF0ZVNjaGVkdWxlcmAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250 cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRv d0NvbnRyb2xsZXIubW0KaW5kZXggOGVkZTgxZDUxZGM1N2E0N2NlOTEwMmE2NjI3ZmNiNmMzNjZm ZTMzOS4uYWIzNTcyYmQwM2M3MGI2ZDk3MmY0NjNiOTNjZTNjZTNiYzdkZjVhOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xs ZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRv d0NvbnRyb2xsZXIubW0KQEAgLTQ0MCw3ICs0NDAsNyBAQCBzdGF0aWMgY29uc3QgZmxvYXQgbWlu VmlkZW9XaWR0aCA9IDQ2ODsgLy8gS2VlcCBpbiBzeW5jIHdpdGggYC0tY29udHJvbHMtYmFyLXdp ZAogCiAtICh2b2lkKWV4aXRGdWxsU2NyZWVuSW1tZWRpYXRlbHkKIHsKLSAgICBpZiAoIVtzZWxm IGlzRnVsbFNjcmVlbl0pCisgICAgaWYgKF9mdWxsU2NyZWVuU3RhdGUgPT0gTm90SW5GdWxsU2Ny ZWVuKQogICAgICAgICByZXR1cm47CiAKICAgICBbc2VsZiBfbWFuYWdlcl0tPnJlcXVlc3RFeGl0 RnVsbFNjcmVlbigpOwpAQCAtNDY0LDcgKzQ2NCw3IEBAIHN0YXRpYyBjb25zdCBmbG9hdCBtaW5W aWRlb1dpZHRoID0gNDY4OyAvLyBLZWVwIGluIHN5bmMgd2l0aCBgLS1jb250cm9scy1iYXItd2lk CiAgICAgaWYgKCFbW3NlbGYgd2luZG93XSBpc09uQWN0aXZlU3BhY2VdKSB7CiAgICAgICAgIC8v IElmIHRoZSBmdWxsIHNjcmVlbiB3aW5kb3cgaXMgbm90IGluIHRoZSBhY3RpdmUgc3BhY2UsIHRo ZSBOU1dpbmRvdyBmdWxsIHNjcmVlbiBhbmltYXRpb24gZGVsZWdhdGUgbWV0aG9kcwogICAgICAg ICAvLyB3aWxsIG5ldmVyIGJlIGNhbGxlZC4gU28gY2FsbCBmaW5pc2hlZEV4aXRGdWxsU2NyZWVu QW5pbWF0aW9uIGV4cGxpY2l0bHkuCi0gICAgICAgIFtzZWxmIGZpbmlzaGVkRXhpdEZ1bGxTY3Jl ZW5BbmltYXRpb246WUVTXTsKKyAgICAgICAgW3NlbGYgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFu aW1hdGlvbjpOT107CiAKICAgICAgICAgLy8gQmVjYXVzZSB3ZSBhcmUgYnJlYWtpbmcgdGhlIG5v cm1hbCBhbmltYXRpb24gcGF0dGVybiwgcmUtZW5hYmxlIHNjcmVlbiB1cGRhdGVzCiAgICAgICAg IC8vIGFzIGV4aXRGdWxsU2NyZWVuIGhhcyBkaXNhYmxlZCB0aGVtLCBidXQgX3N0YXJ0RXhpdEZ1 bGxTY3JlZW5BbmltYXRpb25XaXRoRHVyYXRpb246CkBAIC00OTcsNyArNDk3LDcgQEAgc3RhdGlj IFJldGFpblB0cjxDR0ltYWdlUmVmPiB0YWtlV2luZG93U25hcHNob3QoQ0dTV2luZG93SUQgd2lu ZG93SUQsIGJvb2wgY2FwdHUKICAgICByZXR1cm4gYWRvcHRDRihDR1dpbmRvd0xpc3RDcmVhdGVJ bWFnZShDR1JlY3ROdWxsLCBrQ0dXaW5kb3dMaXN0T3B0aW9uSW5jbHVkaW5nV2luZG93LCB3aW5k b3dJRCwgaW1hZ2VPcHRpb25zKSk7CiB9CiAKLS0gKHZvaWQpZmluaXNoZWRFeGl0RnVsbFNjcmVl bkFuaW1hdGlvbjooYm9vbCljb21wbGV0ZWQKKy0gKHZvaWQpZmluaXNoZWRFeGl0RnVsbFNjcmVl bkFuaW1hdGlvbjooYm9vbClpbW1lZGlhdGVseQogewogICAgIGlmIChfZnVsbFNjcmVlblN0YXRl ID09IEluRnVsbFNjcmVlbikgewogICAgICAgICAvLyBJZiB3ZSBhcmUgY3VycmVudGx5IGluIHRo ZSBJbkZ1bGxTY3JlZW4gc3RhdGUsIHRoaXMgbm90aWZpY2F0aW9uIGlzIHVuZXhwZWN0ZWQsIG1l YW5pbmcKQEAgLTU2MCwxMiArNTYwLDE2IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4g dGFrZVdpbmRvd1NuYXBzaG90KENHU1dpbmRvd0lEIHdpbmRvd0lELCBib29sIGNhcHR1CiAgICAg W3NlbGYgX21hbmFnZXJdLT5yZXN0b3JlU2Nyb2xsUG9zaXRpb24oKTsKICAgICBfcGFnZS0+c2V0 VG9wQ29udGVudEluc2V0KF9zYXZlZFRvcENvbnRlbnRJbnNldCk7CiAKLSAgICBfcGFnZS0+Zm9y Y2VSZXBhaW50KFt3ZWFrU2VsZiA9IFdlYWtPYmpDUHRyPFdLRnVsbFNjcmVlbldpbmRvd0NvbnRy b2xsZXI+KHNlbGYpXSB7Ci0gICAgICAgIFt3ZWFrU2VsZiBjb21wbGV0ZUZpbmlzaEV4aXRGdWxs U2NyZWVuQW5pbWF0aW9uQWZ0ZXJSZXBhaW50XTsKLSAgICB9KTsKLQogICAgIFtDQVRyYW5zYWN0 aW9uIGNvbW1pdF07CiAgICAgW0NBVHJhbnNhY3Rpb24gZmx1c2hdOworCisgICAgaWYgKGltbWVk aWF0ZWx5KQorICAgICAgICBbc2VsZiBjb21wbGV0ZUZpbmlzaEV4aXRGdWxsU2NyZWVuQW5pbWF0 aW9uQWZ0ZXJSZXBhaW50XTsKKyAgICBlbHNlIHsKKyAgICAgICAgX3BhZ2UtPmZvcmNlUmVwYWlu dChbd2Vha1NlbGYgPSBXZWFrT2JqQ1B0cjxXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyPihz ZWxmKV0geworICAgICAgICAgICAgW3dlYWtTZWxmIGNvbXBsZXRlRmluaXNoRXhpdEZ1bGxTY3Jl ZW5BbmltYXRpb25BZnRlclJlcGFpbnRdOworICAgICAgICB9KTsKKyAgICB9CiB9CiAKIC0gKHZv aWQpY29tcGxldGVGaW5pc2hFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbkFmdGVyUmVwYWludApAQCAt NjAzLDExICs2MDcsNyBAQCBzdGF0aWMgUmV0YWluUHRyPENHSW1hZ2VSZWY+IHRha2VXaW5kb3dT bmFwc2hvdChDR1NXaW5kb3dJRCB3aW5kb3dJRCwgYm9vbCBjYXB0dQogICAgIC8vIGhhcyBjbG9z ZWQgb3IgdGhlIHdlYiBwcm9jZXNzIGhhcyBjcmFzaGVkLiAgSnVzdCB3YWxrIHRocm91Z2ggb3Vy CiAgICAgLy8gbm9ybWFsIGV4aXQgZnVsbCBzY3JlZW4gc2VxdWVuY2UsIGJ1dCBkb24ndCB3YWl0 IHRvIGJlIGNhbGxlZCBiYWNrCiAgICAgLy8gaW4gcmVzcG9uc2UuCi0gICAgaWYgKFtzZWxmIGlz RnVsbFNjcmVlbl0pCi0gICAgICAgIFtzZWxmIGV4aXRGdWxsU2NyZWVuSW1tZWRpYXRlbHldOwot ICAgIAotICAgIGlmIChfZnVsbFNjcmVlblN0YXRlID09IEV4aXRpbmdGdWxsU2NyZWVuKQotICAg ICAgICBbc2VsZiBmaW5pc2hlZEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uOllFU107CisgICAgW3Nl bGYgZXhpdEZ1bGxTY3JlZW5JbW1lZGlhdGVseV07CiAKICAgICBbc3VwZXIgY2xvc2VdOwogCkBA IC02OTIsMTQgKzY5MiwxNCBAQCBzdGF0aWMgUmV0YWluUHRyPENHSW1hZ2VSZWY+IHRha2VXaW5k b3dTbmFwc2hvdChDR1NXaW5kb3dJRCB3aW5kb3dJRCwgYm9vbCBjYXB0dQogLSAodm9pZCl3aW5k b3dEaWRGYWlsVG9FeGl0RnVsbFNjcmVlbjooTlNXaW5kb3cgKil3aW5kb3cKIHsKICAgICBSZXRh aW5QdHI8V0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlcj4gcmV0YWluID0gc2VsZjsKLSAgICBb c2VsZiBmaW5pc2hlZEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uOk5PXTsKKyAgICBbc2VsZiBmaW5p c2hlZEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uOllFU107CiAgICAgW3NlbGYgY2xlYXJWaWRlb0Z1 bGxzY3JlZW5NYW5hZ2VyT2JzZXJ2ZXJdOwogfQogCiAtICh2b2lkKXdpbmRvd0RpZEV4aXRGdWxs U2NyZWVuOihOU05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgogewogICAgIFJldGFpblB0cjxX S0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyPiByZXRhaW4gPSBzZWxmOwotICAgIFtzZWxmIGZp bmlzaGVkRXhpdEZ1bGxTY3JlZW5BbmltYXRpb246WUVTXTsKKyAgICBbc2VsZiBmaW5pc2hlZEV4 aXRGdWxsU2NyZWVuQW5pbWF0aW9uOk5PXTsKICAgICBbc2VsZiBjbGVhclZpZGVvRnVsbHNjcmVl bk1hbmFnZXJPYnNlcnZlcl07CiB9CiAK 437651 2021-09-08 11:37:23 -0700 2021-09-08 15:03:40 -0700 Revise the patch based on Jer's comments bug-230024-20210908113722.patch text/plain 7597 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQyM2IzMjE3MjY3YWM1OGNj OGQyMzE3OWIyNTY1ZGI3ODZiMTY5NjcuLjk4OTY0ZTA3NTdmY2Y1YmY5MjMzOTBiNGI4Y2M0N2E4 ZTA2Mjc0YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDggQEAKKzIwMjEtMDktMDggIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIC1bV0tGdWxsU2NyZWVu V2luZG93Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkltbWVkaWF0ZWx5XSBkb2VzIG5vdCBleGl0 IGZ1bGxzY3JlZW4gaW1tZWRpYXRlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzMDAyNAorCisgICAgICAgIFJldmlld2VkIGJ5IEplciBOb2JsZS4K KworICAgICAgICBBIFdlYkNvbnRlbnQgcHJvY2VzcyBtYXkgYXNrIHRoZSBgV0tGdWxsU2NyZWVu V2luZG93Q29udHJvbGxlcmAgaW4KKyAgICAgICAgdGhlIFVJIHByb2Nlc3MgdG8gZXhpdCBmdWxs c2NyZWVuIGltbWVkaWF0ZWx5IHdpdGhvdXQgd2Fsa2luZyB0aHJvdWdoCisgICAgICAgIHRoZSBu b3JtYWwgZXhpdCBmdWxsc2NyZWVuIHNlcXVlbmNlLCBhbmQgdGhlIFdlYkNvbnRlbnQgcHJvY2Vz cyB3b24ndAorICAgICAgICBleHBlY3QgYW55IElQQyBtZXNzYWdlIHJlbGF0ZWQgdG8gZnVsbHNj cmVlbiB0byBjb21lIGJhY2sgZnJvbSB0aGUKKyAgICAgICAgVUkgcHJvY2Vzcy4gSWYgdGhlIFVJ IHByb2Nlc3Mgc2VuZHMgYW4gSVBDIG1lc3NhZ2UgdG8gdGhlIFdlYkNvbnRlbnQKKyAgICAgICAg cHJvY2VzcyBhbmQgZXhwZWN0cyB0aGUgcmVzcG9uc2UgZnJvbSB0aGUgV2ViQ29udGVudCBwcm9j ZXNzIChlLmcuLCBpbgorICAgICAgICBgV2ViUGFnZVByb3h5Ojpmb3JjZVJlcGFpbnQoKWApLCB0 aGUgVUkgcHJvY2VzcyB3aWxsIGJlIHN0dWNrLgorCisgICAgICAgIFRoYXQgd2lsbCBoYXBwZW4g d2hlbiBhIHRhYiBuYXZpZ2F0ZXMgdG8gdGhlIHByZXZpb3VzIHBhZ2Ugd2hpbGUgYSB2aWRlbwor ICAgICAgICBlbGVtZW50IGluIHRoZSBjdXJyZW50IHBhZ2UgaXMgcGxheWluZyBpbiBmdWxsc2Ny ZWVuLiBUaGUgcmVhc29uIGlzIHRoYXQKKyAgICAgICAgYC1bV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlciBleGl0RnVsbFNjcmVlbl1gIGlzIGNhbGxlZCBiZWZvcmUKKyAgICAgICAgYC1bV0tG dWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkltbWVkaWF0ZWx5XWAuCisg ICAgICAgIGAtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZXhpdEZ1bGxTY3JlZW5dYCBj aGFuZ2VzIGBfZnVsbFNjcmVlblN0YXRlYAorICAgICAgICB0byBgV2FpdGluZ1RvRXhpdEZ1bGxT Y3JlZW5gLCBzbyBgLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGV4aXRGdWxsU2NyZWVu SW1tZWRpYXRlbHldYAorICAgICAgICB3aWxsIHJldHVybiBlYXJseS4gVGhpcyBwYXRjaCBmaXhl cyB0aGlzIGlzc3VlIGJ5IGNoYW5naW5nIHRoZSBlYXJseSByZXR1cm4gY29uZGl0aW9uLgorCisg ICAgICAgIEluIGFkZGl0aW9uLCBgLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGV4aXRG dWxsU2NyZWVuSW1tZWRpYXRlbHldYAorICAgICAgICBkb2VzIG5vdCByZWFsbHkgZXhpdCBmdWxs c2NyZWVuIGltbWVkaWF0ZWx5LiBJbnN0ZWFkLCBpdCBjYWxscworICAgICAgICBgLVtXS0Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyIGZpbmlzaGVkRXhpdEZ1bGxTY3JlZW5BbmltYXRpb246XWAs CisgICAgICAgIHdoaWNoIGFsd2F5cyBjYWxscyBgV2ViUGFnZVByb3h5Ojpmb3JjZVJlcGFpbnQo KWAgYW5kIGV4cGVjdHMgYSByZXNwb25zZQorICAgICAgICBmcm9tIHRoZSBXZWJDb250ZXQgcHJv Y2Vzcy4gVGhpcyBwYXRjaCBmaXhlcyB0aGlzIGlzc3VlIGFzIHdlbGwuCisKKyAgICAgICAgVGVz dGVkIG1hbnVhbGx5LgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5k b3dDb250cm9sbGVyLm1tOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVy IGV4aXRGdWxsU2NyZWVuSW1tZWRpYXRlbHldKToKKyAgICAgICAgVXBkYXRlIHRoZSBlYXJseSBy ZXR1cm4gY29uZGl0aW9uIHRvIG1ha2Ugc3VyZSB0aGUgVUkgcHJvY2VzcyB3aWxsIHByb2NlZWQK KyAgICAgICAgdG8gZXhpdCBmdWxsc2NyZWVuIHVubGVzcyB0aGUgY3VycmVudCBzdGF0ZSBpcyBg Tm90SW5GdWxsU2NyZWVuYC4KKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxl ciBiZWdhbkV4aXRGdWxsU2NyZWVuV2l0aEluaXRpYWxGcmFtZTpmaW5hbEZyYW1lOl0pOgorICAg ICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGZpbmlzaGVkRXhpdEZ1bGxTY3Jl ZW5BbmltYXRpb246XSk6CisgICAgICAgIFRoZSBgY29tcGxldGVkYCBwYXJhbWV0ZXIgd2FzIG5v dCB1c2VkLiBUaGlzIHBhdGNoIHJlbmFtZXMgaXQgdG8gYGltbWVkaWF0ZWx5YCB0bworICAgICAg ICBpbmRpY2F0ZSB3aGV0aGVyIGBXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyYCB3YW50cyB0 byBleGl0IGZ1bGxzY3JlZW4gaW1tZWRpYXRlbHkuCisgICAgICAgICgtW1dLRnVsbFNjcmVlbldp bmRvd0NvbnRyb2xsZXIgY2xvc2VdKToKKyAgICAgICAgQ2xlYW4gdXAgdGhpcyBmdW5jdGlvbiBh ZnRlciByZXZpc2luZyBgLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGV4aXRGdWxsU2Ny ZWVuSW1tZWRpYXRlbHldYC4KKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxl ciB3aW5kb3dEaWRGYWlsVG9FeGl0RnVsbFNjcmVlbjpdKToKKyAgICAgICAgVXBkYXRlIHRoZSBh cmd1bWVudCBhY2NvcmRpbmcgdG8gdGhlIGNoYW5nZSBvZiBgLVtXS0Z1bGxTY3JlZW5XaW5kb3dD b250cm9sbGVyIGZpbmlzaGVkRXhpdEZ1bGxTY3JlZW5BbmltYXRpb246XWAuCisgICAgICAgICgt W1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgd2luZG93RGlkRXhpdEZ1bGxTY3JlZW46XSk6 IERpdHRvLgorCiAyMDIxLTA5LTA3ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUu Y29tPgogCiAgICAgICAgIFBvc3QtbGF5b3V0IGBFZGl0b3JTdGF0ZWAgdXBkYXRlcyBzaG91bGQg YmUgc2NoZWR1bGVkIHVzaW5nIGBSZW5kZXJpbmdVcGRhdGVTY2hlZHVsZXJgCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxl ci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250 cm9sbGVyLm1tCmluZGV4IDhlZGU4MWQ1MWRjNTdhNDdjZTkxMDJhNjYyN2ZjYjZjMzY2ZmUzMzku LjgxZDBkYWYyMzEwNzJkODNkYzcxNjY2N2NiOWFkYTU2ZGRkZWI5MzcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250 cm9sbGVyLm1tCkBAIC00NDAsMTQgKzQ0MCwxNCBAQCBzdGF0aWMgY29uc3QgZmxvYXQgbWluVmlk ZW9XaWR0aCA9IDQ2ODsgLy8gS2VlcCBpbiBzeW5jIHdpdGggYC0tY29udHJvbHMtYmFyLXdpZAog CiAtICh2b2lkKWV4aXRGdWxsU2NyZWVuSW1tZWRpYXRlbHkKIHsKLSAgICBpZiAoIVtzZWxmIGlz RnVsbFNjcmVlbl0pCisgICAgaWYgKF9mdWxsU2NyZWVuU3RhdGUgPT0gTm90SW5GdWxsU2NyZWVu KQogICAgICAgICByZXR1cm47CiAKICAgICBbc2VsZiBfbWFuYWdlcl0tPnJlcXVlc3RFeGl0RnVs bFNjcmVlbigpOwogICAgIFtfd2ViVmlld1BsYWNlaG9sZGVyIHNldEV4aXRXYXJuaW5nVmlzaWJs ZTpOT107CiAgICAgW3NlbGYgX21hbmFnZXJdLT53aWxsRXhpdEZ1bGxTY3JlZW4oKTsKICAgICBf ZnVsbFNjcmVlblN0YXRlID0gRXhpdGluZ0Z1bGxTY3JlZW47Ci0gICAgW3NlbGYgZmluaXNoZWRF eGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpZRVNdOworICAgIFtzZWxmIGZpbmlzaGVkRXhpdEZ1bGxT Y3JlZW5BbmltYXRpb25BbmRFeGl0SW1tZWRpYXRlbHk6WUVTXTsKIH0KIAogLSAodm9pZClyZXF1 ZXN0RXhpdEZ1bGxTY3JlZW4KQEAgLTQ2Myw4ICs0NjMsOCBAQCBzdGF0aWMgY29uc3QgZmxvYXQg bWluVmlkZW9XaWR0aCA9IDQ2ODsgLy8gS2VlcCBpbiBzeW5jIHdpdGggYC0tY29udHJvbHMtYmFy LXdpZAogCiAgICAgaWYgKCFbW3NlbGYgd2luZG93XSBpc09uQWN0aXZlU3BhY2VdKSB7CiAgICAg ICAgIC8vIElmIHRoZSBmdWxsIHNjcmVlbiB3aW5kb3cgaXMgbm90IGluIHRoZSBhY3RpdmUgc3Bh Y2UsIHRoZSBOU1dpbmRvdyBmdWxsIHNjcmVlbiBhbmltYXRpb24gZGVsZWdhdGUgbWV0aG9kcwot ICAgICAgICAvLyB3aWxsIG5ldmVyIGJlIGNhbGxlZC4gU28gY2FsbCBmaW5pc2hlZEV4aXRGdWxs U2NyZWVuQW5pbWF0aW9uIGV4cGxpY2l0bHkuCi0gICAgICAgIFtzZWxmIGZpbmlzaGVkRXhpdEZ1 bGxTY3JlZW5BbmltYXRpb246WUVTXTsKKyAgICAgICAgLy8gd2lsbCBuZXZlciBiZSBjYWxsZWQu IFNvIGNhbGwgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbkFuZEV4aXRJbW1lZGlhdGVs eSBleHBsaWNpdGx5LgorICAgICAgICBbc2VsZiBmaW5pc2hlZEV4aXRGdWxsU2NyZWVuQW5pbWF0 aW9uQW5kRXhpdEltbWVkaWF0ZWx5Ok5PXTsKIAogICAgICAgICAvLyBCZWNhdXNlIHdlIGFyZSBi cmVha2luZyB0aGUgbm9ybWFsIGFuaW1hdGlvbiBwYXR0ZXJuLCByZS1lbmFibGUgc2NyZWVuIHVw ZGF0ZXMKICAgICAgICAgLy8gYXMgZXhpdEZ1bGxTY3JlZW4gaGFzIGRpc2FibGVkIHRoZW0sIGJ1 dCBfc3RhcnRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbldpdGhEdXJhdGlvbjoKQEAgLTQ5Nyw3ICs0 OTcsNyBAQCBzdGF0aWMgUmV0YWluUHRyPENHSW1hZ2VSZWY+IHRha2VXaW5kb3dTbmFwc2hvdChD R1NXaW5kb3dJRCB3aW5kb3dJRCwgYm9vbCBjYXB0dQogICAgIHJldHVybiBhZG9wdENGKENHV2lu ZG93TGlzdENyZWF0ZUltYWdlKENHUmVjdE51bGwsIGtDR1dpbmRvd0xpc3RPcHRpb25JbmNsdWRp bmdXaW5kb3csIHdpbmRvd0lELCBpbWFnZU9wdGlvbnMpKTsKIH0KIAotLSAodm9pZClmaW5pc2hl ZEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uOihib29sKWNvbXBsZXRlZAorLSAodm9pZClmaW5pc2hl ZEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uQW5kRXhpdEltbWVkaWF0ZWx5Oihib29sKWltbWVkaWF0 ZWx5CiB7CiAgICAgaWYgKF9mdWxsU2NyZWVuU3RhdGUgPT0gSW5GdWxsU2NyZWVuKSB7CiAgICAg ICAgIC8vIElmIHdlIGFyZSBjdXJyZW50bHkgaW4gdGhlIEluRnVsbFNjcmVlbiBzdGF0ZSwgdGhp cyBub3RpZmljYXRpb24gaXMgdW5leHBlY3RlZCwgbWVhbmluZwpAQCAtNTYwLDE1ICs1NjAsMjAg QEAgc3RhdGljIFJldGFpblB0cjxDR0ltYWdlUmVmPiB0YWtlV2luZG93U25hcHNob3QoQ0dTV2lu ZG93SUQgd2luZG93SUQsIGJvb2wgY2FwdHUKICAgICBbc2VsZiBfbWFuYWdlcl0tPnJlc3RvcmVT Y3JvbGxQb3NpdGlvbigpOwogICAgIF9wYWdlLT5zZXRUb3BDb250ZW50SW5zZXQoX3NhdmVkVG9w Q29udGVudEluc2V0KTsKIAotICAgIF9wYWdlLT5mb3JjZVJlcGFpbnQoW3dlYWtTZWxmID0gV2Vh a09iakNQdHI8V0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlcj4oc2VsZildIHsKLSAgICAgICAg W3dlYWtTZWxmIGNvbXBsZXRlRmluaXNoRXhpdEZ1bGxTY3JlZW5BbmltYXRpb25BZnRlclJlcGFp bnRdOwotICAgIH0pOwotCiAgICAgW0NBVHJhbnNhY3Rpb24gY29tbWl0XTsKICAgICBbQ0FUcmFu c2FjdGlvbiBmbHVzaF07CisKKyAgICBpZiAoaW1tZWRpYXRlbHkpIHsKKyAgICAgICAgW3NlbGYg Y29tcGxldGVGaW5pc2hFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbl07CisgICAgICAgIHJldHVybjsK KyAgICB9CisKKyAgICBfcGFnZS0+Zm9yY2VSZXBhaW50KFt3ZWFrU2VsZiA9IFdlYWtPYmpDUHRy PFdLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXI+KHNlbGYpXSB7CisgICAgICAgIFt3ZWFrU2Vs ZiBjb21wbGV0ZUZpbmlzaEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uXTsKKyAgICB9KTsKIH0KIAot LSAodm9pZCljb21wbGV0ZUZpbmlzaEV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uQWZ0ZXJSZXBhaW50 CistICh2b2lkKWNvbXBsZXRlRmluaXNoRXhpdEZ1bGxTY3JlZW5BbmltYXRpb24KIHsKICAgICBb Q0FUcmFuc2FjdGlvbiBiZWdpbl07CiAgICAgW0NBVHJhbnNhY3Rpb24gc2V0RGlzYWJsZUFjdGlv bnM6WUVTXTsKQEAgLTYwMywxMSArNjA4LDcgQEAgc3RhdGljIFJldGFpblB0cjxDR0ltYWdlUmVm PiB0YWtlV2luZG93U25hcHNob3QoQ0dTV2luZG93SUQgd2luZG93SUQsIGJvb2wgY2FwdHUKICAg ICAvLyBoYXMgY2xvc2VkIG9yIHRoZSB3ZWIgcHJvY2VzcyBoYXMgY3Jhc2hlZC4gIEp1c3Qgd2Fs ayB0aHJvdWdoIG91cgogICAgIC8vIG5vcm1hbCBleGl0IGZ1bGwgc2NyZWVuIHNlcXVlbmNlLCBi dXQgZG9uJ3Qgd2FpdCB0byBiZSBjYWxsZWQgYmFjawogICAgIC8vIGluIHJlc3BvbnNlLgotICAg IGlmIChbc2VsZiBpc0Z1bGxTY3JlZW5dKQotICAgICAgICBbc2VsZiBleGl0RnVsbFNjcmVlbklt bWVkaWF0ZWx5XTsKLSAgICAKLSAgICBpZiAoX2Z1bGxTY3JlZW5TdGF0ZSA9PSBFeGl0aW5nRnVs bFNjcmVlbikKLSAgICAgICAgW3NlbGYgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpZ RVNdOworICAgIFtzZWxmIGV4aXRGdWxsU2NyZWVuSW1tZWRpYXRlbHldOwogCiAgICAgW3N1cGVy IGNsb3NlXTsKIApAQCAtNjkyLDE0ICs2OTMsMTQgQEAgc3RhdGljIFJldGFpblB0cjxDR0ltYWdl UmVmPiB0YWtlV2luZG93U25hcHNob3QoQ0dTV2luZG93SUQgd2luZG93SUQsIGJvb2wgY2FwdHUK IC0gKHZvaWQpd2luZG93RGlkRmFpbFRvRXhpdEZ1bGxTY3JlZW46KE5TV2luZG93ICopd2luZG93 CiB7CiAgICAgUmV0YWluUHRyPFdLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXI+IHJldGFpbiA9 IHNlbGY7Ci0gICAgW3NlbGYgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpOT107Cisg ICAgW3NlbGYgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbkFuZEV4aXRJbW1lZGlhdGVs eTpZRVNdOwogICAgIFtzZWxmIGNsZWFyVmlkZW9GdWxsc2NyZWVuTWFuYWdlck9ic2VydmVyXTsK IH0KIAogLSAodm9pZCl3aW5kb3dEaWRFeGl0RnVsbFNjcmVlbjooTlNOb3RpZmljYXRpb24gKilu b3RpZmljYXRpb24KIHsKICAgICBSZXRhaW5QdHI8V0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxl cj4gcmV0YWluID0gc2VsZjsKLSAgICBbc2VsZiBmaW5pc2hlZEV4aXRGdWxsU2NyZWVuQW5pbWF0 aW9uOllFU107CisgICAgW3NlbGYgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbkFuZEV4 aXRJbW1lZGlhdGVseTpOT107CiAgICAgW3NlbGYgY2xlYXJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2Vy T2JzZXJ2ZXJdOwogfQogCg==