35536 2010-03-01 12:35:25 -0800 [Qt] QtLauncher must be refactored to fix command line arguments usage 2010-03-03 06:42:28 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 35303 35542 0 jesus webkit-unassigned commit-queue oldest_to_newest 194766 0 jesus 2010-03-01 12:35:25 -0800 QtLauncher needs to be refactored so it can respect command line arguments (i.e.g.: -graphicsbased wasn't being respected) and inherit settings when you clone or create a new window. 194773 1 49739 jesus 2010-03-01 12:50:48 -0800 Created attachment 49739 Refactor of QtLauncher This fixes the problems described and will make it easier to add more features in the nearby future. 195510 2 49739 commit-queue 2010-03-03 06:42:24 -0800 Comment on attachment 49739 Refactor of QtLauncher Clearing flags on attachment: 49739 Committed r55460: <http://trac.webkit.org/changeset/55460> 195511 3 commit-queue 2010-03-03 06:42:28 -0800 All reviewed patches have been landed. Closing bug. 49739 2010-03-01 12:50:48 -0800 2010-03-03 06:42:24 -0800 Refactor of QtLauncher 0001-Refactor-QtLauncher-so-it-respects-command-line-arguments.patch text/plain 13570 jesus RnJvbSAyNzdhZGYzYTg5MzRkYWQ0YTRkMDg1ZWYwZjY0YzcwMjQ0NmI1OWQ2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZXN1cyBTYW5jaGV6LVBhbGVuY2lhIDxqZXN1cy5wYWxlbmNp YUBvcGVuYm9zc2Eub3JnPgpEYXRlOiBNb24sIDEgTWFyIDIwMTAgMTc6NDU6MDUgLTAzMDAKU3Vi amVjdDogW1BBVENIXSBSZWZhY3RvciBRdExhdW5jaGVyIHNvIGl0IHJlc3BlY3RzIGNvbW1hbmQg bGluZSBhcmd1bWVudHMKIGFuZCBpbmhlcml0cyBzZXR0aW5ncyB3aGVuIHlvdSBjbG9uZSBvciBj cmVhdGUgYSBuZXcgd2luZG93LgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpJbXBsZW1l bnRlZCB3aXRoIGhlbHAgb2YgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCgpbUXRdIFF0TGF1 bmNoZXIgbXVzdCBiZSByZWZhY3RvcmVkIHRvIGZpeCBjb21tYW5kIGxpbmUgYXJndW1lbnRzIHVz YWdlCmh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTUzNgoKKiBRdExh dW5jaGVyL21haW4uY3BwOgooTGF1bmNoZXJXaW5kb3c6OkxhdW5jaGVyV2luZG93KToKKExhdW5j aGVyV2luZG93Ojppbml0KToKKExhdW5jaGVyV2luZG93Ojppc0dyYXBoaWNzQmFzZWQpOgooYXBw bHlTZXR0aW5nKToKKExhdW5jaGVyV2luZG93OjphcHBseVByZWZzKToKKExhdW5jaGVyV2luZG93 Ojppbml0aWFsaXplVmlldyk6CihMYXVuY2hlcldpbmRvdzo6bmV3V2luZG93KToKKExhdW5jaGVy V2luZG93OjpjbG9uZVdpbmRvdyk6CihMYXVuY2hlcldpbmRvdzo6Y3JlYXRlQ2hyb21lKToKKG1h aW4pOgoqIFF0TGF1bmNoZXIvd2Vidmlldy5jcHA6CihXZWJWaWV3R3JhcGhpY3NCYXNlZDo6V2Vi Vmlld0dyYXBoaWNzQmFzZWQpOgooV2ViVmlld0dyYXBoaWNzQmFzZWQ6OnNldEZyYW1lUmF0ZU1l YXN1cmVtZW50RW5hYmxlZCk6CiogUXRMYXVuY2hlci93ZWJ2aWV3Lmg6CihXZWJWaWV3R3JhcGhp Y3NCYXNlZDo6aXRlbUNhY2hlTW9kZSk6CihXZWJWaWV3R3JhcGhpY3NCYXNlZDo6ZnJhbWVSYXRl TWVhc3VyZW1lbnRFbmFibGVkKToKLS0tCiBXZWJLaXRUb29scy9DaGFuZ2VMb2cgICAgICAgICAg ICAgIHwgICAzMCArKysrKysrKysKIFdlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbi5jcHAgICAg fCAgMTI0ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiBXZWJLaXRUb29scy9R dExhdW5jaGVyL3dlYnZpZXcuY3BwIHwgICAxNyArKystLQogV2ViS2l0VG9vbHMvUXRMYXVuY2hl ci93ZWJ2aWV3LmggICB8ICAgIDYgKystCiA0IGZpbGVzIGNoYW5nZWQsIDEyNiBpbnNlcnRpb25z KCspLCA1MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cg Yi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggMDg2M2YwMi4uYjY5MmNjNCAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDMzIEBACisyMDEwLTAzLTAxICBKZXN1cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMu cGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBSZWZhY3RvciBRdExhdW5jaGVyIHNvIGl0IHJlc3BlY3RzIGNvbW1h bmQgbGluZSBhcmd1bWVudHMKKyAgICAgICAgYW5kIGluaGVyaXRzIHNldHRpbmdzIHdoZW4geW91 IGNsb25lIG9yIGNyZWF0ZSBhIG5ldyB3aW5kb3cuCisKKyAgICAgICAgSW1wbGVtZW50ZWQgd2l0 aCBoZWxwIG9mIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgorCisgICAgICAgIFtRdF0gUXRM YXVuY2hlciBtdXN0IGJlIHJlZmFjdG9yZWQgdG8gZml4IGNvbW1hbmQgbGluZSBhcmd1bWVudHMg dXNhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1 NTM2CisKKyAgICAgICAgKiBRdExhdW5jaGVyL21haW4uY3BwOgorICAgICAgICAoTGF1bmNoZXJX aW5kb3c6OkxhdW5jaGVyV2luZG93KToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojppbml0KToK KyAgICAgICAgKExhdW5jaGVyV2luZG93Ojppc0dyYXBoaWNzQmFzZWQpOgorICAgICAgICAoYXBw bHlTZXR0aW5nKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93OjphcHBseVByZWZzKToKKyAgICAg ICAgKExhdW5jaGVyV2luZG93Ojppbml0aWFsaXplVmlldyk6CisgICAgICAgIChMYXVuY2hlcldp bmRvdzo6bmV3V2luZG93KToKKyAgICAgICAgKExhdW5jaGVyV2luZG93OjpjbG9uZVdpbmRvdyk6 CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6Y3JlYXRlQ2hyb21lKToKKyAgICAgICAgKG1haW4p OgorICAgICAgICAqIFF0TGF1bmNoZXIvd2Vidmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3R3Jh cGhpY3NCYXNlZDo6V2ViVmlld0dyYXBoaWNzQmFzZWQpOgorICAgICAgICAoV2ViVmlld0dyYXBo aWNzQmFzZWQ6OnNldEZyYW1lUmF0ZU1lYXN1cmVtZW50RW5hYmxlZCk6CisgICAgICAgICogUXRM YXVuY2hlci93ZWJ2aWV3Lmg6CisgICAgICAgIChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6aXRlbUNh Y2hlTW9kZSk6CisgICAgICAgIChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6ZnJhbWVSYXRlTWVhc3Vy ZW1lbnRFbmFibGVkKToKKwogMjAxMC0wMy0wMSAgQ2hyaXMgSmVyZG9uZWsgIDxjamVyZG9uZWtA d2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvUXRMYXVuY2hlci9tYWluLmNwcCBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbi5jcHAK aW5kZXggZmU2YTc0My4uNzA3YjM0MSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hl ci9tYWluLmNwcAorKysgYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwCkBAIC04Miw4 ICs4Miw3IEBAIGNsYXNzIExhdW5jaGVyV2luZG93IDogcHVibGljIE1haW5XaW5kb3cgewogICAg IFFfT0JKRUNUCiAKIHB1YmxpYzoKLSAgICBMYXVuY2hlcldpbmRvdyhRU3RyaW5nIHVybCA9IFFT dHJpbmcoKSk7Ci0gICAgTGF1bmNoZXJXaW5kb3coUUdyYXBoaWNzU2NlbmUqIHNjZW5lKTsKKyAg ICBMYXVuY2hlcldpbmRvdyhMYXVuY2hlcldpbmRvdyogb3RoZXIgPSAwLCBib29sIHNoYXJlU2Nl bmUgPSBmYWxzZSk7CiAgICAgdmlydHVhbCB+TGF1bmNoZXJXaW5kb3coKTsKIAogICAgIHZpcnR1 YWwgdm9pZCBrZXlQcmVzc0V2ZW50KFFLZXlFdmVudCogZXZlbnQpOwpAQCAtMTIxLDEyICsxMjAs MTEgQEAgcHJvdGVjdGVkIHNsb3RzOgogICAgIHZvaWQgaW5pdGlhbGl6ZVZpZXcoYm9vbCB1c2VH cmFwaGljc1ZpZXcgPSBmYWxzZSk7CiAKIHB1YmxpYyBzbG90czoKLSAgICB2b2lkIG5ld1dpbmRv dyhjb25zdCBRU3RyaW5nJiB1cmwgPSBRU3RyaW5nKCkpOworICAgIHZvaWQgbmV3V2luZG93KCk7 CiAgICAgdm9pZCBjbG9uZVdpbmRvdygpOwogCiBwcml2YXRlOgotICAgIC8vIGNyZWF0ZSB0aGUg c3RhdHVzIGJhciwgdG9vbCBiYXIgJiBtZW51Ci0gICAgdm9pZCBzZXR1cFVJKCk7CisgICAgdm9p ZCBjcmVhdGVDaHJvbWUoKTsKIAogcHJpdmF0ZToKICAgICBRVmVjdG9yPGludD4gem9vbUxldmVs czsKQEAgLTE0NSwyNCArMTQzLDMyIEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIHZvaWQgaW5p dChib29sIHVzZUdyYXBoaWNzVmlldyA9IGZhbHNlKTsKKyAgICBib29sIGlzR3JhcGhpY3NCYXNl ZCgpIGNvbnN0OworICAgIHZvaWQgYXBwbHlQcmVmcyhMYXVuY2hlcldpbmRvdyogb3RoZXIgPSAw KTsKIH07CiAKLQotTGF1bmNoZXJXaW5kb3c6OkxhdW5jaGVyV2luZG93KFFTdHJpbmcgdXJsKQot ICAgIDogTWFpbldpbmRvdyh1cmwpCi0gICAgLCBjdXJyZW50Wm9vbSgxMDApCi17Ci0gICAgaW5p dCgpOwotICAgIGxvYWQodXJsKTsKLX0KLQotTGF1bmNoZXJXaW5kb3c6OkxhdW5jaGVyV2luZG93 KFFHcmFwaGljc1NjZW5lKiBzY2VuZSkKK0xhdW5jaGVyV2luZG93OjpMYXVuY2hlcldpbmRvdyhM YXVuY2hlcldpbmRvdyogb3RoZXIsIGJvb2wgc2hhcmVTY2VuZSkKICAgICA6IE1haW5XaW5kb3co KQogICAgICwgY3VycmVudFpvb20oMTAwKQotewotICAgIGluaXQodHJ1ZSk7IC8vIHVzZSBRR3Jh cGhpY3NWaWV3Ci0gICAgUUdyYXBoaWNzVmlldyogdmlldyA9IHN0YXRpY19jYXN0PFFHcmFwaGlj c1ZpZXcqPihtX3ZpZXcpOwotICAgIHZpZXctPnNldFNjZW5lKHNjZW5lKTsKKyAgICAsIG1fdmll dygwKQorICAgICwgaW5zcGVjdG9yKDApCisgICAgLCBmb3JtYXRNZW51QWN0aW9uKDApCisgICAg LCBmbGlwQW5pbWF0ZWQoMCkKKyAgICAsIGZsaXBZQW5pbWF0ZWQoMCkKK3sKKyAgICBpZiAob3Ro ZXIpIHsKKyAgICAgICAgaW5pdChvdGhlci0+aXNHcmFwaGljc0Jhc2VkKCkpOworICAgICAgICBh cHBseVByZWZzKG90aGVyKTsKKyAgICAgICAgaWYgKHNoYXJlU2NlbmUgJiYgb3RoZXItPmlzR3Jh cGhpY3NCYXNlZCgpKSB7CisgICAgICAgICAgICBRR3JhcGhpY3NWaWV3KiBvdGhlclZpZXcgPSBz dGF0aWNfY2FzdDxRR3JhcGhpY3NWaWV3Kj4ob3RoZXItPm1fdmlldyk7CisgICAgICAgICAgICBz dGF0aWNfY2FzdDxRR3JhcGhpY3NWaWV3Kj4obV92aWV3KS0+c2V0U2NlbmUob3RoZXJWaWV3LT5z Y2VuZSgpKTsKKyAgICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICAgIGluaXQoZ1VzZUdyYXBo aWNzVmlldyk7CisgICAgICAgIGFwcGx5UHJlZnMoKTsKKyAgICB9CisKKyAgICBjcmVhdGVDaHJv bWUoKTsKIH0KIAogTGF1bmNoZXJXaW5kb3c6On5MYXVuY2hlcldpbmRvdygpCkBAIC0xODEsOCAr MTg3LDYgQEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6aW5pdChib29sIHVzZUdyYXBoaWNzVmlldykK ICAgICByZXNpemUoODAwLCA2MDApOwogI2VuZGlmCiAKLSAgICBtX3ZpZXcgPSAwOwotCiAgICAg aW5pdGlhbGl6ZVZpZXcodXNlR3JhcGhpY3NWaWV3KTsKIAogICAgIGNvbm5lY3QocGFnZSgpLCBT SUdOQUwobG9hZFN0YXJ0ZWQoKSksIHRoaXMsIFNMT1QobG9hZFN0YXJ0ZWQoKSkpOwpAQCAtMTk4 LDggKzIwMiw2IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmluaXQoYm9vbCB1c2VHcmFwaGljc1Zp ZXcpCiAgICAgaW5zcGVjdG9yLT5oaWRlKCk7CiAgICAgY29ubmVjdCh0aGlzLCBTSUdOQUwoZGVz dHJveWVkKCkpLCBpbnNwZWN0b3IsIFNMT1QoZGVsZXRlTGF0ZXIoKSkpOwogCi0gICAgc2V0dXBV SSgpOwotCiAgICAgLy8gdGhlIHpvb20gdmFsdWVzIGFyZSBjaG9zZW4gdG8gYmUgbGlrZSBpbiBN b3ppbGxhIEZpcmVmb3ggMwogICAgIHpvb21MZXZlbHMgPDwgMzAgPDwgNTAgPDwgNjcgPDwgODAg PDwgOTA7CiAgICAgem9vbUxldmVscyA8PCAxMDA7CkBAIC0yMDgsNiArMjEwLDM5IEBAIHZvaWQg TGF1bmNoZXJXaW5kb3c6OmluaXQoYm9vbCB1c2VHcmFwaGljc1ZpZXcpCiAgICAgZ3JhYlpvb21L ZXlzKHRydWUpOwogfQogCitib29sIExhdW5jaGVyV2luZG93Ojppc0dyYXBoaWNzQmFzZWQoKSBj b25zdAoreworICAgIHJldHVybiBib29sKHFvYmplY3RfY2FzdDxRR3JhcGhpY3NWaWV3Kj4obV92 aWV3KSk7Cit9CisKK2lubGluZSB2b2lkIGFwcGx5U2V0dGluZyhRV2ViU2V0dGluZ3M6OldlYkF0 dHJpYnV0ZSB0eXBlLCBRV2ViU2V0dGluZ3MqIHNldHRpbmdzLCBRV2ViU2V0dGluZ3MqIG90aGVy LCBib29sIGRlZmF1bHRWYWx1ZSkKK3sKKyAgICBzZXR0aW5ncy0+c2V0QXR0cmlidXRlKHR5cGUs IG90aGVyID8gb3RoZXItPnRlc3RBdHRyaWJ1dGUodHlwZSkgOiBkZWZhdWx0VmFsdWUpOworfQor Cit2b2lkIExhdW5jaGVyV2luZG93OjphcHBseVByZWZzKExhdW5jaGVyV2luZG93KiBzb3VyY2Up Cit7CisgICAgUVdlYlNldHRpbmdzKiBvdGhlciA9IHNvdXJjZSA/IHNvdXJjZS0+cGFnZSgpLT5z ZXR0aW5ncygpIDogMDsKKyAgICBRV2ViU2V0dGluZ3MqIHNldHRpbmdzID0gcGFnZSgpLT5zZXR0 aW5ncygpOworCisgICAgYXBwbHlTZXR0aW5nKFFXZWJTZXR0aW5nczo6QWNjZWxlcmF0ZWRDb21w b3NpdGluZ0VuYWJsZWQsIHNldHRpbmdzLCBvdGhlciwgZ1VzZUNvbXBvc2l0aW5nKTsKKyAgICBh cHBseVNldHRpbmcoUVdlYlNldHRpbmdzOjpXZWJHTEVuYWJsZWQsIHNldHRpbmdzLCBvdGhlciwg ZmFsc2UpOworCisgICAgaWYgKCFpc0dyYXBoaWNzQmFzZWQoKSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgV2ViVmlld0dyYXBoaWNzQmFzZWQqIHZpZXcgPSBzdGF0aWNfY2FzdDxXZWJWaWV3R3Jh cGhpY3NCYXNlZCo+KG1fdmlldyk7CisgICAgV2ViVmlld0dyYXBoaWNzQmFzZWQqIG90aGVyVmll dyA9IHNvdXJjZSA/IHFvYmplY3RfY2FzdDxXZWJWaWV3R3JhcGhpY3NCYXNlZCo+KHNvdXJjZS0+ bV92aWV3KSA6IDA7CisKKyAgICB2aWV3LT5zZXRWaWV3cG9ydFVwZGF0ZU1vZGUob3RoZXJWaWV3 ID8gb3RoZXJWaWV3LT52aWV3cG9ydFVwZGF0ZU1vZGUoKSA6IGdWaWV3cG9ydFVwZGF0ZU1vZGUp OworICAgIHZpZXctPnNldEZyYW1lUmF0ZU1lYXN1cmVtZW50RW5hYmxlZChvdGhlclZpZXcgPyBv dGhlclZpZXctPmZyYW1lUmF0ZU1lYXN1cmVtZW50RW5hYmxlZCgpIDogZ1Nob3dGcmFtZVJhdGUp OworCisgICAgaWYgKG90aGVyVmlldykKKyAgICAgICAgdmlldy0+c2V0SXRlbUNhY2hlTW9kZShv dGhlclZpZXctPml0ZW1DYWNoZU1vZGUoKSk7CisgICAgZWxzZQorICAgICAgICB2aWV3LT5zZXRJ dGVtQ2FjaGVNb2RlKGdDYWNoZVdlYlZpZXcgPyBRR3JhcGhpY3NJdGVtOjpEZXZpY2VDb29yZGlu YXRlQ2FjaGUgOiBRR3JhcGhpY3NJdGVtOjpOb0NhY2hlKTsKK30KKwogdm9pZCBMYXVuY2hlcldp bmRvdzo6a2V5UHJlc3NFdmVudChRS2V5RXZlbnQqIGV2ZW50KQogewogI2lmZGVmIFFfV1NfTUFF TU9fNQpAQCAtNDg1LDExICs1MjAsNiBAQCB2b2lkIExhdW5jaGVyV2luZG93Ojppbml0aWFsaXpl Vmlldyhib29sIHVzZUdyYXBoaWNzVmlldykKICAgICB9IGVsc2UgewogICAgICAgICBXZWJWaWV3 R3JhcGhpY3NCYXNlZCogdmlldyA9IG5ldyBXZWJWaWV3R3JhcGhpY3NCYXNlZChzcGxpdHRlcik7 CiAgICAgICAgIHZpZXctPnNldFBhZ2UocGFnZSgpKTsKLSAgICAgICAgdmlldy0+c2V0Vmlld3Bv cnRVcGRhdGVNb2RlKGdWaWV3cG9ydFVwZGF0ZU1vZGUpOwotICAgICAgICB2aWV3LT5zZXRJdGVt Q2FjaGVNb2RlKGdDYWNoZVdlYlZpZXcgPyBRR3JhcGhpY3NJdGVtOjpEZXZpY2VDb29yZGluYXRl Q2FjaGUgOiBRR3JhcGhpY3NJdGVtOjpOb0NhY2hlKTsKLSAgICAgICAgaWYgKGdTaG93RnJhbWVS YXRlKQotICAgICAgICAgICAgdmlldy0+ZW5hYmxlRnJhbWVSYXRlTWVhc3VyZW1lbnQoKTsKLSAg ICAgICAgcGFnZSgpLT5zZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpBY2Nl bGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZCwgZ1VzZUNvbXBvc2l0aW5nKTsKIAogICAgICAgICBp ZiAoZmxpcEFuaW1hdGVkKQogICAgICAgICAgICAgY29ubmVjdChmbGlwQW5pbWF0ZWQsIFNJR05B TCh0cmlnZ2VyZWQoKSksIHZpZXcsIFNMT1QoYW5pbWF0ZWRGbGlwKCkpKTsKQEAgLTUwNiwyMSAr NTM2LDE5IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KGJvb2wgdXNlR3Jh cGhpY3NWaWV3KQogI2VuZGlmCiB9CiAKLXZvaWQgTGF1bmNoZXJXaW5kb3c6Om5ld1dpbmRvdyhj b25zdCBRU3RyaW5nJiB1cmwpCit2b2lkIExhdW5jaGVyV2luZG93OjpuZXdXaW5kb3coKQogewot ICAgIExhdW5jaGVyV2luZG93KiBtdyA9IG5ldyBMYXVuY2hlcldpbmRvdyh1cmwpOworICAgIExh dW5jaGVyV2luZG93KiBtdyA9IG5ldyBMYXVuY2hlcldpbmRvdyh0aGlzLCBmYWxzZSk7CiAgICAg bXctPnNob3coKTsKIH0KIAogdm9pZCBMYXVuY2hlcldpbmRvdzo6Y2xvbmVXaW5kb3coKQogewot ICAgIFFHcmFwaGljc1ZpZXcqIHZpZXcgPSBzdGF0aWNfY2FzdDxRR3JhcGhpY3NWaWV3Kj4obV92 aWV3KTsKLQotICAgIExhdW5jaGVyV2luZG93KiBtdyA9IG5ldyBMYXVuY2hlcldpbmRvdyh2aWV3 LT5zY2VuZSgpKTsKKyAgICBMYXVuY2hlcldpbmRvdyogbXcgPSBuZXcgTGF1bmNoZXJXaW5kb3co dGhpcywgdHJ1ZSk7CiAgICAgbXctPnNob3coKTsKIH0KIAotdm9pZCBMYXVuY2hlcldpbmRvdzo6 c2V0dXBVSSgpCit2b2lkIExhdW5jaGVyV2luZG93OjpjcmVhdGVDaHJvbWUoKQogewogICAgIFFN ZW51KiBmaWxlTWVudSA9IG1lbnVCYXIoKS0+YWRkTWVudSgiJkZpbGUiKTsKICAgICBmaWxlTWVu dS0+YWRkQWN0aW9uKCJOZXcgV2luZG93IiwgdGhpcywgU0xPVChuZXdXaW5kb3coKSksIFFLZXlT ZXF1ZW5jZTo6TmV3KTsKQEAgLTU4NCwzNiArNjEyLDQ0IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6 OnNldHVwVUkoKQogICAgIHRvdWNoTW9ja0FjdGlvbi0+c2V0U2hvcnRjdXQoUUtleVNlcXVlbmNl KFF0OjpDVFJMIHwgUXQ6OkFMVCB8IFF0OjpLZXlfVCkpOwogI2VuZGlmCiAKKyAgICBRV2ViU2V0 dGluZ3MqIHNldHRpbmdzID0gcGFnZSgpLT5zZXR0aW5ncygpOworCiAgICAgUU1lbnUqIGdyYXBo aWNzVmlld01lbnUgPSB0b29sc01lbnUtPmFkZE1lbnUoIlFHcmFwaGljc1ZpZXciKTsKICAgICBR QWN0aW9uKiB0b2dnbGVHcmFwaGljc1ZpZXcgPSBncmFwaGljc1ZpZXdNZW51LT5hZGRBY3Rpb24o IlRvZ2dsZSB1c2Ugb2YgUUdyYXBoaWNzVmlldyIsIHRoaXMsIFNMT1QoaW5pdGlhbGl6ZVZpZXco Ym9vbCkpKTsKICAgICB0b2dnbGVHcmFwaGljc1ZpZXctPnNldENoZWNrYWJsZSh0cnVlKTsKLSAg ICB0b2dnbGVHcmFwaGljc1ZpZXctPnNldENoZWNrZWQoZmFsc2UpOworICAgIHRvZ2dsZUdyYXBo aWNzVmlldy0+c2V0Q2hlY2tlZChpc0dyYXBoaWNzQmFzZWQoKSk7CiAKICAgICBRQWN0aW9uKiB0 b2dnbGVXZWJHTCA9IHRvb2xzTWVudS0+YWRkQWN0aW9uKCJUb2dnbGUgV2ViR0wiLCB0aGlzLCBT TE9UKHRvZ2dsZVdlYkdMKGJvb2wpKSk7CiAgICAgdG9nZ2xlV2ViR0wtPnNldENoZWNrYWJsZSh0 cnVlKTsKLSAgICB0b2dnbGVXZWJHTC0+c2V0Q2hlY2tlZChmYWxzZSk7CisgICAgdG9nZ2xlV2Vi R0wtPnNldENoZWNrZWQoc2V0dGluZ3MtPnRlc3RBdHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpXZWJH TEVuYWJsZWQpKTsKIAogICAgIFFBY3Rpb24qIHRvZ2dsZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmcg PSBncmFwaGljc1ZpZXdNZW51LT5hZGRBY3Rpb24oIlRvZ2dsZSBBY2NlbGVyYXRlZCBDb21wb3Np dGluZyIsIHRoaXMsIFNMT1QodG9nZ2xlQWNjZWxlcmF0ZWRDb21wb3NpdGluZyhib29sKSkpOwog ICAgIHRvZ2dsZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmctPnNldENoZWNrYWJsZSh0cnVlKTsKLSAg ICB0b2dnbGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nLT5zZXRDaGVja2VkKGZhbHNlKTsKLSAgICB0 b2dnbGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nLT5zZXRFbmFibGVkKGZhbHNlKTsKKyAgICB0b2dn bGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nLT5zZXRDaGVja2VkKHNldHRpbmdzLT50ZXN0QXR0cmli dXRlKFFXZWJTZXR0aW5nczo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQpKTsKKyAgICB0 b2dnbGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nLT5zZXRFbmFibGVkKGlzR3JhcGhpY3NCYXNlZCgp KTsKICAgICB0b2dnbGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nLT5jb25uZWN0KHRvZ2dsZUdyYXBo aWNzVmlldywgU0lHTkFMKHRvZ2dsZWQoYm9vbCkpLCBTTE9UKHNldEVuYWJsZWQoYm9vbCkpKTsK IAogICAgIGdyYXBoaWNzVmlld01lbnUtPmFkZFNlcGFyYXRvcigpOwogCiAgICAgZmxpcEFuaW1h dGVkID0gZ3JhcGhpY3NWaWV3TWVudS0+YWRkQWN0aW9uKCJBbmltYXRlZCBGbGlwIik7CiAgICAg ZmxpcEFuaW1hdGVkLT5jb25uZWN0KHRvZ2dsZUdyYXBoaWNzVmlldywgU0lHTkFMKHRvZ2dsZWQo Ym9vbCkpLCBTTE9UKHNldEVuYWJsZWQoYm9vbCkpKTsKLSAgICBmbGlwQW5pbWF0ZWQtPnNldEVu YWJsZWQoZmFsc2UpOworICAgIGZsaXBBbmltYXRlZC0+c2V0RW5hYmxlZChpc0dyYXBoaWNzQmFz ZWQoKSk7CiAKICAgICBmbGlwWUFuaW1hdGVkID0gZ3JhcGhpY3NWaWV3TWVudS0+YWRkQWN0aW9u KCJBbmltYXRlZCBZLUZsaXAiKTsKICAgICBmbGlwWUFuaW1hdGVkLT5jb25uZWN0KHRvZ2dsZUdy YXBoaWNzVmlldywgU0lHTkFMKHRvZ2dsZWQoYm9vbCkpLCBTTE9UKHNldEVuYWJsZWQoYm9vbCkp KTsKLSAgICBmbGlwWUFuaW1hdGVkLT5zZXRFbmFibGVkKGZhbHNlKTsKKyAgICBmbGlwWUFuaW1h dGVkLT5zZXRFbmFibGVkKGlzR3JhcGhpY3NCYXNlZCgpKTsKKworICAgIGlmIChpc0dyYXBoaWNz QmFzZWQoKSkgeworICAgICAgICBXZWJWaWV3R3JhcGhpY3NCYXNlZCogdmlldyA9IHN0YXRpY19j YXN0PFdlYlZpZXdHcmFwaGljc0Jhc2VkKj4obV92aWV3KTsKKyAgICAgICAgY29ubmVjdChmbGlw QW5pbWF0ZWQsIFNJR05BTCh0cmlnZ2VyZWQoKSksIHZpZXcsIFNMT1QoYW5pbWF0ZWRGbGlwKCkp KTsKKyAgICAgICAgY29ubmVjdChmbGlwWUFuaW1hdGVkLCBTSUdOQUwodHJpZ2dlcmVkKCkpLCB2 aWV3LCBTTE9UKGFuaW1hdGVkWUZsaXAoKSkpOworICAgIH0KIAogICAgIGdyYXBoaWNzVmlld01l bnUtPmFkZFNlcGFyYXRvcigpOwogCiAgICAgUUFjdGlvbiogY2xvbmVXaW5kb3cgPSBncmFwaGlj c1ZpZXdNZW51LT5hZGRBY3Rpb24oIkNsb25lIFdpbmRvdyIsIHRoaXMsIFNMT1QoY2xvbmVXaW5k b3coKSkpOwogICAgIGNsb25lV2luZG93LT5jb25uZWN0KHRvZ2dsZUdyYXBoaWNzVmlldywgU0lH TkFMKHRvZ2dsZWQoYm9vbCkpLCBTTE9UKHNldEVuYWJsZWQoYm9vbCkpKTsKLSAgICBjbG9uZVdp bmRvdy0+c2V0RW5hYmxlZChmYWxzZSk7CisgICAgY2xvbmVXaW5kb3ctPnNldEVuYWJsZWQoaXNH cmFwaGljc0Jhc2VkKCkpOwogfQogCiBRV2ViUGFnZSogV2ViUGFnZTo6Y3JlYXRlV2luZG93KFFX ZWJQYWdlOjpXZWJXaW5kb3dUeXBlIHR5cGUpCkBAIC04MTAsOSArODQ2LDExIEBAIGludCBtYWlu KGludCBhcmdjLCBjaGFyICoqYXJndikKICAgICBMYXVuY2hlcldpbmRvdyogd2luZG93ID0gMDsK ICAgICBmb3JlYWNoIChRU3RyaW5nIHVybCwgdXJscykgewogICAgICAgICBpZiAoIXdpbmRvdykK LSAgICAgICAgICAgIHdpbmRvdyA9IG5ldyBMYXVuY2hlcldpbmRvdyh1cmwpOworICAgICAgICAg ICAgd2luZG93ID0gbmV3IExhdW5jaGVyV2luZG93KCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAg ICAgIHdpbmRvdy0+bmV3V2luZG93KHVybCk7CisgICAgICAgICAgICB3aW5kb3ctPm5ld1dpbmRv dygpOworCisgICAgICAgIHdpbmRvdy0+bG9hZCh1cmwpOwogICAgIH0KIAogICAgIHdpbmRvdy0+ c2hvdygpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci93ZWJ2aWV3LmNwcCBi L1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvd2Vidmlldy5jcHAKaW5kZXggZTgxODA4Ni4uOTI1MmM4 OSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci93ZWJ2aWV3LmNwcAorKysgYi9X ZWJLaXRUb29scy9RdExhdW5jaGVyL3dlYnZpZXcuY3BwCkBAIC03Miw2ICs3MiwxMCBAQCBXZWJW aWV3R3JhcGhpY3NCYXNlZDo6V2ViVmlld0dyYXBoaWNzQmFzZWQoUVdpZGdldCogcGFyZW50KQog ICAgIG1hY2hpbmUtPnNldEluaXRpYWxTdGF0ZShzMCk7CiAgICAgbWFjaGluZS0+c3RhcnQoKTsK ICNlbmRpZgorCisgICAgbV91cGRhdGVUaW1lciA9IG5ldyBRVGltZXIodGhpcyk7CisgICAgbV91 cGRhdGVUaW1lci0+c2V0SW50ZXJ2YWwoMTAwMCk7CisgICAgY29ubmVjdChtX3VwZGF0ZVRpbWVy LCBTSUdOQUwodGltZW91dCgpKSwgdGhpcywgU0xPVCh1cGRhdGVGcmFtZVJhdGUoKSkpOwogfQog CiB2b2lkIFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpyZXNpemVFdmVudChRUmVzaXplRXZlbnQqIGV2 ZW50KQpAQCAtODEsMTQgKzg1LDEzIEBAIHZvaWQgV2ViVmlld0dyYXBoaWNzQmFzZWQ6OnJlc2l6 ZUV2ZW50KFFSZXNpemVFdmVudCogZXZlbnQpCiAgICAgbV9pdGVtLT5zZXRHZW9tZXRyeShyZWN0 KTsKIH0KIAotdm9pZCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6ZW5hYmxlRnJhbWVSYXRlTWVhc3Vy ZW1lbnQoKQordm9pZCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6c2V0RnJhbWVSYXRlTWVhc3VyZW1l bnRFbmFibGVkKGJvb2wgZW5hYmxlZCkKIHsKLSAgICBtX21lYXN1cmVGcHMgPSB0cnVlOwotICAg IG1fbGFzdENvbnN1bHRUaW1lID0gbV9zdGFydFRpbWUgPSBRVGltZTo6Y3VycmVudFRpbWUoKTsK LSAgICBRVGltZXIqIHVwZGF0ZVRpbWVyID0gbmV3IFFUaW1lcih0aGlzKTsKLSAgICB1cGRhdGVU aW1lci0+c2V0SW50ZXJ2YWwoMTAwMCk7Ci0gICAgY29ubmVjdCh1cGRhdGVUaW1lciwgU0lHTkFM KHRpbWVvdXQoKSksIHRoaXMsIFNMT1QodXBkYXRlRnJhbWVSYXRlKCkpKTsKLSAgICB1cGRhdGVU aW1lci0+c3RhcnQoKTsKKyAgICBpZiAobV9tZWFzdXJlRnBzID0gZW5hYmxlZCkgeworICAgICAg ICBtX2xhc3RDb25zdWx0VGltZSA9IG1fc3RhcnRUaW1lID0gUVRpbWU6OmN1cnJlbnRUaW1lKCk7 CisgICAgICAgIG1fdXBkYXRlVGltZXItPnN0YXJ0KCk7CisgICAgfSBlbHNlIAorICAgICAgICBt X3VwZGF0ZVRpbWVyLT5zdG9wKCk7CiB9CiAKIHZvaWQgV2ViVmlld0dyYXBoaWNzQmFzZWQ6OnVw ZGF0ZUZyYW1lUmF0ZSgpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdExhdW5jaGVyL3dlYnZp ZXcuaCBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvd2Vidmlldy5oCmluZGV4IDI5N2Q5NzUuLmY3 YmNlNmYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvd2Vidmlldy5oCisrKyBi L1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvd2Vidmlldy5oCkBAIC03Myw4ICs3MywxMSBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCB2b2lkIHJlc2l6ZUV2ZW50KFFSZXNpemVFdmVudCopOwogICAgIHZv aWQgc2V0UGFnZShRV2ViUGFnZSogcGFnZSkgeyBtX2l0ZW0tPnNldFBhZ2UocGFnZSk7IH0KICAg ICB2b2lkIHNldEl0ZW1DYWNoZU1vZGUoUUdyYXBoaWNzSXRlbTo6Q2FjaGVNb2RlIG1vZGUpIHsg bV9pdGVtLT5zZXRDYWNoZU1vZGUobW9kZSk7IH0KKyAgICBRR3JhcGhpY3NJdGVtOjpDYWNoZU1v ZGUgaXRlbUNhY2hlTW9kZSgpIHsgcmV0dXJuIG1faXRlbS0+Y2FjaGVNb2RlKCk7IH0KKworICAg IHZvaWQgc2V0RnJhbWVSYXRlTWVhc3VyZW1lbnRFbmFibGVkKGJvb2wgZW5hYmxlZCk7CisgICAg Ym9vbCBmcmFtZVJhdGVNZWFzdXJlbWVudEVuYWJsZWQoKSB7IHJldHVybiBtX21lYXN1cmVGcHM7 IH0gCiAKLSAgICB2b2lkIGVuYWJsZUZyYW1lUmF0ZU1lYXN1cmVtZW50KCk7CiAgICAgdmlydHVh bCB2b2lkIHBhaW50RXZlbnQoUVBhaW50RXZlbnQqIGV2ZW50KTsKIAogICAgIHZvaWQgc2V0WVJv dGF0aW9uKHFyZWFsIGFuZ2xlKQpAQCAtMTA3LDYgKzExMCw3IEBAIHByaXZhdGU6CiAgICAgaW50 IG1fbnVtUGFpbnRzU2luY2VMYXN0TWVhc3VyZTsKICAgICBRVGltZSBtX3N0YXJ0VGltZTsKICAg ICBRVGltZSBtX2xhc3RDb25zdWx0VGltZTsKKyAgICBRVGltZXIqIG1fdXBkYXRlVGltZXI7CiAg ICAgYm9vbCBtX21lYXN1cmVGcHM7CiAgICAgcXJlYWwgbV95Um90YXRpb247CiB9OwotLSAKMS42 LjYKCg==