57314 2011-03-29 01:44:48 -0700 [Qt] Add -print-loaded-urls option to Qt's MiniBrowser and to QtTestBrowser 2011-03-29 06:37:40 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 1 zoltan zoltan oldest_to_newest 375117 0 zoltan 2011-03-29 01:44:48 -0700 Provide possibility to print loaded urls to the standard output. 375118 1 87282 zoltan 2011-03-29 01:46:28 -0700 Created attachment 87282 proposed patch 375235 2 87282 kling 2011-03-29 06:15:45 -0700 Comment on attachment 87282 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=87282&action=review r-, comments on irc > Tools/MiniBrowser/qt/BrowserWindow.cpp:65 > + if (m_windowOptions.printLoadedUrls) > + connect(page(), SIGNAL(urlChanged(const QUrl&)), this, SLOT(printURL())); We typically normalize signal/slot names so Qt doesn't have to do it for us. "urlChanged(const QUrl&)" -> "urlChanged(QUrl)" printURL() should take the const QUrl& argument and print that instead of fetching it from the view. 375236 3 87303 zoltan 2011-03-29 06:16:23 -0700 Created attachment 87303 proposed patch 375238 4 87303 zoltan 2011-03-29 06:16:49 -0700 Comment on attachment 87303 proposed patch Thanks for the comments. 375243 5 87303 kling 2011-03-29 06:20:18 -0700 Comment on attachment 87303 proposed patch Shazam! 375255 6 zoltan 2011-03-29 06:37:40 -0700 Thank you! Landed in r82244. http://trac.webkit.org/changeset/82244 87282 2011-03-29 01:46:28 -0700 2011-03-29 06:15:45 -0700 proposed patch printUrls2.patch text/plain 6716 zoltan ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1NTk5 ZDljLi43ZTA2MzRkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDMtMjkgIFpvbHRhbiBIb3J2YXRoICA8em9s dGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBBZGQgLXByaW50LWxvYWRlZC11cmxzIG9wdGlvbiB0byBRdCdzIE1pbmlC cm93c2VyIGFuZCB0byBRdFRlc3RCcm93c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01NzMxNAorCisgICAgICAgIFByb3ZpZGUgcG9zc2liaWxpdHkg dG8gcHJpbnQgbG9hZGVkIHVybHMgdG8gdGhlIHN0YW5kYXJkIG91dHB1dC4KKworICAgICAgICAq IE1pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwOgorICAgICAgICAoQnJvd3NlcldpbmRv dzo6QnJvd3NlcldpbmRvdyk6CisgICAgICAgIChCcm93c2VyV2luZG93OjpwcmludFVSTCk6Cisg ICAgICAgICogTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oOgorICAgICAgICAqIE1pbmlC cm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uY3BwOgorICAgICAgICAoTWluaUJyb3dz ZXJBcHBsaWNhdGlvbjo6aGFuZGxlVXNlck9wdGlvbnMpOgorICAgICAgICAqIE1pbmlCcm93c2Vy L3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uaDoKKyAgICAgICAgKFdpbmRvd09wdGlvbnM6Oldp bmRvd09wdGlvbnMpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3Bw OgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KToKKyAgICAgICAgKExh dW5jaGVyV2luZG93OjpwcmludFVSTCk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6Y2xvbmVX aW5kb3cpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaDoKKyAgICAg ICAgKFdpbmRvd09wdGlvbnM6OldpbmRvd09wdGlvbnMpOgorICAgICAgICAqIFF0VGVzdEJyb3dz ZXIvbWFpbi5jcHA6CisgICAgICAgIChMYXVuY2hlckFwcGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0 aW9ucyk6CisKIDIwMTEtMDMtMjggIEFuZHJldyBGb3N0ZXIgIDxhbmRyZXdmQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBPamFuIFZhZmFpLgpkaWZmIC0tZ2l0IGEvVG9vbHMv TWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9C cm93c2VyV2luZG93LmNwcAppbmRleCA2N2Q1Njk2Li44ODIxZTgwIDEwMDY0NAotLS0gYS9Ub29s cy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nl ci9xdC9Ccm93c2VyV2luZG93LmNwcApAQCAtNjEsNiArNjEsOSBAQCBCcm93c2VyV2luZG93OjpC cm93c2VyV2luZG93KFFXS0NvbnRleHQqIGNvbnRleHQsIFdpbmRvd09wdGlvbnMqIG9wdGlvbnMp CiAgICAgY29ubmVjdChtX2Jyb3dzZXItPnZpZXcoKSwgU0lHTkFMKHRpdGxlQ2hhbmdlZChjb25z dCBRU3RyaW5nJikpLCBTTE9UKHNldFdpbmRvd1RpdGxlKGNvbnN0IFFTdHJpbmcmKSkpOwogICAg IGNvbm5lY3QobV9icm93c2VyLT52aWV3KCksIFNJR05BTCh1cmxDaGFuZ2VkKGNvbnN0IFFVcmwm KSksIFNMT1QodXJsQ2hhbmdlZChjb25zdCBRVXJsJikpKTsKIAorICAgIGlmIChtX3dpbmRvd09w dGlvbnMucHJpbnRMb2FkZWRVcmxzKQorICAgICAgICBjb25uZWN0KHBhZ2UoKSwgU0lHTkFMKHVy bENoYW5nZWQoY29uc3QgUVVybCYpKSwgdGhpcywgU0xPVChwcmludFVSTCgpKSk7CisKICAgICB0 aGlzLT5zZXRDZW50cmFsV2lkZ2V0KG1fYnJvd3Nlcik7CiAgICAgbV9icm93c2VyLT5zZXRGb2N1 cyhRdDo6T3RoZXJGb2N1c1JlYXNvbik7CiAKQEAgLTMzMiw2ICszMzUsMTIgQEAgdm9pZCBCcm93 c2VyV2luZG93OjpzaG93VXNlckFnZW50RGlhbG9nKCkKICAgICAgICAgcGFnZSgpLT5zZXRDdXN0 b21Vc2VyQWdlbnQoY29tYm8tPmN1cnJlbnRUZXh0KCkpOwogfQogCit2b2lkIEJyb3dzZXJXaW5k b3c6OnByaW50VVJMKCkKK3sKKyAgICBRVGV4dFN0cmVhbSBvdXRwdXQoc3Rkb3V0KTsKKyAgICBv dXRwdXQgPDwgIkxvYWRlZDogIiA8PCBtX2Jyb3dzZXItPnZpZXcoKS0+dXJsKCkudG9TdHJpbmco KSA8PCBlbmRsOworfQorCiB2b2lkIEJyb3dzZXJXaW5kb3c6OnRvZ2dsZURpc2FibGVKYXZhU2Ny aXB0KGJvb2wgZW5hYmxlKQogewogICAgIHBhZ2UoKS0+cHJlZmVyZW5jZXMoKS0+c2V0QXR0cmli dXRlKFFXS1ByZWZlcmVuY2VzOjpKYXZhc2NyaXB0RW5hYmxlZCwgIWVuYWJsZSk7CmRpZmYgLS1n aXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmggYi9Ub29scy9NaW5pQnJv d3Nlci9xdC9Ccm93c2VyV2luZG93LmgKaW5kZXggYzc5YjJkMC4uN2RhZGU0MCAxMDA2NDQKLS0t IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oCisrKyBiL1Rvb2xzL01pbmlC cm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuaApAQCAtNjksNiArNjksOCBAQCBwcm90ZWN0ZWQgc2xv dHM6CiAgICAgdm9pZCB0b2dnbGVGcmFtZUZsYXR0ZW5pbmcoYm9vbCk7CiAgICAgdm9pZCBzaG93 VXNlckFnZW50RGlhbG9nKCk7CiAKKyAgICB2b2lkIHByaW50VVJMKCk7CisKICAgICB2b2lkIHRv Z2dsZUF1dG9Mb2FkSW1hZ2VzKGJvb2wpOwogICAgIHZvaWQgdG9nZ2xlRGlzYWJsZUphdmFTY3Jp cHQoYm9vbCk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2Vy QXBwbGljYXRpb24uY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNh dGlvbi5jcHAKaW5kZXggZDY4ZDI5OS4uZjQwYzg3MCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJy b3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dz ZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKQEAgLTYwLDYgKzYwLDcgQEAgdm9pZCBN aW5pQnJvd3NlckFwcGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0aW9ucygpCiAgICAgICAgICAgICAg PDwgIlstcm9ib3QtZXh0cmEtdGltZSBzZWNvbmRzXSIKICAgICAgICAgICAgICA8PCAiWy1jaHVu a2VkLWRyYXdpbmctYXJlYV0iCiAgICAgICAgICAgICAgPDwgICJbLXNlcGFyYXRlLXdlYi1wcm9j ZXNzLXBlci13aW5kb3ddIgorICAgICAgICAgICAgIDw8ICJbLXByaW50LWxvYWRlZC11cmxzXSIK ICAgICAgICAgICAgICA8PCAiVVJMcyI7CiAgICAgICAgIGFwcFF1aXQoMCk7CiAgICAgfQpAQCAt OTIsNCArOTMsNyBAQCB2b2lkIE1pbmlCcm93c2VyQXBwbGljYXRpb246OmhhbmRsZVVzZXJPcHRp b25zKCkKIAogICAgIGlmIChhcmdzLmNvbnRhaW5zKCItc2VwYXJhdGUtd2ViLXByb2Nlc3MtcGVy LXdpbmRvdyIpKQogICAgICAgICBtX3dpbmRvd09wdGlvbnMudXNlU2VwYXJhdGVXZWJQcm9jZXNz UGVyV2luZG93ID0gdHJ1ZTsKKworICAgIGlmIChhcmdzLmNvbnRhaW5zKCItcHJpbnQtbG9hZGVk LXVybHMiKSkKKyAgICAgICAgbV93aW5kb3dPcHRpb25zLnByaW50TG9hZGVkVXJscyA9IHRydWU7 CiB9CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0 aW9uLmggYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmgKaW5k ZXggNDVkYmRlOS4uNWE3ODgyMCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWlu aUJyb3dzZXJBcHBsaWNhdGlvbi5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93 c2VyQXBwbGljYXRpb24uaApAQCAtMzYsMTEgKzM2LDEzIEBAIHN0cnVjdCBXaW5kb3dPcHRpb25z IHsKICAgICBXaW5kb3dPcHRpb25zKCkKICAgICAgICAgOiB1c2VUaWxlZEJhY2tpbmdTdG9yZSh0 cnVlKQogICAgICAgICAsIHVzZVNlcGFyYXRlV2ViUHJvY2Vzc1BlcldpbmRvdyhmYWxzZSkKKyAg ICAgICAgLCBwcmludExvYWRlZFVybHMoZmFsc2UpCiAgICAgewogICAgIH0KIAogICAgIGJvb2wg dXNlVGlsZWRCYWNraW5nU3RvcmU7CiAgICAgYm9vbCB1c2VTZXBhcmF0ZVdlYlByb2Nlc3NQZXJX aW5kb3c7CisgICAgYm9vbCBwcmludExvYWRlZFVybHM7CiB9OwogCiBjbGFzcyBNaW5pQnJvd3Nl ckFwcGxpY2F0aW9uIDogcHVibGljIFFBcHBsaWNhdGlvbiB7CmRpZmYgLS1naXQgYS9Ub29scy9R dFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmNwcCBiL1Rvb2xzL1F0VGVzdEJyb3dzZXIvbGF1 bmNoZXJ3aW5kb3cuY3BwCmluZGV4IDljYWI3OTEuLjA4MGI1ZjUgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCisrKyBiL1Rvb2xzL1F0VGVzdEJyb3dz ZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCkBAIC0xMzAsNiArMTMwLDkgQEAgdm9pZCBMYXVuY2hlcldp bmRvdzo6aW5pdGlhbGl6ZVZpZXcoKQogICAgICAgICAgICAgdGhpcywgU0xPVChzaG93TGlua0hv dmVyKGNvbnN0IFFTdHJpbmcmLCBjb25zdCBRU3RyaW5nJikpKTsKICAgICBjb25uZWN0KHRoaXMs IFNJR05BTChlbnRlcmVkRnVsbFNjcmVlbk1vZGUoYm9vbCkpLCB0aGlzLCBTTE9UKHRvZ2dsZUZ1 bGxTY3JlZW5Nb2RlKGJvb2wpKSk7CiAKKyAgICBpZiAobV93aW5kb3dPcHRpb25zLnByaW50TG9h ZGVkVXJscykKKyAgICAgICAgY29ubmVjdChwYWdlKCksIFNJR05BTChsb2FkRmluaXNoZWQoYm9v bCkpLCB0aGlzLCBTTE9UKHByaW50VVJMKCkpKTsKKwogICAgIGFwcGx5UHJlZnMoKTsKIAogICAg IHNwbGl0dGVyLT5hZGRXaWRnZXQobV9pbnNwZWN0b3IpOwpAQCAtODk3LDYgKzkwMCwxMiBAQCB2 b2lkIExhdW5jaGVyV2luZG93OjpzaG93VXNlckFnZW50RGlhbG9nKCkKICAgICBkZWxldGUgZGlh bG9nOwogfQogCit2b2lkIExhdW5jaGVyV2luZG93OjpwcmludFVSTCgpCit7CisgICAgUVRleHRT dHJlYW0gb3V0cHV0KHN0ZG91dCk7CisgICAgb3V0cHV0IDw8ICJMb2FkZWQ6ICIgPDwgcGFnZSgp LT5tYWluRnJhbWUoKS0+dXJsKCkudG9TdHJpbmcoKSA8PCBlbmRsOworfQorCiB2b2lkIExhdW5j aGVyV2luZG93Ojp1cGRhdGVGUFMoaW50IGZwcykKIHsKICAgICBRU3RyaW5nIGZwc1N0YXR1c1Rl eHQgPSBRU3RyaW5nKCJDdXJyZW50IEZQUzogJTEiKS5hcmcoZnBzKTsKZGlmZiAtLWdpdCBhL1Rv b2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaCBiL1Rvb2xzL1F0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuaAppbmRleCA0NDFlNmRjLi41OTkyYjgxIDEwMDY0NAotLS0gYS9Ub29s cy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgKKysrIGIvVG9vbHMvUXRUZXN0QnJvd3Nl ci9sYXVuY2hlcndpbmRvdy5oCkBAIC0xMDMsNiArMTAzLDcgQEAgcHVibGljOgogI2lmIGRlZmlu ZWQoUV9XU19YMTEpCiAgICAgICAgICwgdXNlVGVzdEZvbnRzKGZhbHNlKQogI2VuZGlmCisgICAg ICAgICwgcHJpbnRMb2FkZWRVcmxzKGZhbHNlKQogICAgIHsKICAgICB9CiAKQEAgLTEyNSw2ICsx MjYsNyBAQCBwdWJsaWM6CiAjaWYgZGVmaW5lZChRX1dTX1gxMSkKICAgICBib29sIHVzZVRlc3RG b250czsKICNlbmRpZgorICAgIGJvb2wgcHJpbnRMb2FkZWRVcmxzOwogICAgIFFVcmwgaW5zcGVj dG9yVXJsOwogICAgIHF1aW50MTYgcmVtb3RlSW5zcGVjdG9yUG9ydDsKIH07CkBAIC0xOTIsNiAr MTk0LDggQEAgcHJvdGVjdGVkIHNsb3RzOgogICAgIHZvaWQgc2hvd0ZQUyhib29sIGVuYWJsZSk7 CiAgICAgdm9pZCBzaG93VXNlckFnZW50RGlhbG9nKCk7CiAKKyAgICB2b2lkIHByaW50VVJMKCk7 CisKIHB1YmxpYyBzbG90czoKICAgICBMYXVuY2hlcldpbmRvdyogbmV3V2luZG93KCk7CiAgICAg TGF1bmNoZXJXaW5kb3cqIGNsb25lV2luZG93KCk7CmRpZmYgLS1naXQgYS9Ub29scy9RdFRlc3RC cm93c2VyL21haW4uY3BwIGIvVG9vbHMvUXRUZXN0QnJvd3Nlci9tYWluLmNwcAppbmRleCAxOGE4 NjJiLi4wNTkyNjljIDEwMDY0NAotLS0gYS9Ub29scy9RdFRlc3RCcm93c2VyL21haW4uY3BwCisr KyBiL1Rvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbi5jcHAKQEAgLTE5Nyw2ICsxOTcsNyBAQCB2b2lk IExhdW5jaGVyQXBwbGljYXRpb246OmhhbmRsZVVzZXJPcHRpb25zKCkKICNpZiBkZWZpbmVkKFFf V1NfWDExKQogICAgICAgICAgICAgIDw8ICJbLXVzZS10ZXN0LWZvbnRzXSIKICNlbmRpZgorICAg ICAgICAgICAgIDw8ICJbLXByaW50LWxvYWRlZC11cmxzXSIKICAgICAgICAgICAgICA8PCAiVVJM cyI7CiAgICAgICAgIGFwcFF1aXQoMCk7CiAgICAgfQpAQCAtMjc5LDYgKzI4MCw5IEBAIHZvaWQg TGF1bmNoZXJBcHBsaWNhdGlvbjo6aGFuZGxlVXNlck9wdGlvbnMoKQogICAgICAgICB3aW5kb3dP cHRpb25zLnVzZVRlc3RGb250cyA9IHRydWU7CiAjZW5kaWYKIAorICAgIGlmIChhcmdzLmNvbnRh aW5zKCItcHJpbnQtbG9hZGVkLXVybHMiKSkKKyAgICAgICAgd2luZG93T3B0aW9ucy5wcmludExv YWRlZFVybHMgPSB0cnVlOworCiAgICAgUVN0cmluZyBpbnNwZWN0b3JVcmxBcmcoIi1pbnNwZWN0 b3ItdXJsIik7CiAgICAgaW50IGluc3BlY3RvclVybEluZGV4ID0gYXJncy5pbmRleE9mKGluc3Bl Y3RvclVybEFyZyk7CiAgICAgaWYgKGluc3BlY3RvclVybEluZGV4ICE9IC0xKQo= 87303 2011-03-29 06:16:23 -0700 2011-03-29 06:20:18 -0700 proposed patch printUrls3.patch text/plain 6742 zoltan ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5YmM4 ODk0Li42NWRkMDk5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDMtMjkgIFpvbHRhbiBIb3J2YXRoICA8em9s dGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBBZGQgLXByaW50LWxvYWRlZC11cmxzIG9wdGlvbiB0byBRdCdzIE1pbmlC cm93c2VyIGFuZCB0byBRdFRlc3RCcm93c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01NzMxNAorCisgICAgICAgIFByb3ZpZGUgcG9zc2liaWxpdHkg dG8gcHJpbnQgbG9hZGVkIHVybHMgdG8gdGhlIHN0YW5kYXJkIG91dHB1dC4KKworICAgICAgICAq IE1pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwOgorICAgICAgICAoQnJvd3NlcldpbmRv dzo6QnJvd3NlcldpbmRvdyk6CisgICAgICAgIChCcm93c2VyV2luZG93OjpwcmludFVSTCk6Cisg ICAgICAgICogTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oOgorICAgICAgICAqIE1pbmlC cm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uY3BwOgorICAgICAgICAoTWluaUJyb3dz ZXJBcHBsaWNhdGlvbjo6aGFuZGxlVXNlck9wdGlvbnMpOgorICAgICAgICAqIE1pbmlCcm93c2Vy L3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uaDoKKyAgICAgICAgKFdpbmRvd09wdGlvbnM6Oldp bmRvd09wdGlvbnMpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3Bw OgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KToKKyAgICAgICAgKExh dW5jaGVyV2luZG93OjpwcmludFVSTCk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6Y2xvbmVX aW5kb3cpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaDoKKyAgICAg ICAgKFdpbmRvd09wdGlvbnM6OldpbmRvd09wdGlvbnMpOgorICAgICAgICAqIFF0VGVzdEJyb3dz ZXIvbWFpbi5jcHA6CisgICAgICAgIChMYXVuY2hlckFwcGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0 aW9ucyk6CisKIDIwMTEtMDMtMjkgIEdhYm9yIExva2kgIDxsb2tpQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUnViYmVyLXN0YW1wZWQgYnkgQ3NhYmEgT3N6dHJvZ29uw6FjLgpkaWZmIC0tZ2l0IGEv VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAgYi9Ub29scy9NaW5pQnJvd3Nl ci9xdC9Ccm93c2VyV2luZG93LmNwcAppbmRleCA2N2Q1Njk2Li41M2Y3ZGU5IDEwMDY0NAotLS0g YS9Ub29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmNwcAorKysgYi9Ub29scy9NaW5p QnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmNwcApAQCAtNjEsNiArNjEsOSBAQCBCcm93c2VyV2lu ZG93OjpCcm93c2VyV2luZG93KFFXS0NvbnRleHQqIGNvbnRleHQsIFdpbmRvd09wdGlvbnMqIG9w dGlvbnMpCiAgICAgY29ubmVjdChtX2Jyb3dzZXItPnZpZXcoKSwgU0lHTkFMKHRpdGxlQ2hhbmdl ZChjb25zdCBRU3RyaW5nJikpLCBTTE9UKHNldFdpbmRvd1RpdGxlKGNvbnN0IFFTdHJpbmcmKSkp OwogICAgIGNvbm5lY3QobV9icm93c2VyLT52aWV3KCksIFNJR05BTCh1cmxDaGFuZ2VkKGNvbnN0 IFFVcmwmKSksIFNMT1QodXJsQ2hhbmdlZChjb25zdCBRVXJsJikpKTsKIAorICAgIGlmIChtX3dp bmRvd09wdGlvbnMucHJpbnRMb2FkZWRVcmxzKQorICAgICAgICBjb25uZWN0KHBhZ2UoKSwgU0lH TkFMKHVybENoYW5nZWQoUVVybCkpLCB0aGlzLCBTTE9UKHByaW50VVJMKFFVcmwpKSk7CisKICAg ICB0aGlzLT5zZXRDZW50cmFsV2lkZ2V0KG1fYnJvd3Nlcik7CiAgICAgbV9icm93c2VyLT5zZXRG b2N1cyhRdDo6T3RoZXJGb2N1c1JlYXNvbik7CiAKQEAgLTMzMiw2ICszMzUsMTIgQEAgdm9pZCBC cm93c2VyV2luZG93OjpzaG93VXNlckFnZW50RGlhbG9nKCkKICAgICAgICAgcGFnZSgpLT5zZXRD dXN0b21Vc2VyQWdlbnQoY29tYm8tPmN1cnJlbnRUZXh0KCkpOwogfQogCit2b2lkIEJyb3dzZXJX aW5kb3c6OnByaW50VVJMKGNvbnN0IFFVcmwmIHVybCkKK3sKKyAgICBRVGV4dFN0cmVhbSBvdXRw dXQoc3Rkb3V0KTsKKyAgICBvdXRwdXQgPDwgIkxvYWRlZDogIiA8PCB1cmwudG9TdHJpbmcoKSA8 PCBlbmRsOworfQorCiB2b2lkIEJyb3dzZXJXaW5kb3c6OnRvZ2dsZURpc2FibGVKYXZhU2NyaXB0 KGJvb2wgZW5hYmxlKQogewogICAgIHBhZ2UoKS0+cHJlZmVyZW5jZXMoKS0+c2V0QXR0cmlidXRl KFFXS1ByZWZlcmVuY2VzOjpKYXZhc2NyaXB0RW5hYmxlZCwgIWVuYWJsZSk7CmRpZmYgLS1naXQg YS9Ub29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nl ci9xdC9Ccm93c2VyV2luZG93LmgKaW5kZXggYzc5YjJkMC4uNmFkOGYyNyAxMDA2NDQKLS0tIGEv VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oCisrKyBiL1Rvb2xzL01pbmlCcm93 c2VyL3F0L0Jyb3dzZXJXaW5kb3cuaApAQCAtNjksNiArNjksOCBAQCBwcm90ZWN0ZWQgc2xvdHM6 CiAgICAgdm9pZCB0b2dnbGVGcmFtZUZsYXR0ZW5pbmcoYm9vbCk7CiAgICAgdm9pZCBzaG93VXNl ckFnZW50RGlhbG9nKCk7CiAKKyAgICB2b2lkIHByaW50VVJMKGNvbnN0IFFVcmwmKTsKKwogICAg IHZvaWQgdG9nZ2xlQXV0b0xvYWRJbWFnZXMoYm9vbCk7CiAgICAgdm9pZCB0b2dnbGVEaXNhYmxl SmF2YVNjcmlwdChib29sKTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWlu aUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nl ckFwcGxpY2F0aW9uLmNwcAppbmRleCBkNjhkMjk5Li5mNDBjODcwIDEwMDY0NAotLS0gYS9Ub29s cy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcAorKysgYi9Ub29scy9N aW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcApAQCAtNjAsNiArNjAsNyBA QCB2b2lkIE1pbmlCcm93c2VyQXBwbGljYXRpb246OmhhbmRsZVVzZXJPcHRpb25zKCkKICAgICAg ICAgICAgICA8PCAiWy1yb2JvdC1leHRyYS10aW1lIHNlY29uZHNdIgogICAgICAgICAgICAgIDw8 ICJbLWNodW5rZWQtZHJhd2luZy1hcmVhXSIKICAgICAgICAgICAgICA8PCAgIlstc2VwYXJhdGUt d2ViLXByb2Nlc3MtcGVyLXdpbmRvd10iCisgICAgICAgICAgICAgPDwgIlstcHJpbnQtbG9hZGVk LXVybHNdIgogICAgICAgICAgICAgIDw8ICJVUkxzIjsKICAgICAgICAgYXBwUXVpdCgwKTsKICAg ICB9CkBAIC05Miw0ICs5Myw3IEBAIHZvaWQgTWluaUJyb3dzZXJBcHBsaWNhdGlvbjo6aGFuZGxl VXNlck9wdGlvbnMoKQogCiAgICAgaWYgKGFyZ3MuY29udGFpbnMoIi1zZXBhcmF0ZS13ZWItcHJv Y2Vzcy1wZXItd2luZG93IikpCiAgICAgICAgIG1fd2luZG93T3B0aW9ucy51c2VTZXBhcmF0ZVdl YlByb2Nlc3NQZXJXaW5kb3cgPSB0cnVlOworCisgICAgaWYgKGFyZ3MuY29udGFpbnMoIi1wcmlu dC1sb2FkZWQtdXJscyIpKQorICAgICAgICBtX3dpbmRvd09wdGlvbnMucHJpbnRMb2FkZWRVcmxz ID0gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2Vy QXBwbGljYXRpb24uaCBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRp b24uaAppbmRleCA0NWRiZGU5Li41YTc4ODIwIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nl ci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQv TWluaUJyb3dzZXJBcHBsaWNhdGlvbi5oCkBAIC0zNiwxMSArMzYsMTMgQEAgc3RydWN0IFdpbmRv d09wdGlvbnMgewogICAgIFdpbmRvd09wdGlvbnMoKQogICAgICAgICA6IHVzZVRpbGVkQmFja2lu Z1N0b3JlKHRydWUpCiAgICAgICAgICwgdXNlU2VwYXJhdGVXZWJQcm9jZXNzUGVyV2luZG93KGZh bHNlKQorICAgICAgICAsIHByaW50TG9hZGVkVXJscyhmYWxzZSkKICAgICB7CiAgICAgfQogCiAg ICAgYm9vbCB1c2VUaWxlZEJhY2tpbmdTdG9yZTsKICAgICBib29sIHVzZVNlcGFyYXRlV2ViUHJv Y2Vzc1BlcldpbmRvdzsKKyAgICBib29sIHByaW50TG9hZGVkVXJsczsKIH07CiAKIGNsYXNzIE1p bmlCcm93c2VyQXBwbGljYXRpb24gOiBwdWJsaWMgUUFwcGxpY2F0aW9uIHsKZGlmZiAtLWdpdCBh L1Rvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwIGIvVG9vbHMvUXRUZXN0QnJv d3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKaW5kZXggOWNhYjc5MS4uZjRkYjg5OCAxMDA2NDQKLS0t IGEvVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKKysrIGIvVG9vbHMvUXRU ZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKQEAgLTEzMCw2ICsxMzAsOSBAQCB2b2lkIExh dW5jaGVyV2luZG93Ojppbml0aWFsaXplVmlldygpCiAgICAgICAgICAgICB0aGlzLCBTTE9UKHNo b3dMaW5rSG92ZXIoY29uc3QgUVN0cmluZyYsIGNvbnN0IFFTdHJpbmcmKSkpOwogICAgIGNvbm5l Y3QodGhpcywgU0lHTkFMKGVudGVyZWRGdWxsU2NyZWVuTW9kZShib29sKSksIHRoaXMsIFNMT1Qo dG9nZ2xlRnVsbFNjcmVlbk1vZGUoYm9vbCkpKTsKIAorICAgIGlmIChtX3dpbmRvd09wdGlvbnMu cHJpbnRMb2FkZWRVcmxzKQorICAgICAgICBjb25uZWN0KHBhZ2UoKS0+bWFpbkZyYW1lKCksIFNJ R05BTCh1cmxDaGFuZ2VkKFFVcmwpKSwgdGhpcywgU0xPVChwcmludFVSTChRVXJsKSkpOworCiAg ICAgYXBwbHlQcmVmcygpOwogCiAgICAgc3BsaXR0ZXItPmFkZFdpZGdldChtX2luc3BlY3Rvcik7 CkBAIC04OTcsNiArOTAwLDEyIEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OnNob3dVc2VyQWdlbnRE aWFsb2coKQogICAgIGRlbGV0ZSBkaWFsb2c7CiB9CiAKK3ZvaWQgTGF1bmNoZXJXaW5kb3c6OnBy aW50VVJMKGNvbnN0IFFVcmwmIHVybCkKK3sKKyAgICBRVGV4dFN0cmVhbSBvdXRwdXQoc3Rkb3V0 KTsKKyAgICBvdXRwdXQgPDwgIkxvYWRlZDogIiA8PCB1cmwudG9TdHJpbmcoKSA8PCBlbmRsOwor fQorCiB2b2lkIExhdW5jaGVyV2luZG93Ojp1cGRhdGVGUFMoaW50IGZwcykKIHsKICAgICBRU3Ry aW5nIGZwc1N0YXR1c1RleHQgPSBRU3RyaW5nKCJDdXJyZW50IEZQUzogJTEiKS5hcmcoZnBzKTsK ZGlmZiAtLWdpdCBhL1Rvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaCBiL1Rvb2xz L1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaAppbmRleCA0NDFlNmRjLi4yNDE4MGUyIDEw MDY0NAotLS0gYS9Ub29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgKKysrIGIvVG9v bHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCkBAIC0xMDMsNiArMTAzLDcgQEAgcHVi bGljOgogI2lmIGRlZmluZWQoUV9XU19YMTEpCiAgICAgICAgICwgdXNlVGVzdEZvbnRzKGZhbHNl KQogI2VuZGlmCisgICAgICAgICwgcHJpbnRMb2FkZWRVcmxzKGZhbHNlKQogICAgIHsKICAgICB9 CiAKQEAgLTEyNSw2ICsxMjYsNyBAQCBwdWJsaWM6CiAjaWYgZGVmaW5lZChRX1dTX1gxMSkKICAg ICBib29sIHVzZVRlc3RGb250czsKICNlbmRpZgorICAgIGJvb2wgcHJpbnRMb2FkZWRVcmxzOwog ICAgIFFVcmwgaW5zcGVjdG9yVXJsOwogICAgIHF1aW50MTYgcmVtb3RlSW5zcGVjdG9yUG9ydDsK IH07CkBAIC0xOTIsNiArMTk0LDggQEAgcHJvdGVjdGVkIHNsb3RzOgogICAgIHZvaWQgc2hvd0ZQ Uyhib29sIGVuYWJsZSk7CiAgICAgdm9pZCBzaG93VXNlckFnZW50RGlhbG9nKCk7CiAKKyAgICB2 b2lkIHByaW50VVJMKGNvbnN0IFFVcmwmKTsKKwogcHVibGljIHNsb3RzOgogICAgIExhdW5jaGVy V2luZG93KiBuZXdXaW5kb3coKTsKICAgICBMYXVuY2hlcldpbmRvdyogY2xvbmVXaW5kb3coKTsK ZGlmZiAtLWdpdCBhL1Rvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbi5jcHAgYi9Ub29scy9RdFRlc3RC cm93c2VyL21haW4uY3BwCmluZGV4IDE4YTg2MmIuLjA1OTI2OWMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1F0VGVzdEJyb3dzZXIvbWFpbi5jcHAKKysrIGIvVG9vbHMvUXRUZXN0QnJvd3Nlci9tYWluLmNw cApAQCAtMTk3LDYgKzE5Nyw3IEBAIHZvaWQgTGF1bmNoZXJBcHBsaWNhdGlvbjo6aGFuZGxlVXNl ck9wdGlvbnMoKQogI2lmIGRlZmluZWQoUV9XU19YMTEpCiAgICAgICAgICAgICAgPDwgIlstdXNl LXRlc3QtZm9udHNdIgogI2VuZGlmCisgICAgICAgICAgICAgPDwgIlstcHJpbnQtbG9hZGVkLXVy bHNdIgogICAgICAgICAgICAgIDw8ICJVUkxzIjsKICAgICAgICAgYXBwUXVpdCgwKTsKICAgICB9 CkBAIC0yNzksNiArMjgwLDkgQEAgdm9pZCBMYXVuY2hlckFwcGxpY2F0aW9uOjpoYW5kbGVVc2Vy T3B0aW9ucygpCiAgICAgICAgIHdpbmRvd09wdGlvbnMudXNlVGVzdEZvbnRzID0gdHJ1ZTsKICNl bmRpZgogCisgICAgaWYgKGFyZ3MuY29udGFpbnMoIi1wcmludC1sb2FkZWQtdXJscyIpKQorICAg ICAgICB3aW5kb3dPcHRpb25zLnByaW50TG9hZGVkVXJscyA9IHRydWU7CisKICAgICBRU3RyaW5n IGluc3BlY3RvclVybEFyZygiLWluc3BlY3Rvci11cmwiKTsKICAgICBpbnQgaW5zcGVjdG9yVXJs SW5kZXggPSBhcmdzLmluZGV4T2YoaW5zcGVjdG9yVXJsQXJnKTsKICAgICBpZiAoaW5zcGVjdG9y VXJsSW5kZXggIT0gLTEpCg==