214518 2020-07-18 05:20:18 -0700 REGRESSION(r264563): Broke the watchOS build 2020-07-18 05:26:43 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 214195 1 ysuzuki ysuzuki aakash_jain darin megan_gardner webkit-bug-importer oldest_to_newest 1672791 0 ysuzuki 2020-07-18 05:20:18 -0700 https://trac.webkit.org/changeset/264563 broke the build: Broke the watchOS build This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1672793 1 404641 ysuzuki 2020-07-18 05:20:24 -0700 Created attachment 404641 REVERT of r264563 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1672794 2 ews-feeder 2020-07-18 05:25:04 -0700 Committed r264567: <https://trac.webkit.org/changeset/264567> All reviewed patches have been landed. Closing bug and clearing flags on attachment 404641. 1672795 3 webkit-bug-importer 2020-07-18 05:26:17 -0700 <rdar://problem/65765678> 1672797 4 aakash_jain 2020-07-18 05:26:43 -0700 *** Bug 214517 has been marked as a duplicate of this bug. *** 404641 2020-07-18 05:20:24 -0700 2020-07-18 05:25:05 -0700 REVERT of r264563 bug-214518-20200718122023.patch text/plain 8551 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjA1NmEwNzljOTU0MmMw NGY0OWUyN2Q1MWU0ZWU0MDY0ZjQxMDEzNy4uZjkyNGNjZjE3YzA2MjY1NDNkY2EzMzg4MDJiMjQz ZDdkODAyMDJjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA3LTE4ICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByZXZlcnRpbmcgcjI2NDU2My4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNDUxOAorCisgICAgICAgIEJyb2tlIHRoZSB3YXRjaE9TIGJ1aWxkCisK KyAgICAgICAgUmV2ZXJ0ZWQgY2hhbmdlc2V0OgorCisgICAgICAgICJBZGQgT0sgYnV0dG9uIHRv IERhdGUvVGltZSBmb3JtIGNvbnRyb2xzLiIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxNDE5NQorICAgICAgICBodHRwczovL3RyYWMud2Via2l0Lm9y Zy9jaGFuZ2VzZXQvMjY0NTYzCisKIDIwMjAtMDctMTggIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlh LmNvbT4KIAogICAgICAgICBPbmx5IHVzZSBlbnVtIGNsYXNzZXMgaW4gSFRUUFBhcnNlcnMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKaW5kZXggM2NmMTJhYzQ3NWQwMWU4MGJjN2E5NDdiZDA1Mjk5NWYwMmVjYjE0Yi4uNTk2MmFk Zjc1MDBhZjEzYTJmZGY5ZjhhYTI5ZmQzOGZkYWEwOTI1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAyMC0wNy0xOCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+ CisKKyAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNjQ1NjMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ1MTgKKworICAgICAgICBCcm9r ZSB0aGUgd2F0Y2hPUyBidWlsZAorCisgICAgICAgIFJldmVydGVkIGNoYW5nZXNldDoKKworICAg ICAgICAiQWRkIE9LIGJ1dHRvbiB0byBEYXRlL1RpbWUgZm9ybSBjb250cm9scy4iCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQxOTUKKyAgICAgICAg aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzI2NDU2MworCiAyMDIwLTA3LTE4ICBS b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgT25seSB1c2UgZW51bSBjbGFz c2VzIGluIEhUVFBQYXJzZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lbi5scHJvai9M b2NhbGl6YWJsZS5zdHJpbmdzIGIvU291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9jYWxpemFibGUu c3RyaW5ncwppbmRleCA1ODYwMjkwYTk1ZWJlMTY5MDIzZmNhZjJiZmY4Y2RkMDk3Y2QwNjE3Li43 NzNkODRmNGYwN2Q2ZTM3ZmEyNDY5YTAxNTNiMTk2Y2Q3YzEwYTZiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2VuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MKQEAgLTU0NCw5ICs1NDQsNiBAQAogLyog T0sgYnV0dG9uIGxhYmVsIGluIGRvY3VtZW50IHBhc3N3b3JkIGZhaWx1cmUgYWxlcnQgKi8KICJP SyAoZG9jdW1lbnQgcGFzc3dvcmQgZmFpbHVyZSBhbGVydCkiID0gIk9LIjsKIAotLyogVGl0bGUg b2YgdGhlIE9LIGJ1dHRvbiBpbiBkYXRlL3RpbWUgZm9ybSBjb250cm9scy4gKi8KLSJPSyAoT0sg YnV0dG9uIHRpdGxlIGluIGRhdGUvdGltZSBwaWNrZXIpIiA9ICJPSyI7Ci0KIC8qIE1lbnUgaXRl bSBsYWJlbCBmb3IgdGhlIHRyYWNrIHRoYXQgcmVwcmVzZW50cyBkaXNhYmxpbmcgY2xvc2VkIGNh cHRpb25zICovCiAiT2ZmIiA9ICJPZmYiOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1Bs YXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lv cy9VSUtpdFNQSS5oCmluZGV4IDE3Njc1MGNmZTYxM2Y4NGFkNDI0NTExOWRjY2VjODYxNGI0N2Fh MzMuLjU4YzhjZjBiNzYyZDNjNjYxZjdhNmRmOWE1NTA4MDY3N2E4ZGE3Y2MgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCkBAIC0xMTc3LDcgKzExNzcsNiBAQCB0 eXBlZGVmIE5TX0VOVU0oTlNVSW50ZWdlciwgX1VJQ29udGV4dE1lbnVMYXlvdXQpIHsKIEBpbnRl cmZhY2UgVUlDb250ZXh0TWVudUludGVyYWN0aW9uICgpCiBAcHJvcGVydHkgKG5vbmF0b21pYywg cmVhZG9ubHkpIFVJR2VzdHVyZVJlY29nbml6ZXIgKmdlc3R1cmVSZWNvZ25pemVyRm9yRmFpbHVy ZVJlbGF0aW9uc2hpcHM7CiAtICh2b2lkKV9wcmVzZW50TWVudUF0TG9jYXRpb246KENHUG9pbnQp bG9jYXRpb247Ci0tICh2b2lkKWRpc21pc3NNZW51OwogQGVuZAogCiAjZW5kaWYgLy8gVVNFKFVJ Q09OVEVYVE1FTlUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9y bXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCmluZGV4IGQzOWYyMWQxMzc2NGQxM2E0 ZjMxNGFlYTU2MTEyMzI1ZWEzZGI0OGMuLjJjM2NlNzdhOTUxY2NhZGMyYTNjZWRhZTc1ZWQxYmJl Y2MyNGU1ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9X S0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCkBAIC0zNiw3ICszNiw2IEBACiAjaW1w b3J0IDxVSUtpdC9VSUJhckJ1dHRvbkl0ZW0uaD4KICNpbXBvcnQgPFVJS2l0L1VJRGF0ZVBpY2tl ci5oPgogI2ltcG9ydCA8V2ViQ29yZS9Mb2NhbGl6ZWRTdHJpbmdzLmg+Ci0jaW1wb3J0IDxhbGdv cml0aG0+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJL aXQ7CkBAIC03NywxNyArNzYsMTUgQEAgQGltcGxlbWVudGF0aW9uIFdLRGF0ZVRpbWVDb250ZXh0 TWVudVZpZXdDb250cm9sbGVyCiAtIChDR1NpemUpcHJlZmVycmVkQ29udGVudFNpemUKIHsKICAg ICAvLyBGSVhNRTogV29ya2Fyb3VuZCwgc2hvdWxkIGJlIGFibGUgdG8gYmUgcmVhZGRyZXNzZWQg YWZ0ZXIgPHJkYXI6Ly9wcm9ibGVtLzY0MTQzNTM0PgotICAgIFVJVmlldyAqdmlldyA9IHNlbGYu dmlldy5zdWJ2aWV3c1swXTsKKyAgICBVSVZpZXcgKnZpZXcgPSBzZWxmLnZpZXc7CiAgICAgaWYg KFVJRWRnZUluc2V0c0VxdWFsVG9FZGdlSW5zZXRzKHZpZXcubGF5b3V0TWFyZ2lucywgVUlFZGdl SW5zZXRzWmVybykpIHsKICAgICAgICAgdmlldy50cmFuc2xhdGVzQXV0b3Jlc2l6aW5nTWFza0lu dG9Db25zdHJhaW50cyA9IE5POwogICAgICAgICBbdmlldyBsYXlvdXRJZk5lZWRlZF07CiAgICAg ICAgIHZpZXcudHJhbnNsYXRlc0F1dG9yZXNpemluZ01hc2tJbnRvQ29uc3RyYWludHMgPSBZRVM7 CiAgICAgICAgIHZpZXcubGF5b3V0TWFyZ2lucyA9IFVJRWRnZUluc2V0c01ha2UoMTYsIDE2LCAx NiwgMTYpOwogICAgIH0KLSAgICBhdXRvIHNpemUgPSBbdmlldyBzeXN0ZW1MYXlvdXRTaXplRml0 dGluZ1NpemU6VUlMYXlvdXRGaXR0aW5nQ29tcHJlc3NlZFNpemVdOwotICAgIAotICAgIHNpemUu d2lkdGggPSBzdGQ6Om1heChzaXplLndpZHRoLCAyNTAuMCk7Ci0gICAgcmV0dXJuIHNpemU7CisK KyAgICByZXR1cm4gW3ZpZXcgc3lzdGVtTGF5b3V0U2l6ZUZpdHRpbmdTaXplOlVJTGF5b3V0Rml0 dGluZ0NvbXByZXNzZWRTaXplXTsKIH0KIAogQGVuZApAQCAtMTcxLDMwICsxNjgsMTUgQEAgLSAo VUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNv bnRleHRNZW51SW50ZXJhY3Rpb24KICAgICAgICAgW192aWV3Q29udHJvbGxlciBzZXRWaWV3Om5p bF07CiAgICAgICAgIF92aWV3Q29udHJvbGxlciA9IGFkb3B0TlMoW1tXS0RhdGVUaW1lQ29udGV4 dE1lbnVWaWV3Q29udHJvbGxlciBhbGxvY10gaW5pdF0pOwogICAgICAgICBSZXRhaW5QdHI8VUlO YXZpZ2F0aW9uQ29udHJvbGxlcj4gbmF2aWdhdGlvbkNvbnRyb2xsZXIgPSBhZG9wdE5TKFtbVUlO YXZpZ2F0aW9uQ29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhSb290Vmlld0NvbnRyb2xsZXI6X3Zp ZXdDb250cm9sbGVyLmdldCgpXSk7Ci0gICAgICAgIAogICAgICAgICBOU1N0cmluZyAqcmVzZXRT dHJpbmcgPSBXRUJfVUlfU1RSSU5HX0tFWSgiUmVzZXQiLCAiUmVzZXQgQnV0dG9uIERhdGUvVGlt ZSBDb250ZXh0IE1lbnUiLCAiUmVzZXQgYnV0dG9uIGluIGRhdGUgaW5wdXQgY29udGV4dCBtZW51 Iik7Ci0gICAgICAgIE5TU3RyaW5nICpva1N0cmluZyA9IFdFQl9VSV9TVFJJTkdfS0VZKCJPSyIs ICJPSyAoT0sgYnV0dG9uIHRpdGxlIGluIGRhdGUvdGltZSBwaWNrZXIpIiwgIlRpdGxlIG9mIHRo ZSBPSyBidXR0b24gaW4gZGF0ZS90aW1lIGZvcm0gY29udHJvbHMuIik7CiAKLSAgICAgICAgUmV0 YWluUHRyPFVJQmFyQnV0dG9uSXRlbT4gb2tCYXJCdXR0b24gPSBhZG9wdE5TKFtbVUlCYXJCdXR0 b25JdGVtIGFsbG9jXSBpbml0V2l0aFRpdGxlOm9rU3RyaW5nIHN0eWxlOlVJQmFyQnV0dG9uSXRl bVN0eWxlRG9uZSB0YXJnZXQ6c2VsZiBhY3Rpb246QHNlbGVjdG9yKG9rOildKTsKICAgICAgICAg UmV0YWluUHRyPFVJQmFyQnV0dG9uSXRlbT4gYmxhbmtCYXJCdXR0b24gPSBhZG9wdE5TKFtbVUlC YXJCdXR0b25JdGVtIGFsbG9jXSBpbml0V2l0aEJhckJ1dHRvblN5c3RlbUl0ZW06VUlCYXJCdXR0 b25TeXN0ZW1JdGVtRmxleGlibGVTcGFjZSB0YXJnZXQ6bmlsIGFjdGlvbjpuaWxdKTsKICAgICAg ICAgUmV0YWluUHRyPFVJQmFyQnV0dG9uSXRlbT4gcmVzZXRCYXJCdXR0b24gPSBhZG9wdE5TKFtb VUlCYXJCdXR0b25JdGVtIGFsbG9jXSBpbml0V2l0aFRpdGxlOnJlc2V0U3RyaW5nIHN0eWxlOlVJ QmFyQnV0dG9uSXRlbVN0eWxlUGxhaW4gdGFyZ2V0OnNlbGYgYWN0aW9uOkBzZWxlY3RvcihyZXNl dDopXSk7CiAgICAgICAgIAotICAgICAgICBbX3ZpZXdDb250cm9sbGVyIHNldFRvb2xiYXJJdGVt czpAW3Jlc2V0QmFyQnV0dG9uLmdldCgpLCBibGFua0JhckJ1dHRvbi5nZXQoKSwgb2tCYXJCdXR0 b24uZ2V0KCldXTsKKyAgICAgICAgW192aWV3Q29udHJvbGxlciBzZXRUb29sYmFySXRlbXM6QFti bGFua0JhckJ1dHRvbi5nZXQoKSwgcmVzZXRCYXJCdXR0b24uZ2V0KCldXTsKICAgICAgICAgW25h dmlnYXRpb25Db250cm9sbGVyIHNldFRvb2xiYXJIaWRkZW46Tk9dOwotICAgICAgICAKLSAgICAg ICAgYXV0byBjZW50ZXJpbmdWaWV3ID0gYWRvcHROUyhbW1VJVmlldyBhbGxvY10gaW5pdF0pOwot ICAgICAgICAKLSAgICAgICAgW2NlbnRlcmluZ1ZpZXcgYWRkU3VidmlldzpfZGF0ZVBpY2tlci5n ZXQoKV07Ci0gICAgICAgIAotICAgICAgICBfZGF0ZVBpY2tlci5nZXQoKS50cmFuc2xhdGVzQXV0 b3Jlc2l6aW5nTWFza0ludG9Db25zdHJhaW50cyA9IE5POwotICAgICAgICBhdXRvIHdpZHRoQ29u c3RyYWludCA9IFtbY2VudGVyaW5nVmlldyB3aWR0aEFuY2hvcl0gY29uc3RyYWludEdyZWF0ZXJU aGFuT3JFcXVhbFRvQW5jaG9yOltfZGF0ZVBpY2tlciB3aWR0aEFuY2hvcl1dOwotICAgICAgICBh dXRvIGhlaWdodENvbnN0cmFpbnQgPSBbW2NlbnRlcmluZ1ZpZXcgaGVpZ2h0QW5jaG9yXSBjb25z dHJhaW50RXF1YWxUb0FuY2hvcjpbX2RhdGVQaWNrZXIgaGVpZ2h0QW5jaG9yXV07Ci0gICAgICAg IGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnQgPSBbW2NlbnRlcmluZ1ZpZXcgY2VudGVyWEFuY2hv cl0gY29uc3RyYWludEVxdWFsVG9BbmNob3I6W19kYXRlUGlja2VyIGNlbnRlclhBbmNob3JdXTsK LSAgICAgICAgYXV0byB2ZXJ0aWNhbENvbnN0cmFpbnQgPSBbW2NlbnRlcmluZ1ZpZXcgY2VudGVy WUFuY2hvcl0gY29uc3RyYWludEVxdWFsVG9BbmNob3I6W19kYXRlUGlja2VyIGNlbnRlcllBbmNo b3JdXTsKIAotICAgICAgICBbTlNMYXlvdXRDb25zdHJhaW50IGFjdGl2YXRlQ29uc3RyYWludHM6 QFt2ZXJ0aWNhbENvbnN0cmFpbnQsIGhvcml6b250YWxDb25zdHJhaW50LCB3aWR0aENvbnN0cmFp bnQsIGhlaWdodENvbnN0cmFpbnRdXTsKLQotICAgICAgICBbX3ZpZXdDb250cm9sbGVyIHNldFZp ZXc6Y2VudGVyaW5nVmlldy5nZXQoKV07CisgICAgICAgIFtfdmlld0NvbnRyb2xsZXIgc2V0Vmll dzpfZGF0ZVBpY2tlci5nZXQoKV07CiAKICAgICAgICAgTlNTdHJpbmcgKnRpdGxlVGV4dCA9IF92 aWV3LmlucHV0TGFiZWxUZXh0OwogICAgICAgICBpZiAoIVt0aXRsZVRleHQgaXNFcXVhbDpAIiJd KSB7CkBAIC0yMDgsMTAgKzE5MCwxMCBAQCAtIChVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAq KWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbgogICAgICAg ICB9IGVsc2UKICAgICAgICAgICAgIFtuYXZpZ2F0aW9uQ29udHJvbGxlciBzZXROYXZpZ2F0aW9u QmFySGlkZGVuOllFUyBhbmltYXRlZDpOT107CiAgICAgICAgIAorICAgICAgICBbbmF2aWdhdGlv bkNvbnRyb2xsZXIgbmF2aWdhdGlvbkJhcl0uYmFja2dyb3VuZENvbG9yID0gVUlDb2xvci5jbGVh ckNvbG9yOwogICAgICAgICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIgbmF2aWdhdGlvbkJhcl0udHJh bnNsdWNlbnQgPSBOTzsKLSAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIG5hdmlnYXRpb25C YXJdLmJhclRpbnRDb2xvciA9IFtVSUNvbG9yIHN5c3RlbUJhY2tncm91bmRDb2xvcl07CisgICAg ICAgIFtuYXZpZ2F0aW9uQ29udHJvbGxlciB0b29sYmFyXS5iYWNrZ3JvdW5kQ29sb3IgPSBVSUNv bG9yLmNsZWFyQ29sb3I7CiAgICAgICAgIFtuYXZpZ2F0aW9uQ29udHJvbGxlciB0b29sYmFyXS50 cmFuc2x1Y2VudCA9IE5POwotICAgICAgICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIgdG9vbGJhcl0u YmFyVGludENvbG9yID0gW1VJQ29sb3Igc3lzdGVtQmFja2dyb3VuZENvbG9yXTsKICAgICAgICAg cmV0dXJuIG5hdmlnYXRpb25Db250cm9sbGVyLmdldCgpOwogICAgIH0gYWN0aW9uUHJvdmlkZXI6 bmlsXTsKIH0KQEAgLTIyMCw4ICsyMDIsNyBAQCAtICh2b2lkKWNvbnRleHRNZW51SW50ZXJhY3Rp b246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHdpbGxEaXNwbAogewog ICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOlt3ZWFrU2VsZiA9IFdlYWtPYmpDUHRyPFdLRGF0 ZVRpbWVQaWNrZXI+KHNlbGYpXSB7CiAgICAgICAgIGF1dG8gc3Ryb25nU2VsZiA9IHdlYWtTZWxm LmdldCgpOwotICAgICAgICBpZiAoc3Ryb25nU2VsZikKLSAgICAgICAgICAgIFtzdHJvbmdTZWxm LT5fdmlldy53ZWJWaWV3IF9kaWRTaG93Q29udGV4dE1lbnVdOworICAgICAgICBbc3Ryb25nU2Vs Zi0+X3ZpZXcud2ViVmlldyBfZGlkU2hvd0NvbnRleHRNZW51XTsKICAgICB9XTsKIH0KIApAQCAt MjI5LDEwICsyMTAsOCBAQCAtICh2b2lkKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4 dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHdpbGxFbmRGbwogewogICAgIFthbmltYXRv ciBhZGRDb21wbGV0aW9uOlt3ZWFrU2VsZiA9IFdlYWtPYmpDUHRyPFdLRGF0ZVRpbWVQaWNrZXI+ KHNlbGYpXSB7CiAgICAgICAgIGF1dG8gc3Ryb25nU2VsZiA9IHdlYWtTZWxmLmdldCgpOwotICAg ICAgICBpZiAoc3Ryb25nU2VsZikgewotICAgICAgICAgICAgW3N0cm9uZ1NlbGYtPl92aWV3IGFj Y2Vzc29yeURvbmVdOwotICAgICAgICAgICAgW3N0cm9uZ1NlbGYtPl92aWV3LndlYlZpZXcgX2Rp ZERpc21pc3NDb250ZXh0TWVudV07Ci0gICAgICAgIH0KKyAgICAgICAgW3N0cm9uZ1NlbGYtPl92 aWV3IGFjY2Vzc29yeURvbmVdOworICAgICAgICBbc3Ryb25nU2VsZi0+X3ZpZXcud2ViVmlldyBf ZGlkRGlzbWlzc0NvbnRleHRNZW51XTsKICAgICB9XTsKIH0KIApAQCAtMjcwLDEzICsyNDksNiBA QCAtICh2b2lkKXJlc2V0OihpZClzZW5kZXIKICAgICBbX3ZpZXcgcGFnZV0tPnNldEZvY3VzZWRF bGVtZW50VmFsdWUoU3RyaW5nKCkpOwogfQogCi0tICh2b2lkKW9rOihpZClzZW5kZXIKLXsKLSNp ZiBVU0UoVUlDT05URVhUTUVOVSkKLSAgICBbX2RhdGVUaW1lQ29udGV4dE1lbnVJbnRlcmFjdGlv biBkaXNtaXNzTWVudV07Ci0jZW5kaWYKLX0KLQogLSAoTlNTdHJpbmcgKiljYWxlbmRhclR5cGUK IHsKICAgICByZXR1cm4gW19kYXRlUGlja2VyIGNhbGVuZGFyXS5jYWxlbmRhcklkZW50aWZpZXI7 Cg==