181218 2018-01-02 12:30:55 -0800 Fix the build on platforms where UICurrentUserInterfaceIdiomIsPad is defined to false 2018-01-02 13:18:53 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton achristensen aestes commit-queue ews-watchlist sam webkit-bug-importer wenson_hsieh oldest_to_newest 1385194 0 thorton 2018-01-02 12:30:55 -0800 Fix the build on platforms where UICurrentUserInterfaceIdiomIsPad is defined to false 1385195 1 330328 thorton 2018-01-02 12:31:17 -0800 Created attachment 330328 Patch 1385196 2 thorton 2018-01-02 12:32:19 -0800 Someone might have some idea about a better way. I started with #pragma disabling the warning, but it was in a lot of places which is kind of annoying. 1385197 3 ews-watchlist 2018-01-02 12:33:52 -0800 Attachment 330328 did not pass style-queue: ERROR: Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1158: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1385221 4 330328 commit-queue 2018-01-02 13:06:49 -0800 Comment on attachment 330328 Patch Clearing flags on attachment: 330328 Committed r226335: <https://trac.webkit.org/changeset/226335> 1385222 5 commit-queue 2018-01-02 13:06:51 -0800 All reviewed patches have been landed. Closing bug. 1385237 6 webkit-bug-importer 2018-01-02 13:18:53 -0800 <rdar://problem/36261392> 330328 2018-01-02 12:31:17 -0800 2018-01-02 13:06:49 -0800 Patch bug-181218-20180102123116.patch text/plain 11237 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2MzI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYwMjc0OTA5M2NlNDVhMmY1 OGFiZjIzOTE1YjAyNWI2YjI2MjgxN2YuLmJjYmM4NDc0ZGQyYWE0OTYwOGM0MDViYzM4ZDM2ZjA2 ZTBkMzIzNjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMDEtMDIgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IHRoZSBidWlsZCBv biBwbGF0Zm9ybXMgd2hlcmUgVUlDdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQgaXMgZGVm aW5lZCB0byBmYWxzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTgxMjE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmg6CisgICAgICAgIChjdXJyZW50VXNl ckludGVyZmFjZUlkaW9tSXNQYWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvU21hcnRNYWdu aWZpY2F0aW9uQ29udHJvbGxlci5tbToKKyAgICAgICAgKFdlYktpdDo6U21hcnRNYWduaWZpY2F0 aW9uQ29udHJvbGxlcjo6ZGlkQ29sbGVjdEdlb21ldHJ5Rm9yU21hcnRNYWduaWZpY2F0aW9uR2Vz dHVyZSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW06CisgICAgICAgICgtW1dLRm9ybUlucHV0U2Vzc2lvbiBzZXRBY2Nlc3NvcnlWaWV3Q3VzdG9t QnV0dG9uVGl0bGU6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3JlcXVpcmVzS2V5Ym9h cmRXaGVuRmlyc3RSZXNwb25kZXJdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZGlzcGxh eUZvcm1Ob2RlSW5wdXRWaWV3XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgcmVxdWlyZXNB Y2Nlc3NvcnlWaWV3XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3VwZGF0ZUFjY2Vzc29y eV0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tBaXJQbGF5Um91dGVQaWNrZXIu bW06CisgICAgICAgICgtW1dLQWlyUGxheVJvdXRlUGlja2VyIHNob3c6ZnJvbVJlY3Q6XSk6Cisg ICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbToKKyAgICAg ICAgKC1bV0tGaWxlVXBsb2FkUGFuZWwgX3Nob3dQaG90b1BpY2tlcldpdGhTb3VyY2VUeXBlOl0p OgorICAgICAgICAoLVtXS0ZpbGVVcGxvYWRQYW5lbCBfcHJlc2VudE1lbnVPcHRpb25Gb3JDdXJy ZW50SW50ZXJmYWNlSWRpb206XSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zv cm1JbnB1dENvbnRyb2wubW06CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNrZXIgaW5pdFdpdGhW aWV3OmRhdGVQaWNrZXJNb2RlOl0pOgorICAgICAgICAoLVtXS0Zvcm1JbnB1dENvbnRyb2wgaW5p dFdpdGhWaWV3Ol0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0 Q29udHJvbC5tbToKKyAgICAgICAgKC1bV0tGb3JtU2VsZWN0Q29udHJvbCBpbml0V2l0aFZpZXc6 XSk6CisgICAgICAgIE9uIHBsYXRmb3JtcyB3aGVyZSBVSUN1cnJlbnRVc2VySW50ZXJmYWNlSWRp b21Jc1BhZCBpcyBkZWZpbmVkIHRvIGZhbHNlLAorICAgICAgICBibG9ja3MgdGhhdCBjb25kaXRp b25hbGx5IGV4ZWN1dGUgYmFzZWQgb24gaXRzIHZhbHVlIGFyZSB1bnJlYWNoYWJsZS4KKyAgICAg ICAgVGhpcyBjYXVzZXMgdGhlIGNvbXBpbGVyIHRvIGNvbXBsYWluLiBIaWRlIGl0IGF3YXkgaW5z aWRlIGFuIGlubGluZSBmdW5jdGlvbgorICAgICAgICBhbmQgbWFrZSB1c2Ugb2YgdGhhdCBldmVy eXdoZXJlIHdlIHVzZWQgdG8gdXNlIHRoZSBtYWNyby4KKwogMjAxOC0wMS0wMiAgTWljaGFlbCBD YXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV1bR1RLXSBJ bXBsZW1lbnQgdGhlIGFzc2lnbm1lbnQgb2YgUHJvY2Vzc0lkZW50aWZpZXJzIHRvIGNoaWxkIHBy b2Nlc3NlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0 U1BJLmggYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaAppbmRleCBm ZDUwZWM3OGZhMWNkOTE2MWYxNzliNmYwNjZlYjBiNTBlZGZjMzg4Li5jYjIwNTk5YTc3ZWMyYTll OTZlNjQ0N2ZmZTg2MjRlZjc3MTc4YjAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRm b3JtL3NwaS9pb3MvVUlLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9p b3MvVUlLaXRTUEkuaApAQCAtMTY4LDggKzE2OCw2IEBAIHR5cGVkZWYgTlNfRU5VTShOU0ludGVn ZXIsIFVJRGF0ZVBpY2tlclByaXZhdGVNb2RlKSAgewogQHByb3BlcnR5IChub25hdG9taWMsIHJl YWRvbmx5LCBnZXR0ZXI9X2NvbnRlbnRXaWR0aCkgQ0dGbG9hdCBjb250ZW50V2lkdGg7CiBAZW5k CiAKLSNkZWZpbmUgVUlDdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKSAoW1tVSURldmlj ZSBjdXJyZW50RGV2aWNlXSB1c2VySW50ZXJmYWNlSWRpb21dID09IFVJVXNlckludGVyZmFjZUlk aW9tUGFkKQotCiBAaW50ZXJmYWNlIFVJRGV2aWNlICgpCiBAcHJvcGVydHkgKG5vbmF0b21pYywg cmVhZG9ubHksIHJldGFpbikgTlNTdHJpbmcgKmJ1aWxkVmVyc2lvbjsKIEBlbmQKQEAgLTk4MSw2 ICs5NzksMTggQEAgdHlwZWRlZiBOU19PUFRJT05TKE5TVUludGVnZXIsIFVJRHJhZ09wZXJhdGlv bikKIEBlbmQKICNlbmRpZgogCitzdGF0aWMgaW5saW5lIGJvb2wgY3VycmVudFVzZXJJbnRlcmZh Y2VJZGlvbUlzUGFkKCkKK3sKKyAgICAvLyBUaGlzIGlubGluZSBmdW5jdGlvbiBleGlzdHMgdG8g dGh3YXJ0IHVucmVhY2hhYmxlIGNvZGUKKyAgICAvLyBkZXRlY3Rpb24gb24gcGxhdGZvcm1zIHdo ZXJlIFVJQ3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkCisgICAgLy8gaXMgZGVmaW5lZCBk aXJlY3RseSB0byBmYWxzZS4KKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQorICAgIHJldHVy biBVSUN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCgpOworI2Vsc2UKKyAgICByZXR1cm4g W1tVSURldmljZSBjdXJyZW50RGV2aWNlXSB1c2VySW50ZXJmYWNlSWRpb21dID09IFVJVXNlcklu dGVyZmFjZUlkaW9tUGFkOworI2VuZGlmCit9CisKIFdURl9FWFRFUk5fQ19CRUdJTgogCiBCT09M IFVJS2V5Ym9hcmRFbmFibGVkSW5wdXRNb2Rlc0FsbG93T25lVG9NYW55U2hvcnRjdXRzKHZvaWQp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1NtYXJ0TWFnbmlmaWNh dGlvbkNvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvU21hcnRNYWdu aWZpY2F0aW9uQ29udHJvbGxlci5tbQppbmRleCAwNmQ3NTA2ZTRjNzc5ZjliZWJlNDUyNTAyMmQ0 ODY2NWViMDhlZmRjLi45ZGI4YzM0ZmFjNGNiMWI0MjllMGU2YjVlNDFiOGE1ZTI5Mzc5YTgwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvU21hcnRNYWduaWZpY2F0aW9u Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvU21hcnRNYWdu aWZpY2F0aW9uQ29udHJvbGxlci5tbQpAQCAtMTA3LDcgKzEwNyw3IEBAIHZvaWQgU21hcnRNYWdu aWZpY2F0aW9uQ29udHJvbGxlcjo6ZGlkQ29sbGVjdEdlb21ldHJ5Rm9yU21hcnRNYWduaWZpY2F0 aW9uR2VzdHVyCiAgICAgZmxvYXQgbWluaW11bVNjcm9sbERpc3RhbmNlOwogICAgIGlmIChbbV9j b250ZW50VmlldyBib3VuZHNdLnNpemUud2lkdGggPD0gbV93ZWJQYWdlUHJveHkudW5vYnNjdXJl ZENvbnRlbnRSZWN0KCkud2lkdGgoKSkKICAgICAgICAgbWluaW11bVNjcm9sbERpc3RhbmNlID0g c21hcnRNYWduaWZpY2F0aW9uUGFuU2Nyb2xsVGhyZXNob2xkWm9vbWVkT3V0OwotICAgIGVsc2Ug aWYgKFVJQ3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkpCisgICAgZWxzZSBpZiAoY3Vy cmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkpCiAgICAgICAgIG1pbmltdW1TY3JvbGxEaXN0 YW5jZSA9IHNtYXJ0TWFnbmlmaWNhdGlvblBhblNjcm9sbFRocmVzaG9sZElQYWQ7CiAgICAgZWxz ZQogICAgICAgICBtaW5pbXVtU2Nyb2xsRGlzdGFuY2UgPSBzbWFydE1hZ25pZmljYXRpb25QYW5T Y3JvbGxUaHJlc2hvbGRJUGhvbmU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCAxNTE0OTk2MzQ0MWJhYWMz OTY4YzQ2MWEzZTM2NjQ5NDI2YzE5NDYxLi5mNzVlZDI1NmIzMTIzZTk3OGI4YWFlNzhhNTg5YmIx N2JhNmI1YWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTMxMCw3ICszMTAsNyBAQCAtICh2b2lkKXNl dEFjY2Vzc29yeVZpZXdDdXN0b21CdXR0b25UaXRsZTooTlNTdHJpbmcgKil0aXRsZQogICAgICAg ICBbW19jb250ZW50VmlldyBmb3JtQWNjZXNzb3J5Vmlld10gc2hvd0F1dG9GaWxsQnV0dG9uV2l0 aFRpdGxlOnRpdGxlXTsKICAgICBlbHNlCiAgICAgICAgIFtbX2NvbnRlbnRWaWV3IGZvcm1BY2Nl c3NvcnlWaWV3XSBoaWRlQXV0b0ZpbGxCdXR0b25dOwotICAgIGlmIChVSUN1cnJlbnRVc2VySW50 ZXJmYWNlSWRpb21Jc1BhZCgpKQorICAgIGlmIChjdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQ YWQoKSkKICAgICAgICAgW19jb250ZW50VmlldyByZWxvYWRJbnB1dFZpZXdzXTsKIH0KIApAQCAt MTEyOCwxMiArMTEyOCwxMiBAQCAtIChCT09MKV9yZXF1aXJlc0tleWJvYXJkV2hlbkZpcnN0UmVz cG9uZGVyCiAgICAgY2FzZSBJbnB1dFR5cGU6Ok5vbmU6CiAgICAgICAgIHJldHVybiBOTzsKICAg ICBjYXNlIElucHV0VHlwZTo6U2VsZWN0OgotICAgICAgICByZXR1cm4gIVVJQ3VycmVudFVzZXJJ bnRlcmZhY2VJZGlvbUlzUGFkKCk7CisgICAgICAgIHJldHVybiAhY3VycmVudFVzZXJJbnRlcmZh Y2VJZGlvbUlzUGFkKCk7CiAgICAgY2FzZSBJbnB1dFR5cGU6OkRhdGU6CiAgICAgY2FzZSBJbnB1 dFR5cGU6Ok1vbnRoOgogICAgIGNhc2UgSW5wdXRUeXBlOjpEYXRlVGltZUxvY2FsOgogICAgIGNh c2UgSW5wdXRUeXBlOjpUaW1lOgotICAgICAgICByZXR1cm4gIVVJQ3VycmVudFVzZXJJbnRlcmZh Y2VJZGlvbUlzUGFkKCk7CisgICAgICAgIHJldHVybiAhY3VycmVudFVzZXJJbnRlcmZhY2VJZGlv bUlzUGFkKCk7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuICFfYXNzaXN0ZWROb2RlSW5m b3JtYXRpb24uaXNSZWFkT25seTsKICAgICB9CkBAIC0xMTU1LDcgKzExNTUsNyBAQCAtICh2b2lk KV9kaXNwbGF5Rm9ybU5vZGVJbnB1dFZpZXcKICAgICAgICAgICAgICAgICAgIGZvbnRTaXplOl9h c3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5ub2RlRm9udFNpemUKICAgICAgICAgICAgICAgbWluaW11 bVNjYWxlOl9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5taW5pbXVtU2NhbGVGYWN0b3IKICAgICAg ICAgICAgICAgbWF4aW11bVNjYWxlOl9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5tYXhpbXVtU2Nh bGVGYWN0b3JJZ25vcmluZ0Fsd2F5c1NjYWxhYmxlCi0gICAgICAgICAgICAgIGFsbG93U2NhbGlu ZzooX2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmFsbG93c1VzZXJTY2FsaW5nSWdub3JpbmdBbHdh eXNTY2FsYWJsZSAmJiAhVUlDdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKSkKKyAgICAg ICAgICAgICAgYWxsb3dTY2FsaW5nOihfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uYWxsb3dzVXNl clNjYWxpbmdJZ25vcmluZ0Fsd2F5c1NjYWxhYmxlICYmICFjdXJyZW50VXNlckludGVyZmFjZUlk aW9tSXNQYWQoKSkKICAgICAgICAgICAgICAgIGZvcmNlU2Nyb2xsOltzZWxmIHJlcXVpcmVzQWNj ZXNzb3J5Vmlld11dOwogCiAgICAgX2RpZEFjY2Vzc29yeVRhYkluaXRpYXRlRm9jdXMgPSBOTzsK QEAgLTE4NzMsNyArMTg3Myw3IEBAIC0gKEJPT0wpcmVxdWlyZXNBY2Nlc3NvcnlWaWV3CiAgICAg Y2FzZSBJbnB1dFR5cGU6Ok1vbnRoOgogICAgIGNhc2UgSW5wdXRUeXBlOjpXZWVrOgogICAgIGNh c2UgSW5wdXRUeXBlOjpUaW1lOgotICAgICAgICByZXR1cm4gIVVJQ3VycmVudFVzZXJJbnRlcmZh Y2VJZGlvbUlzUGFkKCk7CisgICAgICAgIHJldHVybiAhY3VycmVudFVzZXJJbnRlcmZhY2VJZGlv bUlzUGFkKCk7CiAgICAgfQogfQogCkBAIC0yOTUxLDcgKzI5NTEsNyBAQCAtICh2b2lkKV91cGRh dGVBY2Nlc3NvcnkKICAgICBbX2Zvcm1BY2Nlc3NvcnlWaWV3IHNldE5leHRFbmFibGVkOl9hc3Np c3RlZE5vZGVJbmZvcm1hdGlvbi5oYXNOZXh0Tm9kZV07CiAgICAgW19mb3JtQWNjZXNzb3J5Vmll dyBzZXRQcmV2aW91c0VuYWJsZWQ6X2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmhhc1ByZXZpb3Vz Tm9kZV07CiAKLSAgICBpZiAoVUlDdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKSkKKyAg ICBpZiAoY3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkpCiAgICAgICAgIFtfZm9ybUFj Y2Vzc29yeVZpZXcgc2V0Q2xlYXJWaXNpYmxlOk5PXTsKICAgICBlbHNlIHsKICAgICAgICAgc3dp dGNoIChfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uZWxlbWVudFR5cGUpIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0FpclBsYXlSb3V0ZVBpY2tlci5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0FpclBsYXlSb3V0ZVBpY2tl ci5tbQppbmRleCA0NGVkMTIxOGQ4ZWJhMWE5ZmFmMWMzMmU3NTIzZjU0M2E3MzcwMjhiLi5iNmU1 MTdmYWRjZGRlZDUyM2NlZjgyZDI4OTI1NzJlMjAyODQ0OTBlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tBaXJQbGF5Um91dGVQaWNrZXIubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLQWlyUGxheVJvdXRlUGlja2VyLm1t CkBAIC0xNTEsNyArMTUxLDcgQEAgLSAodm9pZClzaG93OihCT09MKWhhc1ZpZGVvIGZyb21SZWN0 OihDR1JlY3QpZWxlbWVudFJlY3QKICAgICBbX3JvdXRpbmdDb250cm9sbGVyIHNldERpc2NvdmVy eU1vZGU6TVBSb3V0ZURpc2NvdmVyeU1vZGVEZXRhaWxlZF07CiAKICAgICBNUEFWSXRlbVR5cGUg aXRlbVR5cGUgPSBoYXNWaWRlbyA/IE1QQVZJdGVtVHlwZVZpZGVvIDogTVBBVkl0ZW1UeXBlQXVk aW87Ci0gICAgaWYgKFVJQ3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkpCisgICAgaWYg KGN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCgpKQogICAgICAgICBbc2VsZiBzaG93QWly UGxheVBpY2tlcklQYWQ6aXRlbVR5cGUgZnJvbVJlY3Q6ZWxlbWVudFJlY3RdOwogICAgIGVsc2UK ICAgICAgICAgW3NlbGYgc2hvd0FpclBsYXlQaWNrZXJJUGhvbmU6aXRlbVR5cGVdOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVs Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVs Lm1tCmluZGV4IDAwNjEwOTU3OThjZWJjNDNkYTUzZGEyZmJjZmI4ZDdlYzVhMGQ1OTUuLjAyYWZj OGZjYzFmOTViMjNjYzIwZTU4MzBkZTlkZjI0MzllMjI1NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW0KQEAgLTQy Myw3ICs0MjMsNyBAQCAtICh2b2lkKV9zaG93UGhvdG9QaWNrZXJXaXRoU291cmNlVHlwZTooVUlJ bWFnZVBpY2tlckNvbnRyb2xsZXJTb3VyY2VUeXBlKXNvdXJjZQogICAgIAogICAgIC8vIFVzZSBh IHBvcG92ZXIgb24gdGhlIGlQYWQgaWYgdGhlIHNvdXJjZSB0eXBlIGlzIG5vdCB0aGUgY2FtZXJh LgogICAgIC8vIFRoZSBjYW1lcmEgd2lsbCB1c2UgYSBmdWxsc2NyZWVuLCBtb2RhbCB2aWV3IGNv bnRyb2xsZXIuCi0gICAgQk9PTCB1c2VQb3BvdmVyID0gVUlDdXJyZW50VXNlckludGVyZmFjZUlk aW9tSXNQYWQoKSAmJiBzb3VyY2VUeXBlICE9IFVJSW1hZ2VQaWNrZXJDb250cm9sbGVyU291cmNl VHlwZUNhbWVyYTsKKyAgICBCT09MIHVzZVBvcG92ZXIgPSBjdXJyZW50VXNlckludGVyZmFjZUlk aW9tSXNQYWQoKSAmJiBzb3VyY2VUeXBlICE9IFVJSW1hZ2VQaWNrZXJDb250cm9sbGVyU291cmNl VHlwZUNhbWVyYTsKICAgICBpZiAodXNlUG9wb3ZlcikKICAgICAgICAgW3NlbGYgX3ByZXNlbnRQ b3BvdmVyV2l0aENvbnRlbnRWaWV3Q29udHJvbGxlcjpfaW1hZ2VQaWNrZXIuZ2V0KCkgYW5pbWF0 ZWQ6WUVTXTsKICAgICBlbHNlCkBAIC00MzQsNyArNDM0LDcgQEAgLSAodm9pZClfc2hvd1Bob3Rv UGlja2VyV2l0aFNvdXJjZVR5cGU6KFVJSW1hZ2VQaWNrZXJDb250cm9sbGVyU291cmNlVHlwZSlz b3VyY2UKIAogLSAodm9pZClfcHJlc2VudE1lbnVPcHRpb25Gb3JDdXJyZW50SW50ZXJmYWNlSWRp b206KFVJVmlld0NvbnRyb2xsZXIgKil2aWV3Q29udHJvbGxlcgogewotICAgIGlmIChVSUN1cnJl bnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCgpKQorICAgIGlmIChjdXJyZW50VXNlckludGVyZmFj ZUlkaW9tSXNQYWQoKSkKICAgICAgICAgW3NlbGYgX3ByZXNlbnRQb3BvdmVyV2l0aENvbnRlbnRW aWV3Q29udHJvbGxlcjp2aWV3Q29udHJvbGxlciBhbmltYXRlZDpZRVNdOwogICAgIGVsc2UKICAg ICAgICAgW3NlbGYgX3ByZXNlbnRGdWxsc2NyZWVuVmlld0NvbnRyb2xsZXI6dmlld0NvbnRyb2xs ZXIgYW5pbWF0ZWQ6WUVTXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9mb3Jtcy9XS0Zvcm1JbnB1dENvbnRyb2wubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvZm9ybXMvV0tGb3JtSW5wdXRDb250cm9sLm1tCmluZGV4IGI2M2ZiZGQ4MTc5ZGU2ZWM1MmNk Njg0NzkzZDRkNjc5MjM5YTVlODcuLjFjZDYyZTNiYjUxODEzYjcxNGUzNGEzY2ZiZWI3M2FiYWFh OTBjZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zv cm1JbnB1dENvbnRyb2wubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1z L1dLRm9ybUlucHV0Q29udHJvbC5tbQpAQCAtMTA0LDcgKzEwNCw3IEBAIC0gKGlkKWluaXRXaXRo VmlldzooV0tDb250ZW50VmlldyAqKXZpZXcgZGF0ZVBpY2tlck1vZGU6KFVJRGF0ZVBpY2tlck1v ZGUpbW9kZQogICAgICAgICBicmVhazsKICAgIH0KIAotICAgIENHU2l6ZSBzaXplID0gVUlDdXJy ZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKSA/IFtVSVBpY2tlclZpZXcgZGVmYXVsdFNpemVG b3JDdXJyZW50T3JpZW50YXRpb25dIDogW1VJS2V5Ym9hcmQgZGVmYXVsdFNpemVGb3JJbnRlcmZh Y2VPcmllbnRhdGlvbjpbVUlBcHAgaW50ZXJmYWNlT3JpZW50YXRpb25dXTsKKyAgICBDR1NpemUg c2l6ZSA9IGN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCgpID8gW1VJUGlja2VyVmlldyBk ZWZhdWx0U2l6ZUZvckN1cnJlbnRPcmllbnRhdGlvbl0gOiBbVUlLZXlib2FyZCBkZWZhdWx0U2l6 ZUZvckludGVyZmFjZU9yaWVudGF0aW9uOltVSUFwcCBpbnRlcmZhY2VPcmllbnRhdGlvbl1dOwog CiAgICAgX2RhdGVQaWNrZXIgPSBhZG9wdE5TKFtbVUlEYXRlUGlja2VyIGFsbG9jXSBpbml0V2l0 aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgc2l6ZS53aWR0aCwgc2l6ZS5oZWlnaHQpXSk7CiAgICAg X2RhdGVQaWNrZXIuZ2V0KCkuZGF0ZVBpY2tlck1vZGUgPSBtb2RlOwpAQCAtMjU0LDcgKzI1NCw3 IEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFZpZXc6KFdLQ29udGVudFZpZXcgKil2aWV3CiAg ICAgICAgIHJldHVybiBuaWw7CiAgICAgfQogCi0gICAgaWYgKFVJQ3VycmVudFVzZXJJbnRlcmZh Y2VJZGlvbUlzUGFkKCkpCisgICAgaWYgKGN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCgp KQogICAgICAgICBfY29udHJvbCA9IGFkb3B0TlMoW1tXS0RhdGVUaW1lUG9wb3ZlciBhbGxvY10g aW5pdFdpdGhWaWV3OnZpZXcgZGF0ZVBpY2tlck1vZGU6bW9kZV0pOwogICAgIGVsc2UKICAgICAg ICAgX2NvbnRyb2wgPSBhZG9wdE5TKFtbV0tEYXRlVGltZVBpY2tlciBhbGxvY10gaW5pdFdpdGhW aWV3OnZpZXcgZGF0ZVBpY2tlck1vZGU6bW9kZV0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVjdENvbnRyb2wubW0gYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0Q29udHJvbC5tbQppbmRleCAzNWU1 YzdkZTk2M2RiNmI1NzM5OTNhZTM4ODZiOWJiNzFjNmQyMGQzLi40YTUzNGZlOGM3ODQ5NzJhODJj OWZmZTJiOTM5NjhmODlmNGQwZTgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0Q29udHJvbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0Q29udHJvbC5tbQpAQCAtNzYsNyArNzYsNyBA QCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhWaWV3OihXS0NvbnRlbnRWaWV3ICopdmlldwogICAg ICAgICB9CiAgICAgfQogCi0gICAgaWYgKFVJQ3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFk KCkpCisgICAgaWYgKGN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1BhZCgpKQogICAgICAgICBf Y29udHJvbCA9IGFkb3B0TlMoW1tXS1NlbGVjdFBvcG92ZXIgYWxsb2NdIGluaXRXaXRoVmlldzp2 aWV3IGhhc0dyb3VwczpoYXNHcm91cHNdKTsKICAgICBlbHNlIGlmICh2aWV3LmFzc2lzdGVkTm9k ZUluZm9ybWF0aW9uLmlzTXVsdGlTZWxlY3QgfHwgaGFzR3JvdXBzKQogICAgICAgICBfY29udHJv bCA9IGFkb3B0TlMoW1tXS011bHRpcGxlU2VsZWN0UGlja2VyIGFsbG9jXSBpbml0V2l0aFZpZXc6 dmlld10pOwo=