63490 2011-06-27 15:54:33 -0700 [Qt] Add more tests to cover the behavior of loadFinished() signal 2011-07-29 08:41:46 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 61328 1 cmarcelo cmarcelo ademar benjamin robert webkit.review.bot oldest_to_newest 428405 0 cmarcelo 2011-06-27 15:54:33 -0700 [Qt] Add more tests to cover the behavior of loadFinished() signal 428416 1 98809 cmarcelo 2011-06-27 16:04:24 -0700 Created attachment 98809 Patch 428418 2 cmarcelo 2011-06-27 16:05:42 -0700 This patch was motivated by bug 61328, since we needed to keep some functionality that wasn't previously tested. 428994 3 98809 menard 2011-06-28 11:05:38 -0700 Comment on attachment 98809 Patch LGTM. 432760 4 cmarcelo 2011-07-06 07:25:01 -0700 Robert, Benjamin: could either of you take a look at this one? 433748 5 98809 benjamin 2011-07-07 15:38:00 -0700 Comment on attachment 98809 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98809&action=review The patch looks correct but I am not sure ErrorPage isn't leaked. > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2579 > + ErrorPage* page = new ErrorPage; Why is this page allocated on the stack? Isn't it leaked? QWebView::setPage() does not take ownership. 439218 6 101336 cmarcelo 2011-07-19 09:55:00 -0700 Created attachment 101336 Patch 439219 7 cmarcelo 2011-07-19 09:56:26 -0700 (In reply to comment #5) > (From update of attachment 98809 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=98809&action=review > > The patch looks correct but I am not sure ErrorPage isn't leaked. > > > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:2579 > > + ErrorPage* page = new ErrorPage; > > Why is this page allocated on the stack? Isn't it leaked? > QWebView::setPage() does not take ownership. Yes, it was leaking. Thanks for the catch. Uploaded a new version with that issue fixed. The other tests led me to think that QWebView took the ownership. I'll make a patch to fix them too. 439277 8 cmarcelo 2011-07-19 11:19:24 -0700 (In reply to comment #7) > The other tests led me to think that QWebView took the ownership. I'll make a patch to fix them too. This is in bug 64814. 441609 9 101336 benjamin 2011-07-25 05:18:21 -0700 Comment on attachment 101336 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101336&action=review This looks correct. I did some nitpicking for the sake of it, feel free to cq+ this version if you wish :) > Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2325 > + } else if (request.url() == QUrl("http://this.will/return-http-404-error-without-contents.html")) { It would be nice if "http://this.will/return-http-404-error-without-contents.html" was a constant QUrl defined for the whole file instead of copying the string. > Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2326 > + setError(QNetworkReply::ContentNotFoundError, "Not found"); I think the tr() around "Not found" is interesting iff "Not found" is a standard string inside Qt. 441639 10 101866 cmarcelo 2011-07-25 07:30:04 -0700 Created attachment 101866 Patch 441640 11 cmarcelo 2011-07-25 07:34:25 -0700 (In reply to comment #9) > > Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2325 > > + } else if (request.url() == QUrl("http://this.will/return-http-404-error-without-contents.html")) { > > It would be nice if "http://this.will/return-http-404-error-without-contents.html" was a constant QUrl defined for the whole file instead of copying the string. I uploaded a new patch with this implemented. I added the URL as a static const member for FakeReply class. > > Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2326 > > + setError(QNetworkReply::ContentNotFoundError, "Not found"); > > I think the tr() around "Not found" is interesting iff "Not found" is a standard string inside Qt. I'm not familiar with translation system in Qt, but after digging in the Qt source for a while, I don't think there's a built-in translation for "Not found". Since it isn't something any user will see, I think it's fine to not use tr() here. 441674 12 101866 webkit.review.bot 2011-07-25 08:51:31 -0700 Comment on attachment 101866 Patch Clearing flags on attachment: 101866 Committed r91669: <http://trac.webkit.org/changeset/91669> 441675 13 webkit.review.bot 2011-07-25 08:51:37 -0700 All reviewed patches have been landed. Closing bug. 443959 14 ademar 2011-07-29 08:41:46 -0700 Revision r91669 cherry-picked into qtwebkit-2.2 with commit 8a95d2b <http://gitorious.org/webkit/qtwebkit/commit/8a95d2b> 98809 2011-06-27 16:04:24 -0700 2011-07-19 09:54:54 -0700 Patch bug-63490-20110627200422.patch text/plain 5865 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogODk4MzcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggNzRiOGEyNTBhODVj NjRiNzRiZDk1Y2E1YjQ0MTZkYjRmNGNmM2RiNi4uM2EwY2M0MzYzYTNjMDJjZTFkMGIxN2YzNmQ5 ZmY4Y2IyMWRhNGMxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0wNi0y NyAgQ2FpbyBNYXJjZWxvIGRlIE9saXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2ZWlyYUBvcGVuYm9z c2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtRdF0gQWRkIG1vcmUgdGVzdHMgdG8gY292ZXIgdGhlIGJlaGF2aW9yIG9mIGxvYWRGaW5pc2hl ZCgpIHNpZ25hbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjM0OTAKKworICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDoK KyAgICAgICAgKEZha2VSZXBseTo6RmFrZVJlcGx5KToKKyAgICAgICAgKEZha2VOZXR3b3JrTWFu YWdlcjo6Y3JlYXRlUmVxdWVzdCk6IEFkZCBhIGZha2UgcmVwbHkgdGhhdCBnaXZlcyA0MDQgZXJy b3IgY29kZS4KKworICAgICAgICAodHN0X1FXZWJGcmFtZTo6bG9hZEZpbmlzaGVkQWZ0ZXJOb3RG b3VuZEVycm9yKTogVmVyaWZ5IHRoYXQgd2UgZ2V0IGxvYWRGaW5pc2hlZChmYWxzZSkKKyAgICAg ICAgYWZ0ZXIgYSA0MDQgZXJyb3Igd2l0aG91dCBjb250ZW50cy4KKworICAgICAgICAqIHRlc3Rz L3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHA6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OmVycm9y UGFnZUV4dGVuc2lvbkxvYWRGaW5pc2hlZCk6IFZlcmlmeSBpZiB0aGUgYXJndW1lbnQgb2YgbG9h ZEZpbmlzaGVkKCkKKyAgICAgICAgaXMgdHJ1ZSB3aGVuIHdlIHVzZSBlcnJvciBwYWdlIGV4dGVu c2lvbiB0byBwcm9kdWNlIG91ciBvd24gZXJyb3IgcGFnZXMuCisKIDIwMTEtMDYtMjcgIEFsZXhp cyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQv cXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCmluZGV4IGYyYmRjZWUzZmY1ODI0 MTk4ODRiNzk3YTk4NTBhMzE5MzcyNzcxZDcuLjUwNWI3ZGZlZTgyN2YzYjg3YWQ4ZDA1YTI2NTgw OTdjYzA0YjRmOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1l L3RzdF9xd2ViZnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1l L3RzdF9xd2ViZnJhbWUuY3BwCkBAIC02NTgsNiArNjU4LDcgQEAgcHJpdmF0ZSBzbG90czoKICAg ICB2b2lkIHNldFVybFNhbWVVcmwoKTsKICAgICB2b2lkIHNldFVybFRoZW5Mb2Fkc19kYXRhKCk7 CiAgICAgdm9pZCBzZXRVcmxUaGVuTG9hZHMoKTsKKyAgICB2b2lkIGxvYWRGaW5pc2hlZEFmdGVy Tm90Rm91bmRFcnJvcigpOwogCiBwcml2YXRlOgogICAgIFFTdHJpbmcgIGV2YWxKUyhjb25zdCBR U3RyaW5nJnMpIHsKQEAgLTIzMjAsNiArMjMyMSwxMCBAQCBwdWJsaWM6CiAgICAgICAgIGVsc2Ug aWYgKHJlcXVlc3QudXJsKCkuaG9zdCgpID09IFFMYXRpbjFTdHJpbmcoImFiY2RlZi5hYmNkZWYi KSkgewogICAgICAgICAgICAgc2V0RXJyb3IoUU5ldHdvcmtSZXBseTo6SG9zdE5vdEZvdW5kRXJy b3IsIHRyKCJJbnZhbGlkIFVSTCIpKTsKICAgICAgICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdCgw LCB0aGlzLCBTTE9UKGNvbnRpbnVlRXJyb3IoKSkpOworICAgICAgICB9IGVsc2UgaWYgKHJlcXVl c3QudXJsKCkgPT0gUVVybCgiaHR0cDovL3RoaXMud2lsbC9yZXR1cm4taHR0cC00MDQtZXJyb3It d2l0aG91dC1jb250ZW50cy5odG1sIikpIHsKKyAgICAgICAgICAgIHNldEVycm9yKFFOZXR3b3Jr UmVwbHk6OkNvbnRlbnROb3RGb3VuZEVycm9yLCAiTm90IGZvdW5kIik7CisgICAgICAgICAgICBz ZXRBdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpIdHRwU3RhdHVzQ29kZUF0dHJpYnV0ZSwgNDA0 KTsKKyAgICAgICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdCgwLCB0aGlzLCBTTE9UKGNvbnRpbnVl RXJyb3IoKSkpOwogICAgICAgICB9CiAKICAgICAgICAgb3BlbihRSU9EZXZpY2U6OlJlYWRPbmx5 KTsKQEAgLTIzNjIsMTcgKzIzNjcsMTcgQEAgcHJvdGVjdGVkOgogICAgIHsKICAgICAgICAgUVN0 cmluZyB1cmwgPSByZXF1ZXN0LnVybCgpLnRvU3RyaW5nKCk7CiAgICAgICAgIGlmIChvcCA9PSBR TmV0d29ya0FjY2Vzc01hbmFnZXI6OkdldE9wZXJhdGlvbikgewotICAgICAgICAgICAgaWYgKHVy bCA9PSAicXJjOi90ZXN0MS5odG1sIiB8fCAgdXJsID09ICJodHRwOi8vYWJjZGVmLmFiY2RlZi8i KQotICAgICAgICAgICAgICAgIHJldHVybiBuZXcgRmFrZVJlcGx5KHJlcXVlc3QsIHRoaXMpOwog I2lmbmRlZiBRVF9OT19PUEVOU1NMCi0gICAgICAgICAgICBlbHNlIGlmICh1cmwgPT0gInFyYzov ZmFrZS1zc2wtZXJyb3IuaHRtbCIpIHsKKyAgICAgICAgICAgIGlmICh1cmwgPT0gInFyYzovZmFr ZS1zc2wtZXJyb3IuaHRtbCIpIHsKICAgICAgICAgICAgICAgICBGYWtlUmVwbHkqIHJlcGx5ID0g bmV3IEZha2VSZXBseShyZXF1ZXN0LCB0aGlzKTsKICAgICAgICAgICAgICAgICBRTGlzdDxRU3Ns RXJyb3I+IGVycm9yczsKICAgICAgICAgICAgICAgICBlbWl0IHNzbEVycm9ycyhyZXBseSwgZXJy b3JzIDw8IFFTc2xFcnJvcihRU3NsRXJyb3I6OlVuc3BlY2lmaWVkRXJyb3IpKTsKICAgICAgICAg ICAgICAgICByZXR1cm4gcmVwbHk7CiAgICAgICAgICAgICB9CiAjZW5kaWYKLSAgICAgICB9Cisg ICAgICAgICAgICBpZiAodXJsID09ICJxcmM6L3Rlc3QxLmh0bWwiIHx8IHVybCA9PSAiaHR0cDov L2FiY2RlZi5hYmNkZWYvIiB8fCB1cmwgPT0gImh0dHA6Ly90aGlzLndpbGwvcmV0dXJuLWh0dHAt NDA0LWVycm9yLXdpdGhvdXQtY29udGVudHMuaHRtbCIpCisgICAgICAgICAgICAgICAgcmV0dXJu IG5ldyBGYWtlUmVwbHkocmVxdWVzdCwgdGhpcyk7CisgICAgICAgIH0KIAogICAgICAgICByZXR1 cm4gUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOjpjcmVhdGVSZXF1ZXN0KG9wLCByZXF1ZXN0LCBvdXRn b2luZ0RhdGEpOwogICAgIH0KQEAgLTM2NTgsNSArMzY2MywyMCBAQCB2b2lkIHRzdF9RV2ViRnJh bWU6OnNldFVybFRoZW5Mb2FkcygpCiAgICAgUUNPTVBBUkUoZnJhbWUtPmJhc2VVcmwoKSwgZXh0 cmFjdEJhc2VVcmwodXJsVG9Mb2FkMikpOwogfQogCit2b2lkIHRzdF9RV2ViRnJhbWU6OmxvYWRG aW5pc2hlZEFmdGVyTm90Rm91bmRFcnJvcigpCit7CisgICAgUVdlYlBhZ2UgcGFnZTsKKyAgICBR V2ViRnJhbWUqIGZyYW1lID0gcGFnZS5tYWluRnJhbWUoKTsKKworICAgIFFTaWduYWxTcHkgc3B5 KCZwYWdlLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CisgICAgRmFrZU5ldHdvcmtNYW5h Z2VyKiBuZXR3b3JrTWFuYWdlciA9IG5ldyBGYWtlTmV0d29ya01hbmFnZXIoJnBhZ2UpOworICAg IHBhZ2Uuc2V0TmV0d29ya0FjY2Vzc01hbmFnZXIobmV0d29ya01hbmFnZXIpOworCisgICAgZnJh bWUtPnNldFVybChRVXJsKCJodHRwOi8vdGhpcy53aWxsL3JldHVybi1odHRwLTQwNC1lcnJvci13 aXRob3V0LWNvbnRlbnRzLmh0bWwiKSk7CisgICAgUVRSWV9DT01QQVJFKHNweS5jb3VudCgpLCAx KTsKKyAgICBjb25zdCBib29sIHdhc0xvYWRPayA9IHNweS5hdCgwKS5hdCgwKS50b0Jvb2woKTsK KyAgICBRVkVSSUZZKCF3YXNMb2FkT2spOworfQorCiBRVEVTVF9NQUlOKHRzdF9RV2ViRnJhbWUp CiAjaW5jbHVkZSAidHN0X3F3ZWJmcmFtZS5tb2MiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rl c3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXggYWQ2YzliMjE0M2RiOTkyMTBiMGQz MmU5ZTE2ODY0YjMwMjgxZWM0Yi4uOWVkMmVlYzAzODA0OGIwOThmMGM3ZWFhNTgxODRlYjAwOTQx ZDVmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdl YnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJw YWdlLmNwcApAQCAtMTMxLDYgKzEzMSw3IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9pZCBlcnJv clBhZ2VFeHRlbnNpb24oKTsKICAgICB2b2lkIGVycm9yUGFnZUV4dGVuc2lvbkluSUZyYW1lcygp OwogICAgIHZvaWQgZXJyb3JQYWdlRXh0ZW5zaW9uSW5GcmFtZXNldCgpOworICAgIHZvaWQgZXJy b3JQYWdlRXh0ZW5zaW9uTG9hZEZpbmlzaGVkKCk7CiAgICAgdm9pZCB1c2VyQWdlbnRBcHBsaWNh dGlvbk5hbWUoKTsKIAogICAgIHZvaWQgdmlld01vZGVzKCk7CkBAIC0yNTczLDYgKzI1NzQsMzUg QEAgdm9pZCB0c3RfUVdlYlBhZ2U6OmVycm9yUGFnZUV4dGVuc2lvbkluRnJhbWVzZXQoKQogICAg IG1fdmlldy0+c2V0UGFnZSgwKTsKIH0KIAordm9pZCB0c3RfUVdlYlBhZ2U6OmVycm9yUGFnZUV4 dGVuc2lvbkxvYWRGaW5pc2hlZCgpCit7CisgICAgRXJyb3JQYWdlKiBwYWdlID0gbmV3IEVycm9y UGFnZTsKKyAgICBtX3ZpZXctPnNldFBhZ2UocGFnZSk7CisKKyAgICBRU2lnbmFsU3B5IHNweUxv YWRGaW5pc2hlZChtX3ZpZXcsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICBRU2ln bmFsU3B5IHNweUZyYW1lTG9hZEZpbmlzaGVkKG1fdmlldy0+cGFnZSgpLT5tYWluRnJhbWUoKSwg U0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOworCisgICAgbV92aWV3LT5zZXRVcmwoUVVybCgi ZGF0YTp0ZXh0L2h0bWwsZm9vIikpOworICAgIFFUUllfQ09NUEFSRShzcHlMb2FkRmluaXNoZWQu Y291bnQoKSwgMSk7CisgICAgUVRSWV9DT01QQVJFKHNweUZyYW1lTG9hZEZpbmlzaGVkLmNvdW50 KCksIDEpOworCisgICAgY29uc3QgYm9vbCBsb2FkU3VjY2VkZWQgPSBzcHlMb2FkRmluaXNoZWQu YXQoMCkuYXQoMCkudG9Cb29sKCk7CisgICAgUVZFUklGWShsb2FkU3VjY2VkZWQpOworICAgIGNv bnN0IGJvb2wgZnJhbWVMb2FkU3VjY2VkZWQgPSBzcHlGcmFtZUxvYWRGaW5pc2hlZC5hdCgwKS5h dCgwKS50b0Jvb2woKTsKKyAgICBRVkVSSUZZKGZyYW1lTG9hZFN1Y2NlZGVkKTsKKworICAgIG1f dmlldy0+cGFnZSgpLT5tYWluRnJhbWUoKS0+c2V0VXJsKFFVcmwoImh0dHA6Ly9ub24uZXhpc3Rl bnQvdXJsIikpOworICAgIFFUUllfQ09NUEFSRShzcHlMb2FkRmluaXNoZWQuY291bnQoKSwgMik7 CisgICAgUVRSWV9DT01QQVJFKHNweUZyYW1lTG9hZEZpbmlzaGVkLmNvdW50KCksIDIpOworCisg ICAgY29uc3QgYm9vbCBub25FeGlzdGFudExvYWRTdWNjZWRlZCA9IHNweUxvYWRGaW5pc2hlZC5h dCgxKS5hdCgwKS50b0Jvb2woKTsKKyAgICBRVkVSSUZZKG5vbkV4aXN0YW50TG9hZFN1Y2NlZGVk KTsKKyAgICBjb25zdCBib29sIG5vbkV4aXN0YW50RnJhbWVMb2FkU3VjY2VkZWQgPSBzcHlGcmFt ZUxvYWRGaW5pc2hlZC5hdCgxKS5hdCgwKS50b0Jvb2woKTsKKyAgICBRVkVSSUZZKG5vbkV4aXN0 YW50RnJhbWVMb2FkU3VjY2VkZWQpOworCisgICAgbV92aWV3LT5zZXRQYWdlKDApOworfQorCiBj bGFzcyBGcmllbmRseVdlYlBhZ2UgOiBwdWJsaWMgUVdlYlBhZ2UKIHsKIHB1YmxpYzoK 101336 2011-07-19 09:55:00 -0700 2011-07-25 07:29:56 -0700 Patch bug-63490-20110719135458.patch text/plain 5899 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogOTEyMDIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggODI0OGJlNWY4NWZl Mjg5OGE1ZDg1ZDYwZGRlZWE4ZDNjMWVkZDhjYy4uNDE1ODZhNGYxMmFmNDc4NDNjODY3MzQwM2Vh YWY2OTZiMTAxNGZkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0wNy0x OSAgQ2FpbyBNYXJjZWxvIGRlIE9saXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2ZWlyYUBvcGVuYm9z c2Eub3JnPgorCisgICAgICAgIFtRdF0gQWRkIG1vcmUgdGVzdHMgdG8gY292ZXIgdGhlIGJlaGF2 aW9yIG9mIGxvYWRGaW5pc2hlZCgpIHNpZ25hbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM0OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDoK KyAgICAgICAgKEZha2VSZXBseTo6RmFrZVJlcGx5KToKKyAgICAgICAgKEZha2VOZXR3b3JrTWFu YWdlcjo6Y3JlYXRlUmVxdWVzdCk6IEFkZCBhIGZha2UgcmVwbHkgdGhhdCBnaXZlcyA0MDQgZXJy b3IgY29kZS4KKworICAgICAgICAodHN0X1FXZWJGcmFtZTo6bG9hZEZpbmlzaGVkQWZ0ZXJOb3RG b3VuZEVycm9yKTogVmVyaWZ5IHRoYXQgd2UgZ2V0IGxvYWRGaW5pc2hlZChmYWxzZSkKKyAgICAg ICAgYWZ0ZXIgYSA0MDQgZXJyb3Igd2l0aG91dCBjb250ZW50cy4KKworICAgICAgICAqIHRlc3Rz L3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHA6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OmVycm9y UGFnZUV4dGVuc2lvbkxvYWRGaW5pc2hlZCk6IFZlcmlmeSBpZiB0aGUgYXJndW1lbnQgb2YgbG9h ZEZpbmlzaGVkKCkKKyAgICAgICAgaXMgdHJ1ZSB3aGVuIHdlIHVzZSBlcnJvciBwYWdlIGV4dGVu c2lvbiB0byBwcm9kdWNlIG91ciBvd24gZXJyb3IgcGFnZXMuCisKIDIwMTEtMDctMTggIEh1aSBI dWFuZyAgPGh1aS4yLmh1YW5nQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIENvbXBpbGluZyBl cnJvciBpbiBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJlbGVtZW50L3RzdF9xd2ViZWxlbWVu dC5jcHAgd2l0aCBRdCA0Ljcgb3Igb2xkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv dGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9xdC90ZXN0 cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKaW5kZXggYzM2ODBjYjg1ZDY1NTJjNTZiMDM1 Y2M1ZTJmZDNlZWMwYzk3OTg0ZS4uMDRkMmJlYjZhOTRkMDU3ZmVkNjI4NmY2MzU5ZWU1MDQzOWE3 NTc2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3 ZWJmcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3 ZWJmcmFtZS5jcHAKQEAgLTY1OSw2ICs2NTksNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQg c2V0VXJsU2FtZVVybCgpOwogICAgIHZvaWQgc2V0VXJsVGhlbkxvYWRzX2RhdGEoKTsKICAgICB2 b2lkIHNldFVybFRoZW5Mb2FkcygpOworICAgIHZvaWQgbG9hZEZpbmlzaGVkQWZ0ZXJOb3RGb3Vu ZEVycm9yKCk7CiAKIHByaXZhdGU6CiAgICAgUVN0cmluZyAgZXZhbEpTKGNvbnN0IFFTdHJpbmcm cykgewpAQCAtMjMyMSw2ICsyMzIyLDEwIEBAIHB1YmxpYzoKICAgICAgICAgZWxzZSBpZiAocmVx dWVzdC51cmwoKS5ob3N0KCkgPT0gUUxhdGluMVN0cmluZygiYWJjZGVmLmFiY2RlZiIpKSB7CiAg ICAgICAgICAgICBzZXRFcnJvcihRTmV0d29ya1JlcGx5OjpIb3N0Tm90Rm91bmRFcnJvciwgdHIo IkludmFsaWQgVVJMIikpOwogICAgICAgICAgICAgUVRpbWVyOjpzaW5nbGVTaG90KDAsIHRoaXMs IFNMT1QoY29udGludWVFcnJvcigpKSk7CisgICAgICAgIH0gZWxzZSBpZiAocmVxdWVzdC51cmwo KSA9PSBRVXJsKCJodHRwOi8vdGhpcy53aWxsL3JldHVybi1odHRwLTQwNC1lcnJvci13aXRob3V0 LWNvbnRlbnRzLmh0bWwiKSkgeworICAgICAgICAgICAgc2V0RXJyb3IoUU5ldHdvcmtSZXBseTo6 Q29udGVudE5vdEZvdW5kRXJyb3IsICJOb3QgZm91bmQiKTsKKyAgICAgICAgICAgIHNldEF0dHJp YnV0ZShRTmV0d29ya1JlcXVlc3Q6Okh0dHBTdGF0dXNDb2RlQXR0cmlidXRlLCA0MDQpOworICAg ICAgICAgICAgUVRpbWVyOjpzaW5nbGVTaG90KDAsIHRoaXMsIFNMT1QoY29udGludWVFcnJvcigp KSk7CiAgICAgICAgIH0KIAogICAgICAgICBvcGVuKFFJT0RldmljZTo6UmVhZE9ubHkpOwpAQCAt MjM2MywxNyArMjM2OCwxNyBAQCBwcm90ZWN0ZWQ6CiAgICAgewogICAgICAgICBRU3RyaW5nIHVy bCA9IHJlcXVlc3QudXJsKCkudG9TdHJpbmcoKTsKICAgICAgICAgaWYgKG9wID09IFFOZXR3b3Jr QWNjZXNzTWFuYWdlcjo6R2V0T3BlcmF0aW9uKSB7Ci0gICAgICAgICAgICBpZiAodXJsID09ICJx cmM6L3Rlc3QxLmh0bWwiIHx8ICB1cmwgPT0gImh0dHA6Ly9hYmNkZWYuYWJjZGVmLyIpCi0gICAg ICAgICAgICAgICAgcmV0dXJuIG5ldyBGYWtlUmVwbHkocmVxdWVzdCwgdGhpcyk7CiAjaWZuZGVm IFFUX05PX09QRU5TU0wKLSAgICAgICAgICAgIGVsc2UgaWYgKHVybCA9PSAicXJjOi9mYWtlLXNz bC1lcnJvci5odG1sIikgeworICAgICAgICAgICAgaWYgKHVybCA9PSAicXJjOi9mYWtlLXNzbC1l cnJvci5odG1sIikgewogICAgICAgICAgICAgICAgIEZha2VSZXBseSogcmVwbHkgPSBuZXcgRmFr ZVJlcGx5KHJlcXVlc3QsIHRoaXMpOwogICAgICAgICAgICAgICAgIFFMaXN0PFFTc2xFcnJvcj4g ZXJyb3JzOwogICAgICAgICAgICAgICAgIGVtaXQgc3NsRXJyb3JzKHJlcGx5LCBlcnJvcnMgPDwg UVNzbEVycm9yKFFTc2xFcnJvcjo6VW5zcGVjaWZpZWRFcnJvcikpOwogICAgICAgICAgICAgICAg IHJldHVybiByZXBseTsKICAgICAgICAgICAgIH0KICNlbmRpZgotICAgICAgIH0KKyAgICAgICAg ICAgIGlmICh1cmwgPT0gInFyYzovdGVzdDEuaHRtbCIgfHwgdXJsID09ICJodHRwOi8vYWJjZGVm LmFiY2RlZi8iIHx8IHVybCA9PSAiaHR0cDovL3RoaXMud2lsbC9yZXR1cm4taHR0cC00MDQtZXJy b3Itd2l0aG91dC1jb250ZW50cy5odG1sIikKKyAgICAgICAgICAgICAgICByZXR1cm4gbmV3IEZh a2VSZXBseShyZXF1ZXN0LCB0aGlzKTsKKyAgICAgICAgfQogCiAgICAgICAgIHJldHVybiBRTmV0 d29ya0FjY2Vzc01hbmFnZXI6OmNyZWF0ZVJlcXVlc3Qob3AsIHJlcXVlc3QsIG91dGdvaW5nRGF0 YSk7CiAgICAgfQpAQCAtMzY3OSw1ICszNjg0LDIwIEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6c2V0 VXJsVGhlbkxvYWRzKCkKICAgICBRQ09NUEFSRShmcmFtZS0+YmFzZVVybCgpLCBleHRyYWN0QmFz ZVVybCh1cmxUb0xvYWQyKSk7CiB9CiAKK3ZvaWQgdHN0X1FXZWJGcmFtZTo6bG9hZEZpbmlzaGVk QWZ0ZXJOb3RGb3VuZEVycm9yKCkKK3sKKyAgICBRV2ViUGFnZSBwYWdlOworICAgIFFXZWJGcmFt ZSogZnJhbWUgPSBwYWdlLm1haW5GcmFtZSgpOworCisgICAgUVNpZ25hbFNweSBzcHkoJnBhZ2Us IFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICBGYWtlTmV0d29ya01hbmFnZXIqIG5l dHdvcmtNYW5hZ2VyID0gbmV3IEZha2VOZXR3b3JrTWFuYWdlcigmcGFnZSk7CisgICAgcGFnZS5z ZXROZXR3b3JrQWNjZXNzTWFuYWdlcihuZXR3b3JrTWFuYWdlcik7CisKKyAgICBmcmFtZS0+c2V0 VXJsKFFVcmwoImh0dHA6Ly90aGlzLndpbGwvcmV0dXJuLWh0dHAtNDA0LWVycm9yLXdpdGhvdXQt Y29udGVudHMuaHRtbCIpKTsKKyAgICBRVFJZX0NPTVBBUkUoc3B5LmNvdW50KCksIDEpOworICAg IGNvbnN0IGJvb2wgd2FzTG9hZE9rID0gc3B5LmF0KDApLmF0KDApLnRvQm9vbCgpOworICAgIFFW RVJJRlkoIXdhc0xvYWRPayk7Cit9CisKIFFURVNUX01BSU4odHN0X1FXZWJGcmFtZSkKICNpbmNs dWRlICJ0c3RfcXdlYmZyYW1lLm1vYyIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVz dHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdl YnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAppbmRleCBiMjY5ZmRhNTBmYWIyOWUzYzRhNWJkOTk5MWNj Y2JjYjc0ZmE5MmU0Li45Njc0MTJjOWQwMjI0YjI2YTY0YTM1Y2IzNGFhM2M1ZjEwYWJkNTkyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3Bw CkBAIC0xMzQsNiArMTM0LDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIGVycm9yUGFnZUV4 dGVuc2lvbigpOwogICAgIHZvaWQgZXJyb3JQYWdlRXh0ZW5zaW9uSW5JRnJhbWVzKCk7CiAgICAg dm9pZCBlcnJvclBhZ2VFeHRlbnNpb25JbkZyYW1lc2V0KCk7CisgICAgdm9pZCBlcnJvclBhZ2VF eHRlbnNpb25Mb2FkRmluaXNoZWQoKTsKICAgICB2b2lkIHVzZXJBZ2VudEFwcGxpY2F0aW9uTmFt ZSgpOwogCiAgICAgdm9pZCB2aWV3TW9kZXMoKTsKQEAgLTI1NzYsNiArMjU3NywzNSBAQCB2b2lk IHRzdF9RV2ViUGFnZTo6ZXJyb3JQYWdlRXh0ZW5zaW9uSW5GcmFtZXNldCgpCiAgICAgbV92aWV3 LT5zZXRQYWdlKDApOwogfQogCit2b2lkIHRzdF9RV2ViUGFnZTo6ZXJyb3JQYWdlRXh0ZW5zaW9u TG9hZEZpbmlzaGVkKCkKK3sKKyAgICBFcnJvclBhZ2UgcGFnZTsKKyAgICBtX3ZpZXctPnNldFBh Z2UoJnBhZ2UpOworCisgICAgUVNpZ25hbFNweSBzcHlMb2FkRmluaXNoZWQobV92aWV3LCBTSUdO QUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CisgICAgUVNpZ25hbFNweSBzcHlGcmFtZUxvYWRGaW5p c2hlZChtX3ZpZXctPnBhZ2UoKS0+bWFpbkZyYW1lKCksIFNJR05BTChsb2FkRmluaXNoZWQoYm9v bCkpKTsKKworICAgIG1fdmlldy0+c2V0VXJsKFFVcmwoImRhdGE6dGV4dC9odG1sLGZvbyIpKTsK KyAgICBRVFJZX0NPTVBBUkUoc3B5TG9hZEZpbmlzaGVkLmNvdW50KCksIDEpOworICAgIFFUUllf Q09NUEFSRShzcHlGcmFtZUxvYWRGaW5pc2hlZC5jb3VudCgpLCAxKTsKKworICAgIGNvbnN0IGJv b2wgbG9hZFN1Y2NlZGVkID0gc3B5TG9hZEZpbmlzaGVkLmF0KDApLmF0KDApLnRvQm9vbCgpOwor ICAgIFFWRVJJRlkobG9hZFN1Y2NlZGVkKTsKKyAgICBjb25zdCBib29sIGZyYW1lTG9hZFN1Y2Nl ZGVkID0gc3B5RnJhbWVMb2FkRmluaXNoZWQuYXQoMCkuYXQoMCkudG9Cb29sKCk7CisgICAgUVZF UklGWShmcmFtZUxvYWRTdWNjZWRlZCk7CisKKyAgICBtX3ZpZXctPnBhZ2UoKS0+bWFpbkZyYW1l KCktPnNldFVybChRVXJsKCJodHRwOi8vbm9uLmV4aXN0ZW50L3VybCIpKTsKKyAgICBRVFJZX0NP TVBBUkUoc3B5TG9hZEZpbmlzaGVkLmNvdW50KCksIDIpOworICAgIFFUUllfQ09NUEFSRShzcHlG cmFtZUxvYWRGaW5pc2hlZC5jb3VudCgpLCAyKTsKKworICAgIGNvbnN0IGJvb2wgbm9uRXhpc3Rh bnRMb2FkU3VjY2VkZWQgPSBzcHlMb2FkRmluaXNoZWQuYXQoMSkuYXQoMCkudG9Cb29sKCk7Cisg ICAgUVZFUklGWShub25FeGlzdGFudExvYWRTdWNjZWRlZCk7CisgICAgY29uc3QgYm9vbCBub25F eGlzdGFudEZyYW1lTG9hZFN1Y2NlZGVkID0gc3B5RnJhbWVMb2FkRmluaXNoZWQuYXQoMSkuYXQo MCkudG9Cb29sKCk7CisgICAgUVZFUklGWShub25FeGlzdGFudEZyYW1lTG9hZFN1Y2NlZGVkKTsK KworICAgIG1fdmlldy0+c2V0UGFnZSgwKTsKK30KKwogY2xhc3MgRnJpZW5kbHlXZWJQYWdlIDog cHVibGljIFFXZWJQYWdlCiB7CiBwdWJsaWM6Cg== 101866 2011-07-25 07:30:04 -0700 2011-07-25 08:51:31 -0700 Patch bug-63490-20110725113002.patch text/plain 6312 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogOTE2NjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggYzBiODk3YTdmODRj NzU3Zjc3YzA3MDkyYjkxYmRmMjdlYzcxZmI1Yy4uYjI0MGEyM2JkYzI3NzhkMDVmMzVlNThlMzIw NDAxZjVlYTBkZGJlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0wNy0y NSAgQ2FpbyBNYXJjZWxvIGRlIE9saXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2ZWlyYUBvcGVuYm9z c2Eub3JnPgorCisgICAgICAgIFtRdF0gQWRkIG1vcmUgdGVzdHMgdG8gY292ZXIgdGhlIGJlaGF2 aW9yIG9mIGxvYWRGaW5pc2hlZCgpIHNpZ25hbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM0OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDoK KyAgICAgICAgKEZha2VSZXBseTo6RmFrZVJlcGx5KToKKyAgICAgICAgKEZha2VOZXR3b3JrTWFu YWdlcjo6Y3JlYXRlUmVxdWVzdCk6IEFkZCBhIGZha2UgcmVwbHkgdGhhdCBnaXZlcyA0MDQgZXJy b3IgY29kZS4KKworICAgICAgICAodHN0X1FXZWJGcmFtZTo6bG9hZEZpbmlzaGVkQWZ0ZXJOb3RG b3VuZEVycm9yKTogVmVyaWZ5IHRoYXQgd2UgZ2V0IGxvYWRGaW5pc2hlZChmYWxzZSkKKyAgICAg ICAgYWZ0ZXIgYSA0MDQgZXJyb3Igd2l0aG91dCBjb250ZW50cy4KKworICAgICAgICAqIHRlc3Rz L3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHA6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OmVycm9y UGFnZUV4dGVuc2lvbkxvYWRGaW5pc2hlZCk6IFZlcmlmeSBpZiB0aGUgYXJndW1lbnQgb2YgbG9h ZEZpbmlzaGVkKCkKKyAgICAgICAgaXMgdHJ1ZSB3aGVuIHdlIHVzZSBlcnJvciBwYWdlIGV4dGVu c2lvbiB0byBwcm9kdWNlIG91ciBvd24gZXJyb3IgcGFnZXMuCisKIDIwMTEtMDctMTkgIENhaW8g TWFyY2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4K IAogICAgICAgICBbUXRdIEltcHJvdmUgZG9jdW1lbnRhdGlvbiBvZiBRV2ViVmlldzo6c2V0UGFn ZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdl YmZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJh bWUuY3BwCmluZGV4IGMzNjgwY2I4NWQ2NTUyYzU2YjAzNWNjNWUyZmQzZWVjMGM5Nzk4NGUuLmNm NWQ2MDAzYzNkNDc2NjlhOTE2NGMzYjQ5MmI4ZWVhY2UxOGE2NmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC02NTksNiAr NjU5LDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIHNldFVybFNhbWVVcmwoKTsKICAgICB2 b2lkIHNldFVybFRoZW5Mb2Fkc19kYXRhKCk7CiAgICAgdm9pZCBzZXRVcmxUaGVuTG9hZHMoKTsK KyAgICB2b2lkIGxvYWRGaW5pc2hlZEFmdGVyTm90Rm91bmRFcnJvcigpOwogCiBwcml2YXRlOgog ICAgIFFTdHJpbmcgIGV2YWxKUyhjb25zdCBRU3RyaW5nJnMpIHsKQEAgLTIzMDIsNiArMjMwMyw4 IEBAIGNsYXNzIEZha2VSZXBseSA6IHB1YmxpYyBRTmV0d29ya1JlcGx5IHsKICAgICBRX09CSkVD VAogCiBwdWJsaWM6CisgICAgc3RhdGljIGNvbnN0IFFVcmwgdXJsRm9yNDA0RXJyb3JXaXRob3V0 Q29udGVudHM7CisKICAgICBGYWtlUmVwbHkoY29uc3QgUU5ldHdvcmtSZXF1ZXN0JiByZXF1ZXN0 LCBRT2JqZWN0KiBwYXJlbnQgPSAwKQogICAgICAgICA6IFFOZXR3b3JrUmVwbHkocGFyZW50KQog ICAgIHsKQEAgLTIzMjEsNiArMjMyNCwxMCBAQCBwdWJsaWM6CiAgICAgICAgIGVsc2UgaWYgKHJl cXVlc3QudXJsKCkuaG9zdCgpID09IFFMYXRpbjFTdHJpbmcoImFiY2RlZi5hYmNkZWYiKSkgewog ICAgICAgICAgICAgc2V0RXJyb3IoUU5ldHdvcmtSZXBseTo6SG9zdE5vdEZvdW5kRXJyb3IsIHRy KCJJbnZhbGlkIFVSTCIpKTsKICAgICAgICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdCgwLCB0aGlz LCBTTE9UKGNvbnRpbnVlRXJyb3IoKSkpOworICAgICAgICB9IGVsc2UgaWYgKHJlcXVlc3QudXJs KCkgPT0gRmFrZVJlcGx5Ojp1cmxGb3I0MDRFcnJvcldpdGhvdXRDb250ZW50cykgeworICAgICAg ICAgICAgc2V0RXJyb3IoUU5ldHdvcmtSZXBseTo6Q29udGVudE5vdEZvdW5kRXJyb3IsICJOb3Qg Zm91bmQiKTsKKyAgICAgICAgICAgIHNldEF0dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6Okh0dHBT dGF0dXNDb2RlQXR0cmlidXRlLCA0MDQpOworICAgICAgICAgICAgUVRpbWVyOjpzaW5nbGVTaG90 KDAsIHRoaXMsIFNMT1QoY29udGludWVFcnJvcigpKSk7CiAgICAgICAgIH0KIAogICAgICAgICBv cGVuKFFJT0RldmljZTo6UmVhZE9ubHkpOwpAQCAtMjM1Miw2ICsyMzU5LDggQEAgcHJpdmF0ZSBz bG90czoKICAgICB9CiB9OwogCitjb25zdCBRVXJsIEZha2VSZXBseTo6dXJsRm9yNDA0RXJyb3JX aXRob3V0Q29udGVudHMgPSBRVXJsKCJodHRwOi8vdGhpcy53aWxsL3JldHVybi1odHRwLTQwNC1l cnJvci13aXRob3V0LWNvbnRlbnRzLmh0bWwiKTsKKwogY2xhc3MgRmFrZU5ldHdvcmtNYW5hZ2Vy IDogcHVibGljIFFOZXR3b3JrQWNjZXNzTWFuYWdlciB7CiAgICAgUV9PQkpFQ1QKIApAQCAtMjM2 MywxNyArMjM3MiwxNyBAQCBwcm90ZWN0ZWQ6CiAgICAgewogICAgICAgICBRU3RyaW5nIHVybCA9 IHJlcXVlc3QudXJsKCkudG9TdHJpbmcoKTsKICAgICAgICAgaWYgKG9wID09IFFOZXR3b3JrQWNj ZXNzTWFuYWdlcjo6R2V0T3BlcmF0aW9uKSB7Ci0gICAgICAgICAgICBpZiAodXJsID09ICJxcmM6 L3Rlc3QxLmh0bWwiIHx8ICB1cmwgPT0gImh0dHA6Ly9hYmNkZWYuYWJjZGVmLyIpCi0gICAgICAg ICAgICAgICAgcmV0dXJuIG5ldyBGYWtlUmVwbHkocmVxdWVzdCwgdGhpcyk7CiAjaWZuZGVmIFFU X05PX09QRU5TU0wKLSAgICAgICAgICAgIGVsc2UgaWYgKHVybCA9PSAicXJjOi9mYWtlLXNzbC1l cnJvci5odG1sIikgeworICAgICAgICAgICAgaWYgKHVybCA9PSAicXJjOi9mYWtlLXNzbC1lcnJv ci5odG1sIikgewogICAgICAgICAgICAgICAgIEZha2VSZXBseSogcmVwbHkgPSBuZXcgRmFrZVJl cGx5KHJlcXVlc3QsIHRoaXMpOwogICAgICAgICAgICAgICAgIFFMaXN0PFFTc2xFcnJvcj4gZXJy b3JzOwogICAgICAgICAgICAgICAgIGVtaXQgc3NsRXJyb3JzKHJlcGx5LCBlcnJvcnMgPDwgUVNz bEVycm9yKFFTc2xFcnJvcjo6VW5zcGVjaWZpZWRFcnJvcikpOwogICAgICAgICAgICAgICAgIHJl dHVybiByZXBseTsKICAgICAgICAgICAgIH0KICNlbmRpZgotICAgICAgIH0KKyAgICAgICAgICAg IGlmICh1cmwgPT0gInFyYzovdGVzdDEuaHRtbCIgfHwgdXJsID09ICJodHRwOi8vYWJjZGVmLmFi Y2RlZi8iIHx8IHJlcXVlc3QudXJsKCkgPT0gRmFrZVJlcGx5Ojp1cmxGb3I0MDRFcnJvcldpdGhv dXRDb250ZW50cykKKyAgICAgICAgICAgICAgICByZXR1cm4gbmV3IEZha2VSZXBseShyZXF1ZXN0 LCB0aGlzKTsKKyAgICAgICAgfQogCiAgICAgICAgIHJldHVybiBRTmV0d29ya0FjY2Vzc01hbmFn ZXI6OmNyZWF0ZVJlcXVlc3Qob3AsIHJlcXVlc3QsIG91dGdvaW5nRGF0YSk7CiAgICAgfQpAQCAt MzY3OSw1ICszNjg4LDIwIEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6c2V0VXJsVGhlbkxvYWRzKCkK ICAgICBRQ09NUEFSRShmcmFtZS0+YmFzZVVybCgpLCBleHRyYWN0QmFzZVVybCh1cmxUb0xvYWQy KSk7CiB9CiAKK3ZvaWQgdHN0X1FXZWJGcmFtZTo6bG9hZEZpbmlzaGVkQWZ0ZXJOb3RGb3VuZEVy cm9yKCkKK3sKKyAgICBRV2ViUGFnZSBwYWdlOworICAgIFFXZWJGcmFtZSogZnJhbWUgPSBwYWdl Lm1haW5GcmFtZSgpOworCisgICAgUVNpZ25hbFNweSBzcHkoJnBhZ2UsIFNJR05BTChsb2FkRmlu aXNoZWQoYm9vbCkpKTsKKyAgICBGYWtlTmV0d29ya01hbmFnZXIqIG5ldHdvcmtNYW5hZ2VyID0g bmV3IEZha2VOZXR3b3JrTWFuYWdlcigmcGFnZSk7CisgICAgcGFnZS5zZXROZXR3b3JrQWNjZXNz TWFuYWdlcihuZXR3b3JrTWFuYWdlcik7CisKKyAgICBmcmFtZS0+c2V0VXJsKEZha2VSZXBseTo6 dXJsRm9yNDA0RXJyb3JXaXRob3V0Q29udGVudHMpOworICAgIFFUUllfQ09NUEFSRShzcHkuY291 bnQoKSwgMSk7CisgICAgY29uc3QgYm9vbCB3YXNMb2FkT2sgPSBzcHkuYXQoMCkuYXQoMCkudG9C b29sKCk7CisgICAgUVZFUklGWSghd2FzTG9hZE9rKTsKK30KKwogUVRFU1RfTUFJTih0c3RfUVdl YkZyYW1lKQogI2luY2x1ZGUgInRzdF9xd2ViZnJhbWUubW9jIgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktp dC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCmluZGV4IGE2YmFhNjQyMjc5ZjY1 NWQ4M2VkZWY4YmJiZTkyMGFlM2YwZjE1MjcuLjdhZjI2ZmJlNmQ1MzA4YjU2OTMzNmJlMmI3ZmVl NzMwMWM2YzYyYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2Uv dHN0X3F3ZWJwYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3Rz dF9xd2VicGFnZS5jcHAKQEAgLTEzNCw2ICsxMzQsNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZv aWQgZXJyb3JQYWdlRXh0ZW5zaW9uKCk7CiAgICAgdm9pZCBlcnJvclBhZ2VFeHRlbnNpb25JbklG cmFtZXMoKTsKICAgICB2b2lkIGVycm9yUGFnZUV4dGVuc2lvbkluRnJhbWVzZXQoKTsKKyAgICB2 b2lkIGVycm9yUGFnZUV4dGVuc2lvbkxvYWRGaW5pc2hlZCgpOwogICAgIHZvaWQgdXNlckFnZW50 QXBwbGljYXRpb25OYW1lKCk7CiAKICAgICB2b2lkIHZpZXdNb2RlcygpOwpAQCAtMjU3Niw2ICsy NTc3LDM1IEBAIHZvaWQgdHN0X1FXZWJQYWdlOjplcnJvclBhZ2VFeHRlbnNpb25JbkZyYW1lc2V0 KCkKICAgICBtX3ZpZXctPnNldFBhZ2UoMCk7CiB9CiAKK3ZvaWQgdHN0X1FXZWJQYWdlOjplcnJv clBhZ2VFeHRlbnNpb25Mb2FkRmluaXNoZWQoKQoreworICAgIEVycm9yUGFnZSBwYWdlOworICAg IG1fdmlldy0+c2V0UGFnZSgmcGFnZSk7CisKKyAgICBRU2lnbmFsU3B5IHNweUxvYWRGaW5pc2hl ZChtX3ZpZXcsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKKyAgICBRU2lnbmFsU3B5IHNw eUZyYW1lTG9hZEZpbmlzaGVkKG1fdmlldy0+cGFnZSgpLT5tYWluRnJhbWUoKSwgU0lHTkFMKGxv YWRGaW5pc2hlZChib29sKSkpOworCisgICAgbV92aWV3LT5zZXRVcmwoUVVybCgiZGF0YTp0ZXh0 L2h0bWwsZm9vIikpOworICAgIFFUUllfQ09NUEFSRShzcHlMb2FkRmluaXNoZWQuY291bnQoKSwg MSk7CisgICAgUVRSWV9DT01QQVJFKHNweUZyYW1lTG9hZEZpbmlzaGVkLmNvdW50KCksIDEpOwor CisgICAgY29uc3QgYm9vbCBsb2FkU3VjY2VkZWQgPSBzcHlMb2FkRmluaXNoZWQuYXQoMCkuYXQo MCkudG9Cb29sKCk7CisgICAgUVZFUklGWShsb2FkU3VjY2VkZWQpOworICAgIGNvbnN0IGJvb2wg ZnJhbWVMb2FkU3VjY2VkZWQgPSBzcHlGcmFtZUxvYWRGaW5pc2hlZC5hdCgwKS5hdCgwKS50b0Jv b2woKTsKKyAgICBRVkVSSUZZKGZyYW1lTG9hZFN1Y2NlZGVkKTsKKworICAgIG1fdmlldy0+cGFn ZSgpLT5tYWluRnJhbWUoKS0+c2V0VXJsKFFVcmwoImh0dHA6Ly9ub24uZXhpc3RlbnQvdXJsIikp OworICAgIFFUUllfQ09NUEFSRShzcHlMb2FkRmluaXNoZWQuY291bnQoKSwgMik7CisgICAgUVRS WV9DT01QQVJFKHNweUZyYW1lTG9hZEZpbmlzaGVkLmNvdW50KCksIDIpOworCisgICAgY29uc3Qg Ym9vbCBub25FeGlzdGFudExvYWRTdWNjZWRlZCA9IHNweUxvYWRGaW5pc2hlZC5hdCgxKS5hdCgw KS50b0Jvb2woKTsKKyAgICBRVkVSSUZZKG5vbkV4aXN0YW50TG9hZFN1Y2NlZGVkKTsKKyAgICBj b25zdCBib29sIG5vbkV4aXN0YW50RnJhbWVMb2FkU3VjY2VkZWQgPSBzcHlGcmFtZUxvYWRGaW5p c2hlZC5hdCgxKS5hdCgwKS50b0Jvb2woKTsKKyAgICBRVkVSSUZZKG5vbkV4aXN0YW50RnJhbWVM b2FkU3VjY2VkZWQpOworCisgICAgbV92aWV3LT5zZXRQYWdlKDApOworfQorCiBjbGFzcyBGcmll bmRseVdlYlBhZ2UgOiBwdWJsaWMgUVdlYlBhZ2UKIHsKIHB1YmxpYzoK