217356 2020-10-05 17:45:27 -0700 MobileSafari crashes at WebCore: -[WebAVPlayerViewControllerDelegate playerViewControllerWillStartPictureInPicture:] 2020-10-05 22:32:21 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 peng.liu6 peng.liu6 achristensen ddkilzer eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1694977 0 peng.liu6 2020-10-05 17:45:27 -0700 MobileSafari crashes at WebCore: -[WebAVPlayerViewControllerDelegate playerViewControllerWillStartPictureInPicture:] 1694978 1 peng.liu6 2020-10-05 17:49:33 -0700 <rdar://66987917> 1694981 2 410596 peng.liu6 2020-10-05 17:53:56 -0700 Created attachment 410596 Patch 1694994 3 410596 achristensen 2020-10-05 18:48:24 -0700 Comment on attachment 410596 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410596&action=review > Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm:181 > } else return YES; 1695004 4 410596 peng.liu6 2020-10-05 19:30:28 -0700 Comment on attachment 410596 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410596&action=review >> Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm:181 >> } > > else > return YES; Yes! Will fix it. Thanks! 1695012 5 410604 peng.liu6 2020-10-05 20:20:04 -0700 Created attachment 410604 Patch for landing 1695034 6 ews-feeder 2020-10-05 22:32:21 -0700 Committed r268035: <https://trac.webkit.org/changeset/268035> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410604. 410596 2020-10-05 17:53:56 -0700 2020-10-05 18:48:24 -0700 Patch bug-217356-20201005175356.patch text/plain 5039 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MDA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWI1M2NkNTFiYzRhYzg2 NzU5MmFkMTI2NmIyNTFmYmJkNGZjMDQ1MC4uYjhkODdmYWJkMDE5NTJlMzJhMzFjZmI3N2U5NzZh ZDc0OTU2ZjFjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTEwLTA1ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgTW9iaWxlU2FmYXJpIGNyYXNo ZXMgYXQgV2ViQ29yZTogLVtXZWJBVlBsYXllclZpZXdDb250cm9sbGVyRGVsZWdhdGUgcGxheWVy Vmlld0NvbnRyb2xsZXJXaWxsU3RhcnRQaWN0dXJlSW5QaWN0dXJlOl0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzM1NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbmNlIHdlIHJlcGxhY2VkIHRoZSBS ZWZQdHIgb2YgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQgd2l0aCBhIFdlYWtQdHIgaW4K KyAgICAgICAgV2ViQVZQbGF5ZXJWaWV3Q29udHJvbGxlckRlbGVnYXRlIHRvIGZpeCBhIGxlYWsg aW4gcjI2MjE4NSwgc2VsZi5mdWxsc2NyZWVuSW50ZXJmYWNlCisgICAgICAgIGNvdWxkIGJlIE5V TEwgYW5kIHdlIG5lZWQgdG8gYWRkIE5VTEwgY2hlY2tzLgorCisgICAgICAgICogcGxhdGZvcm0v aW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoLVtXZWJBVlBs YXllclZpZXdDb250cm9sbGVyRGVsZWdhdGUgcGxheWVyVmlld0NvbnRyb2xsZXJXaWxsU3RhcnRQ aWN0dXJlSW5QaWN0dXJlOl0pOgorICAgICAgICAoLVtXZWJBVlBsYXllclZpZXdDb250cm9sbGVy RGVsZWdhdGUgcGxheWVyVmlld0NvbnRyb2xsZXJEaWRTdGFydFBpY3R1cmVJblBpY3R1cmU6XSk6 CisgICAgICAgICgtW1dlYkFWUGxheWVyVmlld0NvbnRyb2xsZXJEZWxlZ2F0ZSBwbGF5ZXJWaWV3 Q29udHJvbGxlcjpmYWlsZWRUb1N0YXJ0UGljdHVyZUluUGljdHVyZVdpdGhFcnJvcjpdKToKKyAg ICAgICAgKC1bV2ViQVZQbGF5ZXJWaWV3Q29udHJvbGxlckRlbGVnYXRlIHBsYXllclZpZXdDb250 cm9sbGVyV2lsbFN0b3BQaWN0dXJlSW5QaWN0dXJlOl0pOgorICAgICAgICAoLVtXZWJBVlBsYXll clZpZXdDb250cm9sbGVyRGVsZWdhdGUgcGxheWVyVmlld0NvbnRyb2xsZXJEaWRTdG9wUGljdHVy ZUluUGljdHVyZTpdKToKKyAgICAgICAgKC1bV2ViQVZQbGF5ZXJWaWV3Q29udHJvbGxlckRlbGVn YXRlIHBsYXllclZpZXdDb250cm9sbGVyOnNob3VsZEV4aXRGdWxsU2NyZWVuV2l0aFJlYXNvbjpd KToKKyAgICAgICAgKC1bV2ViQVZQbGF5ZXJWaWV3Q29udHJvbGxlckRlbGVnYXRlIHBsYXllclZp ZXdDb250cm9sbGVyOnJlc3RvcmVVc2VySW50ZXJmYWNlRm9yUGljdHVyZUluUGljdHVyZVN0b3BX aXRoQ29tcGxldGlvbkhhbmRsZXI6XSk6CisKIDIwMjAtMTAtMDUgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFZlY3Rvcml6ZSBsaW5lYXIgdG8gZGVj aWJlbHMgY29udmVyc2lvbiBpbiBSZWFsdGltZUFuYWx5c2VyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQu bW0KaW5kZXggZTIzOGExOGRiMDY0YzM3NDgyZTNmZGMxN2U1YWVkZTJhYjBhZWY0NS4uMmNmMTE4 YWQ4MDMyMjAyMjYyOWVmNzZiNDNiMzliODY2OGMwNjQ5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dC5tbQpAQCAtMTE4LDMyICsxMTgsMzcgQEAgc3RhdGljIGJvb2wgaWdub3JlV2F0Y2hkb2dGb3JE ZWJ1Z2dpbmcgPSBmYWxzZTsKIC0gKHZvaWQpcGxheWVyVmlld0NvbnRyb2xsZXJXaWxsU3RhcnRQ aWN0dXJlSW5QaWN0dXJlOihBVlBsYXllclZpZXdDb250cm9sbGVyICopcGxheWVyVmlld0NvbnRy b2xsZXIKIHsKICAgICBVTlVTRURfUEFSQU0ocGxheWVyVmlld0NvbnRyb2xsZXIpOwotICAgIHNl bGYuZnVsbHNjcmVlbkludGVyZmFjZS0+d2lsbFN0YXJ0UGljdHVyZUluUGljdHVyZSgpOworICAg IGlmIChzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UpCisgICAgICAgIHNlbGYuZnVsbHNjcmVlbklu dGVyZmFjZS0+d2lsbFN0YXJ0UGljdHVyZUluUGljdHVyZSgpOwogfQogCiAtICh2b2lkKXBsYXll clZpZXdDb250cm9sbGVyRGlkU3RhcnRQaWN0dXJlSW5QaWN0dXJlOihBVlBsYXllclZpZXdDb250 cm9sbGVyICopcGxheWVyVmlld0NvbnRyb2xsZXIKIHsKICAgICBVTlVTRURfUEFSQU0ocGxheWVy Vmlld0NvbnRyb2xsZXIpOwotICAgIHNlbGYuZnVsbHNjcmVlbkludGVyZmFjZS0+ZGlkU3RhcnRQ aWN0dXJlSW5QaWN0dXJlKCk7CisgICAgaWYgKHNlbGYuZnVsbHNjcmVlbkludGVyZmFjZSkKKyAg ICAgICAgc2VsZi5mdWxsc2NyZWVuSW50ZXJmYWNlLT5kaWRTdGFydFBpY3R1cmVJblBpY3R1cmUo KTsKIH0KIAogLSAodm9pZClwbGF5ZXJWaWV3Q29udHJvbGxlcjooQVZQbGF5ZXJWaWV3Q29udHJv bGxlciAqKXBsYXllclZpZXdDb250cm9sbGVyIGZhaWxlZFRvU3RhcnRQaWN0dXJlSW5QaWN0dXJl V2l0aEVycm9yOihOU0Vycm9yICopZXJyb3IKIHsKICAgICBVTlVTRURfUEFSQU0ocGxheWVyVmll d0NvbnRyb2xsZXIpOwogICAgIFVOVVNFRF9QQVJBTShlcnJvcik7Ci0gICAgc2VsZi5mdWxsc2Ny ZWVuSW50ZXJmYWNlLT5mYWlsZWRUb1N0YXJ0UGljdHVyZUluUGljdHVyZSgpOworICAgIGlmIChz ZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UpCisgICAgICAgIHNlbGYuZnVsbHNjcmVlbkludGVyZmFj ZS0+ZmFpbGVkVG9TdGFydFBpY3R1cmVJblBpY3R1cmUoKTsKIH0KIAogLSAodm9pZClwbGF5ZXJW aWV3Q29udHJvbGxlcldpbGxTdG9wUGljdHVyZUluUGljdHVyZTooQVZQbGF5ZXJWaWV3Q29udHJv bGxlciAqKXBsYXllclZpZXdDb250cm9sbGVyCiB7CiAgICAgVU5VU0VEX1BBUkFNKHBsYXllclZp ZXdDb250cm9sbGVyKTsKLSAgICBzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UtPndpbGxTdG9wUGlj dHVyZUluUGljdHVyZSgpOworICAgIGlmIChzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UpCisgICAg ICAgIHNlbGYuZnVsbHNjcmVlbkludGVyZmFjZS0+d2lsbFN0b3BQaWN0dXJlSW5QaWN0dXJlKCk7 CiB9CiAKIC0gKHZvaWQpcGxheWVyVmlld0NvbnRyb2xsZXJEaWRTdG9wUGljdHVyZUluUGljdHVy ZTooQVZQbGF5ZXJWaWV3Q29udHJvbGxlciAqKXBsYXllclZpZXdDb250cm9sbGVyCiB7CiAgICAg VU5VU0VEX1BBUkFNKHBsYXllclZpZXdDb250cm9sbGVyKTsKLSAgICBzZWxmLmZ1bGxzY3JlZW5J bnRlcmZhY2UtPmRpZFN0b3BQaWN0dXJlSW5QaWN0dXJlKCk7CisgICAgaWYgKHNlbGYuZnVsbHNj cmVlbkludGVyZmFjZSkKKyAgICAgICAgc2VsZi5mdWxsc2NyZWVuSW50ZXJmYWNlLT5kaWRTdG9w UGljdHVyZUluUGljdHVyZSgpOwogfQogCiAtIChCT09MKXBsYXllclZpZXdDb250cm9sbGVyU2hv dWxkQXV0b21hdGljYWxseURpc21pc3NBdFBpY3R1cmVJblBpY3R1cmVTdGFydDooQVZQbGF5ZXJW aWV3Q29udHJvbGxlciAqKXBsYXllclZpZXdDb250cm9sbGVyCkBAIC0xNzEsMTMgKzE3NiwxNSBA QCBzdGF0aWMgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OkV4aXRGdWxsU2NyZWVuUmVh c29uIGNvbnZlcnRUb0V4aXRGdWxsU2NyZQogLSAoQk9PTClwbGF5ZXJWaWV3Q29udHJvbGxlcjoo QVZQbGF5ZXJWaWV3Q29udHJvbGxlciAqKXBsYXllclZpZXdDb250cm9sbGVyIHNob3VsZEV4aXRG dWxsU2NyZWVuV2l0aFJlYXNvbjooQVZQbGF5ZXJWaWV3Q29udHJvbGxlckV4aXRGdWxsU2NyZWVu UmVhc29uKXJlYXNvbgogewogICAgIFVOVVNFRF9QQVJBTShwbGF5ZXJWaWV3Q29udHJvbGxlcik7 Ci0gICAgcmV0dXJuIHNlbGYuZnVsbHNjcmVlbkludGVyZmFjZS0+c2hvdWxkRXhpdEZ1bGxzY3Jl ZW5XaXRoUmVhc29uKGNvbnZlcnRUb0V4aXRGdWxsU2NyZWVuUmVhc29uKHJlYXNvbikpOworICAg IGlmIChzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UpCisgICAgICAgIHJldHVybiBzZWxmLmZ1bGxz Y3JlZW5JbnRlcmZhY2UtPnNob3VsZEV4aXRGdWxsc2NyZWVuV2l0aFJlYXNvbihjb252ZXJ0VG9F eGl0RnVsbFNjcmVlblJlYXNvbihyZWFzb24pKTsKIH0KIAogLSAodm9pZClwbGF5ZXJWaWV3Q29u dHJvbGxlcjooQVZQbGF5ZXJWaWV3Q29udHJvbGxlciAqKXBsYXllclZpZXdDb250cm9sbGVyIHJl c3RvcmVVc2VySW50ZXJmYWNlRm9yUGljdHVyZUluUGljdHVyZVN0b3BXaXRoQ29tcGxldGlvbkhh bmRsZXI6KHZvaWQgKF4pKEJPT0wgcmVzdG9yZWQpKWNvbXBsZXRpb25IYW5kbGVyCiB7CiAgICAg VU5VU0VEX1BBUkFNKHBsYXllclZpZXdDb250cm9sbGVyKTsKLSAgICBzZWxmLmZ1bGxzY3JlZW5J bnRlcmZhY2UtPnByZXBhcmVGb3JQaWN0dXJlSW5QaWN0dXJlU3RvcFdpdGhDb21wbGV0aW9uSGFu ZGxlcihjb21wbGV0aW9uSGFuZGxlcik7CisgICAgaWYgKHNlbGYuZnVsbHNjcmVlbkludGVyZmFj ZSkKKyAgICAgICAgc2VsZi5mdWxsc2NyZWVuSW50ZXJmYWNlLT5wcmVwYXJlRm9yUGljdHVyZUlu UGljdHVyZVN0b3BXaXRoQ29tcGxldGlvbkhhbmRsZXIoY29tcGxldGlvbkhhbmRsZXIpOwogfQog CiAtIChCT09MKXBsYXllclZpZXdDb250cm9sbGVyU2hvdWxkU3RhcnRQaWN0dXJlSW5QaWN0dXJl RnJvbUlubGluZVdoZW5FbnRlcmluZ0JhY2tncm91bmQ6KEFWUGxheWVyVmlld0NvbnRyb2xsZXIg KilwbGF5ZXJWaWV3Q29udHJvbGxlcgo= 410604 2020-10-05 20:20:04 -0700 2020-10-05 22:32:21 -0700 Patch for landing bug-217356-20201005202003.patch text/plain 4915 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2YxNjQwM2NkOTc2ZjM5 ZjhlYjQ2OGI5ZjE1OWM0ZWQ5YTRmMDU3Yi4uY2E0YjRiMzNiM2JjN2U1ZDIwMzhlOGU0NzZiNzIz MWI5NmJmY2IyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTEwLTA1ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgTW9iaWxlU2FmYXJpIGNyYXNo ZXMgYXQgV2ViQ29yZTogLVtXZWJBVlBsYXllclZpZXdDb250cm9sbGVyRGVsZWdhdGUgcGxheWVy Vmlld0NvbnRyb2xsZXJXaWxsU3RhcnRQaWN0dXJlSW5QaWN0dXJlOl0KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzM1NgorCisgICAgICAgIFJldmll d2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisKKyAgICAgICAgU2luY2Ugd2UgcmVwbGFjZWQgdGhl IFJlZlB0ciBvZiBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdCB3aXRoIGEgV2Vha1B0ciBp bgorICAgICAgICBXZWJBVlBsYXllclZpZXdDb250cm9sbGVyRGVsZWdhdGUgdG8gZml4IGEgbGVh ayBpbiByMjYyMTg1LCBzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UKKyAgICAgICAgY291bGQgYmUg TlVMTCBhbmQgd2UgbmVlZCB0byBhZGQgTlVMTCBjaGVja3MuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW06CisgICAgICAgICgtW1dlYkFW UGxheWVyVmlld0NvbnRyb2xsZXJEZWxlZ2F0ZSBwbGF5ZXJWaWV3Q29udHJvbGxlcldpbGxTdGFy dFBpY3R1cmVJblBpY3R1cmU6XSk6CisgICAgICAgICgtW1dlYkFWUGxheWVyVmlld0NvbnRyb2xs ZXJEZWxlZ2F0ZSBwbGF5ZXJWaWV3Q29udHJvbGxlckRpZFN0YXJ0UGljdHVyZUluUGljdHVyZTpd KToKKyAgICAgICAgKC1bV2ViQVZQbGF5ZXJWaWV3Q29udHJvbGxlckRlbGVnYXRlIHBsYXllclZp ZXdDb250cm9sbGVyOmZhaWxlZFRvU3RhcnRQaWN0dXJlSW5QaWN0dXJlV2l0aEVycm9yOl0pOgor ICAgICAgICAoLVtXZWJBVlBsYXllclZpZXdDb250cm9sbGVyRGVsZWdhdGUgcGxheWVyVmlld0Nv bnRyb2xsZXJXaWxsU3RvcFBpY3R1cmVJblBpY3R1cmU6XSk6CisgICAgICAgICgtW1dlYkFWUGxh eWVyVmlld0NvbnRyb2xsZXJEZWxlZ2F0ZSBwbGF5ZXJWaWV3Q29udHJvbGxlckRpZFN0b3BQaWN0 dXJlSW5QaWN0dXJlOl0pOgorICAgICAgICAoLVtXZWJBVlBsYXllclZpZXdDb250cm9sbGVyRGVs ZWdhdGUgcGxheWVyVmlld0NvbnRyb2xsZXI6c2hvdWxkRXhpdEZ1bGxTY3JlZW5XaXRoUmVhc29u Ol0pOgorICAgICAgICAoLVtXZWJBVlBsYXllclZpZXdDb250cm9sbGVyRGVsZWdhdGUgcGxheWVy Vmlld0NvbnRyb2xsZXI6cmVzdG9yZVVzZXJJbnRlcmZhY2VGb3JQaWN0dXJlSW5QaWN0dXJlU3Rv cFdpdGhDb21wbGV0aW9uSGFuZGxlcjpdKToKKwogMjAyMC0xMC0wNSAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEltcHJvdmVtZW50cyB0byBWZWN0b3JNYXRoIEFQ SQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCmluZGV4IGUyMzhhMThkYjA2NGMzNzQ4MmUzZmRjMTdl NWFlZGUyYWIwYWVmNDUuLmVhZjY3NDU3ZWQ5YTY5N2M5OWNhNWJmYTE3MGQzYzA3OTdlODllMzUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAgLTExOCwzMiArMTE4LDM3IEBAIHN0YXRpYyBi b29sIGlnbm9yZVdhdGNoZG9nRm9yRGVidWdnaW5nID0gZmFsc2U7CiAtICh2b2lkKXBsYXllclZp ZXdDb250cm9sbGVyV2lsbFN0YXJ0UGljdHVyZUluUGljdHVyZTooQVZQbGF5ZXJWaWV3Q29udHJv bGxlciAqKXBsYXllclZpZXdDb250cm9sbGVyCiB7CiAgICAgVU5VU0VEX1BBUkFNKHBsYXllclZp ZXdDb250cm9sbGVyKTsKLSAgICBzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UtPndpbGxTdGFydFBp Y3R1cmVJblBpY3R1cmUoKTsKKyAgICBpZiAoc2VsZi5mdWxsc2NyZWVuSW50ZXJmYWNlKQorICAg ICAgICBzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UtPndpbGxTdGFydFBpY3R1cmVJblBpY3R1cmUo KTsKIH0KIAogLSAodm9pZClwbGF5ZXJWaWV3Q29udHJvbGxlckRpZFN0YXJ0UGljdHVyZUluUGlj dHVyZTooQVZQbGF5ZXJWaWV3Q29udHJvbGxlciAqKXBsYXllclZpZXdDb250cm9sbGVyCiB7CiAg ICAgVU5VU0VEX1BBUkFNKHBsYXllclZpZXdDb250cm9sbGVyKTsKLSAgICBzZWxmLmZ1bGxzY3Jl ZW5JbnRlcmZhY2UtPmRpZFN0YXJ0UGljdHVyZUluUGljdHVyZSgpOworICAgIGlmIChzZWxmLmZ1 bGxzY3JlZW5JbnRlcmZhY2UpCisgICAgICAgIHNlbGYuZnVsbHNjcmVlbkludGVyZmFjZS0+ZGlk U3RhcnRQaWN0dXJlSW5QaWN0dXJlKCk7CiB9CiAKIC0gKHZvaWQpcGxheWVyVmlld0NvbnRyb2xs ZXI6KEFWUGxheWVyVmlld0NvbnRyb2xsZXIgKilwbGF5ZXJWaWV3Q29udHJvbGxlciBmYWlsZWRU b1N0YXJ0UGljdHVyZUluUGljdHVyZVdpdGhFcnJvcjooTlNFcnJvciAqKWVycm9yCiB7CiAgICAg VU5VU0VEX1BBUkFNKHBsYXllclZpZXdDb250cm9sbGVyKTsKICAgICBVTlVTRURfUEFSQU0oZXJy b3IpOwotICAgIHNlbGYuZnVsbHNjcmVlbkludGVyZmFjZS0+ZmFpbGVkVG9TdGFydFBpY3R1cmVJ blBpY3R1cmUoKTsKKyAgICBpZiAoc2VsZi5mdWxsc2NyZWVuSW50ZXJmYWNlKQorICAgICAgICBz ZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UtPmZhaWxlZFRvU3RhcnRQaWN0dXJlSW5QaWN0dXJlKCk7 CiB9CiAKIC0gKHZvaWQpcGxheWVyVmlld0NvbnRyb2xsZXJXaWxsU3RvcFBpY3R1cmVJblBpY3R1 cmU6KEFWUGxheWVyVmlld0NvbnRyb2xsZXIgKilwbGF5ZXJWaWV3Q29udHJvbGxlcgogewogICAg IFVOVVNFRF9QQVJBTShwbGF5ZXJWaWV3Q29udHJvbGxlcik7Ci0gICAgc2VsZi5mdWxsc2NyZWVu SW50ZXJmYWNlLT53aWxsU3RvcFBpY3R1cmVJblBpY3R1cmUoKTsKKyAgICBpZiAoc2VsZi5mdWxs c2NyZWVuSW50ZXJmYWNlKQorICAgICAgICBzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UtPndpbGxT dG9wUGljdHVyZUluUGljdHVyZSgpOwogfQogCiAtICh2b2lkKXBsYXllclZpZXdDb250cm9sbGVy RGlkU3RvcFBpY3R1cmVJblBpY3R1cmU6KEFWUGxheWVyVmlld0NvbnRyb2xsZXIgKilwbGF5ZXJW aWV3Q29udHJvbGxlcgogewogICAgIFVOVVNFRF9QQVJBTShwbGF5ZXJWaWV3Q29udHJvbGxlcik7 Ci0gICAgc2VsZi5mdWxsc2NyZWVuSW50ZXJmYWNlLT5kaWRTdG9wUGljdHVyZUluUGljdHVyZSgp OworICAgIGlmIChzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UpCisgICAgICAgIHNlbGYuZnVsbHNj cmVlbkludGVyZmFjZS0+ZGlkU3RvcFBpY3R1cmVJblBpY3R1cmUoKTsKIH0KIAogLSAoQk9PTClw bGF5ZXJWaWV3Q29udHJvbGxlclNob3VsZEF1dG9tYXRpY2FsbHlEaXNtaXNzQXRQaWN0dXJlSW5Q aWN0dXJlU3RhcnQ6KEFWUGxheWVyVmlld0NvbnRyb2xsZXIgKilwbGF5ZXJWaWV3Q29udHJvbGxl cgpAQCAtMTcxLDEzICsxNzYsMTcgQEAgc3RhdGljIFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0OjpFeGl0RnVsbFNjcmVlblJlYXNvbiBjb252ZXJ0VG9FeGl0RnVsbFNjcmUKIC0gKEJPT0wp cGxheWVyVmlld0NvbnRyb2xsZXI6KEFWUGxheWVyVmlld0NvbnRyb2xsZXIgKilwbGF5ZXJWaWV3 Q29udHJvbGxlciBzaG91bGRFeGl0RnVsbFNjcmVlbldpdGhSZWFzb246KEFWUGxheWVyVmlld0Nv bnRyb2xsZXJFeGl0RnVsbFNjcmVlblJlYXNvbilyZWFzb24KIHsKICAgICBVTlVTRURfUEFSQU0o cGxheWVyVmlld0NvbnRyb2xsZXIpOworICAgIGlmICghc2VsZi5mdWxsc2NyZWVuSW50ZXJmYWNl KQorICAgICAgICByZXR1cm4gWUVTOworCiAgICAgcmV0dXJuIHNlbGYuZnVsbHNjcmVlbkludGVy ZmFjZS0+c2hvdWxkRXhpdEZ1bGxzY3JlZW5XaXRoUmVhc29uKGNvbnZlcnRUb0V4aXRGdWxsU2Ny ZWVuUmVhc29uKHJlYXNvbikpOwogfQogCiAtICh2b2lkKXBsYXllclZpZXdDb250cm9sbGVyOihB VlBsYXllclZpZXdDb250cm9sbGVyICopcGxheWVyVmlld0NvbnRyb2xsZXIgcmVzdG9yZVVzZXJJ bnRlcmZhY2VGb3JQaWN0dXJlSW5QaWN0dXJlU3RvcFdpdGhDb21wbGV0aW9uSGFuZGxlcjoodm9p ZCAoXikoQk9PTCByZXN0b3JlZCkpY29tcGxldGlvbkhhbmRsZXIKIHsKICAgICBVTlVTRURfUEFS QU0ocGxheWVyVmlld0NvbnRyb2xsZXIpOwotICAgIHNlbGYuZnVsbHNjcmVlbkludGVyZmFjZS0+ cHJlcGFyZUZvclBpY3R1cmVJblBpY3R1cmVTdG9wV2l0aENvbXBsZXRpb25IYW5kbGVyKGNvbXBs ZXRpb25IYW5kbGVyKTsKKyAgICBpZiAoc2VsZi5mdWxsc2NyZWVuSW50ZXJmYWNlKQorICAgICAg ICBzZWxmLmZ1bGxzY3JlZW5JbnRlcmZhY2UtPnByZXBhcmVGb3JQaWN0dXJlSW5QaWN0dXJlU3Rv cFdpdGhDb21wbGV0aW9uSGFuZGxlcihjb21wbGV0aW9uSGFuZGxlcik7CiB9CiAKIC0gKEJPT0wp cGxheWVyVmlld0NvbnRyb2xsZXJTaG91bGRTdGFydFBpY3R1cmVJblBpY3R1cmVGcm9tSW5saW5l V2hlbkVudGVyaW5nQmFja2dyb3VuZDooQVZQbGF5ZXJWaWV3Q29udHJvbGxlciAqKXBsYXllclZp ZXdDb250cm9sbGVyCg==