176246 2017-09-01 15:12:18 -0700 Add WKUIDelegatePrivate equivalent of WKPageUIClient's toolbarsAreVisible 2017-09-27 12:39:49 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen thorton webkit-bug-importer oldest_to_newest 1344600 0 achristensen 2017-09-01 15:12:18 -0700 Add WKUIDelegatePrivate equivalent of WKPageUIClient's toolbarsAreVisible 1344601 1 319651 achristensen 2017-09-01 15:13:03 -0700 Created attachment 319651 Patch 1344614 2 achristensen 2017-09-01 15:25:32 -0700 http://trac.webkit.org/r221503 1353579 3 webkit-bug-importer 2017-09-27 12:39:49 -0700 <rdar://problem/34693713> 319651 2017-09-01 15:13:03 -0700 2017-09-01 15:15:23 -0700 Patch bug-176246-20170901151302.patch text/plain 13401 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjE0OTQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE3LTA5LTAxICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLVUlEZWxl Z2F0ZVByaXZhdGUgZXF1aXZhbGVudCBvZiBXS1BhZ2VVSUNsaWVudCdzIHRvb2xiYXJzQXJlVmlz aWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2 MjQ2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTI3MDAzNT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJVUlDbGll bnQuaDoKKyAgICAgICAgKEFQSTo6VUlDbGllbnQ6OnRvb2xiYXJzQXJlVmlzaWJsZSk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHA6CisgICAgICAgIChXS1BhZ2VTZXRQYWdl VUlDbGllbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJp dmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmg6CisgICAgICAg ICogVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW06CisgICAgICAgIChXZWJLaXQ6OlVJRGVs ZWdhdGU6OnNldERlbGVnYXRlKToKKyAgICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0ZTo6VUlDbGll bnQ6OnRvb2xiYXJzQXJlVmlzaWJsZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z2V0VG9vbGJhcnNBcmVWaXNp YmxlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKwogMjAxNy0wOS0wMSAgQWxleCBDaHJp c3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlcGxhY2UgV0tV SURlbGVnYXRlUHJpdmF0ZSdzIGlzUGxheWluZ01lZGlhRGlkQ2hhbmdlIHdpdGggS1ZPIF9pc1Bs YXlpbmdBdWRpbyBvbiBXS1dlYlZpZXcKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAkocmV2aXNpb24gMjIxNDg5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDA2Niw5ICs0MDY2LDExIEBA IHZvaWQgV2ViUGFnZVByb3h5OjpzZXRUb29sYmFyc0FyZVZpc2libGUKICAgICBtX3VpQ2xpZW50 LT5zZXRUb29sYmFyc0FyZVZpc2libGUodGhpcywgdG9vbGJhcnNBcmVWaXNpYmxlKTsKIH0KIAot dm9pZCBXZWJQYWdlUHJveHk6OmdldFRvb2xiYXJzQXJlVmlzaWJsZShib29sJiB0b29sYmFyc0Fy ZVZpc2libGUpCit2b2lkIFdlYlBhZ2VQcm94eTo6Z2V0VG9vbGJhcnNBcmVWaXNpYmxlKFJlZjxN ZXNzYWdlczo6V2ViUGFnZVByb3h5OjpHZXRUb29sYmFyc0FyZVZpc2libGU6OkRlbGF5ZWRSZXBs eT4mJiByZXBseSkKIHsKLSAgICB0b29sYmFyc0FyZVZpc2libGUgPSBtX3VpQ2xpZW50LT50b29s YmFyc0FyZVZpc2libGUodGhpcyk7CisgICAgbV91aUNsaWVudC0+dG9vbGJhcnNBcmVWaXNpYmxl KCp0aGlzLCBbcmVwbHkgPSBXVEZNb3ZlKHJlcGx5KV0oYm9vbCB2aXNpYmxlKSB7CisgICAgICAg IHJlcGx5LT5zZW5kKHZpc2libGUpOworICAgIH0pOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6 c2V0TWVudUJhcklzVmlzaWJsZShib29sIG1lbnVCYXJJc1Zpc2libGUpCkluZGV4OiBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMjIxNDY3KQorKysgU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMDYs NyArMTMwNiw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZXNvbHZlV2ViR0xQb2xpY3lGb3JVUkwo V2ViQ29yZTo6VVJMJiYsIFJlZjxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpSZXNvbHZlV2ViR0xQ b2xpY3lGb3JVUkw6OkRlbGF5ZWRSZXBseT4mJik7CiAjZW5kaWYgLy8gRU5BQkxFKFdFQkdMKQog ICAgIHZvaWQgc2V0VG9vbGJhcnNBcmVWaXNpYmxlKGJvb2wgdG9vbGJhcnNBcmVWaXNpYmxlKTsK LSAgICB2b2lkIGdldFRvb2xiYXJzQXJlVmlzaWJsZShib29sJiB0b29sYmFyc0FyZVZpc2libGUp OworICAgIHZvaWQgZ2V0VG9vbGJhcnNBcmVWaXNpYmxlKFJlZjxNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpHZXRUb29sYmFyc0FyZVZpc2libGU6OkRlbGF5ZWRSZXBseT4mJik7CiAgICAgdm9pZCBz ZXRNZW51QmFySXNWaXNpYmxlKGJvb2wgbWVudUJhcklzVmlzaWJsZSk7CiAgICAgdm9pZCBnZXRN ZW51QmFySXNWaXNpYmxlKGJvb2wmIG1lbnVCYXJJc1Zpc2libGUpOwogICAgIHZvaWQgc2V0U3Rh dHVzQmFySXNWaXNpYmxlKGJvb2wgc3RhdHVzQmFySXNWaXNpYmxlKTsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9u IDIyMTQ2NykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdl cy5pbgkod29ya2luZyBjb3B5KQpAQCAtNTEsNyArNTEsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdl UHJveHkgewogICAgIEZyYW1lU2V0TGFyZ2VzdEZyYW1lQ2hhbmdlZCh1aW50NjRfdCBmcmFtZUlE KQogICAgIFNldFJlbmRlclRyZWVTaXplKHVpbnQ2NF90IHRyZWVTaXplKQogICAgIFNldFRvb2xi YXJzQXJlVmlzaWJsZShib29sIHRvb2xiYXJzQXJlVmlzaWJsZSkKLSAgICBHZXRUb29sYmFyc0Fy ZVZpc2libGUoKSAtPiAoYm9vbCB0b29sYmFyc0FyZVZpc2libGUpCisgICAgR2V0VG9vbGJhcnNB cmVWaXNpYmxlKCkgLT4gKGJvb2wgdG9vbGJhcnNBcmVWaXNpYmxlKSBEZWxheWVkCiAgICAgU2V0 TWVudUJhcklzVmlzaWJsZShib29sIG1lbnVCYXJJc1Zpc2libGUpOwogICAgIEdldE1lbnVCYXJJ c1Zpc2libGUoKSAtPiAoYm9vbCBtZW51QmFySXNWaXNpYmxlKTsKICAgICBTZXRTdGF0dXNCYXJJ c1Zpc2libGUoYm9vbCBzdGF0dXNCYXJJc1Zpc2libGUpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaAkocmV2aXNpb24gMjIxNDg5KQorKysgU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0FQSVVJQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTk5LDcg Kzk5LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaWROb3RIYW5kbGVLZXlFdmVudChX ZWJLaXQ6OldlYlBhZ2VQcm94eSosIGNvbnN0IFdlYktpdDo6TmF0aXZlV2ViS2V5Ym9hcmRFdmVu dCYpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaWROb3RIYW5kbGVXaGVlbEV2ZW50KFdlYktpdDo6 V2ViUGFnZVByb3h5KiwgY29uc3QgV2ViS2l0OjpOYXRpdmVXZWJXaGVlbEV2ZW50JikgeyB9CiAK LSAgICB2aXJ0dWFsIGJvb2wgdG9vbGJhcnNBcmVWaXNpYmxlKFdlYktpdDo6V2ViUGFnZVByb3h5 KikgeyByZXR1cm4gdHJ1ZTsgfQorICAgIHZpcnR1YWwgdm9pZCB0b29sYmFyc0FyZVZpc2libGUo V2ViS2l0OjpXZWJQYWdlUHJveHkmLCBGdW5jdGlvbjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25I YW5kbGVyKSB7IGNvbXBsZXRpb25IYW5kbGVyKHRydWUpOyB9CiAgICAgdmlydHVhbCB2b2lkIHNl dFRvb2xiYXJzQXJlVmlzaWJsZShXZWJLaXQ6OldlYlBhZ2VQcm94eSosIGJvb2wpIHsgfQogICAg IHZpcnR1YWwgYm9vbCBtZW51QmFySXNWaXNpYmxlKFdlYktpdDo6V2ViUGFnZVByb3h5KikgeyBy ZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRNZW51QmFySXNWaXNpYmxlKFdlYktp dDo6V2ViUGFnZVByb3h5KiwgYm9vbCkgeyB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQy9XS1BhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9DL1dLUGFnZS5jcHAJKHJldmlzaW9uIDIyMTQ4OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4MzIsMTEgKzE4MzIs MTEgQEAgdm9pZCBXS1BhZ2VTZXRQYWdlVUlDbGllbnQoV0tQYWdlUmVmIHBhZwogICAgICAgICAg ICAgbV9jbGllbnQuZGlkTm90SGFuZGxlV2hlZWxFdmVudCh0b0FQSShwYWdlKSwgZXZlbnQubmF0 aXZlRXZlbnQoKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKICAgICAgICAgfQogCi0gICAg ICAgIGJvb2wgdG9vbGJhcnNBcmVWaXNpYmxlKFdlYlBhZ2VQcm94eSogcGFnZSkgZmluYWwKKyAg ICAgICAgdm9pZCB0b29sYmFyc0FyZVZpc2libGUoV2ViUGFnZVByb3h5JiBwYWdlLCBGdW5jdGlv bjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKSBmaW5hbAogICAgICAgICB7CiAgICAg ICAgICAgICBpZiAoIW1fY2xpZW50LnRvb2xiYXJzQXJlVmlzaWJsZSkKLSAgICAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAgIHJldHVybiBtX2NsaWVudC50b29sYmFyc0FyZVZp c2libGUodG9BUEkocGFnZSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CisgICAgICAgICAg ICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKHRydWUpOworICAgICAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIobV9jbGllbnQudG9vbGJhcnNBcmVWaXNpYmxlKHRvQVBJKCZwYWdlKSwgbV9j bGllbnQuYmFzZS5jbGllbnRJbmZvKSk7CiAgICAgICAgIH0KIAogICAgICAgICB2b2lkIHNldFRv b2xiYXJzQXJlVmlzaWJsZShXZWJQYWdlUHJveHkqIHBhZ2UsIGJvb2wgdmlzaWJsZSkgZmluYWwK SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGVQcml2 YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dL VUlEZWxlZ2F0ZVByaXZhdGUuaAkocmV2aXNpb24gMjIxNDg5KQorKysgU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0ZVByaXZhdGUuaAkod29ya2luZyBjb3B5KQpA QCAtMTUwLDYgKzE1MCw3IEBAIHN0cnVjdCBVSUVkZ2VJbnNldHM7CiAtICh2b2lkKV93ZWJWaWV3 OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRpZE5vdEhhbmRsZVdoZWVsRXZlbnQ6KE5TRXZlbnQgKill dmVudCBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CiAtICh2b2lkKV93ZWJW aWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGhhbmRsZUF1dG9wbGF5RXZlbnQ6KF9XS0F1dG9wbGF5 RXZlbnQpZXZlbnQgd2l0aEZsYWdzOihfV0tBdXRvcGxheUV2ZW50RmxhZ3MpZmxhZ3MgV0tfQVBJ X0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOwogLSAodm9pZClfd2ViVmlldzooV0tXZWJW aWV3ICopd2ViVmlldyBkaWRDbGlja0F1dG9GaWxsQnV0dG9uV2l0aFVzZXJJbmZvOihpZCA8TlNT ZWN1cmVDb2Rpbmc+KXVzZXJJbmZvIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEp KTsKKy0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZ2V0VG9vbGJhcnNBcmVW aXNpYmxlV2l0aENvbXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKEJPT0wpKWNvbXBsZXRpb25IYW5k bGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKIC0gKHZvaWQpX3dlYlZp ZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgc2F2ZURhdGFUb0ZpbGU6KE5TRGF0YSAqKWRhdGEgc3Vn Z2VzdGVkRmlsZW5hbWU6KE5TU3RyaW5nICopc3VnZ2VzdGVkRmlsZW5hbWUgbWltZVR5cGU6KE5T U3RyaW5nICopbWltZVR5cGUgb3JpZ2luYXRpbmdVUkw6KE5TVVJMICopdXJsIFdLX0FQSV9BVkFJ TEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAq KXdlYlZpZXcgZGlkRXhjZWVkQmFja2dyb3VuZFJlc291cmNlTGltaXRXaGlsZUluRm9yZWdyb3Vu ZDooX1dLUmVzb3VyY2VMaW1pdClsaW1pdCBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNf VEJBKSk7CiAtIChOU01lbnUgKilfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBjb250ZXh0 TWVudTooTlNNZW51ICopbWVudSBmb3JFbGVtZW50OihfV0tDb250ZXh0TWVudUVsZW1lbnRJbmZv ICopZWxlbWVudCBXS19BUElfQVZBSUxBQkxFKG1hY29zeCgxMC4xMikpOwpJbmRleDogU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUuaAkocmV2aXNpb24gMjIxNDg5KQor KysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCSh3b3JraW5nIGNv cHkpCkBAIC0xMDMsNiArMTAzLDcgQEAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBkaWROb3RIYW5k bGVXaGVlbEV2ZW50KFdlYlBhZ2VQcm94eSosIGNvbnN0IE5hdGl2ZVdlYldoZWVsRXZlbnQmKSBm aW5hbDsKICAgICAgICAgdm9pZCBoYW5kbGVBdXRvcGxheUV2ZW50KFdlYlBhZ2VQcm94eSYsIFdl YkNvcmU6OkF1dG9wbGF5RXZlbnQsIE9wdGlvblNldDxXZWJDb3JlOjpBdXRvcGxheUV2ZW50Rmxh Z3M+KSBmaW5hbDsKICAgICAgICAgdm9pZCBkaWRDbGlja0F1dG9GaWxsQnV0dG9uKFdlYlBhZ2VQ cm94eSYsIEFQSTo6T2JqZWN0KikgZmluYWw7CisgICAgICAgIHZvaWQgdG9vbGJhcnNBcmVWaXNp YmxlKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgRnVuY3Rpb248dm9pZChib29sKT4mJikgZmluYWw7 CiAgICAgICAgIGJvb2wgcnVuT3BlblBhbmVsKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkq LCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEmLCBBUEk6Ok9wZW5QYW5lbFBhcmFt ZXRlcnMqLCBXZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclByb3h5KikgZmluYWw7CiAgICAgICAg IHZvaWQgZGlkRXhjZWVkQmFja2dyb3VuZFJlc291cmNlTGltaXRXaGlsZUluRm9yZWdyb3VuZChX ZWJQYWdlUHJveHkmLCBXS1Jlc291cmNlTGltaXQpIGZpbmFsOwogICAgICAgICB2b2lkIHNhdmVE YXRhVG9GaWxlSW5Eb3dubG9hZHNGb2xkZXIoV2ViUGFnZVByb3h5KiwgY29uc3QgV1RGOjpTdHJp bmcmLCBjb25zdCBXVEY6OlN0cmluZyYsIGNvbnN0IFdlYkNvcmU6OlVSTCYsIEFQSTo6RGF0YSYp IGZpbmFsOwpAQCAtMTUyLDYgKzE1Myw3IEBAIHByaXZhdGU6CiAgICAgICAgIGJvb2wgd2ViVmll d0RpZE5vdEhhbmRsZVdoZWVsRXZlbnQgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdIYW5kbGVB dXRvcGxheUV2ZW50V2l0aEZsYWdzIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3RGlkQ2xpY2tB dXRvRmlsbEJ1dHRvbldpdGhVc2VySW5mbyA6IDE7CisgICAgICAgIGJvb2wgd2ViVmlld0dldFRv b2xiYXJzQXJlVmlzaWJsZVdpdGhDb21wbGV0aW9uSGFuZGxlciA6IDE7CiAgICAgICAgIGJvb2wg d2ViVmlld0RpZEV4Y2VlZEJhY2tncm91bmRSZXNvdXJjZUxpbWl0V2hpbGVJbkZvcmVncm91bmQg OiAxOwogICAgICAgICBib29sIHdlYlZpZXdTYXZlRGF0YVRvRmlsZVN1Z2dlc3RlZEZpbGVuYW1l TWltZVR5cGVPcmlnaW5hdGluZ1VSTCA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld1J1bk9wZW5Q YW5lbFdpdGhQYXJhbWV0ZXJzSW5pdGlhdGVkQnlGcmFtZUNvbXBsZXRpb25IYW5kbGVyIDogMTsK SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQkocmV2 aXNpb24gMjIxNDg5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0 ZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTA2LDYgKzEwNiw3IEBAIHZvaWQgVUlEZWxlZ2F0ZTo6 c2V0RGVsZWdhdGUoaWQgPFdLVUlEZWwKICAgICBtX2RlbGVnYXRlTWV0aG9kcy5mb2N1c1dlYlZp ZXcgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfZm9jdXNXZWJWaWV3 OildOwogICAgIG1fZGVsZWdhdGVNZXRob2RzLnVuZm9jdXNXZWJWaWV3ID0gW2RlbGVnYXRlIHJl c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3VuZm9jdXNXZWJWaWV3OildOwogICAgIG1fZGVs ZWdhdGVNZXRob2RzLndlYlZpZXdUYWtlRm9jdXMgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVj dG9yOkBzZWxlY3Rvcihfd2ViVmlldzp0YWtlRm9jdXM6KV07CisgICAgbV9kZWxlZ2F0ZU1ldGhv ZHMud2ViVmlld0dldFRvb2xiYXJzQXJlVmlzaWJsZVdpdGhDb21wbGV0aW9uSGFuZGxlciA9IFtk ZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmdldFRvb2xiYXJz QXJlVmlzaWJsZVdpdGhDb21wbGV0aW9uSGFuZGxlcjopXTsKICAgICBtX2RlbGVnYXRlTWV0aG9k cy53ZWJWaWV3RGlkTm90SGFuZGxlV2hlZWxFdmVudCA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2Vs ZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmRpZE5vdEhhbmRsZVdoZWVsRXZlbnQ6KV07CiAgICAg bV9kZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0hhbmRsZUF1dG9wbGF5RXZlbnRXaXRoRmxhZ3MgPSBb ZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpoYW5kbGVBdXRv cGxheUV2ZW50OndpdGhGbGFnczopXTsKICAgICBtX2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlk Q2xpY2tBdXRvRmlsbEJ1dHRvbldpdGhVc2VySW5mbyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2Vs ZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmRpZENsaWNrQXV0b0ZpbGxCdXR0b25XaXRoVXNlcklu Zm86KV07CkBAIC00OTAsNiArNDkxLDIzIEBAIHN0YXRpYyBfV0tBdXRvcGxheUV2ZW50IHRvV0tB dXRvcGxheUV2ZW4KICAgICByZXR1cm4gX1dLQXV0b3BsYXlFdmVudERpZFBsYXlNZWRpYVByZXZl bnRlZEZyb21BdXRvcGxheWluZzsKIH0KIAordm9pZCBVSURlbGVnYXRlOjpVSUNsaWVudDo6dG9v bGJhcnNBcmVWaXNpYmxlKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgRnVuY3Rpb248dm9pZChib29s KT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICBpZiAoIW1fdWlEZWxlZ2F0ZS5tX2RlbGVn YXRlTWV0aG9kcy53ZWJWaWV3R2V0VG9vbGJhcnNBcmVWaXNpYmxlV2l0aENvbXBsZXRpb25IYW5k bGVyKQorICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIodHJ1ZSk7CisgICAgCisgICAg YXV0byBkZWxlZ2F0ZSA9IG1fdWlEZWxlZ2F0ZS5tX2RlbGVnYXRlLmdldCgpOworICAgIGlmICgh ZGVsZWdhdGUpCisgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcih0cnVlKTsKKyAgICAK KyAgICBbKGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPilkZWxlZ2F0ZSBfd2ViVmlldzptX3VpRGVs ZWdhdGUubV93ZWJWaWV3IGdldFRvb2xiYXJzQXJlVmlzaWJsZVdpdGhDb21wbGV0aW9uSGFuZGxl cjpCbG9ja1B0cjx2b2lkKEJPT0wpPjo6ZnJvbUNhbGxhYmxlKFtjb21wbGV0aW9uSGFuZGxlciA9 IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpLCBjaGVja2VyID0gQ29tcGxldGlvbkhhbmRsZXJD YWxsQ2hlY2tlcjo6Y3JlYXRlKGRlbGVnYXRlLmdldCgpLCBAc2VsZWN0b3IoX3dlYlZpZXc6Z2V0 VG9vbGJhcnNBcmVWaXNpYmxlV2l0aENvbXBsZXRpb25IYW5kbGVyOikpXShCT09MIHZpc2libGUp IHsKKyAgICAgICAgaWYgKGNoZWNrZXItPmNvbXBsZXRpb25IYW5kbGVySGFzQmVlbkNhbGxlZCgp KQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBjaGVja2VyLT5kaWRDYWxsQ29tcGxldGlv bkhhbmRsZXIoKTsKKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIodmlzaWJsZSk7CisgICAgfSku Z2V0KCldOworfQorCiB2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50OjpkaWRDbGlja0F1dG9GaWxs QnV0dG9uKFdlYlBhZ2VQcm94eSYsIEFQSTo6T2JqZWN0KiB1c2VySW5mbykKIHsKICAgICBpZiAo IW1fdWlEZWxlZ2F0ZS5tX2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkQ2xpY2tBdXRvRmlsbEJ1 dHRvbldpdGhVc2VySW5mbykKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMTQ5OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE3LTA5LTAxICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLVUlEZWxlZ2F0ZVBy aXZhdGUgZXF1aXZhbGVudCBvZiBXS1BhZ2VVSUNsaWVudCdzIHRvb2xiYXJzQXJlVmlzaWJsZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2MjQ2Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTI3MDAzNT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvVUlEZWxlZ2F0ZS5tbToKKyAgICAgICAgKC1bVG9vbGJhckRlbGVnYXRlIF93ZWJWaWV3Omdl dFRvb2xiYXJzQXJlVmlzaWJsZVdpdGhDb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKC1b VG9vbGJhckRlbGVnYXRlIHdlYlZpZXc6cnVuSmF2YVNjcmlwdEFsZXJ0UGFuZWxXaXRoTWVzc2Fn ZTppbml0aWF0ZWRCeUZyYW1lOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAoVEVTVCk6 CisKIDIwMTctMDktMDEgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAg ICBXU0wgc2hvdWxkIGhhdmUgbW9yZSB0ZXN0cyBvZiB0eXBlIGNoZWNraW5nIGZhaWx1cmVzCklu ZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1VJRGVsZWdhdGUubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9VSURl bGVnYXRlLm1tCShyZXZpc2lvbiAyMjE0ODkpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1VJRGVsZWdhdGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTEyMiw2ICsxMjIs NDEgQEAgVEVTVChXZWJLaXQyLCBTaG93V2ViVmlldykKICAgICBBU1NFUlRfRVEod2ViVmlld0Zy b21EZWxlZ2F0ZUNhbGxiYWNrLCBjcmVhdGVkV2ViVmlldyk7CiB9CiAKK2Jvb2wgZmlyc3RUb29s YmFyRG9uZTsKKworQGludGVyZmFjZSBUb29sYmFyRGVsZWdhdGUgOiBOU09iamVjdCA8V0tVSURl bGVnYXRlUHJpdmF0ZT4KK0BlbmQKKworQGltcGxlbWVudGF0aW9uIFRvb2xiYXJEZWxlZ2F0ZQor CistICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGdldFRvb2xiYXJzQXJlVmlz aWJsZVdpdGhDb21wbGV0aW9uSGFuZGxlcjoodm9pZCheKShCT09MKSljb21wbGV0aW9uSGFuZGxl cgoreworICAgIGNvbXBsZXRpb25IYW5kbGVyKGZpcnN0VG9vbGJhckRvbmUpOworfQorCistICh2 b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgcnVuSmF2YVNjcmlwdEFsZXJ0UGFuZWxX aXRoTWVzc2FnZTooTlNTdHJpbmcgKiltZXNzYWdlIGluaXRpYXRlZEJ5RnJhbWU6KFdLRnJhbWVJ bmZvICopZnJhbWUgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25I YW5kbGVyCit7CisgICAgaWYgKGZpcnN0VG9vbGJhckRvbmUpIHsKKyAgICAgICAgRVhQRUNUX1NU UkVRKG1lc3NhZ2UuVVRGOFN0cmluZywgInZpc2libGU6dHJ1ZSIpOworICAgICAgICBkb25lID0g dHJ1ZTsKKyAgICB9IGVsc2UgeworICAgICAgICBFWFBFQ1RfU1RSRVEobWVzc2FnZS5VVEY4U3Ry aW5nLCAidmlzaWJsZTpmYWxzZSIpOworICAgICAgICBmaXJzdFRvb2xiYXJEb25lID0gdHJ1ZTsK KyAgICB9CisgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKK30KKworQGVuZAorCitURVNUKFdlYktp dDIsIFRvb2xiYXJWaXNpYmxlKQoreworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0 V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgODAwLCA2MDAp IGNvbmZpZ3VyYXRpb246W1tbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0gYXV0 b3JlbGVhc2VdXSk7CisgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tUb29sYmFyRGVsZWdh dGUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldyBzZXRVSURlbGVnYXRlOmRlbGVnYXRlLmdl dCgpXTsKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmc6QCI8c2NyaXB0 PmFsZXJ0KCd2aXNpYmxlOicgKyB3aW5kb3cudG9vbGJhci52aXNpYmxlKTthbGVydCgndmlzaWJs ZTonICsgd2luZG93LnRvb2xiYXIudmlzaWJsZSk8L3NjcmlwdD4iXTsKKyAgICBUZXN0V2ViS2l0 QVBJOjpVdGlsOjpydW4oJmRvbmUpOworfQorCiBzdGF0aWMgYm9vbCByZWFkeUZvckNsaWNrOwog CiBAaW50ZXJmYWNlIEF1dG9GaWxsRGVsZWdhdGUgOiBOU09iamVjdCA8V0tVSURlbGVnYXRlUHJp dmF0ZT4K