172620 2017-05-25 16:19:42 -0700 Media documents inside iframes should not get controls in the TouchBar unless the video is playing 2017-05-30 20:21:13 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin webkit-unassigned bdakin eric.carlson jer.noble jonlee webkit-bug-importer wenson_hsieh oldest_to_newest 1312942 0 bdakin 2017-05-25 16:19:42 -0700 Media documents inside iframes should not get controls in the TouchBar unless the video is playing rdar://problem/32165477 1312948 1 311311 bdakin 2017-05-25 16:24:05 -0700 Created attachment 311311 Patch 1313023 2 311329 bdakin 2017-05-25 20:16:07 -0700 Created attachment 311329 Patch 1313169 3 bdakin 2017-05-26 10:19:37 -0700 Thanks Jon! https://trac.webkit.org/changeset/217496/webkit 1314020 4 webkit-bug-importer 2017-05-30 20:21:13 -0700 <rdar://problem/32479708> 311311 2017-05-25 16:24:05 -0700 2017-05-25 20:16:07 -0700 Patch for-review.txt text/plain 8275 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNzQ1NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE3LTA1LTI1ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYSBkb2N1bWVudHMgaW5zaWRl IGlmcmFtZXMgc2hvdWxkIG5vdCBnZXQgY29udHJvbHMgaW4gdGhlIFRvdWNoQmFyIHVubGVzcyB0 aGUgCisgICAgICAgIHZpZGVvIGlzIHBsYXlpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjYyMAorICAgICAgICAtYW5kLQorICAgICAgICByZGFy Oi8vcHJvYmxlbS8zMjE2NTQ3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1lZGlhIGRvY3VtZW50cyBnZXQgdG8gcmV0dXJuIGVhcmx5IHdpdGggdHJ1 ZSwgYnV0IHRoYXQgc2hvdWxkIG9ubHkgYXBwbHkgdG8gCisgICAgICAgIG1haW5mcmFtZSBtZWRp YSBkb2N1bWVudHMuIAorICAgICAgICAqIGh0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYUVsZW1lbnRTZXNzaW9uOjpjYW5TaG93Q29udHJvbHNNYW5h Z2VyKToKKwogMjAxNy0wNS0yNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAg ICAgICAgIFJlZ3Jlc3Npb24ocjIxNTY4Nik6IFZpZGVvcyBzb21ldGltZXMgZG8gbm90IGxvYWQg aW4gaUJvb2tzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24u Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lv bi5jcHAJKHJldmlzaW9uIDIxNzQzNykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVt ZW50U2Vzc2lvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3NSw3ICsyNzUsNyBAQCBib29sIE1l ZGlhRWxlbWVudFNlc3Npb246OmNhblNob3dDb250cm9sCiAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICB9CiAKLSAgICBpZiAobV9lbGVtZW50LmRvY3VtZW50KCkuaXNNZWRpYURvY3VtZW50KCkp IHsKKyAgICBpZiAobV9lbGVtZW50LmRvY3VtZW50KCkuaXNNZWRpYURvY3VtZW50KCkgJiYgKG1f ZWxlbWVudC5kb2N1bWVudCgpLmZyYW1lKCkgJiYgbV9lbGVtZW50LmRvY3VtZW50KCkuZnJhbWUo KS0+aXNNYWluRnJhbWUoKSkpIHsKICAgICAgICAgTE9HKE1lZGlhLCAiTWVkaWFFbGVtZW50U2Vz c2lvbjo6Y2FuU2hvd0NvbnRyb2xzTWFuYWdlciAtIHJldHVybmluZyBUUlVFOiBJcyBtZWRpYSBk b2N1bWVudCIpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CkluZGV4OiBUb29scy9DaGFu Z2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMTc0NTYpCisr KyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAxNy0w NS0yNSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CisKKyAgICAgICAgTWVkaWEgZG9j dW1lbnRzIGluc2lkZSBpZnJhbWVzIHNob3VsZCBub3QgZ2V0IGNvbnRyb2xzIGluIHRoZSBUb3Vj aEJhciB1bmxlc3MgdGhlIAorICAgICAgICB2aWRlbyBpcyBwbGF5aW5nCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzI2MjAKKyAgICAgICAgLWFuZC0K KyAgICAgICAgcmRhcjovL3Byb2JsZW0vMzIxNjU0NzcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0MkNvY29hL1ZpZGVvQ29udHJvbHNNYW5hZ2VyLm1tOgorICAgICAgICAoVGVzdFdlYktp dEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2Ev b2Zmc2NyZWVuLWlmcmFtZS1vZi1tZWRpYS1kb2N1bWVudC5odG1sOiBBZGRlZC4KKwogMjAxNy0w NS0yNSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXZWJJRExdIFVz ZSB0aGUgdGVybSAnb3BlcmF0aW9uJyBtb3JlIGNvbnNpc3RlbnRseQpJbmRleDogVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oJKHJldmlzaW9uIDIxNzQzNykKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC00 OTEsNiArNDkxLDcgQEAKIAkJOTNBRjRFQ0UxNTA2RjA2NDAwN0ZENTdFIC8qIE5ld0ZpcnN0Vmlz dWFsbHlOb25FbXB0eUxheW91dEZvckltYWdlc19CdW5kbGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTNBRjRFQ0QxNTA2RjA2NDAwN0ZENTdFIC8q IE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckltYWdlc19CdW5kbGUuY3BwICovOyB9 OwogCQk5M0FGNEVEMTE1MDZGMTMwMDA3RkQ1N0UgLyogbG90cy1vZi1pbWFnZXMuaHRtbCBpbiBD b3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5M0FGNEVD RjE1MDZGMTIzMDA3RkQ1N0UgLyogbG90cy1vZi1pbWFnZXMuaHRtbCAqLzsgfTsKIAkJOTNDRkE4 NjcxQ0VCOUUzODAwMDU2NUE4IC8qIGF1dG9mb2N1c2VkLXRleHQtaW5wdXQuaHRtbCBpbiBDb3B5 IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5M0NGQTg2NjFD RUI5REUxMDAwNTY1QTggLyogYXV0b2ZvY3VzZWQtdGV4dC1pbnB1dC5odG1sICovOyB9OworCQk5 M0UyRDI3NDFFRDc5Q0NFMDBGQTc2RjYgLyogb2Zmc2NyZWVuLWlmcmFtZS1vZi1tZWRpYS1kb2N1 bWVudC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDkzRTJEMjczMUVENzk3QUMwMEZBNzZGNiAvKiBvZmZzY3JlZW4taWZyYW1lLW9mLW1l ZGlhLWRvY3VtZW50Lmh0bWwgKi87IH07CiAJCTkzRjFEQjM0MTREQTIwODcwMDI0QzM2MiAvKiBO ZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRfQnVuZGxlLmNwcCBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzRjFEQjMzMTREQTIwODcwMDI0QzM2MiAv KiBOZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRfQnVuZGxlLmNwcCAqLzsgfTsKIAkJOTNG MURCNTcxNERCMUI4NDAwMjRDMzYyIC8qIE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZh aWxzX0J1bmRsZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSA5M0YxREI1NjE0REIxQjg0MDAyNEMzNjIgLyogTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5 TGF5b3V0RmFpbHNfQnVuZGxlLmNwcCAqLzsgfTsKIAkJOTNGNTZEQTcxRTVGOTE3NDAwM0VERTg0 IC8qIGxpYmljdWNvcmUuZHlsaWIgaW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSA3QzgzRTAzMzFEMEE1RjI3MDBGRUJDRjMgLyogbGliaWN1Y29yZS5keWxp YiAqLzsgfTsKQEAgLTY5Nyw2ICs2OTgsNyBAQAogCQkJZHN0UGF0aCA9IFRlc3RXZWJLaXRBUEku cmVzb3VyY2VzOwogCQkJZHN0U3ViZm9sZGVyU3BlYyA9IDc7CiAJCQlmaWxlcyA9ICgKKwkJCQk5 M0UyRDI3NDFFRDc5Q0NFMDBGQTc2RjYgLyogb2Zmc2NyZWVuLWlmcmFtZS1vZi1tZWRpYS1kb2N1 bWVudC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUY0N0QzMEVFMUVEMjhFN0QwMDA0 ODJFMSAvKiBnaWYtYW5kLWZpbGUtaW5wdXQuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJ CQlGNDdEMzBFQzFFRDI4NjMxMDAwNDgyRTEgLyogYXBwbGUuZ2lmIGluIENvcHkgUmVzb3VyY2Vz ICovLAogCQkJCUM5QjEwNDNFMUVDRjk4NDgwMDA1MjBGQSAvKiBhdXRvcGxheS1pbmhlcml0cy1n ZXN0dXJlLWZyb20tZG9jdW1lbnQuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKQEAgLTEzMDUs NiArMTMwNyw3IEBACiAJCTkzQ0ZBODY4MUNFQkNGRUQwMDA1NjVBOCAvKiBDYW5kaWRhdGVUZXN0 cy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IENhbmRpZGF0ZVRl c3RzLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5M0QzRDE5QjE3QjFBN0IwMDBD N0M0MTUgLyogYWxsLWNvbnRlbnQtaW4tb25lLWlmcmFtZS5odG1sICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5o dG1sOyBwYXRoID0gImFsbC1jb250ZW50LWluLW9uZS1pZnJhbWUuaHRtbCI7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTkzRDNEMTlEMTdCMUE4NDIwMEM3QzQxNSAvKiBMYXlvdXRNaWxl c3RvbmVzV2l0aEFsbENvbnRlbnRJbkZyYW1lLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgcGF0aCA9IExheW91dE1pbGVzdG9uZXNXaXRoQWxsQ29udGVudEluRnJhbWUuY3BwOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk5M0UyRDI3MzFFRDc5N0FDMDBGQTc2RjYgLyog b2Zmc2NyZWVuLWlmcmFtZS1vZi1tZWRpYS1kb2N1bWVudC5odG1sICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5o dG1sOyBwYXRoID0gIm9mZnNjcmVlbi1pZnJhbWUtb2YtbWVkaWEtZG9jdW1lbnQuaHRtbCI7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzRTk0M0YxMUNEM0U4N0UwMEFDMDhDMiAvKiBW aWRlb0NvbnRyb2xzTWFuYWdlci5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsg cGF0aCA9IFZpZGVvQ29udHJvbHNNYW5hZ2VyLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQk5M0YxREIzMDE0REEyMDc2MDAyNEMzNjIgLyogTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5 TGF5b3V0LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ld0ZpcnN0 VmlzdWFsbHlOb25FbXB0eUxheW91dC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTkzRjFEQjMzMTREQTIwODcwMDI0QzM2MiAvKiBOZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlv dXRfQnVuZGxlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ld0Zp cnN0VmlzdWFsbHlOb25FbXB0eUxheW91dF9CdW5kbGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwpAQCAtMTk4OCw2ICsxOTkxLDcgQEAKIAkJCQk0NkM1MTlFMzFEMzU2Mjk2MDBEQUE1 MUEgLyogTG9jYWxTdG9yYWdlTnVsbEVudHJpZXMubG9jYWxzdG9yYWdlICovLAogCQkJCTQ2QzUx OUU0MUQzNTYyOTYwMERBQTUxQSAvKiBMb2NhbFN0b3JhZ2VOdWxsRW50cmllcy5sb2NhbHN0b3Jh Z2Utc2htICovLAogCQkJCTdBNkEyQzcxMURDQ0ZCMDIwMEMwRDA4NSAvKiBMb2NhbFN0b3JhZ2VR dWlya0VuYWJsZWQuaHRtbCAqLywKKwkJCQk5M0UyRDI3MzFFRDc5N0FDMDBGQTc2RjYgLyogb2Zm c2NyZWVuLWlmcmFtZS1vZi1tZWRpYS1kb2N1bWVudC5odG1sICovLAogCQkJCTdDQ0I5OTIyMUQz QjQ0RTcwMDM5MjJGNiAvKiBvcGVuLW11bHRpcGxlLWV4dGVybmFsLXVybC5odG1sICovLAogCQkJ CUNFQkNBMTM0MUUzQTgwMzQwMEM3MzI5MyAvKiBwYWdlLXdpdGgtY3NwLWlmcmFtZS5odG1sICov LAogCQkJCUNFQkNBMTM1MUUzQTgwMzQwMEM3MzI5MyAvKiBwYWdlLXdpdGgtY3NwLmh0bWwgKi8s CkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9WaWRlb0NvbnRy b2xzTWFuYWdlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdDJDb2NvYS9WaWRlb0NvbnRyb2xzTWFuYWdlci5tbQkocmV2aXNpb24gMjE3NDM3KQorKysg VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvVmlkZW9Db250cm9sc01hbmFn ZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTQxMyw2ICs0MTMsMTUgQEAgVEVTVChWaWRlb0NvbnRy b2xzTWFuYWdlciwgVmlkZW9Db250cm9scwogICAgIC8vIFdlIGV4cGVjdCB0aGUgbWVkaWEgY29u dHJvbGxlciB0byBiZSBwcmVzZW50IGJlY2F1c2UgdGhpcyBpcyBhIG1lZGlhIGRvY3VtZW50Lgog ICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IF9oYXNBY3RpdmVWaWRlb0ZvckNvbnRyb2xzTWFuYWdl cl0pOwogfQorICAgIAorVEVTVChWaWRlb0NvbnRyb2xzTWFuYWdlciwgVmlkZW9Db250cm9sc01h bmFnZXJPZmZzY3JlZW5JZnJhbWVNZWRpYURvY3VtZW50KQoreworICAgIFJldGFpblB0cjxWaWRl b0NvbnRyb2xzTWFuYWdlclRlc3RXZWJWaWV3Kj4gd2ViVmlldyA9IHNldFVwV2ViVmlld0ZvclRl c3RpbmdWaWRlb0NvbnRyb2xzTWFuYWdlcihOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSk7Cisg ICAgW3dlYlZpZXcgbG9hZFRlc3RQYWdlTmFtZWQ6QCJvZmZzY3JlZW4taWZyYW1lLW9mLW1lZGlh LWRvY3VtZW50Il07CisgICAgCisgICAgLy8gV2UgZG8gbm90IGV4cGVjdCBhIGNvbnRyb2xzIG1h bmFnZXIgYmVjdWFzZSB0aGUgbWVkaWEgZG9jdW1lbnQgaXMgaW4gYW4gaWZyYW1lLgorICAgIFt3 ZWJWaWV3IGV4cGVjdENvbnRyb2xzTWFuYWdlcjpOTyBhZnRlclJlY2VpdmluZ01lc3NhZ2U6QCJs b2FkZWQiXTsKK30KIAogVEVTVChWaWRlb0NvbnRyb2xzTWFuYWdlciwgVmlkZW9Db250cm9sc01h bmFnZXJMb25nU2tpbm55VmlkZW9JbldpZGVNYWluRnJhbWUpCiB7CkluZGV4OiBUb29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9vZmZzY3JlZW4taWZyYW1lLW9mLW1lZGlhLWRv Y3VtZW50Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQyQ29jb2Evb2Zmc2NyZWVuLWlmcmFtZS1vZi1tZWRpYS1kb2N1bWVudC5odG1sCShub25leGlz dGVudCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL29mZnNjcmVl bi1pZnJhbWUtb2YtbWVkaWEtZG9jdW1lbnQuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsx LDE3IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KKyAgICBmdW5jdGlvbiBsb2FkZWQoKSB7 CisgICAgICAgIHRyeSB7CisgICAgICAgICAgICB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVy cy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgibG9hZGVkIik7CisgICAgICAgfSBjYXRjaChlKSB7 IH0KKyAgICB9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0ibG9hZGVkKCkiPgor ICAgIAorPGRpdiBzdHlsZT0id2lkdGg6MjVweDsgaGVpZ2h0OjgwMHB4OyI+PC9kaXY+Cis8aWZy YW1lIHdpZHRoPSIzMjAiIGhlaWdodD0iMjQwIiBzcmM9InRlc3QubXA0IiAvPgorCis8L2JvZHk+ Cis8L2h0bWw+Cg== 311329 2017-05-25 20:16:07 -0700 2017-05-25 20:21:06 -0700 Patch for-review-2.txt text/plain 9718 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNzQ3MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE3LTA1LTI1ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYSBkb2N1bWVudHMgaW5zaWRl IGlmcmFtZXMgc2hvdWxkIG5vdCBnZXQgY29udHJvbHMgaW4gdGhlIFRvdWNoQmFyIHVubGVzcyB0 aGUgCisgICAgICAgIHZpZGVvIGlzIHBsYXlpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjYyMAorICAgICAgICAtYW5kLQorICAgICAgICByZGFy Oi8vcHJvYmxlbS8zMjE2NTQ3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1lZGlhIGRvY3VtZW50cyBnZXQgdG8gcmV0dXJuIGVhcmx5IHdpdGggdHJ1 ZSwgYnV0IHRoYXQgc2hvdWxkIG9ubHkgYXBwbHkgdG8gCisgICAgICAgIG1haW5mcmFtZSBtZWRp YSBkb2N1bWVudHMuIAorICAgICAgICAqIGh0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYUVsZW1lbnRTZXNzaW9uOjpjYW5TaG93Q29udHJvbHNNYW5h Z2VyKToKKwogMjAxNy0wNS0yNSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCBidWlsZCBmaXggaW4gR1RLIGFuZCBXUEUgcG9ydHMK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcAkocmV2 aXNpb24gMjE3NDcxKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9u LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc1LDcgKzI3NSw3IEBAIGJvb2wgTWVkaWFFbGVtZW50 U2Vzc2lvbjo6Y2FuU2hvd0NvbnRyb2wKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAot ICAgIGlmIChtX2VsZW1lbnQuZG9jdW1lbnQoKS5pc01lZGlhRG9jdW1lbnQoKSkgeworICAgIGlm IChtX2VsZW1lbnQuZG9jdW1lbnQoKS5pc01lZGlhRG9jdW1lbnQoKSAmJiAobV9lbGVtZW50LmRv Y3VtZW50KCkuZnJhbWUoKSAmJiBtX2VsZW1lbnQuZG9jdW1lbnQoKS5mcmFtZSgpLT5pc01haW5G cmFtZSgpKSkgewogICAgICAgICBMT0coTWVkaWEsICJNZWRpYUVsZW1lbnRTZXNzaW9uOjpjYW5T aG93Q29udHJvbHNNYW5hZ2VyIC0gcmV0dXJuaW5nIFRSVUU6IElzIG1lZGlhIGRvY3VtZW50Iik7 CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNzQ3MSkKKysrIFRvb2xzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE3LTA1LTI1ICBCZXRo IERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYSBkb2N1bWVudHMgaW5z aWRlIGlmcmFtZXMgc2hvdWxkIG5vdCBnZXQgY29udHJvbHMgaW4gdGhlIFRvdWNoQmFyIHVubGVz cyB0aGUgCisgICAgICAgIHZpZGVvIGlzIHBsYXlpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjYyMAorICAgICAgICAtYW5kLQorICAgICAgICBy ZGFyOi8vcHJvYmxlbS8zMjE2NTQ3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2o6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29j b2EvVmlkZW9Db250cm9sc01hbmFnZXIubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNU KToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9vZmZzY3JlZW4t aWZyYW1lLW9mLW1lZGlhLWRvY3VtZW50Lmh0bWw6IEFkZGVkLgorCiAyMDE3LTA1LTI1ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW1dLMV0gaWZy YW1lcyBpbiBsYXllci1iYWNrZWQgTlNWaWV3cyBhcmUgbm90IGNsZWFyZWQgYmV0d2VlbiBzdWNj ZXNzaXZlIGRyYXdzCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gMjE3NDcx KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTQ5MSw2ICs0OTEsNyBAQAogCQk5M0FGNEVDRTE1 MDZGMDY0MDA3RkQ1N0UgLyogTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9ySW1hZ2Vz X0J1bmRsZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSA5M0FGNEVDRDE1MDZGMDY0MDA3RkQ1N0UgLyogTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5 b3V0Rm9ySW1hZ2VzX0J1bmRsZS5jcHAgKi87IH07CiAJCTkzQUY0RUQxMTUwNkYxMzAwMDdGRDU3 RSAvKiBsb3RzLW9mLWltYWdlcy5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzQUY0RUNGMTUwNkYxMjMwMDdGRDU3RSAvKiBsb3RzLW9m LWltYWdlcy5odG1sICovOyB9OwogCQk5M0NGQTg2NzFDRUI5RTM4MDAwNTY1QTggLyogYXV0b2Zv Y3VzZWQtdGV4dC1pbnB1dC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDkzQ0ZBODY2MUNFQjlERTEwMDA1NjVBOCAvKiBhdXRvZm9jdXNl ZC10ZXh0LWlucHV0Lmh0bWwgKi87IH07CisJCTkzRTJEMjc2MUVEN0Q1MzIwMEZBNzZGNiAvKiBv ZmZzY3JlZW4taWZyYW1lLW9mLW1lZGlhLWRvY3VtZW50Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTNFMkQyNzUxRUQ3RDUxNzAwRkE3 NkY2IC8qIG9mZnNjcmVlbi1pZnJhbWUtb2YtbWVkaWEtZG9jdW1lbnQuaHRtbCAqLzsgfTsKIAkJ OTNGMURCMzQxNERBMjA4NzAwMjRDMzYyIC8qIE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91 dF9CdW5kbGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gOTNGMURCMzMxNERBMjA4NzAwMjRDMzYyIC8qIE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxh eW91dF9CdW5kbGUuY3BwICovOyB9OwogCQk5M0YxREI1NzE0REIxQjg0MDAyNEMzNjIgLyogTmV3 Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0RmFpbHNfQnVuZGxlLmNwcCBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzRjFEQjU2MTREQjFCODQwMDI0QzM2 MiAvKiBOZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGYWlsc19CdW5kbGUuY3BwICovOyB9 OwogCQk5M0Y1NkRBNzFFNUY5MTc0MDAzRURFODQgLyogbGliaWN1Y29yZS5keWxpYiBpbiBGcmFt ZXdvcmtzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDODNFMDMzMUQwQTVG MjcwMEZFQkNGMyAvKiBsaWJpY3Vjb3JlLmR5bGliICovOyB9OwpAQCAtNjE3LDggKzYxOCw2IEBA CiAJCUY0NDUxQzc2MUVCOEZEODkwMDIwQzVEQSAvKiB0d28tcGFyYWdyYXBoLWNvbnRlbnRlZGl0 YWJsZS5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEY0NDUxQzc1MUVCOEZEN0MwMDIwQzVEQSAvKiB0d28tcGFyYWdyYXBoLWNvbnRlbnRl ZGl0YWJsZS5odG1sICovOyB9OwogCQlGNDUzOEVGNzFFODQ3M0U2MDBCNUM5NTMgLyogbGFyZ2Ut cmVkLXNxdWFyZS5wbmcgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gRjQ1MzhFRjAxRTg0NkI0MTAwQjVDOTUzIC8qIGxhcmdlLXJlZC1zcXVhcmUu cG5nICovOyB9OwogCQlGNDc3Mjg5OTFFNEFFM0MxMDA3QUJGNkEgLyogZnVsbC1wYWdlLWNvbnRl bnRlZGl0YWJsZS5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IEY0NzcyODk4MUU0QUUzQUQwMDdBQkY2QSAvKiBmdWxsLXBhZ2UtY29udGVu dGVkaXRhYmxlLmh0bWwgKi87IH07Ci0JCUY0N0QzMEVDMUVEMjg2MzEwMDA0ODJFMSAvKiBhcHBs ZS5naWYgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gRjQ3RDMwRUIxRUQyODYxOTAwMDQ4MkUxIC8qIGFwcGxlLmdpZiAqLzsgfTsKLQkJRjQ3RDMw RUUxRUQyOEU3RDAwMDQ4MkUxIC8qIGdpZi1hbmQtZmlsZS1pbnB1dC5odG1sIGluIENvcHkgUmVz b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY0N0QzMEVEMUVEMjhB NkMwMDA0ODJFMSAvKiBnaWYtYW5kLWZpbGUtaW5wdXQuaHRtbCAqLzsgfTsKIAkJRjQ4NTZDQTMx RTY0OUVBODAwOUQ3RUU3IC8qIGF0dGFjaG1lbnQtZWxlbWVudC5odG1sIGluIENvcHkgUmVzb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY0ODU2Q0EyMUU2NDk4QTgw MDlEN0VFNyAvKiBhdHRhY2htZW50LWVsZW1lbnQuaHRtbCAqLzsgfTsKIAkJRjRCRkE2OEUxRTRB RDA4MDAwMTU0Mjk4IC8qIERyYWdBbmREcm9wUGFzdGVib2FyZFRlc3RzLm1tIGluIFNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjRCRkE2OEMxRTRBRDA4MDAwMTU0 Mjk4IC8qIERyYWdBbmREcm9wUGFzdGVib2FyZFRlc3RzLm1tICovOyB9OwogCQlGNEMyQUIyMjFE RDZEOTVFMDBFMDZENUIgLyogZW5vcm1vdXMtdmlkZW8td2l0aC1zb3VuZC5odG1sIGluIENvcHkg UmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY0QzJBQjIxMURE NkQ5NDEwMEUwNkQ1QiAvKiBlbm9ybW91cy12aWRlby13aXRoLXNvdW5kLmh0bWwgKi87IH07CkBA IC03MDAsNiArNjk5LDcgQEAKIAkJCWRzdFBhdGggPSBUZXN0V2ViS2l0QVBJLnJlc291cmNlczsK IAkJCWRzdFN1YmZvbGRlclNwZWMgPSA3OwogCQkJZmlsZXMgPSAoCisJCQkJOTNFMkQyNzYxRUQ3 RDUzMjAwRkE3NkY2IC8qIG9mZnNjcmVlbi1pZnJhbWUtb2YtbWVkaWEtZG9jdW1lbnQuaHRtbCBp biBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlDREEzMTU5QTFFRDU0OEYxMDA5RjYwRDMgLyogTWVk aWFQbGF5YmFja1NsZWVwQXNzZXJ0aW9uLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJ QzlCMTA0M0UxRUNGOTg0ODAwMDUyMEZBIC8qIGF1dG9wbGF5LWluaGVyaXRzLWdlc3R1cmUtZnJv bS1kb2N1bWVudC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCTNGQ0M0RkU4MUVDNEU4 Q0EwMDc2RTM3QyAvKiBQaWN0dXJlSW5QaWN0dXJlRGVsZWdhdGUuaHRtbCBpbiBDb3B5IFJlc291 cmNlcyAqLywKQEAgLTEzMDcsNiArMTMwNyw3IEBACiAJCTkzQ0ZBODY4MUNFQkNGRUQwMDA1NjVB OCAvKiBDYW5kaWRhdGVUZXN0cy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsg cGF0aCA9IENhbmRpZGF0ZVRlc3RzLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5 M0QzRDE5QjE3QjFBN0IwMDBDN0M0MTUgLyogYWxsLWNvbnRlbnQtaW4tb25lLWlmcmFtZS5odG1s ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gdGV4dC5odG1sOyBwYXRoID0gImFsbC1jb250ZW50LWluLW9uZS1pZnJhbWUu aHRtbCI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzRDNEMTlEMTdCMUE4NDIwMEM3 QzQxNSAvKiBMYXlvdXRNaWxlc3RvbmVzV2l0aEFsbENvbnRlbnRJbkZyYW1lLmNwcCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IExheW91dE1pbGVzdG9uZXNXaXRoQWxsQ29u dGVudEluRnJhbWUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk5M0UyRDI3NTFF RDdENTE3MDBGQTc2RjYgLyogb2Zmc2NyZWVuLWlmcmFtZS1vZi1tZWRpYS1kb2N1bWVudC5odG1s ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gdGV4dC5odG1sOyBwYXRoID0gIm9mZnNjcmVlbi1pZnJhbWUtb2YtbWVkaWEt ZG9jdW1lbnQuaHRtbCI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzRTk0M0YxMUNE M0U4N0UwMEFDMDhDMiAvKiBWaWRlb0NvbnRyb2xzTWFuYWdlci5tbSAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFZpZGVvQ29udHJvbHNNYW5hZ2VyLm1tOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQk5M0YxREIzMDE0REEyMDc2MDAyNEMzNjIgLyogTmV3Rmly c3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dC5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTkzRjFEQjMzMTREQTIwODcwMDI0QzM2MiAvKiBOZXdGaXJzdFZp c3VhbGx5Tm9uRW1wdHlMYXlvdXRfQnVuZGxlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgcGF0aCA9IE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dF9CdW5kbGUuY3BwOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMTk5NSw2ICsxOTk2LDcgQEAKIAkJCQk0NkM1 MTlFMzFEMzU2Mjk2MDBEQUE1MUEgLyogTG9jYWxTdG9yYWdlTnVsbEVudHJpZXMubG9jYWxzdG9y YWdlICovLAogCQkJCTQ2QzUxOUU0MUQzNTYyOTYwMERBQTUxQSAvKiBMb2NhbFN0b3JhZ2VOdWxs RW50cmllcy5sb2NhbHN0b3JhZ2Utc2htICovLAogCQkJCTdBNkEyQzcxMURDQ0ZCMDIwMEMwRDA4 NSAvKiBMb2NhbFN0b3JhZ2VRdWlya0VuYWJsZWQuaHRtbCAqLywKKwkJCQk5M0UyRDI3NTFFRDdE NTE3MDBGQTc2RjYgLyogb2Zmc2NyZWVuLWlmcmFtZS1vZi1tZWRpYS1kb2N1bWVudC5odG1sICov LAogCQkJCTdDQ0I5OTIyMUQzQjQ0RTcwMDM5MjJGNiAvKiBvcGVuLW11bHRpcGxlLWV4dGVybmFs LXVybC5odG1sICovLAogCQkJCUNFQkNBMTM0MUUzQTgwMzQwMEM3MzI5MyAvKiBwYWdlLXdpdGgt Y3NwLWlmcmFtZS5odG1sICovLAogCQkJCUNFQkNBMTM1MUUzQTgwMzQwMEM3MzI5MyAvKiBwYWdl LXdpdGgtY3NwLmh0bWwgKi8sCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dDJDb2NvYS9WaWRlb0NvbnRyb2xzTWFuYWdlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9WaWRlb0NvbnRyb2xzTWFuYWdlci5tbQkocmV2 aXNpb24gMjE3NDcxKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2Ev VmlkZW9Db250cm9sc01hbmFnZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTQxMyw2ICs0MTMsMTUg QEAgVEVTVChWaWRlb0NvbnRyb2xzTWFuYWdlciwgVmlkZW9Db250cm9scwogICAgIC8vIFdlIGV4 cGVjdCB0aGUgbWVkaWEgY29udHJvbGxlciB0byBiZSBwcmVzZW50IGJlY2F1c2UgdGhpcyBpcyBh IG1lZGlhIGRvY3VtZW50LgogICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IF9oYXNBY3RpdmVWaWRl b0ZvckNvbnRyb2xzTWFuYWdlcl0pOwogfQorICAgIAorVEVTVChWaWRlb0NvbnRyb2xzTWFuYWdl ciwgVmlkZW9Db250cm9sc01hbmFnZXJPZmZzY3JlZW5JZnJhbWVNZWRpYURvY3VtZW50KQorewor ICAgIFJldGFpblB0cjxWaWRlb0NvbnRyb2xzTWFuYWdlclRlc3RXZWJWaWV3Kj4gd2ViVmlldyA9 IHNldFVwV2ViVmlld0ZvclRlc3RpbmdWaWRlb0NvbnRyb2xzTWFuYWdlcihOU01ha2VSZWN0KDAs IDAsIDgwMCwgNjAwKSk7CisgICAgW3dlYlZpZXcgbG9hZFRlc3RQYWdlTmFtZWQ6QCJvZmZzY3Jl ZW4taWZyYW1lLW9mLW1lZGlhLWRvY3VtZW50Il07CisgICAgCisgICAgLy8gV2UgZG8gbm90IGV4 cGVjdCBhIGNvbnRyb2xzIG1hbmFnZXIgYmVjdWFzZSB0aGUgbWVkaWEgZG9jdW1lbnQgaXMgaW4g YW4gaWZyYW1lLgorICAgIFt3ZWJWaWV3IGV4cGVjdENvbnRyb2xzTWFuYWdlcjpOTyBhZnRlclJl Y2VpdmluZ01lc3NhZ2U6QCJsb2FkZWQiXTsKK30KIAogVEVTVChWaWRlb0NvbnRyb2xzTWFuYWdl ciwgVmlkZW9Db250cm9sc01hbmFnZXJMb25nU2tpbm55VmlkZW9JbldpZGVNYWluRnJhbWUpCiB7 CkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9vZmZzY3JlZW4t aWZyYW1lLW9mLW1lZGlhLWRvY3VtZW50Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2Evb2Zmc2NyZWVuLWlmcmFtZS1vZi1tZWRpYS1kb2N1 bWVudC5odG1sCShub25leGlzdGVudCkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0MkNvY29hL29mZnNjcmVlbi1pZnJhbWUtb2YtbWVkaWEtZG9jdW1lbnQuaHRtbAkod29ya2lu ZyBjb3B5KQpAQCAtMCwwICsxLDE3IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KKyAgICBm dW5jdGlvbiBsb2FkZWQoKSB7CisgICAgICAgIHRyeSB7CisgICAgICAgICAgICB3aW5kb3cud2Vi a2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgibG9hZGVkIik7Cisg ICAgICAgfSBjYXRjaChlKSB7IH0KKyAgICB9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9u bG9hZD0ibG9hZGVkKCkiPgorICAgIAorPGRpdiBzdHlsZT0id2lkdGg6MjVweDsgaGVpZ2h0Ojgw MHB4OyI+PC9kaXY+Cis8aWZyYW1lIHdpZHRoPSIzMjAiIGhlaWdodD0iMjQwIiBzcmM9InRlc3Qu bXA0IiAvPgorCis8L2JvZHk+Cis8L2h0bWw+Cg==