63235 2011-06-23 01:53:43 -0700 [Qt] Fix tst_QWebFrame::setHtmlWithResource() API test 2011-07-05 13:53:21 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 38654 1 ossy rafael.lobo ademar ossy rafael.lobo webkit.review.bot oldest_to_newest 426025 0 ossy 2011-06-23 01:53:43 -0700 http://build.webkit.org/builders/Qt%20Linux%20Release/builds/34519 FAIL! : tst_QWebFrame::setHtmlWithResource() Compared values are not the same Actual (frame->evaluateJavaScript("document.images[0].width").toInt()): 0 Expected (128): 128 Loc: [/ramdisk/qt-linux-release/build/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp(2506)] 426106 1 ossy 2011-06-23 05:51:17 -0700 Two more fails: FAIL! : tst_QWebFrame::setHtmlWithResource() Compared values are not the same Actual (frame->evaluateJavaScript("document.images[0].height").toInt()): 0 Expected (128): 128 Loc: [/home/oszi/WebKit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp(2508)] FAIL! : tst_QWebFrame::setHtmlWithResource() Compared values are not the same Actual (p.styleProperty("color", QWebElement::CascadedStyle)): Expected (QLatin1String("red")): red Loc: [/home/oszi/WebKit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp(2527)] Marked as expected fails: http://trac.webkit.org/changeset/89561 429813 2 rafael.lobo 2011-06-29 13:11:56 -0700 I've tried to explain how is the issue that is causing this on https://bugs.webkit.org/show_bug.cgi?id=63236 (that test is also failing because of the same thing). To be quick, it's not loading local resources when you specify the susbtitute data for a page. When I say resources, I mean, for example, an image. If you use "file" or "qrc", it won't download the image, just because you've loaded this html replacing its substitute data. Still investigating why this is happening. 430862 3 99400 rafael.lobo 2011-06-30 17:04:10 -0700 Created attachment 99400 Specified baseUrl to be a local file as we must get a security origin with granted permission to request local resources. Also added the expected behavior for the opposite situation. I've removed QSignalSpy because it would always increment its counter, no matter what happens related to the local resources, so it looks like it was pointless to check it there. I've also added a comment to the test setHtmlWithBaseURL to explain the difference between this test and the other one. Perhaps we should rename them? Or is this unrelated to this patch and I should remove it? I don't know, I think it's nice to explain why they are different and what they're actually testing. We've discussed the use of baseUrl to fix those tests at https://bugs.webkit.org/show_bug.cgi?id=63236. To make it short, it looks like we've been using setHtml in the wrong way. Feedbacks are welcome! :) 430866 4 webkit.review.bot 2011-06-30 17:07:46 -0700 Attachment 99400 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/ChangeLog', u'Source/WebK..." exit_code: 1 Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2501: Missing space after , [whitespace/comma] [3] Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2518: Missing space after , [whitespace/comma] [3] Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2531: Missing space after , [whitespace/comma] [3] Total errors found: 3 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 431864 5 99400 benjamin 2011-07-04 03:21:36 -0700 Comment on attachment 99400 Specified baseUrl to be a local file as we must get a security origin with granted permission to request local resources. View in context: https://bugs.webkit.org/attachment.cgi?id=99400&action=review The change make sense. Just a few comments on the style... This test is doing 2 things: image from setHtml <-> doc properties from setHTML. You should split it, the two tests with image together. The two tests using html2 in a new function. > Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2496 > + QString html("<html><body><p>hello world</p><img src='qrc:/image.png'/></body></html>"); QLatin1String. (I know it is not widespread and not enforced in tests at the moment.) > Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2499 > + QWebElement webElement; This variable is declared a bit too far for its first use. You should declare next to the second part of the test. >> Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2501 >> + frame->setHtml(html,QUrl("file:///path/to/file")); > > Missing space after , [whitespace/comma] [3] Style + QLatin1String. >> Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2518 >> + frame->setHtml(html2,QUrl("qrc:/path/to/file")); > > Missing space after , [whitespace/comma] [3] QLatin1String Why do you need a path here? > Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2520 > + webElement = frame->documentElement().findAll("p").at(0); QLatin1String And you can replace findAll().at(0) by QWebElement::findFirst(). > Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2533 > + webElement = frame->documentElement().findAll("p").at(0); findFirst() > Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2541 > + // This will test if baseUrl is indeed affecting the relative paths from resources. > + // As we're using a local file as baseUrl, its security origin will be able to load local resources. "This tests", the future form here is a bit strange :) "As we are" "its security origin should be able" 432330 6 99726 rafael.lobo 2011-07-05 10:55:38 -0700 Created attachment 99726 modified style as suggested, and also have split the test into two (one for image, and other for stylesheet) I'm not sure if the new names are ideal, but I'm not good with it anyway. They're essentially the same test, just the way it checks is different, but I like the idea to separate them into two, it made the code more clear. Feedbacks are welcome. :) 432336 7 99726 benjamin 2011-07-05 11:02:10 -0700 Comment on attachment 99726 modified style as suggested, and also have split the test into two (one for image, and other for stylesheet) View in context: https://bugs.webkit.org/attachment.cgi?id=99726&action=review Looks good. > Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2531 > + QLatin1String html = QLatin1String(htmlData); QLatin1String html(htmlData); > Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2536 > + frame->setHtml(html, QUrl(QLatin1String("qrc:file"))); qrc:file is not a valid qrc url (maybe it is at the moment but that is not very robust). Better use qrc:///file (I can't remember if that should be 2 or 3 / :)) > Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2546 > + QCOMPARE(webElement.styleProperty("color", QWebElement::CascadedStyle), QLatin1String("")); QLatin1String("") -> QString() I guess 432353 8 99733 rafael.lobo 2011-07-05 11:46:04 -0700 Created attachment 99733 minor changes on the last one 432369 9 99733 webkit.review.bot 2011-07-05 12:45:12 -0700 Comment on attachment 99733 minor changes on the last one Clearing flags on attachment: 99733 Committed r90403: <http://trac.webkit.org/changeset/90403> 432370 10 webkit.review.bot 2011-07-05 12:45:18 -0700 All reviewed patches have been landed. Closing bug. 432392 11 ademar 2011-07-05 13:53:21 -0700 Revision r90403 cherry-picked into qtwebkit-2.2 with commit dfe73c3 <http://gitorious.org/webkit/qtwebkit/commit/dfe73c3> 99400 2011-06-30 17:04:10 -0700 2011-07-05 10:55:38 -0700 Specified baseUrl to be a local file as we must get a security origin with granted permission to request local resources. setHtmlWithResources-1.diff text/plain 4310 rafael.lobo ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggZGY2YWNkNi4uMjlkNWEwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxMS0wNi0zMCAgUmFmYWVsIEJyYW5kYW8gIDxyYWZhZWwubG9ib0BvcGVu Ym9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFtRdF0gRml4IHRzdF9RV2ViRnJhbWU6OnNldEh0bWxXaXRoUmVzb3VyY2UoKSBBUEkgdGVz dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMyMzUK KworICAgICAgICBNb2RpZmllZCBiYXNlVXJsIHRvIGJlIGEgbG9jYWwgZmlsZSBpbiBvcmRlciB0 byBnZXQgYSBzZWN1cml0eSBvcmlnaW4KKyAgICAgICAgdGhhdCBpcyBhbGxvd2VkIHRvIHJlcXVl c3QgbG9jYWwgcmVzb3VyY2VzLiBSZW1vdmVkIFFTaWduYWxTcHkgZnJvbSBpdAorICAgICAgICBh cyBsb2FkRmluaXNoZWQgaGFwcGVucyBubyBtYXR0ZXIgd2UgZ2V0IHRoZSBsb2NhbCByZXNvdXJj ZS4KKworICAgICAgICAqIHRlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcDoKKyAgICAg ICAgKHRzdF9RV2ViRnJhbWU6OnNldEh0bWxXaXRoUmVzb3VyY2UpOgorICAgICAgICAodHN0X1FX ZWJGcmFtZTo6c2V0SHRtbFdpdGhCYXNlVVJMKToKKwogMjAxMS0wNi0zMCAgRmFicml6aW8gTWFj aGFkbyAgPGZhYnJpemlvLm1hY2hhZG9Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEJlbmphbWluIFBvdWxhaW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3 ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZy YW1lL3RzdF9xd2ViZnJhbWUuY3BwCmluZGV4IGYyYmRjZWUuLmQxOTUzNzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBAIC0y NDkwLDIxICsyNDkwLDE5IEBAIHZvaWQgdHN0X1FXZWJGcmFtZTo6c2V0SHRtbCgpCiAKIHZvaWQg dHN0X1FXZWJGcmFtZTo6c2V0SHRtbFdpdGhSZXNvdXJjZSgpCiB7Ci0gICAgUVN0cmluZyBodG1s KCI8aHRtbD48Ym9keT48cD5oZWxsbyB3b3JsZDwvcD48aW1nIHNyYz0ncXJjOi9pbWFnZS5wbmcn Lz48L2JvZHk+PC9odG1sPiIpOworICAgIC8vIEJ5IGRlZmF1bHQsIG9ubHkgc2VjdXJpdHkgb3Jp Z2lucyBvZiBsb2NhbCBmaWxlcyBjYW4gbG9hZCBsb2NhbCByZXNvdXJjZXMuCisgICAgLy8gU28g d2Ugc2hvdWxkIHNwZWNpZnkgYmFzZVVybCB0byBiZSBhIGxvY2FsIGZpbGUgaW4gb3JkZXIgdG8g Z2V0IGEgcHJvcGVyIG9yaWdpbi4KIAorICAgIFFTdHJpbmcgaHRtbCgiPGh0bWw+PGJvZHk+PHA+ aGVsbG8gd29ybGQ8L3A+PGltZyBzcmM9J3FyYzovaW1hZ2UucG5nJy8+PC9ib2R5PjwvaHRtbD4i KTsKICAgICBRV2ViUGFnZSBwYWdlOwogICAgIFFXZWJGcmFtZSogZnJhbWUgPSBwYWdlLm1haW5G cmFtZSgpOworICAgIFFXZWJFbGVtZW50IHdlYkVsZW1lbnQ7CiAKLSAgICAvLyBpbiBmZXcgc2Vj b25kcywgdGhlIGltYWdlIHNob3VsZCBiZSBjb21wbGV0ZXkgbG9hZGVkCi0gICAgUVNpZ25hbFNw eSBzcHkoJnBhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKLSAgICBmcmFtZS0+c2V0 SHRtbChodG1sKTsKKyAgICBmcmFtZS0+c2V0SHRtbChodG1sLFFVcmwoImZpbGU6Ly8vcGF0aC90 by9maWxlIikpOwogICAgIHdhaXRGb3JTaWduYWwoZnJhbWUsIFNJR05BTChsb2FkRmluaXNoZWQo Ym9vbCkpLCAyMDApOwotICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCAxKTsKIAogICAgIFFDT01Q QVJFKGZyYW1lLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmltYWdlcy5sZW5ndGgiKS50 b0ludCgpLCAxKTsKLSAgICBRRVhQRUNUX0ZBSUwoIiIsICJodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjMyMzUiLCBDb250aW51ZSk7CiAgICAgUUNPTVBBUkUoZnJhbWUt PmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuaW1hZ2VzWzBdLndpZHRoIikudG9JbnQoKSwg MTI4KTsKLSAgICBRRVhQRUNUX0ZBSUwoIiIsICJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjMyMzUiLCBDb250aW51ZSk7CiAgICAgUUNPTVBBUkUoZnJhbWUtPmV2YWx1 YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuaW1hZ2VzWzBdLmhlaWdodCIpLnRvSW50KCksIDEyOCk7 CiAKICAgICBRU3RyaW5nIGh0bWwyID0KQEAgLTI1MTcsMTggKzI1MTUsMzEgQEAgdm9pZCB0c3Rf UVdlYkZyYW1lOjpzZXRIdG1sV2l0aFJlc291cmNlKCkKICAgICAgICAgICAgICI8L2JvZHk+Igog ICAgICAgICAiPC9odG1sPiI7CiAKLSAgICAvLyBpbiBmZXcgc2Vjb25kcywgdGhlIENTUyBzaG91 bGQgYmUgY29tcGxldGV5IGxvYWRlZAotICAgIGZyYW1lLT5zZXRIdG1sKGh0bWwyKTsKKyAgICBm cmFtZS0+c2V0SHRtbChodG1sMixRVXJsKCJxcmM6L3BhdGgvdG8vZmlsZSIpKTsKKyAgICB3YWl0 Rm9yU2lnbmFsKGZyYW1lLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSwgMjAwKTsKKyAgICB3 ZWJFbGVtZW50ID0gZnJhbWUtPmRvY3VtZW50RWxlbWVudCgpLmZpbmRBbGwoInAiKS5hdCgwKTsK KyAgICBRQ09NUEFSRSh3ZWJFbGVtZW50LnN0eWxlUHJvcGVydHkoImNvbG9yIiwgUVdlYkVsZW1l bnQ6OkNhc2NhZGVkU3R5bGUpLCBRTGF0aW4xU3RyaW5nKCJyZWQiKSk7CisKKyAgICAvLyBOb3cg d2UgdGVzdCB0aGUgb3Bwb3NpdGU6IHdpdGhvdXQgYSBiYXNlVXJsIGFzIGEgbG9jYWwgZmlsZSwg d2UgY2Fubm90IHJlcXVlc3QgbG9jYWwgcmVzb3VyY2VzLgorCisgICAgZnJhbWUtPnNldEh0bWwo aHRtbCk7CiAgICAgd2FpdEZvclNpZ25hbChmcmFtZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29s KSksIDIwMCk7Ci0gICAgUUNPTVBBUkUoc3B5LnNpemUoKSwgMik7CisgICAgUUNPTVBBUkUoZnJh bWUtPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuaW1hZ2VzLmxlbmd0aCIpLnRvSW50KCks IDEpOworICAgIFFDT01QQVJFKGZyYW1lLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50Lmlt YWdlc1swXS53aWR0aCIpLnRvSW50KCksIDApOworICAgIFFDT01QQVJFKGZyYW1lLT5ldmFsdWF0 ZUphdmFTY3JpcHQoImRvY3VtZW50LmltYWdlc1swXS5oZWlnaHQiKS50b0ludCgpLCAwKTsKKwor ICAgIGZyYW1lLT5zZXRIdG1sKGh0bWwyLFFVcmwoImh0dHA6Ly93d3cuZXhhbXBsZS5jb20vIikp OworICAgIHdhaXRGb3JTaWduYWwoZnJhbWUsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpLCAy MDApOworICAgIHdlYkVsZW1lbnQgPSBmcmFtZS0+ZG9jdW1lbnRFbGVtZW50KCkuZmluZEFsbCgi cCIpLmF0KDApOworICAgIFFDT01QQVJFKHdlYkVsZW1lbnQuc3R5bGVQcm9wZXJ0eSgiY29sb3Ii LCBRV2ViRWxlbWVudDo6Q2FzY2FkZWRTdHlsZSksIFFMYXRpbjFTdHJpbmcoIiIpKTsKIAotICAg IFFXZWJFbGVtZW50IHAgPSBmcmFtZS0+ZG9jdW1lbnRFbGVtZW50KCkuZmluZEFsbCgicCIpLmF0 KDApOwotICAgIFFFWFBFQ1RfRkFJTCgiIiwgImh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02MzIzNSIsIENvbnRpbnVlKTsKLSAgICBRQ09NUEFSRShwLnN0eWxlUHJvcGVy dHkoImNvbG9yIiwgUVdlYkVsZW1lbnQ6OkNhc2NhZGVkU3R5bGUpLCBRTGF0aW4xU3RyaW5nKCJy ZWQiKSk7CiB9CiAKIHZvaWQgdHN0X1FXZWJGcmFtZTo6c2V0SHRtbFdpdGhCYXNlVVJMKCkKIHsK KyAgICAvLyBUaGlzIHdpbGwgdGVzdCBpZiBiYXNlVXJsIGlzIGluZGVlZCBhZmZlY3RpbmcgdGhl IHJlbGF0aXZlIHBhdGhzIGZyb20gcmVzb3VyY2VzLgorICAgIC8vIEFzIHdlJ3JlIHVzaW5nIGEg bG9jYWwgZmlsZSBhcyBiYXNlVXJsLCBpdHMgc2VjdXJpdHkgb3JpZ2luIHdpbGwgYmUgYWJsZSB0 byBsb2FkIGxvY2FsIHJlc291cmNlcy4KKwogICAgIGlmICghUURpcihURVNUU19TT1VSQ0VfRElS KS5leGlzdHMoKSkKICAgICAgICAgUVNLSVAoUVN0cmluZygiVGhpcyB0ZXN0IHJlcXVpcmVzIGFj Y2VzcyB0byByZXNvdXJjZXMgZm91bmQgaW4gJyUxJyIpLmFyZyhURVNUU19TT1VSQ0VfRElSKS50 b0xhdGluMSgpLmNvbnN0RGF0YSgpLCBTa2lwQWxsKTsKIAo= 99726 2011-07-05 10:55:38 -0700 2011-07-05 11:46:04 -0700 modified style as suggested, and also have split the test into two (one for image, and other for stylesheet) setHtmlWithResources-2.diff text/plain 5540 rafael.lobo ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggNGI3MDFlMC4uNjNjNmZmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMS0wNy0wNSAgUmFmYWVsIEJyYW5kYW8gIDxyYWZhZWwubG9ib0BvcGVu Ym9zc2Eub3JnPgorCisgICAgICAgIFtRdF0gRml4IHRzdF9RV2ViRnJhbWU6OnNldEh0bWxXaXRo UmVzb3VyY2UoKSBBUEkgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjMyMzUKKworICAgICAgICBNb2RpZmllZCBiYXNlVXJsIHRvIGJlIGEgbG9j YWwgZmlsZSBpbiBvcmRlciB0byBnZXQgYSBzZWN1cml0eSBvcmlnaW4KKyAgICAgICAgdGhhdCBp cyBhbGxvd2VkIHRvIHJlcXVlc3QgbG9jYWwgcmVzb3VyY2VzLiBSZW1vdmVkIFFTaWduYWxTcHkg ZnJvbSBpdAorICAgICAgICBhcyBsb2FkRmluaXNoZWQgYWx3YXlzIGhhcHBlbnMsIGFuZCB0aGUg b3JpZ2luYWwgdGVzdCB3YXMgc3BsaXQgaW50byB0d28uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFt ZS5jcHA6CisgICAgICAgICh0c3RfUVdlYkZyYW1lOjpzZXRIdG1sV2l0aEltYWdlUmVzb3VyY2Up OgorICAgICAgICAodHN0X1FXZWJGcmFtZTo6c2V0SHRtbFdpdGhTdHlsZXNoZWV0UmVzb3VyY2Up OgorICAgICAgICAodHN0X1FXZWJGcmFtZTo6c2V0SHRtbFdpdGhCYXNlVVJMKToKKwogMjAxMS0w NC0wMiAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQmVuamFtaW4gUG91bGFpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVz dHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x d2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKaW5kZXggMjIwZTE0Yy4uZTRlMmQyOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAK QEAgLTYxOSw3ICs2MTksOCBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgamF2YVNjcmlwdFdp bmRvd09iamVjdENsZWFyZWQoKTsKICAgICB2b2lkIGphdmFTY3JpcHRXaW5kb3dPYmplY3RDbGVh cmVkT25FdmFsdWF0ZSgpOwogICAgIHZvaWQgc2V0SHRtbCgpOwotICAgIHZvaWQgc2V0SHRtbFdp dGhSZXNvdXJjZSgpOworICAgIHZvaWQgc2V0SHRtbFdpdGhJbWFnZVJlc291cmNlKCk7CisgICAg dm9pZCBzZXRIdG1sV2l0aFN0eWxlc2hlZXRSZXNvdXJjZSgpOwogICAgIHZvaWQgc2V0SHRtbFdp dGhCYXNlVVJMKCk7CiAgICAgdm9pZCBzZXRIdG1sV2l0aEpTQWxlcnQoKTsKICAgICB2b2lkIGlw djZIb3N0RW5jb2RpbmcoKTsKQEAgLTI0ODgsMjYgKzI0ODksMzcgQEAgdm9pZCB0c3RfUVdlYkZy YW1lOjpzZXRIdG1sKCkKICAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgMSk7CiB9CiAKLXZvaWQg dHN0X1FXZWJGcmFtZTo6c2V0SHRtbFdpdGhSZXNvdXJjZSgpCit2b2lkIHRzdF9RV2ViRnJhbWU6 OnNldEh0bWxXaXRoSW1hZ2VSZXNvdXJjZSgpCiB7Ci0gICAgUVN0cmluZyBodG1sKCI8aHRtbD48 Ym9keT48cD5oZWxsbyB3b3JsZDwvcD48aW1nIHNyYz0ncXJjOi9pbWFnZS5wbmcnLz48L2JvZHk+ PC9odG1sPiIpOworICAgIC8vIEJ5IGRlZmF1bHQsIG9ubHkgc2VjdXJpdHkgb3JpZ2lucyBvZiBs b2NhbCBmaWxlcyBjYW4gbG9hZCBsb2NhbCByZXNvdXJjZXMuCisgICAgLy8gU28gd2Ugc2hvdWxk IHNwZWNpZnkgYmFzZVVybCB0byBiZSBhIGxvY2FsIGZpbGUgaW4gb3JkZXIgdG8gZ2V0IGEgcHJv cGVyIG9yaWdpbiBhbmQgbG9hZCB0aGUgbG9jYWwgaW1hZ2UuCiAKKyAgICBRTGF0aW4xU3RyaW5n IGh0bWwoIjxodG1sPjxib2R5PjxwPmhlbGxvIHdvcmxkPC9wPjxpbWcgc3JjPSdxcmM6L2ltYWdl LnBuZycvPjwvYm9keT48L2h0bWw+Iik7CiAgICAgUVdlYlBhZ2UgcGFnZTsKICAgICBRV2ViRnJh bWUqIGZyYW1lID0gcGFnZS5tYWluRnJhbWUoKTsKIAotICAgIC8vIGluIGZldyBzZWNvbmRzLCB0 aGUgaW1hZ2Ugc2hvdWxkIGJlIGNvbXBsZXRleSBsb2FkZWQKLSAgICBRU2lnbmFsU3B5IHNweSgm cGFnZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOwotICAgIGZyYW1lLT5zZXRIdG1sKGh0 bWwpOworICAgIGZyYW1lLT5zZXRIdG1sKGh0bWwsIFFVcmwoUUxhdGluMVN0cmluZygiZmlsZTov Ly9wYXRoL3RvL2ZpbGUiKSkpOwogICAgIHdhaXRGb3JTaWduYWwoZnJhbWUsIFNJR05BTChsb2Fk RmluaXNoZWQoYm9vbCkpLCAyMDApOwotICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCAxKTsKIAog ICAgIFFDT01QQVJFKGZyYW1lLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmltYWdlcy5s ZW5ndGgiKS50b0ludCgpLCAxKTsKLSAgICBRRVhQRUNUX0ZBSUwoIiIsICJodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMyMzUiLCBDb250aW51ZSk7CiAgICAgUUNPTVBB UkUoZnJhbWUtPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuaW1hZ2VzWzBdLndpZHRoIiku dG9JbnQoKSwgMTI4KTsKLSAgICBRRVhQRUNUX0ZBSUwoIiIsICJodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMyMzUiLCBDb250aW51ZSk7CiAgICAgUUNPTVBBUkUoZnJh bWUtPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuaW1hZ2VzWzBdLmhlaWdodCIpLnRvSW50 KCksIDEyOCk7CiAKLSAgICBRU3RyaW5nIGh0bWwyID0KKyAgICAvLyBOb3cgd2UgdGVzdCB0aGUg b3Bwb3NpdGU6IHdpdGhvdXQgYSBiYXNlVXJsIGFzIGEgbG9jYWwgZmlsZSwgd2UgY2Fubm90IHJl cXVlc3QgbG9jYWwgcmVzb3VyY2VzLgorCisgICAgZnJhbWUtPnNldEh0bWwoaHRtbCk7CisgICAg d2FpdEZvclNpZ25hbChmcmFtZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSksIDIwMCk7Cisg ICAgUUNPTVBBUkUoZnJhbWUtPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuaW1hZ2VzLmxl bmd0aCIpLnRvSW50KCksIDEpOworICAgIFFDT01QQVJFKGZyYW1lLT5ldmFsdWF0ZUphdmFTY3Jp cHQoImRvY3VtZW50LmltYWdlc1swXS53aWR0aCIpLnRvSW50KCksIDApOworICAgIFFDT01QQVJF KGZyYW1lLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmltYWdlc1swXS5oZWlnaHQiKS50 b0ludCgpLCAwKTsKK30KKwordm9pZCB0c3RfUVdlYkZyYW1lOjpzZXRIdG1sV2l0aFN0eWxlc2hl ZXRSZXNvdXJjZSgpCit7CisgICAgLy8gQnkgZGVmYXVsdCwgb25seSBzZWN1cml0eSBvcmlnaW5z IG9mIGxvY2FsIGZpbGVzIGNhbiBsb2FkIGxvY2FsIHJlc291cmNlcy4KKyAgICAvLyBTbyB3ZSBz aG91bGQgc3BlY2lmeSBiYXNlVXJsIHRvIGJlIGEgbG9jYWwgZmlsZSBpbiBvcmRlciB0byBiZSBh YmxlIHRvIGRvd25sb2FkIHRoZSBsb2NhbCBzdHlsZXNoZWV0LgorCisgICAgY29uc3QgY2hhciog aHRtbERhdGEgPQogICAgICAgICAiPGh0bWw+IgogICAgICAgICAgICAgIjxoZWFkPiIKICAgICAg ICAgICAgICAgICAiPGxpbmsgcmVsPSdzdHlsZXNoZWV0JyBocmVmPSdxcmM6L3N0eWxlLmNzcycg dHlwZT0ndGV4dC9jc3MnIC8+IgpAQCAtMjUxNiwxOSArMjUyOCwyOSBAQCB2b2lkIHRzdF9RV2Vi RnJhbWU6OnNldEh0bWxXaXRoUmVzb3VyY2UoKQogICAgICAgICAgICAgICAgICI8cCBpZD0naWRQ Jz5zb21lIHRleHQ8L3A+IgogICAgICAgICAgICAgIjwvYm9keT4iCiAgICAgICAgICI8L2h0bWw+ IjsKKyAgICBRTGF0aW4xU3RyaW5nIGh0bWwgPSBRTGF0aW4xU3RyaW5nKGh0bWxEYXRhKTsKKyAg ICBRV2ViUGFnZSBwYWdlOworICAgIFFXZWJGcmFtZSogZnJhbWUgPSBwYWdlLm1haW5GcmFtZSgp OworICAgIFFXZWJFbGVtZW50IHdlYkVsZW1lbnQ7CiAKLSAgICAvLyBpbiBmZXcgc2Vjb25kcywg dGhlIENTUyBzaG91bGQgYmUgY29tcGxldGV5IGxvYWRlZAotICAgIGZyYW1lLT5zZXRIdG1sKGh0 bWwyKTsKKyAgICBmcmFtZS0+c2V0SHRtbChodG1sLCBRVXJsKFFMYXRpbjFTdHJpbmcoInFyYzpm aWxlIikpKTsKICAgICB3YWl0Rm9yU2lnbmFsKGZyYW1lLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJv b2wpKSwgMjAwKTsKLSAgICBRQ09NUEFSRShzcHkuc2l6ZSgpLCAyKTsKKyAgICB3ZWJFbGVtZW50 ID0gZnJhbWUtPmRvY3VtZW50RWxlbWVudCgpLmZpbmRGaXJzdCgicCIpOworICAgIFFDT01QQVJF KHdlYkVsZW1lbnQuc3R5bGVQcm9wZXJ0eSgiY29sb3IiLCBRV2ViRWxlbWVudDo6Q2FzY2FkZWRT dHlsZSksIFFMYXRpbjFTdHJpbmcoInJlZCIpKTsKKworICAgIC8vIE5vdyB3ZSB0ZXN0IHRoZSBv cHBvc2l0ZTogd2l0aG91dCBhIGJhc2VVcmwgYXMgYSBsb2NhbCBmaWxlLCB3ZSBjYW5ub3QgcmVx dWVzdCBsb2NhbCByZXNvdXJjZXMuCiAKLSAgICBRV2ViRWxlbWVudCBwID0gZnJhbWUtPmRvY3Vt ZW50RWxlbWVudCgpLmZpbmRBbGwoInAiKS5hdCgwKTsKLSAgICBRRVhQRUNUX0ZBSUwoIiIsICJo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMyMzUiLCBDb250aW51ZSk7 Ci0gICAgUUNPTVBBUkUocC5zdHlsZVByb3BlcnR5KCJjb2xvciIsIFFXZWJFbGVtZW50OjpDYXNj YWRlZFN0eWxlKSwgUUxhdGluMVN0cmluZygicmVkIikpOworICAgIGZyYW1lLT5zZXRIdG1sKGh0 bWwsIFFVcmwoUUxhdGluMVN0cmluZygiaHR0cDovL3d3dy5leGFtcGxlLmNvbS8iKSkpOworICAg IHdhaXRGb3JTaWduYWwoZnJhbWUsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpLCAyMDApOwor ICAgIHdlYkVsZW1lbnQgPSBmcmFtZS0+ZG9jdW1lbnRFbGVtZW50KCkuZmluZEZpcnN0KCJwIik7 CisgICAgUUNPTVBBUkUod2ViRWxlbWVudC5zdHlsZVByb3BlcnR5KCJjb2xvciIsIFFXZWJFbGVt ZW50OjpDYXNjYWRlZFN0eWxlKSwgUUxhdGluMVN0cmluZygiIikpOwogfQogCiB2b2lkIHRzdF9R V2ViRnJhbWU6OnNldEh0bWxXaXRoQmFzZVVSTCgpCiB7CisgICAgLy8gVGhpcyB0ZXN0cyBpZiBi YXNlVXJsIGlzIGluZGVlZCBhZmZlY3RpbmcgdGhlIHJlbGF0aXZlIHBhdGhzIGZyb20gcmVzb3Vy Y2VzLgorICAgIC8vIEFzIHdlIGFyZSB1c2luZyBhIGxvY2FsIGZpbGUgYXMgYmFzZVVybCwgaXRz IHNlY3VyaXR5IG9yaWdpbiBzaG91bGQgYmUgYWJsZSB0byBsb2FkIGxvY2FsIHJlc291cmNlcy4K KwogICAgIGlmICghUURpcihURVNUU19TT1VSQ0VfRElSKS5leGlzdHMoKSkKICAgICAgICAgUVNL SVAoUVN0cmluZygiVGhpcyB0ZXN0IHJlcXVpcmVzIGFjY2VzcyB0byByZXNvdXJjZXMgZm91bmQg aW4gJyUxJyIpLmFyZyhURVNUU19TT1VSQ0VfRElSKS50b0xhdGluMSgpLmNvbnN0RGF0YSgpLCBT a2lwQWxsKTsKIAo= 99733 2011-07-05 11:46:04 -0700 2011-07-05 12:45:12 -0700 minor changes on the last one setHtmlWithResources-3.diff text/plain 5519 rafael.lobo ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggNGI3MDFlMC4uNjNjNmZmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMS0wNy0wNSAgUmFmYWVsIEJyYW5kYW8gIDxyYWZhZWwubG9ib0BvcGVu Ym9zc2Eub3JnPgorCisgICAgICAgIFtRdF0gRml4IHRzdF9RV2ViRnJhbWU6OnNldEh0bWxXaXRo UmVzb3VyY2UoKSBBUEkgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjMyMzUKKworICAgICAgICBNb2RpZmllZCBiYXNlVXJsIHRvIGJlIGEgbG9j YWwgZmlsZSBpbiBvcmRlciB0byBnZXQgYSBzZWN1cml0eSBvcmlnaW4KKyAgICAgICAgdGhhdCBp cyBhbGxvd2VkIHRvIHJlcXVlc3QgbG9jYWwgcmVzb3VyY2VzLiBSZW1vdmVkIFFTaWduYWxTcHkg ZnJvbSBpdAorICAgICAgICBhcyBsb2FkRmluaXNoZWQgYWx3YXlzIGhhcHBlbnMsIGFuZCB0aGUg b3JpZ2luYWwgdGVzdCB3YXMgc3BsaXQgaW50byB0d28uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFt ZS5jcHA6CisgICAgICAgICh0c3RfUVdlYkZyYW1lOjpzZXRIdG1sV2l0aEltYWdlUmVzb3VyY2Up OgorICAgICAgICAodHN0X1FXZWJGcmFtZTo6c2V0SHRtbFdpdGhTdHlsZXNoZWV0UmVzb3VyY2Up OgorICAgICAgICAodHN0X1FXZWJGcmFtZTo6c2V0SHRtbFdpdGhCYXNlVVJMKToKKwogMjAxMS0w NC0wMiAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQmVuamFtaW4gUG91bGFpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVz dHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x d2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKaW5kZXggMjIwZTE0Yy4uYzM2ODBjYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAK QEAgLTYxOSw3ICs2MTksOCBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgamF2YVNjcmlwdFdp bmRvd09iamVjdENsZWFyZWQoKTsKICAgICB2b2lkIGphdmFTY3JpcHRXaW5kb3dPYmplY3RDbGVh cmVkT25FdmFsdWF0ZSgpOwogICAgIHZvaWQgc2V0SHRtbCgpOwotICAgIHZvaWQgc2V0SHRtbFdp dGhSZXNvdXJjZSgpOworICAgIHZvaWQgc2V0SHRtbFdpdGhJbWFnZVJlc291cmNlKCk7CisgICAg dm9pZCBzZXRIdG1sV2l0aFN0eWxlc2hlZXRSZXNvdXJjZSgpOwogICAgIHZvaWQgc2V0SHRtbFdp dGhCYXNlVVJMKCk7CiAgICAgdm9pZCBzZXRIdG1sV2l0aEpTQWxlcnQoKTsKICAgICB2b2lkIGlw djZIb3N0RW5jb2RpbmcoKTsKQEAgLTI0ODgsMjYgKzI0ODksMzcgQEAgdm9pZCB0c3RfUVdlYkZy YW1lOjpzZXRIdG1sKCkKICAgICBRQ09NUEFSRShzcHkuY291bnQoKSwgMSk7CiB9CiAKLXZvaWQg dHN0X1FXZWJGcmFtZTo6c2V0SHRtbFdpdGhSZXNvdXJjZSgpCit2b2lkIHRzdF9RV2ViRnJhbWU6 OnNldEh0bWxXaXRoSW1hZ2VSZXNvdXJjZSgpCiB7Ci0gICAgUVN0cmluZyBodG1sKCI8aHRtbD48 Ym9keT48cD5oZWxsbyB3b3JsZDwvcD48aW1nIHNyYz0ncXJjOi9pbWFnZS5wbmcnLz48L2JvZHk+ PC9odG1sPiIpOworICAgIC8vIEJ5IGRlZmF1bHQsIG9ubHkgc2VjdXJpdHkgb3JpZ2lucyBvZiBs b2NhbCBmaWxlcyBjYW4gbG9hZCBsb2NhbCByZXNvdXJjZXMuCisgICAgLy8gU28gd2Ugc2hvdWxk IHNwZWNpZnkgYmFzZVVybCB0byBiZSBhIGxvY2FsIGZpbGUgaW4gb3JkZXIgdG8gZ2V0IGEgcHJv cGVyIG9yaWdpbiBhbmQgbG9hZCB0aGUgbG9jYWwgaW1hZ2UuCiAKKyAgICBRTGF0aW4xU3RyaW5n IGh0bWwoIjxodG1sPjxib2R5PjxwPmhlbGxvIHdvcmxkPC9wPjxpbWcgc3JjPSdxcmM6L2ltYWdl LnBuZycvPjwvYm9keT48L2h0bWw+Iik7CiAgICAgUVdlYlBhZ2UgcGFnZTsKICAgICBRV2ViRnJh bWUqIGZyYW1lID0gcGFnZS5tYWluRnJhbWUoKTsKIAotICAgIC8vIGluIGZldyBzZWNvbmRzLCB0 aGUgaW1hZ2Ugc2hvdWxkIGJlIGNvbXBsZXRleSBsb2FkZWQKLSAgICBRU2lnbmFsU3B5IHNweSgm cGFnZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOwotICAgIGZyYW1lLT5zZXRIdG1sKGh0 bWwpOworICAgIGZyYW1lLT5zZXRIdG1sKGh0bWwsIFFVcmwoUUxhdGluMVN0cmluZygiZmlsZTov Ly9wYXRoL3RvL2ZpbGUiKSkpOwogICAgIHdhaXRGb3JTaWduYWwoZnJhbWUsIFNJR05BTChsb2Fk RmluaXNoZWQoYm9vbCkpLCAyMDApOwotICAgIFFDT01QQVJFKHNweS5jb3VudCgpLCAxKTsKIAog ICAgIFFDT01QQVJFKGZyYW1lLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmltYWdlcy5s ZW5ndGgiKS50b0ludCgpLCAxKTsKLSAgICBRRVhQRUNUX0ZBSUwoIiIsICJodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMyMzUiLCBDb250aW51ZSk7CiAgICAgUUNPTVBB UkUoZnJhbWUtPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuaW1hZ2VzWzBdLndpZHRoIiku dG9JbnQoKSwgMTI4KTsKLSAgICBRRVhQRUNUX0ZBSUwoIiIsICJodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMyMzUiLCBDb250aW51ZSk7CiAgICAgUUNPTVBBUkUoZnJh bWUtPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuaW1hZ2VzWzBdLmhlaWdodCIpLnRvSW50 KCksIDEyOCk7CiAKLSAgICBRU3RyaW5nIGh0bWwyID0KKyAgICAvLyBOb3cgd2UgdGVzdCB0aGUg b3Bwb3NpdGU6IHdpdGhvdXQgYSBiYXNlVXJsIGFzIGEgbG9jYWwgZmlsZSwgd2UgY2Fubm90IHJl cXVlc3QgbG9jYWwgcmVzb3VyY2VzLgorCisgICAgZnJhbWUtPnNldEh0bWwoaHRtbCk7CisgICAg d2FpdEZvclNpZ25hbChmcmFtZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSksIDIwMCk7Cisg ICAgUUNPTVBBUkUoZnJhbWUtPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuaW1hZ2VzLmxl bmd0aCIpLnRvSW50KCksIDEpOworICAgIFFDT01QQVJFKGZyYW1lLT5ldmFsdWF0ZUphdmFTY3Jp cHQoImRvY3VtZW50LmltYWdlc1swXS53aWR0aCIpLnRvSW50KCksIDApOworICAgIFFDT01QQVJF KGZyYW1lLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmltYWdlc1swXS5oZWlnaHQiKS50 b0ludCgpLCAwKTsKK30KKwordm9pZCB0c3RfUVdlYkZyYW1lOjpzZXRIdG1sV2l0aFN0eWxlc2hl ZXRSZXNvdXJjZSgpCit7CisgICAgLy8gQnkgZGVmYXVsdCwgb25seSBzZWN1cml0eSBvcmlnaW5z IG9mIGxvY2FsIGZpbGVzIGNhbiBsb2FkIGxvY2FsIHJlc291cmNlcy4KKyAgICAvLyBTbyB3ZSBz aG91bGQgc3BlY2lmeSBiYXNlVXJsIHRvIGJlIGEgbG9jYWwgZmlsZSBpbiBvcmRlciB0byBiZSBh YmxlIHRvIGRvd25sb2FkIHRoZSBsb2NhbCBzdHlsZXNoZWV0LgorCisgICAgY29uc3QgY2hhciog aHRtbERhdGEgPQogICAgICAgICAiPGh0bWw+IgogICAgICAgICAgICAgIjxoZWFkPiIKICAgICAg ICAgICAgICAgICAiPGxpbmsgcmVsPSdzdHlsZXNoZWV0JyBocmVmPSdxcmM6L3N0eWxlLmNzcycg dHlwZT0ndGV4dC9jc3MnIC8+IgpAQCAtMjUxNiwxOSArMjUyOCwyOSBAQCB2b2lkIHRzdF9RV2Vi RnJhbWU6OnNldEh0bWxXaXRoUmVzb3VyY2UoKQogICAgICAgICAgICAgICAgICI8cCBpZD0naWRQ Jz5zb21lIHRleHQ8L3A+IgogICAgICAgICAgICAgIjwvYm9keT4iCiAgICAgICAgICI8L2h0bWw+ IjsKKyAgICBRTGF0aW4xU3RyaW5nIGh0bWwoaHRtbERhdGEpOworICAgIFFXZWJQYWdlIHBhZ2U7 CisgICAgUVdlYkZyYW1lKiBmcmFtZSA9IHBhZ2UubWFpbkZyYW1lKCk7CisgICAgUVdlYkVsZW1l bnQgd2ViRWxlbWVudDsKIAotICAgIC8vIGluIGZldyBzZWNvbmRzLCB0aGUgQ1NTIHNob3VsZCBi ZSBjb21wbGV0ZXkgbG9hZGVkCi0gICAgZnJhbWUtPnNldEh0bWwoaHRtbDIpOworICAgIGZyYW1l LT5zZXRIdG1sKGh0bWwsIFFVcmwoUUxhdGluMVN0cmluZygicXJjOi8vL2ZpbGUiKSkpOwogICAg IHdhaXRGb3JTaWduYWwoZnJhbWUsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpLCAyMDApOwot ICAgIFFDT01QQVJFKHNweS5zaXplKCksIDIpOworICAgIHdlYkVsZW1lbnQgPSBmcmFtZS0+ZG9j dW1lbnRFbGVtZW50KCkuZmluZEZpcnN0KCJwIik7CisgICAgUUNPTVBBUkUod2ViRWxlbWVudC5z dHlsZVByb3BlcnR5KCJjb2xvciIsIFFXZWJFbGVtZW50OjpDYXNjYWRlZFN0eWxlKSwgUUxhdGlu MVN0cmluZygicmVkIikpOworCisgICAgLy8gTm93IHdlIHRlc3QgdGhlIG9wcG9zaXRlOiB3aXRo b3V0IGEgYmFzZVVybCBhcyBhIGxvY2FsIGZpbGUsIHdlIGNhbm5vdCByZXF1ZXN0IGxvY2FsIHJl c291cmNlcy4KIAotICAgIFFXZWJFbGVtZW50IHAgPSBmcmFtZS0+ZG9jdW1lbnRFbGVtZW50KCku ZmluZEFsbCgicCIpLmF0KDApOwotICAgIFFFWFBFQ1RfRkFJTCgiIiwgImh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzIzNSIsIENvbnRpbnVlKTsKLSAgICBRQ09NUEFS RShwLnN0eWxlUHJvcGVydHkoImNvbG9yIiwgUVdlYkVsZW1lbnQ6OkNhc2NhZGVkU3R5bGUpLCBR TGF0aW4xU3RyaW5nKCJyZWQiKSk7CisgICAgZnJhbWUtPnNldEh0bWwoaHRtbCwgUVVybChRTGF0 aW4xU3RyaW5nKCJodHRwOi8vd3d3LmV4YW1wbGUuY29tLyIpKSk7CisgICAgd2FpdEZvclNpZ25h bChmcmFtZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSksIDIwMCk7CisgICAgd2ViRWxlbWVu dCA9IGZyYW1lLT5kb2N1bWVudEVsZW1lbnQoKS5maW5kRmlyc3QoInAiKTsKKyAgICBRQ09NUEFS RSh3ZWJFbGVtZW50LnN0eWxlUHJvcGVydHkoImNvbG9yIiwgUVdlYkVsZW1lbnQ6OkNhc2NhZGVk U3R5bGUpLCBRU3RyaW5nKCkpOwogfQogCiB2b2lkIHRzdF9RV2ViRnJhbWU6OnNldEh0bWxXaXRo QmFzZVVSTCgpCiB7CisgICAgLy8gVGhpcyB0ZXN0cyBpZiBiYXNlVXJsIGlzIGluZGVlZCBhZmZl Y3RpbmcgdGhlIHJlbGF0aXZlIHBhdGhzIGZyb20gcmVzb3VyY2VzLgorICAgIC8vIEFzIHdlIGFy ZSB1c2luZyBhIGxvY2FsIGZpbGUgYXMgYmFzZVVybCwgaXRzIHNlY3VyaXR5IG9yaWdpbiBzaG91 bGQgYmUgYWJsZSB0byBsb2FkIGxvY2FsIHJlc291cmNlcy4KKwogICAgIGlmICghUURpcihURVNU U19TT1VSQ0VfRElSKS5leGlzdHMoKSkKICAgICAgICAgUVNLSVAoUVN0cmluZygiVGhpcyB0ZXN0 IHJlcXVpcmVzIGFjY2VzcyB0byByZXNvdXJjZXMgZm91bmQgaW4gJyUxJyIpLmFyZyhURVNUU19T T1VSQ0VfRElSKS50b0xhdGluMSgpLmNvbnN0RGF0YSgpLCBTa2lwQWxsKTsKIAo=