61865 2011-06-01 08:51:07 -0700 [Qt] Implement download feature for QtTestBrowser 2011-06-06 08:21:10 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 Barat.Tibor webkit-unassigned abecsi ademar commit-queue ossy zoltan oldest_to_newest 413407 0 Barat.Tibor 2011-06-01 08:51:07 -0700 Implement save as feature for QTtestBrowser. 414041 1 95752 Barat.Tibor 2011-06-02 05:16:37 -0700 Created attachment 95752 proposed patch 414069 2 95752 ossy 2011-06-02 06:32:27 -0700 Comment on attachment 95752 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=95752&action=review > Tools/QtTestBrowser/launcherwindow.cpp:53 > , m_zoomAnimation(0) > + , m_reply(0) > { Please update this part of the patch, because it conflicts with ToT. > Tools/QtTestBrowser/launcherwindow.cpp:940 > + connect(m_reply, SIGNAL(finished()), this, SLOT(slotFinished())); I can't find slotFinished anywhere, but fileDownloadFinished. > Tools/QtTestBrowser/launcherwindow.cpp:950 > + if (fileName.isEmpty() || !m_reply->errorString().isNull()) > + QMessageBox::warning(this, QString("Download"), QString("Download failed.")); It fails for me, m_reply->errorString() returns always with "Unknown error." 414705 3 95867 Barat.Tibor 2011-06-03 00:57:51 -0700 Created attachment 95867 proposed patch 414837 4 95867 abecsi 2011-06-03 06:23:50 -0700 Comment on attachment 95867 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=95867&action=review > Tools/QtTestBrowser/launcherwindow.cpp:991 > + if (fileName.isEmpty() && m_reply->error() != QNetworkReply::NoError) AND does not seem to be correct here, you need OR. 414840 5 abecsi 2011-06-03 06:30:28 -0700 (In reply to comment #4) > (From update of attachment 95867 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=95867&action=review > > > Tools/QtTestBrowser/launcherwindow.cpp:991 > > + if (fileName.isEmpty() && m_reply->error() != QNetworkReply::NoError) > > AND does not seem to be correct here, you need OR. Most probably if you have fileName.isEmpty() then you sould simply return, since the user pressed "Cancel" on the dialog, and only show an error message when m_reply->error() indicates an error. 414847 6 95867 abecsi 2011-06-03 06:46:14 -0700 Comment on attachment 95867 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=95867&action=review Later this could be extended with a simple progress bar, but I think this is not the scope of this patch. Because of the problems previously pointed out, I would say r- for this patch if I were a reviewer. > Tools/QtTestBrowser/launcherwindow.cpp:992 > + QMessageBox::warning(this, QString("Download"), QString("Download failed.")); Further more, the message shown here could be more expressive if you would display m_reply->errorString(). And I would use critical here, but that's only a nitpick. 414888 7 95867 ossy 2011-06-03 07:43:05 -0700 Comment on attachment 95867 proposed patch I agree with Andras, user shouldn't get "Download failed" error if he or she pressed cancel button. And crital message would be better than warning message. r- now, but I'll set r+ if you fix these things. > Tools/QtTestBrowser/launcherwindow.cpp:991 > + if (fileName.isEmpty() && m_reply->error() != QNetworkReply::NoError) I mean this would be good: if (fileName.isEmpty()) return; if (m_reply->error() != QNetworkReply::NoError) QMessageBox::critical(this, QString("Download"), QString("Download failed.")); 415787 8 96077 Barat.Tibor 2011-06-06 05:22:27 -0700 Created attachment 96077 proposed patch 415797 9 96077 ossy 2011-06-06 05:57:38 -0700 Comment on attachment 96077 proposed patch LGTM, r=me 415799 10 96077 commit-queue 2011-06-06 06:19:35 -0700 Comment on attachment 96077 proposed patch Clearing flags on attachment: 96077 Committed r88161: <http://trac.webkit.org/changeset/88161> 415800 11 commit-queue 2011-06-06 06:19:41 -0700 All reviewed patches have been landed. Closing bug. 415836 12 ossy 2011-06-06 07:57:59 -0700 Unreviewed --minimal buildfix landed in http://trac.webkit.org/changeset/88167 415848 13 ademar 2011-06-06 08:21:10 -0700 Revision r88161 cherry-picked into qtwebkit-2.2 with commit 1be60bc <http://gitorious.org/webkit/qtwebkit/commit/1be60bc> Revision r88167 cherry-picked into qtwebkit-2.2 with commit 0558b11 <http://gitorious.org/webkit/qtwebkit/commit/0558b11> 95752 2011-06-02 05:16:37 -0700 2011-06-02 06:32:27 -0700 proposed patch uj10diff.patch text/plain 3617 Barat.Tibor ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhODFh ZjNiLi43NzVlNmNlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDYtMDIgIEJhcsOhdCBUaWJvciAgPEJhcmF0 LlRpYm9yQHN0dWQudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBJbXBsZW1lbnQgZG93bmxvYWQgZmVhdHVyZSBmb3IgUXRU ZXN0QnJvd3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjE4NjUKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwOgor ICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OkxhdW5jaGVyV2luZG93KToKKyAgICAgICAgKExhdW5j aGVyV2luZG93Ojpkb3dubG9hZFJlcXVlc3QpOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OmZp bGVEb3dubG9hZEZpbmlzaGVkKToKKyAgICAgICAgKiBRdFRlc3RCcm93c2VyL2xhdW5jaGVyd2lu ZG93Lmg6CisKIDIwMTEtMDQtMTIgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1Rvb2xz L1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwIGIvVG9vbHMvUXRUZXN0QnJvd3Nlci9s YXVuY2hlcndpbmRvdy5jcHAKaW5kZXggZDZiNjcxMC4uMTA4Y2ZmOSAxMDA2NDQKLS0tIGEvVG9v bHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKKysrIGIvVG9vbHMvUXRUZXN0QnJv d3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKQEAgLTMxLDcgKzMxLDEyIEBACiAgKi8KIAogI2luY2x1 ZGUgImxhdW5jaGVyd2luZG93LmgiCisKICNpbmNsdWRlICJ1cmxsb2FkZXIuaCIKKyNpbmNsdWRl IDxRRmlsZURpYWxvZz4KKyNpbmNsdWRlIDxRRmlsZUluZm8+CisjaW5jbHVkZSA8UU1lc3NhZ2VC b3g+CisjaW5jbHVkZSA8UU5ldHdvcmtSZXBseT4KIAogY29uc3QgaW50IGdFeGl0Q2xpY2tBcmVh ID0gODA7CiBRVmVjdG9yPGludD4gTGF1bmNoZXJXaW5kb3c6Om1fem9vbUxldmVsczsKQEAgLTQ0 LDYgKzQ5LDcgQEAgTGF1bmNoZXJXaW5kb3c6OkxhdW5jaGVyV2luZG93KFdpbmRvd09wdGlvbnMq IGRhdGEsIFFHcmFwaGljc1NjZW5lKiBzaGFyZWRTY2VuZSkKICAgICAsIG1faW5zcGVjdG9yKDAp CiAgICAgLCBtX2Zvcm1hdE1lbnVBY3Rpb24oMCkKICAgICAsIG1fem9vbUFuaW1hdGlvbigwKQor ICAgICwgbV9yZXBseSgwKQogewogICAgIGlmIChkYXRhKQogICAgICAgICBtX3dpbmRvd09wdGlv bnMgPSAqZGF0YTsKQEAgLTUzLDYgKzU5LDggQEAgTGF1bmNoZXJXaW5kb3c6OkxhdW5jaGVyV2lu ZG93KFdpbmRvd09wdGlvbnMqIGRhdGEsIFFHcmFwaGljc1NjZW5lKiBzaGFyZWRTY2VuZSkKICAg ICAgICAgc3RhdGljX2Nhc3Q8UUdyYXBoaWNzVmlldyo+KG1fdmlldyktPnNldFNjZW5lKHNoYXJl ZFNjZW5lKTsKIAogICAgIGNyZWF0ZUNocm9tZSgpOworCisgICAgY29ubmVjdChwYWdlKCksIFNJ R05BTChkb3dubG9hZFJlcXVlc3RlZChjb25zdCBRTmV0d29ya1JlcXVlc3QmKSksIHRoaXMsIFNM T1QoZG93bmxvYWRSZXF1ZXN0KGNvbnN0IFFOZXR3b3JrUmVxdWVzdCYpKSk7CiB9CiAKIExhdW5j aGVyV2luZG93Ojp+TGF1bmNoZXJXaW5kb3coKQpAQCAtOTI1LDYgKzkzMywzMCBAQCB2b2lkIExh dW5jaGVyV2luZG93OjpwcmludFVSTChjb25zdCBRVXJsJiB1cmwpCiAgICAgb3V0cHV0IDw8ICJM b2FkZWQ6ICIgPDwgdXJsLnRvU3RyaW5nKCkgPDwgZW5kbDsKIH0KIAordm9pZCBMYXVuY2hlcldp bmRvdzo6ZG93bmxvYWRSZXF1ZXN0KGNvbnN0IFFOZXR3b3JrUmVxdWVzdCAmcmVxdWVzdCkKK3sK KyAgICBRTmV0d29ya0FjY2Vzc01hbmFnZXIqIG1hbmFnZXIgPSBuZXcgUU5ldHdvcmtBY2Nlc3NN YW5hZ2VyKHRoaXMpOworICAgIG1fcmVwbHkgPSBtYW5hZ2VyLT5nZXQocmVxdWVzdCk7CisgICAg Y29ubmVjdChtX3JlcGx5LCBTSUdOQUwoZmluaXNoZWQoKSksIHRoaXMsIFNMT1Qoc2xvdEZpbmlz aGVkKCkpKTsKK30KKwordm9pZCBMYXVuY2hlcldpbmRvdzo6ZmlsZURvd25sb2FkRmluaXNoZWQo KQoreworICAgIFFGaWxlSW5mbyBmaWxlSW5mKG1fcmVwbHktPnJlcXVlc3QoKS51cmwoKS50b1N0 cmluZygpKTsKKyAgICBRU3RyaW5nIHJlcXVlc3RGaWxlTmFtZSA9IFFEaXI6OmhvbWVQYXRoKCkg KyAiLyIgKyBmaWxlSW5mLmZpbGVOYW1lKCk7CisgICAgUVN0cmluZyBmaWxlTmFtZSA9IFFGaWxl RGlhbG9nOjpnZXRTYXZlRmlsZU5hbWUodGhpcywgIlNhdmUgYXMuLi4iLCByZXF1ZXN0RmlsZU5h bWUsICJBbGwgRmlsZXMgKCopIik7CisKKyAgICBpZiAoZmlsZU5hbWUuaXNFbXB0eSgpIHx8ICFt X3JlcGx5LT5lcnJvclN0cmluZygpLmlzTnVsbCgpKQorICAgICAgICBRTWVzc2FnZUJveDo6d2Fy bmluZyh0aGlzLCBRU3RyaW5nKCJEb3dubG9hZCIpLCBRU3RyaW5nKCJEb3dubG9hZCBmYWlsZWQu IikpOworICAgIGVsc2UgeworICAgICAgICBRRmlsZSBmaWxlKGZpbGVOYW1lKTsKKyAgICAgICAg ZmlsZS5vcGVuKFFJT0RldmljZTo6V3JpdGVPbmx5KTsKKyAgICAgICAgZmlsZS53cml0ZShtX3Jl cGx5LT5yZWFkQWxsKCkpOworICAgICAgICBmaWxlLmNsb3NlKCk7CisgICAgICAgIFFNZXNzYWdl Qm94OjppbmZvcm1hdGlvbih0aGlzLCBRU3RyaW5nKCJEb3dubG9hZCIpLCBmaWxlTmFtZSArIFFT dHJpbmcoIiBkb3dubG9hZGVkIHN1Y2Nlc3NmdWxseS4iKSk7CisgICAgfQorfQorCiB2b2lkIExh dW5jaGVyV2luZG93Ojp1cGRhdGVGUFMoaW50IGZwcykKIHsKICAgICBRU3RyaW5nIGZwc1N0YXR1 c1RleHQgPSBRU3RyaW5nKCJDdXJyZW50IEZQUzogJTEiKS5hcmcoZnBzKTsKZGlmZiAtLWdpdCBh L1Rvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaCBiL1Rvb2xzL1F0VGVzdEJyb3dz ZXIvbGF1bmNoZXJ3aW5kb3cuaAppbmRleCAxNjM2OGY1Li5iMWRmMDI0IDEwMDY0NAotLS0gYS9U b29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgKKysrIGIvVG9vbHMvUXRUZXN0QnJv d3Nlci9sYXVuY2hlcndpbmRvdy5oCkBAIC0xOTcsNiArMTk3LDggQEAgcHJvdGVjdGVkIHNsb3Rz OgogICAgIHZvaWQgc2hvd1VzZXJBZ2VudERpYWxvZygpOwogCiAgICAgdm9pZCBwcmludFVSTChj b25zdCBRVXJsJik7CisgICAgdm9pZCBkb3dubG9hZFJlcXVlc3QoY29uc3QgUU5ldHdvcmtSZXF1 ZXN0Jik7CisgICAgdm9pZCBmaWxlRG93bmxvYWRGaW5pc2hlZCgpOwogCiBwdWJsaWMgc2xvdHM6 CiAgICAgTGF1bmNoZXJXaW5kb3cqIG5ld1dpbmRvdygpOwpAQCAtMjI5LDYgKzIzMSw5IEBAIHBy aXZhdGU6CiAgICAgUUFjdGlvbiogbV9mb3JtYXRNZW51QWN0aW9uOwogCiAgICAgUVByb3BlcnR5 QW5pbWF0aW9uKiBtX3pvb21BbmltYXRpb247CisKKyAgICBRTmV0d29ya1JlcGx5KiBtX3JlcGx5 OworCiAgICAgUUxpc3Q8UVRvdWNoRXZlbnQ6OlRvdWNoUG9pbnQ+IG1fdG91Y2hQb2ludHM7CiAg ICAgYm9vbCBtX3RvdWNoTW9ja2luZzsKIAo= 95867 2011-06-03 00:57:51 -0700 2011-06-03 07:43:05 -0700 proposed patch uj12diff.patch text/plain 3622 Barat.Tibor ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2YzNj ZjViLi5mNWZlMzhhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDYtMDMgIEJhcsOhdCBUaWJvciAgPEJhcmF0 LlRpYm9yQHN0dWQudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBJbXBsZW1lbnQgZG93bmxvYWQgZmVhdHVyZSBmb3IgUXRU ZXN0QnJvd3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjE4NjUKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwOgor ICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OkxhdW5jaGVyV2luZG93KToKKyAgICAgICAgKExhdW5j aGVyV2luZG93Ojpkb3dubG9hZFJlcXVlc3QpOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OmZp bGVEb3dubG9hZEZpbmlzaGVkKToKKyAgICAgICAgKiBRdFRlc3RCcm93c2VyL2xhdW5jaGVyd2lu ZG93Lmg6CisKIDIwMTEtMDYtMDIgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1F0 VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwIGIvVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVu Y2hlcndpbmRvdy5jcHAKaW5kZXggOTgwZmM1OC4uYzc4NjY1NiAxMDA2NDQKLS0tIGEvVG9vbHMv UXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKKysrIGIvVG9vbHMvUXRUZXN0QnJvd3Nl ci9sYXVuY2hlcndpbmRvdy5jcHAKQEAgLTM0LDYgKzM0LDEwIEBACiAKICNpbmNsdWRlICJsYXVu Y2hlcndpbmRvdy5oIgogI2luY2x1ZGUgInVybGxvYWRlci5oIgorI2luY2x1ZGUgPFFGaWxlRGlh bG9nPgorI2luY2x1ZGUgPFFGaWxlSW5mbz4KKyNpbmNsdWRlIDxRTWVzc2FnZUJveD4KKyNpbmNs dWRlIDxRTmV0d29ya1JlcGx5PgogCiBjb25zdCBpbnQgZ0V4aXRDbGlja0FyZWEgPSA4MDsKIFFW ZWN0b3I8aW50PiBMYXVuY2hlcldpbmRvdzo6bV96b29tTGV2ZWxzOwpAQCAtNDYsNiArNTAsNyBA QCBMYXVuY2hlcldpbmRvdzo6TGF1bmNoZXJXaW5kb3coV2luZG93T3B0aW9ucyogZGF0YSwgUUdy YXBoaWNzU2NlbmUqIHNoYXJlZFNjZW5lKQogICAgICwgbV9pbnNwZWN0b3IoMCkKICAgICAsIG1f Zm9ybWF0TWVudUFjdGlvbigwKQogICAgICwgbV96b29tQW5pbWF0aW9uKDApCisgICAgLCBtX3Jl cGx5KDApCiAjaWZuZGVmIFFUX05PX0xJTkVFRElUCiAgICAgLCBtX2ZpbmRGbGFnKDApCiAjZW5k aWYKQEAgLTU4LDYgKzYzLDggQEAgTGF1bmNoZXJXaW5kb3c6OkxhdW5jaGVyV2luZG93KFdpbmRv d09wdGlvbnMqIGRhdGEsIFFHcmFwaGljc1NjZW5lKiBzaGFyZWRTY2VuZSkKICAgICAgICAgc3Rh dGljX2Nhc3Q8UUdyYXBoaWNzVmlldyo+KG1fdmlldyktPnNldFNjZW5lKHNoYXJlZFNjZW5lKTsK IAogICAgIGNyZWF0ZUNocm9tZSgpOworCisgICAgY29ubmVjdChwYWdlKCksIFNJR05BTChkb3du bG9hZFJlcXVlc3RlZChjb25zdCBRTmV0d29ya1JlcXVlc3QmKSksIHRoaXMsIFNMT1QoZG93bmxv YWRSZXF1ZXN0KGNvbnN0IFFOZXR3b3JrUmVxdWVzdCYpKSk7CiB9CiAKIExhdW5jaGVyV2luZG93 Ojp+TGF1bmNoZXJXaW5kb3coKQpAQCAtOTY4LDYgKzk3NSwzMCBAQCB2b2lkIExhdW5jaGVyV2lu ZG93OjpwcmludFVSTChjb25zdCBRVXJsJiB1cmwpCiAgICAgb3V0cHV0IDw8ICJMb2FkZWQ6ICIg PDwgdXJsLnRvU3RyaW5nKCkgPDwgZW5kbDsKIH0KIAordm9pZCBMYXVuY2hlcldpbmRvdzo6ZG93 bmxvYWRSZXF1ZXN0KGNvbnN0IFFOZXR3b3JrUmVxdWVzdCAmcmVxdWVzdCkKK3sKKyAgICBRTmV0 d29ya0FjY2Vzc01hbmFnZXIqIG1hbmFnZXIgPSBuZXcgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyKHRo aXMpOworICAgIG1fcmVwbHkgPSBtYW5hZ2VyLT5nZXQocmVxdWVzdCk7CisgICAgY29ubmVjdCht X3JlcGx5LCBTSUdOQUwoZmluaXNoZWQoKSksIHRoaXMsIFNMT1QoZmlsZURvd25sb2FkRmluaXNo ZWQoKSkpOworfQorCit2b2lkIExhdW5jaGVyV2luZG93OjpmaWxlRG93bmxvYWRGaW5pc2hlZCgp Cit7CisgICAgUUZpbGVJbmZvIGZpbGVJbmYobV9yZXBseS0+cmVxdWVzdCgpLnVybCgpLnRvU3Ry aW5nKCkpOworICAgIFFTdHJpbmcgcmVxdWVzdEZpbGVOYW1lID0gUURpcjo6aG9tZVBhdGgoKSAr ICIvIiArIGZpbGVJbmYuZmlsZU5hbWUoKTsKKyAgICBRU3RyaW5nIGZpbGVOYW1lID0gUUZpbGVE aWFsb2c6OmdldFNhdmVGaWxlTmFtZSh0aGlzLCAiU2F2ZSBhcy4uLiIsIHJlcXVlc3RGaWxlTmFt ZSwgIkFsbCBGaWxlcyAoKikiKTsKKworICAgIGlmIChmaWxlTmFtZS5pc0VtcHR5KCkgJiYgbV9y ZXBseS0+ZXJyb3IoKSAhPSBRTmV0d29ya1JlcGx5OjpOb0Vycm9yKQorICAgICAgICBRTWVzc2Fn ZUJveDo6d2FybmluZyh0aGlzLCBRU3RyaW5nKCJEb3dubG9hZCIpLCBRU3RyaW5nKCJEb3dubG9h ZCBmYWlsZWQuIikpOworICAgIGVsc2UgeworICAgICAgICBRRmlsZSBmaWxlKGZpbGVOYW1lKTsK KyAgICAgICAgZmlsZS5vcGVuKFFJT0RldmljZTo6V3JpdGVPbmx5KTsKKyAgICAgICAgZmlsZS53 cml0ZShtX3JlcGx5LT5yZWFkQWxsKCkpOworICAgICAgICBmaWxlLmNsb3NlKCk7CisgICAgICAg IFFNZXNzYWdlQm94OjppbmZvcm1hdGlvbih0aGlzLCBRU3RyaW5nKCJEb3dubG9hZCIpLCBmaWxl TmFtZSArIFFTdHJpbmcoIiBkb3dubG9hZGVkIHN1Y2Nlc3NmdWxseS4iKSk7CisgICAgfQorfQor CiB2b2lkIExhdW5jaGVyV2luZG93Ojp1cGRhdGVGUFMoaW50IGZwcykKIHsKICAgICBRU3RyaW5n IGZwc1N0YXR1c1RleHQgPSBRU3RyaW5nKCJDdXJyZW50IEZQUzogJTEiKS5hcmcoZnBzKTsKZGlm ZiAtLWdpdCBhL1Rvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaCBiL1Rvb2xzL1F0 VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaAppbmRleCBkNjg5OTU4Li5lZWJlMGJlIDEwMDY0 NAotLS0gYS9Ub29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgKKysrIGIvVG9vbHMv UXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCkBAIC0yMDYsNiArMjA2LDggQEAgcHJvdGVj dGVkIHNsb3RzOgogICAgIHZvaWQgc2hvd1VzZXJBZ2VudERpYWxvZygpOwogCiAgICAgdm9pZCBw cmludFVSTChjb25zdCBRVXJsJik7CisgICAgdm9pZCBkb3dubG9hZFJlcXVlc3QoY29uc3QgUU5l dHdvcmtSZXF1ZXN0Jik7CisgICAgdm9pZCBmaWxlRG93bmxvYWRGaW5pc2hlZCgpOwogCiBwdWJs aWMgc2xvdHM6CiAgICAgTGF1bmNoZXJXaW5kb3cqIG5ld1dpbmRvdygpOwpAQCAtMjM4LDYgKzI0 MCw3IEBAIHByaXZhdGU6CiAgICAgUUFjdGlvbiogbV9mb3JtYXRNZW51QWN0aW9uOwogCiAgICAg UVByb3BlcnR5QW5pbWF0aW9uKiBtX3pvb21BbmltYXRpb247CisgICAgUU5ldHdvcmtSZXBseSog bV9yZXBseTsKICAgICBRTGlzdDxRVG91Y2hFdmVudDo6VG91Y2hQb2ludD4gbV90b3VjaFBvaW50 czsKICAgICBib29sIG1fdG91Y2hNb2NraW5nOwogCg== 96077 2011-06-06 05:22:27 -0700 2011-06-06 06:19:35 -0700 proposed patch uj13diff.patch text/plain 3647 Barat.Tibor ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2YzNj ZjViLi5mNWZlMzhhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDYtMDMgIEJhcsOhdCBUaWJvciAgPEJhcmF0 LlRpYm9yQHN0dWQudS1zemVnZWQuaHU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBJbXBsZW1lbnQgZG93bmxvYWQgZmVhdHVyZSBmb3IgUXRU ZXN0QnJvd3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjE4NjUKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwOgor ICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OkxhdW5jaGVyV2luZG93KToKKyAgICAgICAgKExhdW5j aGVyV2luZG93Ojpkb3dubG9hZFJlcXVlc3QpOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OmZp bGVEb3dubG9hZEZpbmlzaGVkKToKKyAgICAgICAgKiBRdFRlc3RCcm93c2VyL2xhdW5jaGVyd2lu ZG93Lmg6CisKIDIwMTEtMDYtMDIgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1F0 VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwIGIvVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVu Y2hlcndpbmRvdy5jcHAKaW5kZXggOTgwZmM1OC4uODBmOGIzNiAxMDA2NDQKLS0tIGEvVG9vbHMv UXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKKysrIGIvVG9vbHMvUXRUZXN0QnJvd3Nl ci9sYXVuY2hlcndpbmRvdy5jcHAKQEAgLTM0LDYgKzM0LDEwIEBACiAKICNpbmNsdWRlICJsYXVu Y2hlcndpbmRvdy5oIgogI2luY2x1ZGUgInVybGxvYWRlci5oIgorI2luY2x1ZGUgPFFGaWxlRGlh bG9nPgorI2luY2x1ZGUgPFFGaWxlSW5mbz4KKyNpbmNsdWRlIDxRTWVzc2FnZUJveD4KKyNpbmNs dWRlIDxRTmV0d29ya1JlcGx5PgogCiBjb25zdCBpbnQgZ0V4aXRDbGlja0FyZWEgPSA4MDsKIFFW ZWN0b3I8aW50PiBMYXVuY2hlcldpbmRvdzo6bV96b29tTGV2ZWxzOwpAQCAtNDYsNiArNTAsNyBA QCBMYXVuY2hlcldpbmRvdzo6TGF1bmNoZXJXaW5kb3coV2luZG93T3B0aW9ucyogZGF0YSwgUUdy YXBoaWNzU2NlbmUqIHNoYXJlZFNjZW5lKQogICAgICwgbV9pbnNwZWN0b3IoMCkKICAgICAsIG1f Zm9ybWF0TWVudUFjdGlvbigwKQogICAgICwgbV96b29tQW5pbWF0aW9uKDApCisgICAgLCBtX3Jl cGx5KDApCiAjaWZuZGVmIFFUX05PX0xJTkVFRElUCiAgICAgLCBtX2ZpbmRGbGFnKDApCiAjZW5k aWYKQEAgLTU4LDYgKzYzLDggQEAgTGF1bmNoZXJXaW5kb3c6OkxhdW5jaGVyV2luZG93KFdpbmRv d09wdGlvbnMqIGRhdGEsIFFHcmFwaGljc1NjZW5lKiBzaGFyZWRTY2VuZSkKICAgICAgICAgc3Rh dGljX2Nhc3Q8UUdyYXBoaWNzVmlldyo+KG1fdmlldyktPnNldFNjZW5lKHNoYXJlZFNjZW5lKTsK IAogICAgIGNyZWF0ZUNocm9tZSgpOworCisgICAgY29ubmVjdChwYWdlKCksIFNJR05BTChkb3du bG9hZFJlcXVlc3RlZChjb25zdCBRTmV0d29ya1JlcXVlc3QmKSksIHRoaXMsIFNMT1QoZG93bmxv YWRSZXF1ZXN0KGNvbnN0IFFOZXR3b3JrUmVxdWVzdCYpKSk7CiB9CiAKIExhdW5jaGVyV2luZG93 Ojp+TGF1bmNoZXJXaW5kb3coKQpAQCAtOTY4LDYgKzk3NSwzMiBAQCB2b2lkIExhdW5jaGVyV2lu ZG93OjpwcmludFVSTChjb25zdCBRVXJsJiB1cmwpCiAgICAgb3V0cHV0IDw8ICJMb2FkZWQ6ICIg PDwgdXJsLnRvU3RyaW5nKCkgPDwgZW5kbDsKIH0KIAordm9pZCBMYXVuY2hlcldpbmRvdzo6ZG93 bmxvYWRSZXF1ZXN0KGNvbnN0IFFOZXR3b3JrUmVxdWVzdCAmcmVxdWVzdCkKK3sKKyAgICBRTmV0 d29ya0FjY2Vzc01hbmFnZXIqIG1hbmFnZXIgPSBuZXcgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyKHRo aXMpOworICAgIG1fcmVwbHkgPSBtYW5hZ2VyLT5nZXQocmVxdWVzdCk7CisgICAgY29ubmVjdCht X3JlcGx5LCBTSUdOQUwoZmluaXNoZWQoKSksIHRoaXMsIFNMT1QoZmlsZURvd25sb2FkRmluaXNo ZWQoKSkpOworfQorCit2b2lkIExhdW5jaGVyV2luZG93OjpmaWxlRG93bmxvYWRGaW5pc2hlZCgp Cit7CisgICAgUUZpbGVJbmZvIGZpbGVJbmYobV9yZXBseS0+cmVxdWVzdCgpLnVybCgpLnRvU3Ry aW5nKCkpOworICAgIFFTdHJpbmcgcmVxdWVzdEZpbGVOYW1lID0gUURpcjo6aG9tZVBhdGgoKSAr ICIvIiArIGZpbGVJbmYuZmlsZU5hbWUoKTsKKyAgICBRU3RyaW5nIGZpbGVOYW1lID0gUUZpbGVE aWFsb2c6OmdldFNhdmVGaWxlTmFtZSh0aGlzLCAiU2F2ZSBhcy4uLiIsIHJlcXVlc3RGaWxlTmFt ZSwgIkFsbCBGaWxlcyAoKikiKTsKKworICAgIGlmIChmaWxlTmFtZS5pc0VtcHR5KCkpCisgICAg ICAgIHJldHVybjsKKyAgICBpZiAobV9yZXBseS0+ZXJyb3IoKSAhPSBRTmV0d29ya1JlcGx5OjpO b0Vycm9yKQorICAgICAgICBRTWVzc2FnZUJveDo6Y3JpdGljYWwodGhpcywgUVN0cmluZygiRG93 bmxvYWQiKSwgUVN0cmluZygiRG93bmxvYWQgZmFpbGVkLiIpKTsKKyAgICBlbHNlIHsKKyAgICAg ICAgUUZpbGUgZmlsZShmaWxlTmFtZSk7CisgICAgICAgIGZpbGUub3BlbihRSU9EZXZpY2U6Oldy aXRlT25seSk7CisgICAgICAgIGZpbGUud3JpdGUobV9yZXBseS0+cmVhZEFsbCgpKTsKKyAgICAg ICAgZmlsZS5jbG9zZSgpOworICAgICAgICBRTWVzc2FnZUJveDo6aW5mb3JtYXRpb24odGhpcywg UVN0cmluZygiRG93bmxvYWQiKSwgZmlsZU5hbWUgKyBRU3RyaW5nKCIgZG93bmxvYWRlZCBzdWNj ZXNzZnVsbHkuIikpOworICAgIH0KK30KKwogdm9pZCBMYXVuY2hlcldpbmRvdzo6dXBkYXRlRlBT KGludCBmcHMpCiB7CiAgICAgUVN0cmluZyBmcHNTdGF0dXNUZXh0ID0gUVN0cmluZygiQ3VycmVu dCBGUFM6ICUxIikuYXJnKGZwcyk7CmRpZmYgLS1naXQgYS9Ub29scy9RdFRlc3RCcm93c2VyL2xh dW5jaGVyd2luZG93LmggYi9Ub29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgKaW5k ZXggZDY4OTk1OC4uZWViZTBiZSAxMDA2NDQKLS0tIGEvVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVu Y2hlcndpbmRvdy5oCisrKyBiL1Rvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaApA QCAtMjA2LDYgKzIwNiw4IEBAIHByb3RlY3RlZCBzbG90czoKICAgICB2b2lkIHNob3dVc2VyQWdl bnREaWFsb2coKTsKIAogICAgIHZvaWQgcHJpbnRVUkwoY29uc3QgUVVybCYpOworICAgIHZvaWQg ZG93bmxvYWRSZXF1ZXN0KGNvbnN0IFFOZXR3b3JrUmVxdWVzdCYpOworICAgIHZvaWQgZmlsZURv d25sb2FkRmluaXNoZWQoKTsKIAogcHVibGljIHNsb3RzOgogICAgIExhdW5jaGVyV2luZG93KiBu ZXdXaW5kb3coKTsKQEAgLTIzOCw2ICsyNDAsNyBAQCBwcml2YXRlOgogICAgIFFBY3Rpb24qIG1f Zm9ybWF0TWVudUFjdGlvbjsKIAogICAgIFFQcm9wZXJ0eUFuaW1hdGlvbiogbV96b29tQW5pbWF0 aW9uOworICAgIFFOZXR3b3JrUmVwbHkqIG1fcmVwbHk7CiAgICAgUUxpc3Q8UVRvdWNoRXZlbnQ6 OlRvdWNoUG9pbnQ+IG1fdG91Y2hQb2ludHM7CiAgICAgYm9vbCBtX3RvdWNoTW9ja2luZzsKIAo=