230085 2021-09-08 23:52:01 -0700 [iOS] Ensure the CA transaction has been synchronously committed before snapshotting it 2021-10-20 10:30:40 -0700 1 1 1 Unclassified WebKit Images WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=227318 https://bugs.webkit.org/show_bug.cgi?id=226257 InRadar P2 Normal --- 1 sabouhallawa sabouhallawa ap ggaren sabouhallawa sihui_liu simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1791776 0 sabouhallawa 2021-09-08 23:52:01 -0700 Committing the CA transaction may be an asynchronous operation. 1791780 1 sabouhallawa 2021-09-08 23:58:23 -0700 <rdar://81800118> 1791781 2 437714 sabouhallawa 2021-09-09 00:00:51 -0700 Created attachment 437714 Patch 1791790 3 437714 thorton 2021-09-09 00:11:08 -0700 Comment on attachment 437714 Patch This seems like wild overkill for 99.9% of snapshotting use (which is snapshotting the currently displayed content). Is it really ok to -[CATransaction synchronize] every navigation, for example? (When we take back/forward snapshots) 1791794 4 437714 thorton 2021-09-09 00:19:18 -0700 Comment on attachment 437714 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437714&action=review > Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm:3208 > + [CATransaction synchronize]; At a /minimum/, it seems like you need to not do this if WKSnapshotConfiguration.afterScreenUpdates=NO (which currently isn't plumbed in here but could be, and is one way to avoid it in the swipe snapshot case) 1792245 5 437838 sabouhallawa 2021-09-09 23:16:50 -0700 Created attachment 437838 Patch 1792809 6 ap 2021-09-12 14:07:26 -0700 Is this likely to fix any flaky tests? :) 1793062 7 437838 wenson_hsieh 2021-09-13 13:22:42 -0700 Comment on attachment 437838 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437838&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h:493 > +- (void)_snapshotRectWithConfiguration:(WKSnapshotConfiguration *)snapshotConfiguration rectInViewCoordinates:(CGRect)rectInViewCoordinates intoImageOfWidth:(CGFloat)imageWidth completionHandler:(void(^)(CGImageRef))completionHandler; Note that Mail on iOS still uses this method, so we'll need to keep the old SPI around for source/binary compatibility. (The new method should include a `WK_API_AVAILABLE(…)`, as well) 1793065 8 437838 simon.fraser 2021-09-13 13:28:56 -0700 Comment on attachment 437838 Patch r- because it changes SPI 1793180 9 438096 sabouhallawa 2021-09-13 18:33:33 -0700 Created attachment 438096 Patch 1805815 10 441666 sabouhallawa 2021-10-18 18:03:48 -0700 Created attachment 441666 Patch 1806371 11 441666 thorton 2021-10-19 15:23:03 -0700 Comment on attachment 441666 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=441666&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h:493 > +- (void)_snapshotRectWithAfterScreenUpdates:(BOOL)afterScreenUpdates rectInViewCoordinates:(CGRect)rectInViewCoordinates intoImageOfWidth:(CGFloat)imageWidth completionHandler:(void(^)(CGImageRef))completionHandler WK_API_AVAILABLE(ios(WK_IOS_TBA)); drop the "with" 1806444 12 441832 sabouhallawa 2021-10-19 18:37:06 -0700 Created attachment 441832 Patch 1806683 13 ews-feeder 2021-10-20 10:30:38 -0700 Committed r284547 (243289@main): <https://commits.webkit.org/243289@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 441832. 437714 2021-09-09 00:00:51 -0700 2021-09-09 23:16:48 -0700 Patch bug-230085-20210909000050.patch text/plain 1798 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ3MDIwMGFiNzliNGJlNDUy ZGY3YWJjM2UxMDkxNjU3ZTY1NzFhN2QuLmVjMDg3NDAwMmFjZGRjOWY1OWJlNzJhMzIyOWRkZjU5 NDk3YWYxMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDktMDggIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gRW5zdXJlIHRoZSBD QSB0cmFuc2FjdGlvbiBoYXMgYmVlbiBzeW5jaHJvbm91c2x5IGNvbW1pdHRlZCBiZWZvcmUgc25h cHNob3R0aW5nIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzAwODUKKyAgICAgICAgPHJkYXI6Ly84MTgwMDExOD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCZWNhdXNlIGNvbW1pdHRpbmcgdGhlIENB IHRyYW5zYWN0aW9uIG1heSBiZSBhbiBhc3luY2hyb25vdXMgb3BlcmF0aW9uLAorICAgICAgICB3 ZSBuZWVkIHRvIGVuc3VyZSB0aGUgQ0FMYXllciBpcyBmdWxseSB1cGRhdGVkIGJlZm9yZSBzbmFw c2hvdHRpbmcgaXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1Mu bW06CisgICAgICAgICgtW1dLV2ViVmlldyBfc25hcHNob3RSZWN0OmludG9JbWFnZU9mV2lkdGg6 Y29tcGxldGlvbkhhbmRsZXI6XSk6CisKIDIwMjEtMDktMDggIFBlciBBcm5lICA8cHZvbGxhbkBh cHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHVubmVlZGVkIGNhbGwgb24gc3RhcnR1cCBvZiBX ZWJDb250ZW50IHByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9pb3MvV0tXZWJWaWV3SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9X S1dlYlZpZXdJT1MubW0KaW5kZXggZDk5MTJkZmRlYzVhODY1ZDUzYmQwMmMzNzg0NmRhMjY1YzRm ZGZjMS4uN2EwZWYxMjk1ZWY1M2VjZmQ4ZWZkOTlmNGM0ODQwNTRkYTQ5M2Y2YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KQEAgLTMyMDUs NiArMzIwNSw3IEBAIHN0YXRpYyBXZWJDb3JlOjpVc2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9u IHRvVXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbihVSVNlCiAgICAgICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcihudWxscHRyKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQorICAg ICAgICBbQ0FUcmFuc2FjdGlvbiBzeW5jaHJvbml6ZV07CiAgICAgICAgIENHRmxvYXQgaW1hZ2VT Y2FsZUluVmlld0Nvb3JkaW5hdGVzID0gaW1hZ2VXaWR0aCAvIHJlY3RJblZpZXdDb29yZGluYXRl cy5zaXplLndpZHRoOwogICAgICAgICBDQVRyYW5zZm9ybTNEIHRyYW5zZm9ybSA9IENBVHJhbnNm b3JtM0RNYWtlU2NhbGUoaW1hZ2VTY2FsZUluVmlld0Nvb3JkaW5hdGVzLCBpbWFnZVNjYWxlSW5W aWV3Q29vcmRpbmF0ZXMsIDEpOwogICAgICAgICB0cmFuc2Zvcm0gPSBDQVRyYW5zZm9ybTNEVHJh bnNsYXRlKHRyYW5zZm9ybSwgLXJlY3RJblZpZXdDb29yZGluYXRlcy5vcmlnaW4ueCwgLXJlY3RJ blZpZXdDb29yZGluYXRlcy5vcmlnaW4ueSwgMCk7Cg== 437838 2021-09-09 23:16:50 -0700 2021-09-13 18:33:31 -0700 Patch bug-230085-20210909231649.patch text/plain 6755 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE4M2IzMTY0NDBiM2Q0MGYy ODdmMjhlMWRmZGNiZmIxMTgzYmUyNjMuLjIyMTU2NzIyMWEyY2ZhYjcyYzhkZTk3OTg5OTBkYzY1 NGIyZTEyNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMDktMDkgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gRW5zdXJlIHRoZSBD QSB0cmFuc2FjdGlvbiBoYXMgYmVlbiBzeW5jaHJvbm91c2x5IGNvbW1pdHRlZCBiZWZvcmUgc25h cHNob3R0aW5nIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzAwODUKKyAgICAgICAgPHJkYXI6Ly84MTgwMDExOD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCZWNhdXNlIGNvbW1pdHRpbmcgdGhlIENB IHRyYW5zYWN0aW9uIG1heSBiZSBhbiBhc3luY2hyb25vdXMgb3BlcmF0aW9uLAorICAgICAgICB3 ZSBuZWVkIHRvIGVuc3VyZSB0aGUgQ0FMYXllciBpcyBmdWxseSB1cGRhdGVkIGJlZm9yZSBzbmFw c2hvdHRpbmcgaXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bToKKyAgICAgICAgKC1bV0tXZWJWaWV3IHRha2VTbmFwc2hvdFdpdGhDb25maWd1cmF0aW9uOmNv bXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3UHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5t bToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9zbmFwc2hvdFJlY3RXaXRoQ29uZmlndXJhdGlvbjpy ZWN0SW5WaWV3Q29vcmRpbmF0ZXM6aW50b0ltYWdlT2ZXaWR0aDpjb21wbGV0aW9uSGFuZGxlcjpd KToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9zbmFwc2hvdFJlY3Q6aW50b0ltYWdlT2ZXaWR0aDpj b21wbGV0aW9uSGFuZGxlcjpdKTogRGVsZXRlZC4KKwogMjAyMS0wOS0wOSAgQmVuIE5oYW0gIDxu aGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBQcmVjb25uZWN0ZWQgc29ja2V0IGlzIHNvbWV0aW1l cyBub3QgdXNlZCBmb3IgaW5pdGlhbCByZXF1ZXN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBiYjMxODQ3YTdhNjhiYzAxMDUzNzAwOTEz MjBhZGZlN2Q4MGM4YzhlLi5kMDU1NmI3MTljMjMxMzdmYTNlNjNlNjVhNGVmZWMwMjhkNDIxMTFi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0K QEAgLTEyMTgsOCArMTIxOCw5IEBAIHN0YXRpYyBXS01lZGlhUGxheWJhY2tTdGF0ZSB0b1dLTWVk aWFQbGF5YmFja1N0YXRlKFdlYktpdDo6TWVkaWFQbGF5YmFja1N0YXRlIG1lCiAgICAgQ0dGbG9h dCBkZXZpY2VTY2FsZSA9IHVzZUludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yID8gVUlTY3JlZW4u bWFpblNjcmVlbi5zY2FsZSA6IF9wYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpOwogICAgIENHRmxv YXQgaW1hZ2VXaWR0aCA9IHVzZUludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yID8gc25hcHNob3RX aWR0aCA6IHNuYXBzaG90V2lkdGggKiBkZXZpY2VTY2FsZTsKICAgICBSZXRhaW5QdHI8V0tXZWJW aWV3PiBzdHJvbmdTZWxmID0gc2VsZjsKLSAgICBhdXRvIGNhbGxTbmFwc2hvdFJlY3QgPSBbc3Ry b25nU2VsZiwgcmVjdEluVmlld0Nvb3JkaW5hdGVzLCBpbWFnZVdpZHRoLCBkZXZpY2VTY2FsZSwg aGFuZGxlcl0gewotICAgICAgICBbc3Ryb25nU2VsZiBfc25hcHNob3RSZWN0OnJlY3RJblZpZXdD b29yZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOmltYWdlV2lkdGggY29tcGxldGlvbkhhbmRsZXI6 W3N0cm9uZ1NlbGYsIGhhbmRsZXIsIGRldmljZVNjYWxlXShDR0ltYWdlUmVmIHNuYXBzaG90SW1h Z2UpIHsKKyAgICBSZXRhaW5QdHI8V0tTbmFwc2hvdENvbmZpZ3VyYXRpb24+IHN0cm9uZ1NuYXBz aG90Q29uZmlndXJhdGlvbiA9IHNuYXBzaG90Q29uZmlndXJhdGlvbjsKKyAgICBhdXRvIGNhbGxT bmFwc2hvdFJlY3QgPSBbc3Ryb25nU2VsZiwgc3Ryb25nU25hcHNob3RDb25maWd1cmF0aW9uLCBy ZWN0SW5WaWV3Q29vcmRpbmF0ZXMsIGltYWdlV2lkdGgsIGRldmljZVNjYWxlLCBoYW5kbGVyXSB7 CisgICAgICAgIFtzdHJvbmdTZWxmIF9zbmFwc2hvdFJlY3RXaXRoQ29uZmlndXJhdGlvbjpzdHJv bmdTbmFwc2hvdENvbmZpZ3VyYXRpb24uZ2V0KCkgcmVjdEluVmlld0Nvb3JkaW5hdGVzOnJlY3RJ blZpZXdDb29yZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOmltYWdlV2lkdGggY29tcGxldGlvbkhh bmRsZXI6W3N0cm9uZ1NlbGYsIGhhbmRsZXIsIGRldmljZVNjYWxlXShDR0ltYWdlUmVmIHNuYXBz aG90SW1hZ2UpIHsKICAgICAgICAgICAgIFJldGFpblB0cjxOU0Vycm9yPiBlcnJvcjsKICAgICAg ICAgICAgIFJldGFpblB0cjxVSUltYWdlPiBpbWFnZTsKICAgICAgICAgICAgIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKaW5k ZXggYWE4MTZhMjkzMWZkZDdhMGMzMGUzYzM1Y2Q3ZTU5Y2VjYjYyMGM1ZC4uOGRmZGVkMDAwZDZk YjUwMWQxZmJjYmZmMDVkNzkyZjA2Nzk5ZGI3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCkBAIC00OTAsNyArNDkwLDcg QEAgZm9yIHRoaXMgcHJvcGVydHkuCiAtICh2b2lkKV9lbmRBbmltYXRlZFJlc2l6ZTsKIC0gKHZv aWQpX3Jlc2l6ZVdoaWxlSGlkaW5nQ29udGVudFdpdGhVcGRhdGVzOih2b2lkICheKSh2b2lkKSl1 cGRhdGVCbG9jazsKIAotLSAodm9pZClfc25hcHNob3RSZWN0OihDR1JlY3QpcmVjdEluVmlld0Nv b3JkaW5hdGVzIGludG9JbWFnZU9mV2lkdGg6KENHRmxvYXQpaW1hZ2VXaWR0aCBjb21wbGV0aW9u SGFuZGxlcjoodm9pZCheKShDR0ltYWdlUmVmKSljb21wbGV0aW9uSGFuZGxlcjsKKy0gKHZvaWQp X3NuYXBzaG90UmVjdFdpdGhDb25maWd1cmF0aW9uOihXS1NuYXBzaG90Q29uZmlndXJhdGlvbiAq KXNuYXBzaG90Q29uZmlndXJhdGlvbiByZWN0SW5WaWV3Q29vcmRpbmF0ZXM6KENHUmVjdClyZWN0 SW5WaWV3Q29vcmRpbmF0ZXMgaW50b0ltYWdlT2ZXaWR0aDooQ0dGbG9hdClpbWFnZVdpZHRoIGNv bXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKENHSW1hZ2VSZWYpKWNvbXBsZXRpb25IYW5kbGVyOwog CiAtICh2b2lkKV9vdmVycmlkZUxheW91dFBhcmFtZXRlcnNXaXRoTWluaW11bUxheW91dFNpemU6 KENHU2l6ZSltaW5pbXVtTGF5b3V0U2l6ZSBtYXhpbXVtVW5vYnNjdXJlZFNpemVPdmVycmlkZToo Q0dTaXplKW1heGltdW1Vbm9ic2N1cmVkU2l6ZU92ZXJyaWRlIFdLX0FQSV9BVkFJTEFCTEUoaW9z KDlfMCkpOwogLSAodm9pZClfY2xlYXJPdmVycmlkZUxheW91dFBhcmFtZXRlcnMgV0tfQVBJX0FW QUlMQUJMRShpb3MoMTEuMCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2lvcy9XS1dlYlZpZXdJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9z L1dLV2ViVmlld0lPUy5tbQppbmRleCBkOTkxMmRmZGVjNWE4NjVkNTNiZDAyYzM3ODQ2ZGEyNjVj NGZkZmMxLi5hMmIwNzY3ODE2Y2ExMzVhODlmMTFlYmIxMWZiMTE2ZDUzY2VlMWYxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpAQCAtNDMs NiArNDMsNyBAQAogI2ltcG9ydCAiV0tQYXNzd29yZFZpZXcuaCIKICNpbXBvcnQgIldLU2FmZUJy b3dzaW5nV2FybmluZy5oIgogI2ltcG9ydCAiV0tTY3JvbGxWaWV3LmgiCisjaW1wb3J0ICJXS1Nu YXBzaG90Q29uZmlndXJhdGlvbi5oIgogI2ltcG9ydCAiV0tVSURlbGVnYXRlUHJpdmF0ZS5oIgog I2ltcG9ydCAiV0tXZWJWaWV3Q29uZmlndXJhdGlvbkludGVybmFsLmgiCiAjaW1wb3J0ICJXS1dl YlZpZXdDb250ZW50UHJvdmlkZXIuaCIKQEAgLTMxNzUsMTIgKzMxNzYsMTIgQEAgc3RhdGljIFdl YkNvcmU6OlVzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb24gdG9Vc2VySW50ZXJmYWNlTGF5b3V0 RGlyZWN0aW9uKFVJU2UKIC8vIEZJWE1FICg8cmRhcjovL3Byb2JsZW0vODA5ODYzMzA+KTogVGhp cyBtZXRob2Qgc2hvdWxkIGJlIHVwZGF0ZWQgdG8gdGFrZSBhbiBpbWFnZQogLy8gd2lkdGggaW4g cG9pbnRzIChmb3IgY29uc2lzdGVuY3kpIGFuZCBhIGNvbXBsZXRpb24gaGFuZGxlciB3aXRoIGEg VUlJbWFnZSBwYXJhbWV0ZXIKIC8vICh0byBhdm9pZCByZWR1bmRhbnQgY29waWVzIGZvciBQREZz KSwgb25jZSBpdCBpcyBubyBsb25nZXIgaW4gdXNlIGJ5IGludGVybmFsIGNsaWVudHMuCi0tICh2 b2lkKV9zbmFwc2hvdFJlY3Q6KENHUmVjdClyZWN0SW5WaWV3Q29vcmRpbmF0ZXMgaW50b0ltYWdl T2ZXaWR0aDooQ0dGbG9hdClpbWFnZVdpZHRoIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKENH SW1hZ2VSZWYpKWNvbXBsZXRpb25IYW5kbGVyCistICh2b2lkKV9zbmFwc2hvdFJlY3RXaXRoQ29u ZmlndXJhdGlvbjooV0tTbmFwc2hvdENvbmZpZ3VyYXRpb24gKilzbmFwc2hvdENvbmZpZ3VyYXRp b24gcmVjdEluVmlld0Nvb3JkaW5hdGVzOihDR1JlY3QpcmVjdEluVmlld0Nvb3JkaW5hdGVzIGlu dG9JbWFnZU9mV2lkdGg6KENHRmxvYXQpaW1hZ2VXaWR0aCBjb21wbGV0aW9uSGFuZGxlcjoodm9p ZCheKShDR0ltYWdlUmVmKSljb21wbGV0aW9uSGFuZGxlcgogewogICAgIGlmIChfZHluYW1pY1Zp ZXdwb3J0VXBkYXRlTW9kZSAhPSBXZWJLaXQ6OkR5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGU6Ok5v dFJlc2l6aW5nKSB7CiAgICAgICAgIC8vIERlZmVyIHNuYXBzaG90dGluZyB1bnRpbCBhZnRlciB0 aGUgY3VycmVudCByZXNpemUgY29tcGxldGVzLgotICAgICAgICBfY2FsbGJhY2tzRGVmZXJyZWRE dXJpbmdSZXNpemUuYXBwZW5kKFtyZXRhaW5lZFNlbGYgPSByZXRhaW5QdHIoc2VsZiksIHJlY3RJ blZpZXdDb29yZGluYXRlcywgaW1hZ2VXaWR0aCwgY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxv Y2tQdHIoY29tcGxldGlvbkhhbmRsZXIpXSB7Ci0gICAgICAgICAgICBbcmV0YWluZWRTZWxmIF9z bmFwc2hvdFJlY3Q6cmVjdEluVmlld0Nvb3JkaW5hdGVzIGludG9JbWFnZU9mV2lkdGg6aW1hZ2VX aWR0aCBjb21wbGV0aW9uSGFuZGxlcjpjb21wbGV0aW9uSGFuZGxlci5nZXQoKV07CisgICAgICAg IF9jYWxsYmFja3NEZWZlcnJlZER1cmluZ1Jlc2l6ZS5hcHBlbmQoW3JldGFpbmVkU2VsZiA9IHJl dGFpblB0cihzZWxmKSwgcmV0YWluZWRTbmFwc2hvdENvbmZpZ3VyYXRpb24gPSByZXRhaW5QdHIo c25hcHNob3RDb25maWd1cmF0aW9uKSwgcmVjdEluVmlld0Nvb3JkaW5hdGVzLCBpbWFnZVdpZHRo LCBjb21wbGV0aW9uSGFuZGxlciA9IG1ha2VCbG9ja1B0cihjb21wbGV0aW9uSGFuZGxlcildIHsK KyAgICAgICAgICAgIFtyZXRhaW5lZFNlbGYgX3NuYXBzaG90UmVjdFdpdGhDb25maWd1cmF0aW9u OnJldGFpbmVkU25hcHNob3RDb25maWd1cmF0aW9uLmdldCgpIHJlY3RJblZpZXdDb29yZGluYXRl czpyZWN0SW5WaWV3Q29vcmRpbmF0ZXMgaW50b0ltYWdlT2ZXaWR0aDppbWFnZVdpZHRoIGNvbXBs ZXRpb25IYW5kbGVyOmNvbXBsZXRpb25IYW5kbGVyLmdldCgpXTsKICAgICAgICAgfSk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CkBAIC0zMjA1LDYgKzMyMDYsOCBAQCBzdGF0aWMgV2ViQ29yZTo6 VXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbiB0b1VzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rp b24oVUlTZQogICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIobnVsbHB0cik7CiAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIH0KKyAgICAgICAgaWYgKHNuYXBzaG90Q29uZmlndXJhdGlv biAmJiBzbmFwc2hvdENvbmZpZ3VyYXRpb24uYWZ0ZXJTY3JlZW5VcGRhdGVzKQorICAgICAgICAg ICAgW0NBVHJhbnNhY3Rpb24gc3luY2hyb25pemVdOwogICAgICAgICBDR0Zsb2F0IGltYWdlU2Nh bGVJblZpZXdDb29yZGluYXRlcyA9IGltYWdlV2lkdGggLyByZWN0SW5WaWV3Q29vcmRpbmF0ZXMu c2l6ZS53aWR0aDsKICAgICAgICAgQ0FUcmFuc2Zvcm0zRCB0cmFuc2Zvcm0gPSBDQVRyYW5zZm9y bTNETWFrZVNjYWxlKGltYWdlU2NhbGVJblZpZXdDb29yZGluYXRlcywgaW1hZ2VTY2FsZUluVmll d0Nvb3JkaW5hdGVzLCAxKTsKICAgICAgICAgdHJhbnNmb3JtID0gQ0FUcmFuc2Zvcm0zRFRyYW5z bGF0ZSh0cmFuc2Zvcm0sIC1yZWN0SW5WaWV3Q29vcmRpbmF0ZXMub3JpZ2luLngsIC1yZWN0SW5W aWV3Q29vcmRpbmF0ZXMub3JpZ2luLnksIDApOwo= 438096 2021-09-13 18:33:33 -0700 2021-10-18 18:03:45 -0700 Patch bug-230085-20210913183332.patch text/plain 7165 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ1YTEzNjIxODkwNDY5Nzk5 MjhmMDFlYjExYmRhZmRiNWM3Mzc1YTEuLjkwOWE4OTc0ZWYwMzc3YzU1YmQ4OGM0MTM1Yjc0MWJl MjM0MjJkM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMDktMTMgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gRW5zdXJlIHRoZSBD QSB0cmFuc2FjdGlvbiBoYXMgYmVlbiBzeW5jaHJvbm91c2x5IGNvbW1pdHRlZCBiZWZvcmUgc25h cHNob3R0aW5nIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzAwODUKKyAgICAgICAgPHJkYXI6Ly84MTgwMDExOD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCZWNhdXNlIGNvbW1pdHRpbmcgdGhlIENB IHRyYW5zYWN0aW9uIG1heSBiZSBhbiBhc3luY2hyb25vdXMgb3BlcmF0aW9uLAorICAgICAgICB3 ZSBuZWVkIHRvIGVuc3VyZSB0aGUgQ0FMYXllciBpcyBmdWxseSB1cGRhdGVkIGJlZm9yZSBzbmFw c2hvdHRpbmcgaXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bToKKyAgICAgICAgKC1bV0tXZWJWaWV3IHRha2VTbmFwc2hvdFdpdGhDb25maWd1cmF0aW9uOmNv bXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3UHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5t bToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9zbmFwc2hvdFJlY3RXaXRoQWZ0ZXJTY3JlZW5VcGRh dGVzOnJlY3RJblZpZXdDb29yZGluYXRlczppbnRvSW1hZ2VPZldpZHRoOmNvbXBsZXRpb25IYW5k bGVyOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3NuYXBzaG90UmVjdDppbnRvSW1hZ2VPZldp ZHRoOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorCiAyMDIxLTA5LTEzICBXZW5zb24gSHNpZWggIDx3 ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIEZvbGxvd3VwIHRvIHIyODIzMjAgLSBh dm9pZCBhIHBvdGVudGlhbCBtZW1vcnkgbGVhawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggODVlNWQzMjIzMGI1ZWUzMDRjZjIyZTQwYzA4 OGE1ZTZlZDA3MTYzOC4uMDYzZTNhNzE5MDNmNjY2ZDJkNTdlNTFhMmNmYTBmMTMwZjBjYmFjOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBA IC0xMjI0LDggKzEyMjQsOSBAQCBzdGF0aWMgV0tNZWRpYVBsYXliYWNrU3RhdGUgdG9XS01lZGlh UGxheWJhY2tTdGF0ZShXZWJLaXQ6Ok1lZGlhUGxheWJhY2tTdGF0ZSBtZQogICAgIENHRmxvYXQg ZGV2aWNlU2NhbGUgPSB1c2VJbnRyaW5zaWNEZXZpY2VTY2FsZUZhY3RvciA/IFVJU2NyZWVuLm1h aW5TY3JlZW4uc2NhbGUgOiBfcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKICAgICBDR0Zsb2F0 IGltYWdlV2lkdGggPSB1c2VJbnRyaW5zaWNEZXZpY2VTY2FsZUZhY3RvciA/IHNuYXBzaG90V2lk dGggOiBzbmFwc2hvdFdpZHRoICogZGV2aWNlU2NhbGU7CiAgICAgUmV0YWluUHRyPFdLV2ViVmll dz4gc3Ryb25nU2VsZiA9IHNlbGY7Ci0gICAgYXV0byBjYWxsU25hcHNob3RSZWN0ID0gW3N0cm9u Z1NlbGYsIHJlY3RJblZpZXdDb29yZGluYXRlcywgaW1hZ2VXaWR0aCwgZGV2aWNlU2NhbGUsIGhh bmRsZXJdIHsKLSAgICAgICAgW3N0cm9uZ1NlbGYgX3NuYXBzaG90UmVjdDpyZWN0SW5WaWV3Q29v cmRpbmF0ZXMgaW50b0ltYWdlT2ZXaWR0aDppbWFnZVdpZHRoIGNvbXBsZXRpb25IYW5kbGVyOltz dHJvbmdTZWxmLCBoYW5kbGVyLCBkZXZpY2VTY2FsZV0oQ0dJbWFnZVJlZiBzbmFwc2hvdEltYWdl KSB7CisgICAgQk9PTCBhZnRlclNjcmVlblVwZGF0ZXMgPSBzbmFwc2hvdENvbmZpZ3VyYXRpb24g JiYgc25hcHNob3RDb25maWd1cmF0aW9uLmFmdGVyU2NyZWVuVXBkYXRlczsKKyAgICBhdXRvIGNh bGxTbmFwc2hvdFJlY3QgPSBbc3Ryb25nU2VsZiwgYWZ0ZXJTY3JlZW5VcGRhdGVzLCByZWN0SW5W aWV3Q29vcmRpbmF0ZXMsIGltYWdlV2lkdGgsIGRldmljZVNjYWxlLCBoYW5kbGVyXSB7CisgICAg ICAgIFtzdHJvbmdTZWxmIF9zbmFwc2hvdFJlY3RXaXRoQWZ0ZXJTY3JlZW5VcGRhdGVzOmFmdGVy U2NyZWVuVXBkYXRlcyByZWN0SW5WaWV3Q29vcmRpbmF0ZXM6cmVjdEluVmlld0Nvb3JkaW5hdGVz IGludG9JbWFnZU9mV2lkdGg6aW1hZ2VXaWR0aCBjb21wbGV0aW9uSGFuZGxlcjpbc3Ryb25nU2Vs ZiwgaGFuZGxlciwgZGV2aWNlU2NhbGVdKENHSW1hZ2VSZWYgc25hcHNob3RJbWFnZSkgewogICAg ICAgICAgICAgUmV0YWluUHRyPE5TRXJyb3I+IGVycm9yOwogICAgICAgICAgICAgUmV0YWluUHRy PFVJSW1hZ2U+IGltYWdlOwogICAgICAgICAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaAppbmRleCAzN2NhNDRjYzMxNjM3 ODllM2M1NzY2YWYwNjNkNGE1ZjY2ZWMzMWJjLi45NzE2NTY0NWEyYjdlNjFiZGMyZmY0ZjI3OWJi YzBmZTUwNGIwYjg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKQEAgLTQ4OCw2ICs0ODgsNyBAQCBmb3IgdGhpcyBwcm9w ZXJ0eS4KIC0gKHZvaWQpX2VuZEFuaW1hdGVkUmVzaXplOwogLSAodm9pZClfcmVzaXplV2hpbGVI aWRpbmdDb250ZW50V2l0aFVwZGF0ZXM6KHZvaWQgKF4pKHZvaWQpKXVwZGF0ZUJsb2NrOwogCist ICh2b2lkKV9zbmFwc2hvdFJlY3RXaXRoQWZ0ZXJTY3JlZW5VcGRhdGVzOihCT09MKWFmdGVyU2Ny ZWVuVXBkYXRlcyByZWN0SW5WaWV3Q29vcmRpbmF0ZXM6KENHUmVjdClyZWN0SW5WaWV3Q29vcmRp bmF0ZXMgaW50b0ltYWdlT2ZXaWR0aDooQ0dGbG9hdClpbWFnZVdpZHRoIGNvbXBsZXRpb25IYW5k bGVyOih2b2lkKF4pKENHSW1hZ2VSZWYpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFC TEUoaW9zKFdLX0lPU19UQkEpKTsKIC0gKHZvaWQpX3NuYXBzaG90UmVjdDooQ0dSZWN0KXJlY3RJ blZpZXdDb29yZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOihDR0Zsb2F0KWltYWdlV2lkdGggY29t cGxldGlvbkhhbmRsZXI6KHZvaWQoXikoQ0dJbWFnZVJlZikpY29tcGxldGlvbkhhbmRsZXI7CiAK IC0gKHZvaWQpX292ZXJyaWRlTGF5b3V0UGFyYW1ldGVyc1dpdGhNaW5pbXVtTGF5b3V0U2l6ZToo Q0dTaXplKW1pbmltdW1MYXlvdXRTaXplIG1heGltdW1Vbm9ic2N1cmVkU2l6ZU92ZXJyaWRlOihD R1NpemUpbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGUgV0tfQVBJX0FWQUlMQUJMRShpb3Mo OV8wKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2Vi Vmlld0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9T Lm1tCmluZGV4IGQ5OTEyZGZkZWM1YTg2NWQ1M2JkMDJjMzc4NDZkYTI2NWM0ZmRmYzEuLjNiNTgw NmU2MDQxZGE1ZWJhZmVhZjA0NmQ5ZjFjZWE5MWJjOGMzZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCkBAIC0zMTc1LDEyICszMTc1LDEy IEBAIHN0YXRpYyBXZWJDb3JlOjpVc2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uIHRvVXNlcklu dGVyZmFjZUxheW91dERpcmVjdGlvbihVSVNlCiAvLyBGSVhNRSAoPHJkYXI6Ly9wcm9ibGVtLzgw OTg2MzMwPik6IFRoaXMgbWV0aG9kIHNob3VsZCBiZSB1cGRhdGVkIHRvIHRha2UgYW4gaW1hZ2UK IC8vIHdpZHRoIGluIHBvaW50cyAoZm9yIGNvbnNpc3RlbmN5KSBhbmQgYSBjb21wbGV0aW9uIGhh bmRsZXIgd2l0aCBhIFVJSW1hZ2UgcGFyYW1ldGVyCiAvLyAodG8gYXZvaWQgcmVkdW5kYW50IGNv cGllcyBmb3IgUERGcyksIG9uY2UgaXQgaXMgbm8gbG9uZ2VyIGluIHVzZSBieSBpbnRlcm5hbCBj bGllbnRzLgotLSAodm9pZClfc25hcHNob3RSZWN0OihDR1JlY3QpcmVjdEluVmlld0Nvb3JkaW5h dGVzIGludG9JbWFnZU9mV2lkdGg6KENHRmxvYXQpaW1hZ2VXaWR0aCBjb21wbGV0aW9uSGFuZGxl cjoodm9pZCheKShDR0ltYWdlUmVmKSljb21wbGV0aW9uSGFuZGxlcgorLSAodm9pZClfc25hcHNo b3RSZWN0V2l0aEFmdGVyU2NyZWVuVXBkYXRlczooQk9PTClhZnRlclNjcmVlblVwZGF0ZXMgcmVj dEluVmlld0Nvb3JkaW5hdGVzOihDR1JlY3QpcmVjdEluVmlld0Nvb3JkaW5hdGVzIGludG9JbWFn ZU9mV2lkdGg6KENHRmxvYXQpaW1hZ2VXaWR0aCBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCheKShD R0ltYWdlUmVmKSljb21wbGV0aW9uSGFuZGxlcgogewogICAgIGlmIChfZHluYW1pY1ZpZXdwb3J0 VXBkYXRlTW9kZSAhPSBXZWJLaXQ6OkR5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGU6Ok5vdFJlc2l6 aW5nKSB7CiAgICAgICAgIC8vIERlZmVyIHNuYXBzaG90dGluZyB1bnRpbCBhZnRlciB0aGUgY3Vy cmVudCByZXNpemUgY29tcGxldGVzLgotICAgICAgICBfY2FsbGJhY2tzRGVmZXJyZWREdXJpbmdS ZXNpemUuYXBwZW5kKFtyZXRhaW5lZFNlbGYgPSByZXRhaW5QdHIoc2VsZiksIHJlY3RJblZpZXdD b29yZGluYXRlcywgaW1hZ2VXaWR0aCwgY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIo Y29tcGxldGlvbkhhbmRsZXIpXSB7Ci0gICAgICAgICAgICBbcmV0YWluZWRTZWxmIF9zbmFwc2hv dFJlY3Q6cmVjdEluVmlld0Nvb3JkaW5hdGVzIGludG9JbWFnZU9mV2lkdGg6aW1hZ2VXaWR0aCBj b21wbGV0aW9uSGFuZGxlcjpjb21wbGV0aW9uSGFuZGxlci5nZXQoKV07CisgICAgICAgIF9jYWxs YmFja3NEZWZlcnJlZER1cmluZ1Jlc2l6ZS5hcHBlbmQoW3JldGFpbmVkU2VsZiA9IHJldGFpblB0 cihzZWxmKSwgYWZ0ZXJTY3JlZW5VcGRhdGVzLCByZWN0SW5WaWV3Q29vcmRpbmF0ZXMsIGltYWdl V2lkdGgsIGNvbXBsZXRpb25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5kbGVy KV0geworICAgICAgICAgICAgW3JldGFpbmVkU2VsZiBfc25hcHNob3RSZWN0V2l0aEFmdGVyU2Ny ZWVuVXBkYXRlczphZnRlclNjcmVlblVwZGF0ZXMgcmVjdEluVmlld0Nvb3JkaW5hdGVzOnJlY3RJ blZpZXdDb29yZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOmltYWdlV2lkdGggY29tcGxldGlvbkhh bmRsZXI6Y29tcGxldGlvbkhhbmRsZXIuZ2V0KCldOwogICAgICAgICB9KTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KQEAgLTMyMDUsNiArMzIwNSw4IEBAIHN0YXRpYyBXZWJDb3JlOjpVc2VySW50 ZXJmYWNlTGF5b3V0RGlyZWN0aW9uIHRvVXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbihVSVNl CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihudWxscHRyKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQorICAgICAgICBpZiAoYWZ0ZXJTY3JlZW5VcGRhdGVzKQorICAgICAg ICAgICAgW0NBVHJhbnNhY3Rpb24gc3luY2hyb25pemVdOwogICAgICAgICBDR0Zsb2F0IGltYWdl U2NhbGVJblZpZXdDb29yZGluYXRlcyA9IGltYWdlV2lkdGggLyByZWN0SW5WaWV3Q29vcmRpbmF0 ZXMuc2l6ZS53aWR0aDsKICAgICAgICAgQ0FUcmFuc2Zvcm0zRCB0cmFuc2Zvcm0gPSBDQVRyYW5z Zm9ybTNETWFrZVNjYWxlKGltYWdlU2NhbGVJblZpZXdDb29yZGluYXRlcywgaW1hZ2VTY2FsZUlu Vmlld0Nvb3JkaW5hdGVzLCAxKTsKICAgICAgICAgdHJhbnNmb3JtID0gQ0FUcmFuc2Zvcm0zRFRy YW5zbGF0ZSh0cmFuc2Zvcm0sIC1yZWN0SW5WaWV3Q29vcmRpbmF0ZXMub3JpZ2luLngsIC1yZWN0 SW5WaWV3Q29vcmRpbmF0ZXMub3JpZ2luLnksIDApOwpAQCAtMzI0Niw2ICszMjQ4LDExIEBAIHN0 YXRpYyBXZWJDb3JlOjpVc2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uIHRvVXNlckludGVyZmFj ZUxheW91dERpcmVjdGlvbihVSVNlCiAgICAgfSk7CiB9CiAKKy0gKHZvaWQpX3NuYXBzaG90UmVj dDooQ0dSZWN0KXJlY3RJblZpZXdDb29yZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOihDR0Zsb2F0 KWltYWdlV2lkdGggY29tcGxldGlvbkhhbmRsZXI6KHZvaWQoXikoQ0dJbWFnZVJlZikpY29tcGxl dGlvbkhhbmRsZXIKK3sKKyAgICBbc2VsZiBfc25hcHNob3RSZWN0V2l0aEFmdGVyU2NyZWVuVXBk YXRlczpOTyByZWN0SW5WaWV3Q29vcmRpbmF0ZXM6cmVjdEluVmlld0Nvb3JkaW5hdGVzIGludG9J bWFnZU9mV2lkdGg6aW1hZ2VXaWR0aCBjb21wbGV0aW9uSGFuZGxlcjpjb21wbGV0aW9uSGFuZGxl cl07Cit9CisKIC0gKHZvaWQpX292ZXJyaWRlTGF5b3V0UGFyYW1ldGVyc1dpdGhNaW5pbXVtTGF5 b3V0U2l6ZTooQ0dTaXplKW1pbmltdW1MYXlvdXRTaXplIG1heGltdW1Vbm9ic2N1cmVkU2l6ZU92 ZXJyaWRlOihDR1NpemUpbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGUKIHsKICAgICBMT0df V0lUSF9TVFJFQU0oVmlzaWJsZVJlY3RzLCBzdHJlYW0gPDwgIi1bV0tXZWJWaWV3ICIgPDwgX3Bh Z2UtPmlkZW50aWZpZXIoKSA8PCAiIF9vdmVycmlkZUxheW91dFBhcmFtZXRlcnNXaXRoTWluaW11 bUxheW91dFNpemU6IiA8PCBXZWJDb3JlOjpGbG9hdFNpemUobWluaW11bUxheW91dFNpemUpIDw8 ICIgbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGU6IiA8PCBXZWJDb3JlOjpGbG9hdFNpemUo bWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGUpIDw8ICJdIik7Cg== 441666 2021-10-18 18:03:48 -0700 2021-10-19 15:23:03 -0700 Patch bug-230085-20211018180347.patch text/plain 7133 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0Mzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ2MzczZjQyNGQwN2UyM2Ux OWNlOWZlZjk3NjVjYzljNDZiNDgyYWUuLjI4YTUyNGJiMTIxZjUxMTY4NDhjZDY4OWU5MDgzYWUw Y2Q1YzU1YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMTAtMTggIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gRW5zdXJlIHRoZSBD QSB0cmFuc2FjdGlvbiBoYXMgYmVlbiBzeW5jaHJvbm91c2x5IGNvbW1pdHRlZCBiZWZvcmUgc25h cHNob3R0aW5nIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzAwODUKKyAgICAgICAgPHJkYXI6Ly84MTgwMDExOD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCZWNhdXNlIGNvbW1pdHRpbmcgdGhlIENB IHRyYW5zYWN0aW9uIG1heSBiZSBhbiBhc3luY2hyb25vdXMgb3BlcmF0aW9uLAorICAgICAgICB3 ZSBuZWVkIHRvIGVuc3VyZSB0aGUgQ0FMYXllciBpcyBmdWxseSB1cGRhdGVkIGJlZm9yZSBzbmFw c2hvdHRpbmcgaXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bToKKyAgICAgICAgKC1bV0tXZWJWaWV3IHRha2VTbmFwc2hvdFdpdGhDb25maWd1cmF0aW9uOmNv bXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3UHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5t bToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9zbmFwc2hvdFJlY3RXaXRoQWZ0ZXJTY3JlZW5VcGRh dGVzOnJlY3RJblZpZXdDb29yZGluYXRlczppbnRvSW1hZ2VPZldpZHRoOmNvbXBsZXRpb25IYW5k bGVyOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3NuYXBzaG90UmVjdDppbnRvSW1hZ2VPZldp ZHRoOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorCiAyMDIxLTEwLTE4ICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2ZXJ0IHIyODQyMTYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0g Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IDE3 M2Q3MzBkNTI1NTg3ZmY0MjJlZWI5MDI4N2QzMjhkNTdmZTdkN2YuLmRlZWE5NjJmNmE1NjllNzA3 NGQ5NGU2YjMyZmU0YWI4MWIzNmFiM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMTIyMiw4ICsxMjIyLDkgQEAgc3RhdGljIFdLTWVk aWFQbGF5YmFja1N0YXRlIHRvV0tNZWRpYVBsYXliYWNrU3RhdGUoV2ViS2l0OjpNZWRpYVBsYXli YWNrU3RhdGUgbWUKICAgICBDR0Zsb2F0IGRldmljZVNjYWxlID0gdXNlSW50cmluc2ljRGV2aWNl U2NhbGVGYWN0b3IgPyBVSVNjcmVlbi5tYWluU2NyZWVuLnNjYWxlIDogX3BhZ2UtPmRldmljZVNj YWxlRmFjdG9yKCk7CiAgICAgQ0dGbG9hdCBpbWFnZVdpZHRoID0gdXNlSW50cmluc2ljRGV2aWNl U2NhbGVGYWN0b3IgPyBzbmFwc2hvdFdpZHRoIDogc25hcHNob3RXaWR0aCAqIGRldmljZVNjYWxl OwogICAgIFJldGFpblB0cjxXS1dlYlZpZXc+IHN0cm9uZ1NlbGYgPSBzZWxmOwotICAgIGF1dG8g Y2FsbFNuYXBzaG90UmVjdCA9IFtzdHJvbmdTZWxmLCByZWN0SW5WaWV3Q29vcmRpbmF0ZXMsIGlt YWdlV2lkdGgsIGRldmljZVNjYWxlLCBoYW5kbGVyXSB7Ci0gICAgICAgIFtzdHJvbmdTZWxmIF9z bmFwc2hvdFJlY3Q6cmVjdEluVmlld0Nvb3JkaW5hdGVzIGludG9JbWFnZU9mV2lkdGg6aW1hZ2VX aWR0aCBjb21wbGV0aW9uSGFuZGxlcjpbc3Ryb25nU2VsZiwgaGFuZGxlciwgZGV2aWNlU2NhbGVd KENHSW1hZ2VSZWYgc25hcHNob3RJbWFnZSkgeworICAgIEJPT0wgYWZ0ZXJTY3JlZW5VcGRhdGVz ID0gc25hcHNob3RDb25maWd1cmF0aW9uICYmIHNuYXBzaG90Q29uZmlndXJhdGlvbi5hZnRlclNj cmVlblVwZGF0ZXM7CisgICAgYXV0byBjYWxsU25hcHNob3RSZWN0ID0gW3N0cm9uZ1NlbGYsIGFm dGVyU2NyZWVuVXBkYXRlcywgcmVjdEluVmlld0Nvb3JkaW5hdGVzLCBpbWFnZVdpZHRoLCBkZXZp Y2VTY2FsZSwgaGFuZGxlcl0geworICAgICAgICBbc3Ryb25nU2VsZiBfc25hcHNob3RSZWN0V2l0 aEFmdGVyU2NyZWVuVXBkYXRlczphZnRlclNjcmVlblVwZGF0ZXMgcmVjdEluVmlld0Nvb3JkaW5h dGVzOnJlY3RJblZpZXdDb29yZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOmltYWdlV2lkdGggY29t cGxldGlvbkhhbmRsZXI6W3N0cm9uZ1NlbGYsIGhhbmRsZXIsIGRldmljZVNjYWxlXShDR0ltYWdl UmVmIHNuYXBzaG90SW1hZ2UpIHsKICAgICAgICAgICAgIFJldGFpblB0cjxOU0Vycm9yPiBlcnJv cjsKICAgICAgICAgICAgIFJldGFpblB0cjxVSUltYWdlPiBpbWFnZTsKICAgICAgICAgICAgIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1By aXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2 YXRlLmgKaW5kZXggY2I3ZjMzNDNmZGVlMDIwNWFlMGNlMjY2Y2Y4MzE3OWYxMWRhZDA0MS4uMWIw ZjExNGZlYTZmYzIxY2U3MjQxMTkyZjM5MzZlNjk2MTNiNWFjNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCkBAIC00OTAs NiArNDkwLDcgQEAgZm9yIHRoaXMgcHJvcGVydHkuCiAtICh2b2lkKV9lbmRBbmltYXRlZFJlc2l6 ZTsKIC0gKHZvaWQpX3Jlc2l6ZVdoaWxlSGlkaW5nQ29udGVudFdpdGhVcGRhdGVzOih2b2lkIChe KSh2b2lkKSl1cGRhdGVCbG9jazsKIAorLSAodm9pZClfc25hcHNob3RSZWN0V2l0aEFmdGVyU2Ny ZWVuVXBkYXRlczooQk9PTClhZnRlclNjcmVlblVwZGF0ZXMgcmVjdEluVmlld0Nvb3JkaW5hdGVz OihDR1JlY3QpcmVjdEluVmlld0Nvb3JkaW5hdGVzIGludG9JbWFnZU9mV2lkdGg6KENHRmxvYXQp aW1hZ2VXaWR0aCBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCheKShDR0ltYWdlUmVmKSljb21wbGV0 aW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKGlvcyhXS19JT1NfVEJBKSk7CiAtICh2b2lkKV9z bmFwc2hvdFJlY3Q6KENHUmVjdClyZWN0SW5WaWV3Q29vcmRpbmF0ZXMgaW50b0ltYWdlT2ZXaWR0 aDooQ0dGbG9hdClpbWFnZVdpZHRoIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKENHSW1hZ2VS ZWYpKWNvbXBsZXRpb25IYW5kbGVyOwogCiAtICh2b2lkKV9vdmVycmlkZUxheW91dFBhcmFtZXRl cnNXaXRoTWluaW11bUxheW91dFNpemU6KENHU2l6ZSltaW5pbXVtTGF5b3V0U2l6ZSBtYXhpbXVt VW5vYnNjdXJlZFNpemVPdmVycmlkZTooQ0dTaXplKW1heGltdW1Vbm9ic2N1cmVkU2l6ZU92ZXJy aWRlIFdLX0FQSV9BVkFJTEFCTEUoaW9zKDlfMCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQppbmRleCBmOTBhYmE5YWQ5OWRiMzUzYjQ0MjMx MDE4NjZmYTFlNThkZDU0Yjk5Li5lODNjNWI0MDQwN2NkNWJiNTJhNDhmNjk3MDI1MTIzYTE0MzIz OTNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmll d0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lP Uy5tbQpAQCAtMzE4MywxMiArMzE4MywxMiBAQCBzdGF0aWMgV2ViQ29yZTo6VXNlckludGVyZmFj ZUxheW91dERpcmVjdGlvbiB0b1VzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb24oVUlTZQogLy8g RklYTUUgKDxyZGFyOi8vcHJvYmxlbS84MDk4NjMzMD4pOiBUaGlzIG1ldGhvZCBzaG91bGQgYmUg dXBkYXRlZCB0byB0YWtlIGFuIGltYWdlCiAvLyB3aWR0aCBpbiBwb2ludHMgKGZvciBjb25zaXN0 ZW5jeSkgYW5kIGEgY29tcGxldGlvbiBoYW5kbGVyIHdpdGggYSBVSUltYWdlIHBhcmFtZXRlcgog Ly8gKHRvIGF2b2lkIHJlZHVuZGFudCBjb3BpZXMgZm9yIFBERnMpLCBvbmNlIGl0IGlzIG5vIGxv bmdlciBpbiB1c2UgYnkgaW50ZXJuYWwgY2xpZW50cy4KLS0gKHZvaWQpX3NuYXBzaG90UmVjdDoo Q0dSZWN0KXJlY3RJblZpZXdDb29yZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOihDR0Zsb2F0KWlt YWdlV2lkdGggY29tcGxldGlvbkhhbmRsZXI6KHZvaWQoXikoQ0dJbWFnZVJlZikpY29tcGxldGlv bkhhbmRsZXIKKy0gKHZvaWQpX3NuYXBzaG90UmVjdFdpdGhBZnRlclNjcmVlblVwZGF0ZXM6KEJP T0wpYWZ0ZXJTY3JlZW5VcGRhdGVzIHJlY3RJblZpZXdDb29yZGluYXRlczooQ0dSZWN0KXJlY3RJ blZpZXdDb29yZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOihDR0Zsb2F0KWltYWdlV2lkdGggY29t cGxldGlvbkhhbmRsZXI6KHZvaWQoXikoQ0dJbWFnZVJlZikpY29tcGxldGlvbkhhbmRsZXIKIHsK ICAgICBpZiAoX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgIT0gV2ViS2l0OjpEeW5hbWljVmll d3BvcnRVcGRhdGVNb2RlOjpOb3RSZXNpemluZykgewogICAgICAgICAvLyBEZWZlciBzbmFwc2hv dHRpbmcgdW50aWwgYWZ0ZXIgdGhlIGN1cnJlbnQgcmVzaXplIGNvbXBsZXRlcy4KLSAgICAgICAg X2NhbGxiYWNrc0RlZmVycmVkRHVyaW5nUmVzaXplLmFwcGVuZChbcmV0YWluZWRTZWxmID0gcmV0 YWluUHRyKHNlbGYpLCByZWN0SW5WaWV3Q29vcmRpbmF0ZXMsIGltYWdlV2lkdGgsIGNvbXBsZXRp b25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKV0gewotICAgICAgICAg ICAgW3JldGFpbmVkU2VsZiBfc25hcHNob3RSZWN0OnJlY3RJblZpZXdDb29yZGluYXRlcyBpbnRv SW1hZ2VPZldpZHRoOmltYWdlV2lkdGggY29tcGxldGlvbkhhbmRsZXI6Y29tcGxldGlvbkhhbmRs ZXIuZ2V0KCldOworICAgICAgICBfY2FsbGJhY2tzRGVmZXJyZWREdXJpbmdSZXNpemUuYXBwZW5k KFtyZXRhaW5lZFNlbGYgPSByZXRhaW5QdHIoc2VsZiksIGFmdGVyU2NyZWVuVXBkYXRlcywgcmVj dEluVmlld0Nvb3JkaW5hdGVzLCBpbWFnZVdpZHRoLCBjb21wbGV0aW9uSGFuZGxlciA9IG1ha2VC bG9ja1B0cihjb21wbGV0aW9uSGFuZGxlcildIHsKKyAgICAgICAgICAgIFtyZXRhaW5lZFNlbGYg X3NuYXBzaG90UmVjdFdpdGhBZnRlclNjcmVlblVwZGF0ZXM6YWZ0ZXJTY3JlZW5VcGRhdGVzIHJl Y3RJblZpZXdDb29yZGluYXRlczpyZWN0SW5WaWV3Q29vcmRpbmF0ZXMgaW50b0ltYWdlT2ZXaWR0 aDppbWFnZVdpZHRoIGNvbXBsZXRpb25IYW5kbGVyOmNvbXBsZXRpb25IYW5kbGVyLmdldCgpXTsK ICAgICAgICAgfSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0zMjEzLDYgKzMyMTMsOCBA QCBzdGF0aWMgV2ViQ29yZTo6VXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbiB0b1VzZXJJbnRl cmZhY2VMYXlvdXREaXJlY3Rpb24oVUlTZQogICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo bnVsbHB0cik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KKyAgICAgICAgaWYgKGFm dGVyU2NyZWVuVXBkYXRlcykKKyAgICAgICAgICAgIFtDQVRyYW5zYWN0aW9uIHN5bmNocm9uaXpl XTsKICAgICAgICAgQ0dGbG9hdCBpbWFnZVNjYWxlSW5WaWV3Q29vcmRpbmF0ZXMgPSBpbWFnZVdp ZHRoIC8gcmVjdEluVmlld0Nvb3JkaW5hdGVzLnNpemUud2lkdGg7CiAgICAgICAgIENBVHJhbnNm b3JtM0QgdHJhbnNmb3JtID0gQ0FUcmFuc2Zvcm0zRE1ha2VTY2FsZShpbWFnZVNjYWxlSW5WaWV3 Q29vcmRpbmF0ZXMsIGltYWdlU2NhbGVJblZpZXdDb29yZGluYXRlcywgMSk7CiAgICAgICAgIHRy YW5zZm9ybSA9IENBVHJhbnNmb3JtM0RUcmFuc2xhdGUodHJhbnNmb3JtLCAtcmVjdEluVmlld0Nv b3JkaW5hdGVzLm9yaWdpbi54LCAtcmVjdEluVmlld0Nvb3JkaW5hdGVzLm9yaWdpbi55LCAwKTsK QEAgLTMyNTQsNiArMzI1NiwxMSBAQCBzdGF0aWMgV2ViQ29yZTo6VXNlckludGVyZmFjZUxheW91 dERpcmVjdGlvbiB0b1VzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb24oVUlTZQogICAgIH0pOwog fQogCistICh2b2lkKV9zbmFwc2hvdFJlY3Q6KENHUmVjdClyZWN0SW5WaWV3Q29vcmRpbmF0ZXMg aW50b0ltYWdlT2ZXaWR0aDooQ0dGbG9hdClpbWFnZVdpZHRoIGNvbXBsZXRpb25IYW5kbGVyOih2 b2lkKF4pKENHSW1hZ2VSZWYpKWNvbXBsZXRpb25IYW5kbGVyCit7CisgICAgW3NlbGYgX3NuYXBz aG90UmVjdFdpdGhBZnRlclNjcmVlblVwZGF0ZXM6Tk8gcmVjdEluVmlld0Nvb3JkaW5hdGVzOnJl Y3RJblZpZXdDb29yZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOmltYWdlV2lkdGggY29tcGxldGlv bkhhbmRsZXI6Y29tcGxldGlvbkhhbmRsZXJdOworfQorCiAtICh2b2lkKV9vdmVycmlkZUxheW91 dFBhcmFtZXRlcnNXaXRoTWluaW11bUxheW91dFNpemU6KENHU2l6ZSltaW5pbXVtTGF5b3V0U2l6 ZSBtYXhpbXVtVW5vYnNjdXJlZFNpemVPdmVycmlkZTooQ0dTaXplKW1heGltdW1Vbm9ic2N1cmVk U2l6ZU92ZXJyaWRlCiB7CiAgICAgTE9HX1dJVEhfU1RSRUFNKFZpc2libGVSZWN0cywgc3RyZWFt IDw8ICItW1dLV2ViVmlldyAiIDw8IF9wYWdlLT5pZGVudGlmaWVyKCkgPDwgIiBfb3ZlcnJpZGVM YXlvdXRQYXJhbWV0ZXJzV2l0aE1pbmltdW1MYXlvdXRTaXplOiIgPDwgV2ViQ29yZTo6RmxvYXRT aXplKG1pbmltdW1MYXlvdXRTaXplKSA8PCAiIG1heGltdW1Vbm9ic2N1cmVkU2l6ZU92ZXJyaWRl OiIgPDwgV2ViQ29yZTo6RmxvYXRTaXplKG1heGltdW1Vbm9ic2N1cmVkU2l6ZU92ZXJyaWRlKSA8 PCAiXSIpOwo= 441832 2021-10-19 18:37:06 -0700 2021-10-20 10:30:39 -0700 Patch bug-230085-20211019183705.patch text/plain 7117 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE5M2NjMTYzZWIyMWVlYjMw MzY0NWIwYTA3YTg4NjBhNTRjM2RlZjEuLjQ1NzI4MDZlZjE5MzAzNGQwZGRlOWFlYTViMTFkOGYz YjAwOGNmYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMTAtMTkgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gRW5zdXJlIHRoZSBD QSB0cmFuc2FjdGlvbiBoYXMgYmVlbiBzeW5jaHJvbm91c2x5IGNvbW1pdHRlZCBiZWZvcmUgc25h cHNob3R0aW5nIGl0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzAwODUKKyAgICAgICAgPHJkYXI6Ly84MTgwMDExOD4KKworICAgICAgICBSZXZpZXdl ZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEJlY2F1c2UgY29tbWl0dGluZyB0aGUgQ0EgdHJh bnNhY3Rpb24gbWF5IGJlIGFuIGFzeW5jaHJvbm91cyBvcGVyYXRpb24sCisgICAgICAgIHdlIG5l ZWQgdG8gZW5zdXJlIHRoZSBDQUxheWVyIGlzIGZ1bGx5IHVwZGF0ZWQgYmVmb3JlIHNuYXBzaG90 dGluZyBpdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgor ICAgICAgICAoLVtXS1dlYlZpZXcgdGFrZVNuYXBzaG90V2l0aENvbmZpZ3VyYXRpb246Y29tcGxl dGlvbkhhbmRsZXI6XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQ cml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tOgor ICAgICAgICAoLVtXS1dlYlZpZXcgX3NuYXBzaG90UmVjdEFmdGVyU2NyZWVuVXBkYXRlczpyZWN0 SW5WaWV3Q29vcmRpbmF0ZXM6aW50b0ltYWdlT2ZXaWR0aDpjb21wbGV0aW9uSGFuZGxlcjpdKToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9zbmFwc2hvdFJlY3Q6aW50b0ltYWdlT2ZXaWR0aDpjb21w bGV0aW9uSGFuZGxlcjpdKToKKwogMjAyMS0xMC0xOSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1 ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyODQwOTku CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRl eCAyYTU1ZjY3NWM0YjQzNDI0NTRhMGRiOGU4N2FjMjEzZGJkNDRmM2E1Li5lMjk5MjUxNDc2ZjQ3 NmFhNDE2ODk5NzczNzdiZDI2MGE3MDVjZWVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTEyMjIsOCArMTIyMiw5IEBAIHN0YXRpYyBX S01lZGlhUGxheWJhY2tTdGF0ZSB0b1dLTWVkaWFQbGF5YmFja1N0YXRlKFdlYktpdDo6TWVkaWFQ bGF5YmFja1N0YXRlIG1lCiAgICAgQ0dGbG9hdCBkZXZpY2VTY2FsZSA9IHVzZUludHJpbnNpY0Rl dmljZVNjYWxlRmFjdG9yID8gVUlTY3JlZW4ubWFpblNjcmVlbi5zY2FsZSA6IF9wYWdlLT5kZXZp Y2VTY2FsZUZhY3RvcigpOwogICAgIENHRmxvYXQgaW1hZ2VXaWR0aCA9IHVzZUludHJpbnNpY0Rl dmljZVNjYWxlRmFjdG9yID8gc25hcHNob3RXaWR0aCA6IHNuYXBzaG90V2lkdGggKiBkZXZpY2VT Y2FsZTsKICAgICBSZXRhaW5QdHI8V0tXZWJWaWV3PiBzdHJvbmdTZWxmID0gc2VsZjsKLSAgICBh dXRvIGNhbGxTbmFwc2hvdFJlY3QgPSBbc3Ryb25nU2VsZiwgcmVjdEluVmlld0Nvb3JkaW5hdGVz LCBpbWFnZVdpZHRoLCBkZXZpY2VTY2FsZSwgaGFuZGxlcl0gewotICAgICAgICBbc3Ryb25nU2Vs ZiBfc25hcHNob3RSZWN0OnJlY3RJblZpZXdDb29yZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOmlt YWdlV2lkdGggY29tcGxldGlvbkhhbmRsZXI6W3N0cm9uZ1NlbGYsIGhhbmRsZXIsIGRldmljZVNj YWxlXShDR0ltYWdlUmVmIHNuYXBzaG90SW1hZ2UpIHsKKyAgICBCT09MIGFmdGVyU2NyZWVuVXBk YXRlcyA9IHNuYXBzaG90Q29uZmlndXJhdGlvbiAmJiBzbmFwc2hvdENvbmZpZ3VyYXRpb24uYWZ0 ZXJTY3JlZW5VcGRhdGVzOworICAgIGF1dG8gY2FsbFNuYXBzaG90UmVjdCA9IFtzdHJvbmdTZWxm LCBhZnRlclNjcmVlblVwZGF0ZXMsIHJlY3RJblZpZXdDb29yZGluYXRlcywgaW1hZ2VXaWR0aCwg ZGV2aWNlU2NhbGUsIGhhbmRsZXJdIHsKKyAgICAgICAgW3N0cm9uZ1NlbGYgX3NuYXBzaG90UmVj dEFmdGVyU2NyZWVuVXBkYXRlczphZnRlclNjcmVlblVwZGF0ZXMgcmVjdEluVmlld0Nvb3JkaW5h dGVzOnJlY3RJblZpZXdDb29yZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOmltYWdlV2lkdGggY29t cGxldGlvbkhhbmRsZXI6W3N0cm9uZ1NlbGYsIGhhbmRsZXIsIGRldmljZVNjYWxlXShDR0ltYWdl UmVmIHNuYXBzaG90SW1hZ2UpIHsKICAgICAgICAgICAgIFJldGFpblB0cjxOU0Vycm9yPiBlcnJv cjsKICAgICAgICAgICAgIFJldGFpblB0cjxVSUltYWdlPiBpbWFnZTsKICAgICAgICAgICAgIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1By aXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2 YXRlLmgKaW5kZXggYzg4YjQ4NzQwZjkyOWM1MGZlOGZiMzFmZjk5OGZlYWMzNjIwYWRiMC4uMzYx ZWU2NWUzYzI2N2RiM2M3ODUwZTNiOWUwY2NjYzc5YmEzYWEzYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCkBAIC00OTEs NiArNDkxLDcgQEAgZm9yIHRoaXMgcHJvcGVydHkuCiAtICh2b2lkKV9lbmRBbmltYXRlZFJlc2l6 ZTsKIC0gKHZvaWQpX3Jlc2l6ZVdoaWxlSGlkaW5nQ29udGVudFdpdGhVcGRhdGVzOih2b2lkIChe KSh2b2lkKSl1cGRhdGVCbG9jazsKIAorLSAodm9pZClfc25hcHNob3RSZWN0QWZ0ZXJTY3JlZW5V cGRhdGVzOihCT09MKWFmdGVyU2NyZWVuVXBkYXRlcyByZWN0SW5WaWV3Q29vcmRpbmF0ZXM6KENH UmVjdClyZWN0SW5WaWV3Q29vcmRpbmF0ZXMgaW50b0ltYWdlT2ZXaWR0aDooQ0dGbG9hdClpbWFn ZVdpZHRoIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKENHSW1hZ2VSZWYpKWNvbXBsZXRpb25I YW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUoaW9zKFdLX0lPU19UQkEpKTsKIC0gKHZvaWQpX3NuYXBz aG90UmVjdDooQ0dSZWN0KXJlY3RJblZpZXdDb29yZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOihD R0Zsb2F0KWltYWdlV2lkdGggY29tcGxldGlvbkhhbmRsZXI6KHZvaWQoXikoQ0dJbWFnZVJlZikp Y29tcGxldGlvbkhhbmRsZXI7CiAKIC0gKHZvaWQpX292ZXJyaWRlTGF5b3V0UGFyYW1ldGVyc1dp dGhNaW5pbXVtTGF5b3V0U2l6ZTooQ0dTaXplKW1pbmltdW1MYXlvdXRTaXplIG1heGltdW1Vbm9i c2N1cmVkU2l6ZU92ZXJyaWRlOihDR1NpemUpbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGUg V0tfQVBJX0FWQUlMQUJMRShpb3MoOV8wKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCmluZGV4IGFmMzA0NmI5MmM1NjM2YjcxZWYzNTg0ZDQ3 ZTZjYTNmZjdlNGUzOGEuLjFhNDYxYTE2YjhlOTJlZjRjNjk5NjlkMWQyMGRjMjY1ZDIzZjliM2Yg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9T Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1t CkBAIC0zMTg5LDEyICszMTg5LDEyIEBAIHN0YXRpYyBXZWJDb3JlOjpVc2VySW50ZXJmYWNlTGF5 b3V0RGlyZWN0aW9uIHRvVXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbihVSVNlCiAvLyBGSVhN RSAoPHJkYXI6Ly9wcm9ibGVtLzgwOTg2MzMwPik6IFRoaXMgbWV0aG9kIHNob3VsZCBiZSB1cGRh dGVkIHRvIHRha2UgYW4gaW1hZ2UKIC8vIHdpZHRoIGluIHBvaW50cyAoZm9yIGNvbnNpc3RlbmN5 KSBhbmQgYSBjb21wbGV0aW9uIGhhbmRsZXIgd2l0aCBhIFVJSW1hZ2UgcGFyYW1ldGVyCiAvLyAo dG8gYXZvaWQgcmVkdW5kYW50IGNvcGllcyBmb3IgUERGcyksIG9uY2UgaXQgaXMgbm8gbG9uZ2Vy IGluIHVzZSBieSBpbnRlcm5hbCBjbGllbnRzLgotLSAodm9pZClfc25hcHNob3RSZWN0OihDR1Jl Y3QpcmVjdEluVmlld0Nvb3JkaW5hdGVzIGludG9JbWFnZU9mV2lkdGg6KENHRmxvYXQpaW1hZ2VX aWR0aCBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCheKShDR0ltYWdlUmVmKSljb21wbGV0aW9uSGFu ZGxlcgorLSAodm9pZClfc25hcHNob3RSZWN0QWZ0ZXJTY3JlZW5VcGRhdGVzOihCT09MKWFmdGVy U2NyZWVuVXBkYXRlcyByZWN0SW5WaWV3Q29vcmRpbmF0ZXM6KENHUmVjdClyZWN0SW5WaWV3Q29v cmRpbmF0ZXMgaW50b0ltYWdlT2ZXaWR0aDooQ0dGbG9hdClpbWFnZVdpZHRoIGNvbXBsZXRpb25I YW5kbGVyOih2b2lkKF4pKENHSW1hZ2VSZWYpKWNvbXBsZXRpb25IYW5kbGVyCiB7CiAgICAgaWYg KF9keW5hbWljVmlld3BvcnRVcGRhdGVNb2RlICE9IFdlYktpdDo6RHluYW1pY1ZpZXdwb3J0VXBk YXRlTW9kZTo6Tm90UmVzaXppbmcpIHsKICAgICAgICAgLy8gRGVmZXIgc25hcHNob3R0aW5nIHVu dGlsIGFmdGVyIHRoZSBjdXJyZW50IHJlc2l6ZSBjb21wbGV0ZXMuCi0gICAgICAgIF9jYWxsYmFj a3NEZWZlcnJlZER1cmluZ1Jlc2l6ZS5hcHBlbmQoW3JldGFpbmVkU2VsZiA9IHJldGFpblB0cihz ZWxmKSwgcmVjdEluVmlld0Nvb3JkaW5hdGVzLCBpbWFnZVdpZHRoLCBjb21wbGV0aW9uSGFuZGxl ciA9IG1ha2VCbG9ja1B0cihjb21wbGV0aW9uSGFuZGxlcildIHsKLSAgICAgICAgICAgIFtyZXRh aW5lZFNlbGYgX3NuYXBzaG90UmVjdDpyZWN0SW5WaWV3Q29vcmRpbmF0ZXMgaW50b0ltYWdlT2ZX aWR0aDppbWFnZVdpZHRoIGNvbXBsZXRpb25IYW5kbGVyOmNvbXBsZXRpb25IYW5kbGVyLmdldCgp XTsKKyAgICAgICAgX2NhbGxiYWNrc0RlZmVycmVkRHVyaW5nUmVzaXplLmFwcGVuZChbcmV0YWlu ZWRTZWxmID0gcmV0YWluUHRyKHNlbGYpLCBhZnRlclNjcmVlblVwZGF0ZXMsIHJlY3RJblZpZXdD b29yZGluYXRlcywgaW1hZ2VXaWR0aCwgY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIo Y29tcGxldGlvbkhhbmRsZXIpXSB7CisgICAgICAgICAgICBbcmV0YWluZWRTZWxmIF9zbmFwc2hv dFJlY3RBZnRlclNjcmVlblVwZGF0ZXM6YWZ0ZXJTY3JlZW5VcGRhdGVzIHJlY3RJblZpZXdDb29y ZGluYXRlczpyZWN0SW5WaWV3Q29vcmRpbmF0ZXMgaW50b0ltYWdlT2ZXaWR0aDppbWFnZVdpZHRo IGNvbXBsZXRpb25IYW5kbGVyOmNvbXBsZXRpb25IYW5kbGVyLmdldCgpXTsKICAgICAgICAgfSk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0zMjE5LDYgKzMyMTksOCBAQCBzdGF0aWMgV2Vi Q29yZTo6VXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbiB0b1VzZXJJbnRlcmZhY2VMYXlvdXRE aXJlY3Rpb24oVUlTZQogICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIobnVsbHB0cik7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KKyAgICAgICAgaWYgKGFmdGVyU2NyZWVuVXBk YXRlcykKKyAgICAgICAgICAgIFtDQVRyYW5zYWN0aW9uIHN5bmNocm9uaXplXTsKICAgICAgICAg Q0dGbG9hdCBpbWFnZVNjYWxlSW5WaWV3Q29vcmRpbmF0ZXMgPSBpbWFnZVdpZHRoIC8gcmVjdElu Vmlld0Nvb3JkaW5hdGVzLnNpemUud2lkdGg7CiAgICAgICAgIENBVHJhbnNmb3JtM0QgdHJhbnNm b3JtID0gQ0FUcmFuc2Zvcm0zRE1ha2VTY2FsZShpbWFnZVNjYWxlSW5WaWV3Q29vcmRpbmF0ZXMs IGltYWdlU2NhbGVJblZpZXdDb29yZGluYXRlcywgMSk7CiAgICAgICAgIHRyYW5zZm9ybSA9IENB VHJhbnNmb3JtM0RUcmFuc2xhdGUodHJhbnNmb3JtLCAtcmVjdEluVmlld0Nvb3JkaW5hdGVzLm9y aWdpbi54LCAtcmVjdEluVmlld0Nvb3JkaW5hdGVzLm9yaWdpbi55LCAwKTsKQEAgLTMyNjAsNiAr MzI2MiwxMSBAQCBzdGF0aWMgV2ViQ29yZTo6VXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbiB0 b1VzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb24oVUlTZQogICAgIH0pOwogfQogCistICh2b2lk KV9zbmFwc2hvdFJlY3Q6KENHUmVjdClyZWN0SW5WaWV3Q29vcmRpbmF0ZXMgaW50b0ltYWdlT2ZX aWR0aDooQ0dGbG9hdClpbWFnZVdpZHRoIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKENHSW1h Z2VSZWYpKWNvbXBsZXRpb25IYW5kbGVyCit7CisgICAgW3NlbGYgX3NuYXBzaG90UmVjdEFmdGVy U2NyZWVuVXBkYXRlczpOTyByZWN0SW5WaWV3Q29vcmRpbmF0ZXM6cmVjdEluVmlld0Nvb3JkaW5h dGVzIGludG9JbWFnZU9mV2lkdGg6aW1hZ2VXaWR0aCBjb21wbGV0aW9uSGFuZGxlcjpjb21wbGV0 aW9uSGFuZGxlcl07Cit9CisKIC0gKHZvaWQpX292ZXJyaWRlTGF5b3V0UGFyYW1ldGVyc1dpdGhN aW5pbXVtTGF5b3V0U2l6ZTooQ0dTaXplKW1pbmltdW1MYXlvdXRTaXplIG1heGltdW1Vbm9ic2N1 cmVkU2l6ZU92ZXJyaWRlOihDR1NpemUpbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGUKIHsK ICAgICBMT0dfV0lUSF9TVFJFQU0oVmlzaWJsZVJlY3RzLCBzdHJlYW0gPDwgIi1bV0tXZWJWaWV3 ICIgPDwgX3BhZ2UtPmlkZW50aWZpZXIoKSA8PCAiIF9vdmVycmlkZUxheW91dFBhcmFtZXRlcnNX aXRoTWluaW11bUxheW91dFNpemU6IiA8PCBXZWJDb3JlOjpGbG9hdFNpemUobWluaW11bUxheW91 dFNpemUpIDw8ICIgbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGU6IiA8PCBXZWJDb3JlOjpG bG9hdFNpemUobWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGUpIDw8ICJdIik7Cg==