35542 2010-03-01 13:42:45 -0800 [Qt] QtLauncher is not respecting class variable names 2010-03-03 19:14:08 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 35536 0 jesus webkit-unassigned commit-queue oldest_to_newest 194801 0 jesus 2010-03-01 13:42:45 -0800 Need to add 'm_' to LauncherWindow variables names. 194816 1 49750 jesus 2010-03-01 14:08:00 -0800 Created attachment 49750 Fix m_ on variables names 195150 2 49750 commit-queue 2010-03-02 11:59:10 -0800 Comment on attachment 49750 Fix m_ on variables names Rejecting patch 49750 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Simon Hausmann', '--force']" exit_code: 1 Last 500 characters of output: -35 lines). Hunk #6 succeeded at 311 (offset -35 lines). Hunk #7 succeeded at 325 (offset -35 lines). Hunk #8 succeeded at 361 (offset -35 lines). Hunk #9 succeeded at 419 (offset -35 lines). Hunk #10 succeeded at 458 (offset -35 lines). Hunk #11 succeeded at 491 with fuzz 2 (offset -30 lines). Hunk #12 succeeded at 558 (offset -28 lines). Hunk #13 succeeded at 574 (offset -28 lines). Hunk #14 FAILED at 603. 3 out of 14 hunks FAILED -- saving rejects to file WebKitTools/QtLauncher/main.cpp.rej Full output: http://webkit-commit-queue.appspot.com/results/321969 195156 3 jesus 2010-03-02 12:06:06 -0800 This should only be committed after the patch on https://bugs.webkit.org/show_bug.cgi?id=35536 which is waiting review... 195617 4 49750 jesus 2010-03-03 08:05:10 -0800 Comment on attachment 49750 Fix m_ on variables names No we can commit this... 195859 5 49750 commit-queue 2010-03-03 19:14:04 -0800 Comment on attachment 49750 Fix m_ on variables names Clearing flags on attachment: 49750 Committed r55498: <http://trac.webkit.org/changeset/55498> 195860 6 commit-queue 2010-03-03 19:14:08 -0800 All reviewed patches have been landed. Closing bug. 49750 2010-03-01 14:08:00 -0800 2010-03-03 19:14:04 -0800 Fix m_ on variables names 0001-Add-m_-to-class-variables-names.patch text/plain 13752 jesus RnJvbSA1NjJkZDliNjBjODQ4MTZlYzg1M2M5Njk0YmRlYTRlNjk5MDhlNWVlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZXN1cyBTYW5jaGV6LVBhbGVuY2lhIDxqZXN1cy5wYWxlbmNp YUBvcGVuYm9zc2Eub3JnPgpEYXRlOiBNb24sIDEgTWFyIDIwMTAgMTg6NTA6NTkgLTAzMDAKU3Vi amVjdDogW1BBVENIXSBBZGQgJ21fJyB0byBjbGFzcyB2YXJpYWJsZXMgbmFtZXMuCgpSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KCltRdF0gUXRMYXVuY2hlciBpcyBub3QgcmVzcGVjdGluZyBj bGFzcyB2YXJpYWJsZSBuYW1lcwpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzU1NDIKCiogUXRMYXVuY2hlci9tYWluLmNwcDoKKExhdW5jaGVyV2luZG93OjpMYXVuY2hl cldpbmRvdyk6CihMYXVuY2hlcldpbmRvdzo6aW5pdCk6CihMYXVuY2hlcldpbmRvdzo6c2VuZFRv dWNoRXZlbnQpOgooTGF1bmNoZXJXaW5kb3c6OmV2ZW50RmlsdGVyKToKKExhdW5jaGVyV2luZG93 Ojp6b29tSW4pOgooTGF1bmNoZXJXaW5kb3c6Onpvb21PdXQpOgooTGF1bmNoZXJXaW5kb3c6OnJl c2V0Wm9vbSk6CihMYXVuY2hlcldpbmRvdzo6c2V0RWRpdGFibGUpOgooTGF1bmNoZXJXaW5kb3c6 OnNldFRvdWNoTW9ja2luZyk6CihMYXVuY2hlcldpbmRvdzo6aW5pdGlhbGl6ZVZpZXcpOgooTGF1 bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSk6Ci0tLQogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nICAg ICAgICAgICB8ICAgMjIgKysrKysrCiBXZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwIHwg IDEzOCArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFu Z2VkLCA5MSBpbnNlcnRpb25zKCspLCA2OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggYjY5MmNjNC4u M2NhOTgyMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRv b2xzL0NoYW5nZUxvZwpAQCAtMiw2ICsyLDI4IEBACiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCiAKKyAgICAgICAgQWRkIGEgbWlzc2luZyAnbV8nIHRvIGNsYXNzIHZhcmlh YmxlcyBuYW1lcy4KKworICAgICAgICBbUXRdIFF0TGF1bmNoZXIgaXMgbm90IHJlc3BlY3Rpbmcg Y2xhc3MgdmFyaWFibGUgbmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM1NTQyCisKKyAgICAgICAgKiBRdExhdW5jaGVyL21haW4uY3BwOgorICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OkxhdW5jaGVyV2luZG93KToKKyAgICAgICAgKExhdW5jaGVy V2luZG93Ojppbml0KToKKyAgICAgICAgKExhdW5jaGVyV2luZG93OjpzZW5kVG91Y2hFdmVudCk6 CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6ZXZlbnRGaWx0ZXIpOgorICAgICAgICAoTGF1bmNo ZXJXaW5kb3c6Onpvb21Jbik6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6em9vbU91dCk6Cisg ICAgICAgIChMYXVuY2hlcldpbmRvdzo6cmVzZXRab29tKToKKyAgICAgICAgKExhdW5jaGVyV2lu ZG93OjpzZXRFZGl0YWJsZSk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6c2V0VG91Y2hNb2Nr aW5nKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojppbml0aWFsaXplVmlldyk6CisgICAgICAg IChMYXVuY2hlcldpbmRvdzo6Y3JlYXRlQ2hyb21lKToKKworMjAxMC0wMy0wMSAgSmVzdXMgU2Fu Y2hlei1QYWxlbmNpYSAgPGplc3VzLnBhbGVuY2lhQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgUmVmYWN0b3IgUXRMYXVuY2hl ciBzbyBpdCByZXNwZWN0cyBjb21tYW5kIGxpbmUgYXJndW1lbnRzCiAgICAgICAgIGFuZCBpbmhl cml0cyBzZXR0aW5ncyB3aGVuIHlvdSBjbG9uZSBvciBjcmVhdGUgYSBuZXcgd2luZG93LgogCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwIGIvV2ViS2l0VG9vbHMv UXRMYXVuY2hlci9tYWluLmNwcAppbmRleCA3MDdiMzQxLi5jNDdlZjEzIDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNo ZXIvbWFpbi5jcHAKQEAgLTEyNywxOSArMTI3LDE5IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjcmVh dGVDaHJvbWUoKTsKIAogcHJpdmF0ZToKLSAgICBRVmVjdG9yPGludD4gem9vbUxldmVsczsKLSAg ICBpbnQgY3VycmVudFpvb207CisgICAgUVZlY3RvcjxpbnQ+IG1fem9vbUxldmVsczsKKyAgICBp bnQgbV9jdXJyZW50Wm9vbTsKIAogICAgIFFXaWRnZXQqIG1fdmlldzsKLSAgICBXZWJJbnNwZWN0 b3IqIGluc3BlY3RvcjsKKyAgICBXZWJJbnNwZWN0b3IqIG1faW5zcGVjdG9yOwogCi0gICAgUUFj dGlvbiogZm9ybWF0TWVudUFjdGlvbjsKLSAgICBRQWN0aW9uKiBmbGlwQW5pbWF0ZWQ7Ci0gICAg UUFjdGlvbiogZmxpcFlBbmltYXRlZDsKKyAgICBRQWN0aW9uKiBtX2Zvcm1hdE1lbnVBY3Rpb247 CisgICAgUUFjdGlvbiogbV9mbGlwQW5pbWF0ZWQ7CisgICAgUUFjdGlvbiogbV9mbGlwWUFuaW1h dGVkOwogCiAjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDYsIDApCi0gICAg UUxpc3Q8UVRvdWNoRXZlbnQ6OlRvdWNoUG9pbnQ+IHRvdWNoUG9pbnRzOwotICAgIGJvb2wgdG91 Y2hNb2NraW5nOworICAgIFFMaXN0PFFUb3VjaEV2ZW50OjpUb3VjaFBvaW50PiBtX3RvdWNoUG9p bnRzOworICAgIGJvb2wgbV90b3VjaE1vY2tpbmc7CiAjZW5kaWYKIAogICAgIHZvaWQgaW5pdChi b29sIHVzZUdyYXBoaWNzVmlldyA9IGZhbHNlKTsKQEAgLTE0OSwxMiArMTQ5LDEyIEBAIHByaXZh dGU6CiAKIExhdW5jaGVyV2luZG93OjpMYXVuY2hlcldpbmRvdyhMYXVuY2hlcldpbmRvdyogb3Ro ZXIsIGJvb2wgc2hhcmVTY2VuZSkKICAgICA6IE1haW5XaW5kb3coKQotICAgICwgY3VycmVudFpv b20oMTAwKQorICAgICwgbV9jdXJyZW50Wm9vbSgxMDApCiAgICAgLCBtX3ZpZXcoMCkKLSAgICAs IGluc3BlY3RvcigwKQotICAgICwgZm9ybWF0TWVudUFjdGlvbigwKQotICAgICwgZmxpcEFuaW1h dGVkKDApCi0gICAgLCBmbGlwWUFuaW1hdGVkKDApCisgICAgLCBtX2luc3BlY3RvcigwKQorICAg ICwgbV9mb3JtYXRNZW51QWN0aW9uKDApCisgICAgLCBtX2ZsaXBBbmltYXRlZCgwKQorICAgICwg bV9mbGlwWUFuaW1hdGVkKDApCiB7CiAgICAgaWYgKG90aGVyKSB7CiAgICAgICAgIGluaXQob3Ro ZXItPmlzR3JhcGhpY3NCYXNlZCgpKTsKQEAgLTE5NywxNSArMTk3LDE1IEBAIHZvaWQgTGF1bmNo ZXJXaW5kb3c6OmluaXQoYm9vbCB1c2VHcmFwaGljc1ZpZXcpCiAgICAgaWYgKCFnSW5zcGVjdG9y VXJsLmlzRW1wdHkoKSkKICAgICAgIHBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0SW5zcGVjdG9yVXJs KGdJbnNwZWN0b3JVcmwpOwogCi0gICAgaW5zcGVjdG9yID0gbmV3IFdlYkluc3BlY3RvcihzcGxp dHRlcik7Ci0gICAgaW5zcGVjdG9yLT5zZXRQYWdlKHBhZ2UoKSk7Ci0gICAgaW5zcGVjdG9yLT5o aWRlKCk7Ci0gICAgY29ubmVjdCh0aGlzLCBTSUdOQUwoZGVzdHJveWVkKCkpLCBpbnNwZWN0b3Is IFNMT1QoZGVsZXRlTGF0ZXIoKSkpOworICAgIG1faW5zcGVjdG9yID0gbmV3IFdlYkluc3BlY3Rv cihzcGxpdHRlcik7CisgICAgbV9pbnNwZWN0b3ItPnNldFBhZ2UocGFnZSgpKTsKKyAgICBtX2lu c3BlY3Rvci0+aGlkZSgpOworICAgIGNvbm5lY3QodGhpcywgU0lHTkFMKGRlc3Ryb3llZCgpKSwg bV9pbnNwZWN0b3IsIFNMT1QoZGVsZXRlTGF0ZXIoKSkpOwogCiAgICAgLy8gdGhlIHpvb20gdmFs dWVzIGFyZSBjaG9zZW4gdG8gYmUgbGlrZSBpbiBNb3ppbGxhIEZpcmVmb3ggMwotICAgIHpvb21M ZXZlbHMgPDwgMzAgPDwgNTAgPDwgNjcgPDwgODAgPDwgOTA7Ci0gICAgem9vbUxldmVscyA8PCAx MDA7Ci0gICAgem9vbUxldmVscyA8PCAxMTAgPDwgMTIwIDw8IDEzMyA8PCAxNTAgPDwgMTcwIDw8 IDIwMCA8PCAyNDAgPDwgMzAwOworICAgIG1fem9vbUxldmVscyA8PCAzMCA8PCA1MCA8PCA2NyA8 PCA4MCA8PCA5MDsKKyAgICBtX3pvb21MZXZlbHMgPDwgMTAwOworICAgIG1fem9vbUxldmVscyA8 PCAxMTAgPDwgMTIwIDw8IDEzMyA8PCAxNTAgPDwgMTcwIDw8IDIwMCA8PCAyNDAgPDwgMzAwOwog CiAgICAgZ3JhYlpvb21LZXlzKHRydWUpOwogfQpAQCAtMjgyLDMxICsyODIsMzEgQEAgdm9pZCBM YXVuY2hlcldpbmRvdzo6Z3JhYlpvb21LZXlzKGJvb2wgZ3JhYikKICNpZiBRVF9WRVJTSU9OID49 IFFUX1ZFUlNJT05fQ0hFQ0soNCwgNiwgMCkKIHZvaWQgTGF1bmNoZXJXaW5kb3c6OnNlbmRUb3Vj aEV2ZW50KCkKIHsKLSAgICBpZiAodG91Y2hQb2ludHMuaXNFbXB0eSgpKQorICAgIGlmIChtX3Rv dWNoUG9pbnRzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgUUV2ZW50OjpUeXBl IHR5cGUgPSBRRXZlbnQ6OlRvdWNoVXBkYXRlOwotICAgIGlmICh0b3VjaFBvaW50cy5zaXplKCkg PT0gMSkgewotICAgICAgICBpZiAodG91Y2hQb2ludHNbMF0uc3RhdGUoKSA9PSBRdDo6VG91Y2hQ b2ludFJlbGVhc2VkKQorICAgIGlmIChtX3RvdWNoUG9pbnRzLnNpemUoKSA9PSAxKSB7CisgICAg ICAgIGlmIChtX3RvdWNoUG9pbnRzWzBdLnN0YXRlKCkgPT0gUXQ6OlRvdWNoUG9pbnRSZWxlYXNl ZCkKICAgICAgICAgICAgIHR5cGUgPSBRRXZlbnQ6OlRvdWNoRW5kOwotICAgICAgICBlbHNlIGlm ICh0b3VjaFBvaW50c1swXS5zdGF0ZSgpID09IFF0OjpUb3VjaFBvaW50UHJlc3NlZCkKKyAgICAg ICAgZWxzZSBpZiAobV90b3VjaFBvaW50c1swXS5zdGF0ZSgpID09IFF0OjpUb3VjaFBvaW50UHJl c3NlZCkKICAgICAgICAgICAgIHR5cGUgPSBRRXZlbnQ6OlRvdWNoQmVnaW47CiAgICAgfQogCiAg ICAgUVRvdWNoRXZlbnQgdG91Y2hFdih0eXBlKTsKLSAgICB0b3VjaEV2LnNldFRvdWNoUG9pbnRz KHRvdWNoUG9pbnRzKTsKKyAgICB0b3VjaEV2LnNldFRvdWNoUG9pbnRzKG1fdG91Y2hQb2ludHMp OwogICAgIFFDb3JlQXBwbGljYXRpb246OnNlbmRFdmVudChwYWdlKCksICZ0b3VjaEV2KTsKIAog ICAgIC8vIEFmdGVyIHNlbmRpbmcgdGhlIGV2ZW50LCByZW1vdmUgYWxsIHRvdWNocG9pbnRzIHRo YXQgd2VyZSByZWxlYXNlZAotICAgIGlmICh0b3VjaFBvaW50c1swXS5zdGF0ZSgpID09IFF0OjpU b3VjaFBvaW50UmVsZWFzZWQpCi0gICAgICAgIHRvdWNoUG9pbnRzLnJlbW92ZUF0KDApOwotICAg IGlmICh0b3VjaFBvaW50cy5zaXplKCkgPiAxICYmIHRvdWNoUG9pbnRzWzFdLnN0YXRlKCkgPT0g UXQ6OlRvdWNoUG9pbnRSZWxlYXNlZCkKLSAgICAgICAgdG91Y2hQb2ludHMucmVtb3ZlQXQoMSk7 CisgICAgaWYgKG1fdG91Y2hQb2ludHNbMF0uc3RhdGUoKSA9PSBRdDo6VG91Y2hQb2ludFJlbGVh c2VkKQorICAgICAgICBtX3RvdWNoUG9pbnRzLnJlbW92ZUF0KDApOworICAgIGlmIChtX3RvdWNo UG9pbnRzLnNpemUoKSA+IDEgJiYgbV90b3VjaFBvaW50c1sxXS5zdGF0ZSgpID09IFF0OjpUb3Vj aFBvaW50UmVsZWFzZWQpCisgICAgICAgIG1fdG91Y2hQb2ludHMucmVtb3ZlQXQoMSk7CiB9CiAK IGJvb2wgTGF1bmNoZXJXaW5kb3c6OmV2ZW50RmlsdGVyKFFPYmplY3QqIG9iaiwgUUV2ZW50KiBl dmVudCkKIHsKLSAgICBpZiAoIXRvdWNoTW9ja2luZyB8fCBvYmogIT0gbV92aWV3KQorICAgIGlm ICghbV90b3VjaE1vY2tpbmcgfHwgb2JqICE9IG1fdmlldykKICAgICAgICAgcmV0dXJuIFFPYmpl Y3Q6OmV2ZW50RmlsdGVyKG9iaiwgZXZlbnQpOwogCiAgICAgaWYgKGV2ZW50LT50eXBlKCkgPT0g UUV2ZW50OjpNb3VzZUJ1dHRvblByZXNzCkBAIC0zMzMsMTIgKzMzMywxMiBAQCBib29sIExhdW5j aGVyV2luZG93OjpldmVudEZpbHRlcihRT2JqZWN0KiBvYmosIFFFdmVudCogZXZlbnQpCiAgICAg ICAgIHRvdWNoUG9pbnQuc2V0UHJlc3N1cmUoMSk7CiAKICAgICAgICAgLy8gSWYgdGhlIHBvaW50 IGFscmVhZHkgZXhpc3RzLCB1cGRhdGUgaXQuIE90aGVyd2lzZSBjcmVhdGUgaXQuCi0gICAgICAg IGlmICh0b3VjaFBvaW50cy5zaXplKCkgPiAwICYmICF0b3VjaFBvaW50c1swXS5pZCgpKQotICAg ICAgICAgICAgdG91Y2hQb2ludHNbMF0gPSB0b3VjaFBvaW50OwotICAgICAgICBlbHNlIGlmICh0 b3VjaFBvaW50cy5zaXplKCkgPiAxICYmICF0b3VjaFBvaW50c1sxXS5pZCgpKQotICAgICAgICAg ICAgdG91Y2hQb2ludHNbMV0gPSB0b3VjaFBvaW50OworICAgICAgICBpZiAobV90b3VjaFBvaW50 cy5zaXplKCkgPiAwICYmICFtX3RvdWNoUG9pbnRzWzBdLmlkKCkpCisgICAgICAgICAgICBtX3Rv dWNoUG9pbnRzWzBdID0gdG91Y2hQb2ludDsKKyAgICAgICAgZWxzZSBpZiAobV90b3VjaFBvaW50 cy5zaXplKCkgPiAxICYmICFtX3RvdWNoUG9pbnRzWzFdLmlkKCkpCisgICAgICAgICAgICBtX3Rv dWNoUG9pbnRzWzFdID0gdG91Y2hQb2ludDsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgdG91 Y2hQb2ludHMuYXBwZW5kKHRvdWNoUG9pbnQpOworICAgICAgICAgICAgbV90b3VjaFBvaW50cy5h cHBlbmQodG91Y2hQb2ludCk7CiAKICAgICAgICAgc2VuZFRvdWNoRXZlbnQoKTsKICAgICB9IGVs c2UgaWYgKGV2ZW50LT50eXBlKCkgPT0gUUV2ZW50OjpLZXlQcmVzcwpAQCAtMzQ2LDEyICszNDYs MTIgQEAgYm9vbCBMYXVuY2hlcldpbmRvdzo6ZXZlbnRGaWx0ZXIoUU9iamVjdCogb2JqLCBRRXZl bnQqIGV2ZW50KQogICAgICAgICAmJiBzdGF0aWNfY2FzdDxRS2V5RXZlbnQqPihldmVudCktPm1v ZGlmaWVycygpID09IFF0OjpDb250cm9sTW9kaWZpZXIpIHsKIAogICAgICAgICAvLyBJZiB0aGUg a2V5Ym9hcmQgcG9pbnQgaXMgYWxyZWFkeSBwcmVzc2VkLCByZWxlYXNlIGl0LgotICAgICAgICAv LyBPdGhlcndpc2UgY3JlYXRlIGl0IGFuZCBhcHBlbmQgdG8gdG91Y2hQb2ludHMuCi0gICAgICAg IGlmICh0b3VjaFBvaW50cy5zaXplKCkgPiAwICYmIHRvdWNoUG9pbnRzWzBdLmlkKCkgPT0gMSkg ewotICAgICAgICAgICAgdG91Y2hQb2ludHNbMF0uc2V0U3RhdGUoUXQ6OlRvdWNoUG9pbnRSZWxl YXNlZCk7CisgICAgICAgIC8vIE90aGVyd2lzZSBjcmVhdGUgaXQgYW5kIGFwcGVuZCB0byBtX3Rv dWNoUG9pbnRzLgorICAgICAgICBpZiAobV90b3VjaFBvaW50cy5zaXplKCkgPiAwICYmIG1fdG91 Y2hQb2ludHNbMF0uaWQoKSA9PSAxKSB7CisgICAgICAgICAgICBtX3RvdWNoUG9pbnRzWzBdLnNl dFN0YXRlKFF0OjpUb3VjaFBvaW50UmVsZWFzZWQpOwogICAgICAgICAgICAgc2VuZFRvdWNoRXZl bnQoKTsKLSAgICAgICAgfSBlbHNlIGlmICh0b3VjaFBvaW50cy5zaXplKCkgPiAxICYmIHRvdWNo UG9pbnRzWzFdLmlkKCkgPT0gMSkgewotICAgICAgICAgICAgdG91Y2hQb2ludHNbMV0uc2V0U3Rh dGUoUXQ6OlRvdWNoUG9pbnRSZWxlYXNlZCk7CisgICAgICAgIH0gZWxzZSBpZiAobV90b3VjaFBv aW50cy5zaXplKCkgPiAxICYmIG1fdG91Y2hQb2ludHNbMV0uaWQoKSA9PSAxKSB7CisgICAgICAg ICAgICBtX3RvdWNoUG9pbnRzWzFdLnNldFN0YXRlKFF0OjpUb3VjaFBvaW50UmVsZWFzZWQpOwog ICAgICAgICAgICAgc2VuZFRvdWNoRXZlbnQoKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAg ICAgIFFUb3VjaEV2ZW50OjpUb3VjaFBvaW50IHRvdWNoUG9pbnQ7CkBAIC0zNjAsMTEgKzM2MCwx MSBAQCBib29sIExhdW5jaGVyV2luZG93OjpldmVudEZpbHRlcihRT2JqZWN0KiBvYmosIFFFdmVu dCogZXZlbnQpCiAgICAgICAgICAgICB0b3VjaFBvaW50LnNldFNjcmVlblBvcyhRQ3Vyc29yOjpw b3MoKSk7CiAgICAgICAgICAgICB0b3VjaFBvaW50LnNldFBvcyhtX3ZpZXctPm1hcEZyb21HbG9i YWwoUUN1cnNvcjo6cG9zKCkpKTsKICAgICAgICAgICAgIHRvdWNoUG9pbnQuc2V0UHJlc3N1cmUo MSk7Ci0gICAgICAgICAgICB0b3VjaFBvaW50cy5hcHBlbmQodG91Y2hQb2ludCk7CisgICAgICAg ICAgICBtX3RvdWNoUG9pbnRzLmFwcGVuZCh0b3VjaFBvaW50KTsKICAgICAgICAgICAgIHNlbmRU b3VjaEV2ZW50KCk7CiAKICAgICAgICAgICAgIC8vIEFmdGVyIHNlbmRpbmcgdGhlIGV2ZW50LCBj aGFuZ2UgdGhlIHRvdWNocG9pbnQgc3RhdGUgdG8gc3RhdGlvbmFyeQotICAgICAgICAgICAgdG91 Y2hQb2ludHMubGFzdCgpLnNldFN0YXRlKFF0OjpUb3VjaFBvaW50U3RhdGlvbmFyeSk7CisgICAg ICAgICAgICBtX3RvdWNoUG9pbnRzLmxhc3QoKS5zZXRTdGF0ZShRdDo6VG91Y2hQb2ludFN0YXRp b25hcnkpOwogICAgICAgICB9CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKQEAgLTM5NiwyNyAr Mzk2LDI3IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OnNob3dMaW5rSG92ZXIoY29uc3QgUVN0cmlu ZyAmbGluaywgY29uc3QgUVN0cmluZyAmdG9vbFRpcCkKIAogdm9pZCBMYXVuY2hlcldpbmRvdzo6 em9vbUluKCkKIHsKLSAgICBpbnQgaSA9IHpvb21MZXZlbHMuaW5kZXhPZihjdXJyZW50Wm9vbSk7 CisgICAgaW50IGkgPSBtX3pvb21MZXZlbHMuaW5kZXhPZihtX2N1cnJlbnRab29tKTsKICAgICBR X0FTU0VSVChpID49IDApOwotICAgIGlmIChpIDwgem9vbUxldmVscy5jb3VudCgpIC0gMSkKLSAg ICAgICAgY3VycmVudFpvb20gPSB6b29tTGV2ZWxzW2kgKyAxXTsKKyAgICBpZiAoaSA8IG1fem9v bUxldmVscy5jb3VudCgpIC0gMSkKKyAgICAgICAgbV9jdXJyZW50Wm9vbSA9IG1fem9vbUxldmVs c1tpICsgMV07CiAKLSAgICBwYWdlKCktPm1haW5GcmFtZSgpLT5zZXRab29tRmFjdG9yKHFyZWFs KGN1cnJlbnRab29tKSAvIDEwMC4wKTsKKyAgICBwYWdlKCktPm1haW5GcmFtZSgpLT5zZXRab29t RmFjdG9yKHFyZWFsKG1fY3VycmVudFpvb20pIC8gMTAwLjApOwogfQogCiB2b2lkIExhdW5jaGVy V2luZG93Ojp6b29tT3V0KCkKIHsKLSAgICBpbnQgaSA9IHpvb21MZXZlbHMuaW5kZXhPZihjdXJy ZW50Wm9vbSk7CisgICAgaW50IGkgPSBtX3pvb21MZXZlbHMuaW5kZXhPZihtX2N1cnJlbnRab29t KTsKICAgICBRX0FTU0VSVChpID49IDApOwogICAgIGlmIChpID4gMCkKLSAgICAgICAgY3VycmVu dFpvb20gPSB6b29tTGV2ZWxzW2kgLSAxXTsKKyAgICAgICAgbV9jdXJyZW50Wm9vbSA9IG1fem9v bUxldmVsc1tpIC0gMV07CiAKLSAgICBwYWdlKCktPm1haW5GcmFtZSgpLT5zZXRab29tRmFjdG9y KHFyZWFsKGN1cnJlbnRab29tKSAvIDEwMC4wKTsKKyAgICBwYWdlKCktPm1haW5GcmFtZSgpLT5z ZXRab29tRmFjdG9yKHFyZWFsKG1fY3VycmVudFpvb20pIC8gMTAwLjApOwogfQogCiB2b2lkIExh dW5jaGVyV2luZG93OjpyZXNldFpvb20oKQogewotICAgIGN1cnJlbnRab29tID0gMTAwOworICAg IG1fY3VycmVudFpvb20gPSAxMDA7CiAgICAgcGFnZSgpLT5tYWluRnJhbWUoKS0+c2V0Wm9vbUZh Y3RvcigxLjApOwogfQogCkBAIC00NTQsNyArNDU0LDcgQEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6 c2NyZWVuc2hvdCgpCiB2b2lkIExhdW5jaGVyV2luZG93OjpzZXRFZGl0YWJsZShib29sIG9uKQog ewogICAgIHBhZ2UoKS0+c2V0Q29udGVudEVkaXRhYmxlKG9uKTsKLSAgICBmb3JtYXRNZW51QWN0 aW9uLT5zZXRWaXNpYmxlKG9uKTsKKyAgICBtX2Zvcm1hdE1lbnVBY3Rpb24tPnNldFZpc2libGUo b24pOwogfQogCiAvKgpAQCAtNDkzLDcgKzQ5Myw3IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OnNl bGVjdEVsZW1lbnRzKCkKIHZvaWQgTGF1bmNoZXJXaW5kb3c6OnNldFRvdWNoTW9ja2luZyhib29s IG9uKQogewogI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQotICAg IHRvdWNoTW9ja2luZyA9IG9uOworICAgIG1fdG91Y2hNb2NraW5nID0gb247CiAjZW5kaWYKIH0K IApAQCAtNTIxLDE4ICs1MjEsMTggQEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6aW5pdGlhbGl6ZVZp ZXcoYm9vbCB1c2VHcmFwaGljc1ZpZXcpCiAgICAgICAgIFdlYlZpZXdHcmFwaGljc0Jhc2VkKiB2 aWV3ID0gbmV3IFdlYlZpZXdHcmFwaGljc0Jhc2VkKHNwbGl0dGVyKTsKICAgICAgICAgdmlldy0+ c2V0UGFnZShwYWdlKCkpOwogCi0gICAgICAgIGlmIChmbGlwQW5pbWF0ZWQpCi0gICAgICAgICAg ICBjb25uZWN0KGZsaXBBbmltYXRlZCwgU0lHTkFMKHRyaWdnZXJlZCgpKSwgdmlldywgU0xPVChh bmltYXRlZEZsaXAoKSkpOworICAgICAgICBpZiAobV9mbGlwQW5pbWF0ZWQpCisgICAgICAgICAg ICBjb25uZWN0KG1fZmxpcEFuaW1hdGVkLCBTSUdOQUwodHJpZ2dlcmVkKCkpLCB2aWV3LCBTTE9U KGFuaW1hdGVkRmxpcCgpKSk7CiAKLSAgICAgICAgaWYgKGZsaXBZQW5pbWF0ZWQpCi0gICAgICAg ICAgICBjb25uZWN0KGZsaXBZQW5pbWF0ZWQsIFNJR05BTCh0cmlnZ2VyZWQoKSksIHZpZXcsIFNM T1QoYW5pbWF0ZWRZRmxpcCgpKSk7CisgICAgICAgIGlmIChtX2ZsaXBZQW5pbWF0ZWQpCisgICAg ICAgICAgICBjb25uZWN0KG1fZmxpcFlBbmltYXRlZCwgU0lHTkFMKHRyaWdnZXJlZCgpKSwgdmll dywgU0xPVChhbmltYXRlZFlGbGlwKCkpKTsKIAogICAgICAgICBtX3ZpZXcgPSB2aWV3OwogICAg IH0KIAogI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQogICAgIG1f dmlldy0+aW5zdGFsbEV2ZW50RmlsdGVyKHRoaXMpOwotICAgIHRvdWNoTW9ja2luZyA9IGZhbHNl OworICAgIG1fdG91Y2hNb2NraW5nID0gZmFsc2U7CiAjZW5kaWYKIH0KIApAQCAtNTg2LDggKzU4 Niw4IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSgpCiAgICAgLy8gdmlld01l bnUtPmFkZEFjdGlvbigiRHVtcCBwbHVnaW5zIiwgdGhpcywgU0xPVChkdW1wUGx1Z2lucygpKSk7 CiAKICAgICBRTWVudSogZm9ybWF0TWVudSA9IG5ldyBRTWVudSgiRiZvcm1hdCIsIHRoaXMpOwot ICAgIGZvcm1hdE1lbnVBY3Rpb24gPSBtZW51QmFyKCktPmFkZE1lbnUoZm9ybWF0TWVudSk7Ci0g ICAgZm9ybWF0TWVudUFjdGlvbi0+c2V0VmlzaWJsZShmYWxzZSk7CisgICAgbV9mb3JtYXRNZW51 QWN0aW9uID0gbWVudUJhcigpLT5hZGRNZW51KGZvcm1hdE1lbnUpOworICAgIG1fZm9ybWF0TWVu dUFjdGlvbi0+c2V0VmlzaWJsZShmYWxzZSk7CiAgICAgZm9ybWF0TWVudS0+YWRkQWN0aW9uKHBh Z2UoKS0+YWN0aW9uKFFXZWJQYWdlOjpUb2dnbGVCb2xkKSk7CiAgICAgZm9ybWF0TWVudS0+YWRk QWN0aW9uKHBhZ2UoKS0+YWN0aW9uKFFXZWJQYWdlOjpUb2dnbGVJdGFsaWMpKTsKICAgICBmb3Jt YXRNZW51LT5hZGRBY3Rpb24ocGFnZSgpLT5hY3Rpb24oUVdlYlBhZ2U6OlRvZ2dsZVVuZGVybGlu ZSkpOwpAQCAtNjAyLDkgKzYwMiw5IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9t ZSgpCiAKICAgICBRTWVudSogdG9vbHNNZW51ID0gbWVudUJhcigpLT5hZGRNZW51KCImRGV2ZWxv cCIpOwogICAgIHRvb2xzTWVudS0+YWRkQWN0aW9uKCJTZWxlY3QgRWxlbWVudHMuLi4iLCB0aGlz LCBTTE9UKHNlbGVjdEVsZW1lbnRzKCkpKTsKLSAgICBRQWN0aW9uKiBzaG93SW5zcGVjdG9yQWN0 aW9uID0gdG9vbHNNZW51LT5hZGRBY3Rpb24oIlNob3cgV2ViIEluc3BlY3RvciIsIGluc3BlY3Rv ciwgU0xPVChzZXRWaXNpYmxlKGJvb2wpKSwgUUtleVNlcXVlbmNlKFF0OjpDVFJMIHwgUXQ6OkFM VCB8IFF0OjpLZXlfSSkpOworICAgIFFBY3Rpb24qIHNob3dJbnNwZWN0b3JBY3Rpb24gPSB0b29s c01lbnUtPmFkZEFjdGlvbigiU2hvdyBXZWIgSW5zcGVjdG9yIiwgbV9pbnNwZWN0b3IsIFNMT1Qo c2V0VmlzaWJsZShib29sKSksIFFLZXlTZXF1ZW5jZShRdDo6Q1RSTCB8IFF0OjpBTFQgfCBRdDo6 S2V5X0kpKTsKICAgICBzaG93SW5zcGVjdG9yQWN0aW9uLT5zZXRDaGVja2FibGUodHJ1ZSk7Ci0g ICAgc2hvd0luc3BlY3RvckFjdGlvbi0+Y29ubmVjdChpbnNwZWN0b3IsIFNJR05BTCh2aXNpYmxl Q2hhbmdlZChib29sKSksIFNMT1Qoc2V0Q2hlY2tlZChib29sKSkpOworICAgIHNob3dJbnNwZWN0 b3JBY3Rpb24tPmNvbm5lY3QobV9pbnNwZWN0b3IsIFNJR05BTCh2aXNpYmxlQ2hhbmdlZChib29s KSksIFNMT1Qoc2V0Q2hlY2tlZChib29sKSkpOwogCiAjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJT SU9OX0NIRUNLKDQsIDYsIDApCiAgICAgUUFjdGlvbiogdG91Y2hNb2NrQWN0aW9uID0gdG9vbHNN ZW51LT5hZGRBY3Rpb24oIlRvZ2dsZSBtdWx0aXRvdWNoIG1vY2tpbmciLCB0aGlzLCBTTE9UKHNl dFRvdWNoTW9ja2luZyhib29sKSkpOwpAQCAtNjMxLDE4ICs2MzEsMTggQEAgdm9pZCBMYXVuY2hl cldpbmRvdzo6Y3JlYXRlQ2hyb21lKCkKIAogICAgIGdyYXBoaWNzVmlld01lbnUtPmFkZFNlcGFy YXRvcigpOwogCi0gICAgZmxpcEFuaW1hdGVkID0gZ3JhcGhpY3NWaWV3TWVudS0+YWRkQWN0aW9u KCJBbmltYXRlZCBGbGlwIik7Ci0gICAgZmxpcEFuaW1hdGVkLT5jb25uZWN0KHRvZ2dsZUdyYXBo aWNzVmlldywgU0lHTkFMKHRvZ2dsZWQoYm9vbCkpLCBTTE9UKHNldEVuYWJsZWQoYm9vbCkpKTsK LSAgICBmbGlwQW5pbWF0ZWQtPnNldEVuYWJsZWQoaXNHcmFwaGljc0Jhc2VkKCkpOworICAgIG1f ZmxpcEFuaW1hdGVkID0gZ3JhcGhpY3NWaWV3TWVudS0+YWRkQWN0aW9uKCJBbmltYXRlZCBGbGlw Iik7CisgICAgbV9mbGlwQW5pbWF0ZWQtPmNvbm5lY3QodG9nZ2xlR3JhcGhpY3NWaWV3LCBTSUdO QUwodG9nZ2xlZChib29sKSksIFNMT1Qoc2V0RW5hYmxlZChib29sKSkpOworICAgIG1fZmxpcEFu aW1hdGVkLT5zZXRFbmFibGVkKGlzR3JhcGhpY3NCYXNlZCgpKTsKIAotICAgIGZsaXBZQW5pbWF0 ZWQgPSBncmFwaGljc1ZpZXdNZW51LT5hZGRBY3Rpb24oIkFuaW1hdGVkIFktRmxpcCIpOwotICAg IGZsaXBZQW5pbWF0ZWQtPmNvbm5lY3QodG9nZ2xlR3JhcGhpY3NWaWV3LCBTSUdOQUwodG9nZ2xl ZChib29sKSksIFNMT1Qoc2V0RW5hYmxlZChib29sKSkpOwotICAgIGZsaXBZQW5pbWF0ZWQtPnNl dEVuYWJsZWQoaXNHcmFwaGljc0Jhc2VkKCkpOworICAgIG1fZmxpcFlBbmltYXRlZCA9IGdyYXBo aWNzVmlld01lbnUtPmFkZEFjdGlvbigiQW5pbWF0ZWQgWS1GbGlwIik7CisgICAgbV9mbGlwWUFu aW1hdGVkLT5jb25uZWN0KHRvZ2dsZUdyYXBoaWNzVmlldywgU0lHTkFMKHRvZ2dsZWQoYm9vbCkp LCBTTE9UKHNldEVuYWJsZWQoYm9vbCkpKTsKKyAgICBtX2ZsaXBZQW5pbWF0ZWQtPnNldEVuYWJs ZWQoaXNHcmFwaGljc0Jhc2VkKCkpOwogCiAgICAgaWYgKGlzR3JhcGhpY3NCYXNlZCgpKSB7CiAg ICAgICAgIFdlYlZpZXdHcmFwaGljc0Jhc2VkKiB2aWV3ID0gc3RhdGljX2Nhc3Q8V2ViVmlld0dy YXBoaWNzQmFzZWQqPihtX3ZpZXcpOwotICAgICAgICBjb25uZWN0KGZsaXBBbmltYXRlZCwgU0lH TkFMKHRyaWdnZXJlZCgpKSwgdmlldywgU0xPVChhbmltYXRlZEZsaXAoKSkpOwotICAgICAgICBj b25uZWN0KGZsaXBZQW5pbWF0ZWQsIFNJR05BTCh0cmlnZ2VyZWQoKSksIHZpZXcsIFNMT1QoYW5p bWF0ZWRZRmxpcCgpKSk7CisgICAgICAgIGNvbm5lY3QobV9mbGlwQW5pbWF0ZWQsIFNJR05BTCh0 cmlnZ2VyZWQoKSksIHZpZXcsIFNMT1QoYW5pbWF0ZWRGbGlwKCkpKTsKKyAgICAgICAgY29ubmVj dChtX2ZsaXBZQW5pbWF0ZWQsIFNJR05BTCh0cmlnZ2VyZWQoKSksIHZpZXcsIFNMT1QoYW5pbWF0 ZWRZRmxpcCgpKSk7CiAgICAgfQogCiAgICAgZ3JhcGhpY3NWaWV3TWVudS0+YWRkU2VwYXJhdG9y KCk7Ci0tIAoxLjYuNgoK