33617 2010-01-13 12:24:45 -0800 [Qt] DRT missing setUserStyleSheetLocation and setUserStyleSheetEnabled in LayoutTestController 2010-01-14 11:50:53 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P2 Normal --- 33614 1 diegohcg webkit-unassigned commit-queue eric hausmann jwieczorek kenneth tonikitoo webkit.review.bot oldest_to_newest 180336 0 diegohcg 2010-01-13 12:24:45 -0800 The setUserStyleSheetLocation and setUserStyleSheetEnabled are missing in LayoutTestController, which fails the http/tests/security/local-user-CSS-from-remote.html LayoutTest 180356 1 46492 diegohcg 2010-01-13 12:48:51 -0800 Created attachment 46492 Proposed patch 180360 2 webkit.review.bot 2010-01-13 12:51:36 -0800 Attachment 46492 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp:174: Should have a space between // and comment [whitespace/comments] [4] Total errors found: 1 180386 3 jwieczorek 2010-01-13 13:48:57 -0800 Let me add my 3 cents... > --- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp > +++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp > @@ -171,6 +171,7 @@ void WebPage::resetSettings() > m_drt->layoutTestController()->setXSSAuditorEnabled(false); > > QWebSettings::setMaximumPagesInCache(0); // reset to default > + settings()->setUserStyleSheetUrl(QUrl("")); //reset to default The default constructor (QUrl()) would be fine as well. > --- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp > +++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp > @@ -391,3 +391,22 @@ void LayoutTestController::overridePreference(const QString& name, const QVarian > else if (name == "WebKitUsesPageCachePreferenceKey") > QWebSettings::setMaximumPagesInCache(value.toInt()); > } > + > +static QUrl userStyleSheetLocation = QUrl(""); I would make it a member variable instead. > +void LayoutTestController::setUserStyleSheetLocation(const QString& url) > +{ > + if (!url.isEmpty()) Is this check even needed? > +void LayoutTestController::setUserStyleSheetEnabled(bool enabled) > +{ > + QWebSettings* settings = m_topLoadingFrame->page()->settings(); > + if (settings) { I doubt settings can be null here. > + if (enabled) > + settings->setUserStyleSheetUrl(userStyleSheetLocation); > + else > + settings->setUserStyleSheetUrl(QUrl("")); Same as above, I would use the default constructor. 180397 4 diegohcg 2010-01-13 14:03:11 -0800 (In reply to comment #3) > Let me add my 3 cents... > > > --- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp > > +++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp > > @@ -171,6 +171,7 @@ void WebPage::resetSettings() > > m_drt->layoutTestController()->setXSSAuditorEnabled(false); > > > > QWebSettings::setMaximumPagesInCache(0); // reset to default > > + settings()->setUserStyleSheetUrl(QUrl("")); //reset to default > > The default constructor (QUrl()) would be fine as well. > > > --- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp > > +++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp > > @@ -391,3 +391,22 @@ void LayoutTestController::overridePreference(const QString& name, const QVarian > > else if (name == "WebKitUsesPageCachePreferenceKey") > > QWebSettings::setMaximumPagesInCache(value.toInt()); > > } > > + > > +static QUrl userStyleSheetLocation = QUrl(""); > > I would make it a member variable instead. > > > +void LayoutTestController::setUserStyleSheetLocation(const QString& url) > > +{ > > + if (!url.isEmpty()) > > Is this check even needed? > > > +void LayoutTestController::setUserStyleSheetEnabled(bool enabled) > > +{ > > + QWebSettings* settings = m_topLoadingFrame->page()->settings(); > > + if (settings) { > > I doubt settings can be null here. > > > + if (enabled) > > + settings->setUserStyleSheetUrl(userStyleSheetLocation); > > + else > > + settings->setUserStyleSheetUrl(QUrl("")); > > Same as above, I would use the default constructor. Good suggestions! Thanks a lot. Reviewing now 180406 5 46507 diegohcg 2010-01-13 14:23:25 -0800 Created attachment 46507 Proposed patch v0.2 Correct style and add Jakub suggestions 180524 6 tonikitoo 2010-01-13 19:50:24 -0800 LGTM ! simon, kenneth , could one of you guys please review ? thx (In reply to comment #5) > Created an attachment (id=46507) [details] > Proposed patch v0.2 > > Correct style and add Jakub suggestions 180570 7 46507 kenneth 2010-01-13 23:38:01 -0800 Comment on attachment 46507 Proposed patch v0.2 LGTM, r=me > + if (enabled) > + m_drt->webPage()->settings()->setUserStyleSheetUrl(m_userStyleSheetLocation); > + else > + m_drt->webPage()->settings()->setUserStyleSheetUrl(QUrl()); Do you know what happens if I give an invalid url to setUserStyleSheetUrl? Is that handled? 180607 8 46507 commit-queue 2010-01-14 01:47:32 -0800 Comment on attachment 46507 Proposed patch v0.2 Clearing flags on attachment: 46507 Committed r53249: <http://trac.webkit.org/changeset/53249> 180608 9 commit-queue 2010-01-14 01:47:38 -0800 All reviewed patches have been landed. Closing bug. 180643 10 eric 2010-01-14 02:43:19 -0800 This looks like this caused one test to regress: http://build.webkit.org/results/Qt%20Linux%20Release/r53249%20(5974)/http/tests/security/local-user-CSS-from-remote-pretty-diff.html I'm going to look at rolling this out unless someone is around to comment. 180644 11 eric 2010-01-14 02:46:17 -0800 In case the buildbot results are purged by the time someone looks at this, here is the failing diff: --- layout-test-results/http/tests/security/local-user-CSS-from-remote-expected.txt 2010-01-14 01:54:07.000000000 -0800 +++ layout-test-results/http/tests/security/local-user-CSS-from-remote-actual.txt 2010-01-14 01:54:07.000000000 -0800 @@ -2,4 +2,4 @@ To run this test manually you must set your user style sheet in your Safari preferences to LayoutTests/http/tests/security/resources/cssStyle.css If the background is yellow then the user stylesheet was loaded. -Test Passed: Local user stylesheet loaded. +Test Failed: Local user stylesheet not loaded into remote document. 180645 12 kenneth 2010-01-14 02:46:54 -0800 I guess Diego will first be around in 2 hours or so. He is in the Manaus, Brazil time zone. 180646 13 eric 2010-01-14 02:48:21 -0800 Reverted r53249 for reason: This caused http/tests/security/local-user-CSS-from-remote.html to fail on the Qt Release Build Bot. Committed r53253: <http://trac.webkit.org/changeset/53253> 180648 14 tonikitoo 2010-01-14 02:58:38 -0800 guys that test regressed because bug 33614 (see dependency field) has to land first ! kenneth , could look over that one and we re-try this ? (In reply to comment #13) > Reverted r53249 for reason: > > This caused http/tests/security/local-user-CSS-from-remote.html to fail on the > Qt Release Build Bot. > > Committed r53253: <http://trac.webkit.org/changeset/53253> 180650 15 tonikitoo 2010-01-14 02:59:20 -0800 (In reply to comment #7) > (From update of attachment 46507 [details]) > LGTM, r=me > > > + if (enabled) > > + m_drt->webPage()->settings()->setUserStyleSheetUrl(m_userStyleSheetLocation); > > + else > > + m_drt->webPage()->settings()->setUserStyleSheetUrl(QUrl()); > > Do you know what happens if I give an invalid url to setUserStyleSheetUrl? Is > that handled? in this case, it is like unsetting the userStyleSheet 180654 16 eric 2010-01-14 03:03:11 -0800 Yup. It's just better to roll-out first and ask questions later. That way we keep the bots green more of the time. In this case that's extra important because we have over a days worth of commits pent up in the commit-queue because it was blocked all day due to bug 33638. This will be easy to roll back in once we can do so without breaking the bots. Just go ahead and set r+/cq+ on the patch once it's ready to land again :) 180827 17 tonikitoo 2010-01-14 11:49:09 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/platform/qt/Skipped M WebKitTools/ChangeLog M WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp M WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp M WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h Committed r53281 180829 18 eric 2010-01-14 11:50:53 -0800 It's unclear what changed between checkins and why this new one isn't going to cause failures. :) The bots will tell. :) 46492 2010-01-13 12:48:51 -0800 2010-01-13 14:23:25 -0800 Proposed patch userStyleSheet.diff text/plain 4215 diegohcg ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiNTBjN2U4Li44ODRhMzljIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDEt MTMgIERpZWdvIEdvbnphbGV6ICA8ZGllZ28uZ29uemFsZXpAb3BlbmJvc3NhLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIERSVCBtaXNz aW5nIHNldFVzZXJTdHlsZVNoZWV0TG9jYXRpb24gYW5kIHNldFVzZXJTdHlsZVNoZWV0RW5hYmxl ZCBpbiBMYXlvdXRUZXN0Q29udHJvbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MzM2MTcKKworICAgICAgICAqIHBsYXRmb3JtL3F0L1NraXBwZWQ6 CisKIDIwMTAtMDEtMTMgIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgVW5yZXZpZXdlZC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1Nr aXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDVjZDA0NTMuLjRi MWE3YzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApAQCAtMjA0LDkgKzIwNCw2IEBAIGh0dHAv dGVzdHMvc2VjdXJpdHkvaXNvbGF0ZWRXb3JsZAogaHR0cC90ZXN0cy9zZWN1cml0eS9taXhlZENv bnRlbnQKIGh0dHAvdGVzdHMvY2FjaGUvc3VicmVzb3VyY2UtZmFpbG92ZXItdG8tbmV0d29yay5o dG1sCiAKLSMgTWlzc2luZyBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRVc2VyU3R5bGVTaGVldExv Y2F0aW9uKCkgYW5kIGxheW91dFRlc3RDb250cm9sbGVyLnNldFVzZXJTdHlsZVNoZWV0RW5hYmxl ZCgpCi1odHRwL3Rlc3RzL3NlY3VyaXR5L2xvY2FsLXVzZXItQ1NTLWZyb20tcmVtb3RlLmh0bWwK LQogIyBNaXNzaW5nIGxheW91dFRlc3RDb250cm9sbGVyLmV2YWx1YXRlSW5XZWJJbnNwZWN0b3Io KQogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMwOTYKIGluc3Bl Y3Rvci9jb29raWUtcmVzb3VyY2UtbWF0Y2guaHRtbApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv Q2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDg1MzEzYTMuLjQ2OTcwNzMg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wMS0xMyAgRGllZ28gR29uemFsZXogIDxkaWVn by5nb256YWxlekBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtRdF0gRFJUIG1pc3Npbmcgc2V0VXNlclN0eWxlU2hlZXRMb2Nh dGlvbiBhbmQgc2V0VXNlclN0eWxlU2hlZXRFbmFibGVkIGluIExheW91dFRlc3RDb250cm9sbGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzYxNwor CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpXZWJQYWdlOjpyZXNldFNldHRpbmdzKToKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcDoKKyAgICAgICAgKExheW91dFRl c3RDb250cm9sbGVyOjpzZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uKToKKyAgICAgICAgKExheW91 dFRlc3RDb250cm9sbGVyOjpzZXRVc2VyU3R5bGVTaGVldEVuYWJsZWQpOgorICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuaDoKKwogMjAxMC0wMS0xMyAg Sm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVt cFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVu ZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcAppbmRleCA2MzY3ZmUzLi5iYjA3MGU4IDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0 LmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0 LmNwcApAQCAtMTcxLDYgKzE3MSw3IEBAIHZvaWQgV2ViUGFnZTo6cmVzZXRTZXR0aW5ncygpCiAg ICAgbV9kcnQtPmxheW91dFRlc3RDb250cm9sbGVyKCktPnNldFhTU0F1ZGl0b3JFbmFibGVkKGZh bHNlKTsKIAogICAgIFFXZWJTZXR0aW5nczo6c2V0TWF4aW11bVBhZ2VzSW5DYWNoZSgwKTsgLy8g cmVzZXQgdG8gZGVmYXVsdAorICAgIHNldHRpbmdzKCktPnNldFVzZXJTdHlsZVNoZWV0VXJsKFFV cmwoIiIpKTsgLy9yZXNldCB0byBkZWZhdWx0CiB9CiAKIFFXZWJQYWdlICpXZWJQYWdlOjpjcmVh dGVXaW5kb3coUVdlYlBhZ2U6OldlYldpbmRvd1R5cGUpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcCBiL1dlYktpdFRv b2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCmluZGV4IGUw MTdlZTcuLjA5MjM1N2EgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0 L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCkBAIC0zOTEsMyArMzkxLDIyIEBAIHZv aWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6Om92ZXJyaWRlUHJlZmVyZW5jZShjb25zdCBRU3RyaW5n JiBuYW1lLCBjb25zdCBRVmFyaWFuCiAgICAgZWxzZSBpZiAobmFtZSA9PSAiV2ViS2l0VXNlc1Bh Z2VDYWNoZVByZWZlcmVuY2VLZXkiKQogICAgICAgICBRV2ViU2V0dGluZ3M6OnNldE1heGltdW1Q YWdlc0luQ2FjaGUodmFsdWUudG9JbnQoKSk7CiB9CisKK3N0YXRpYyBRVXJsIHVzZXJTdHlsZVNo ZWV0TG9jYXRpb24gPSBRVXJsKCIiKTsKKwordm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0 VXNlclN0eWxlU2hlZXRMb2NhdGlvbihjb25zdCBRU3RyaW5nJiB1cmwpCit7CisgICAgaWYgKCF1 cmwuaXNFbXB0eSgpKQorICAgICAgICB1c2VyU3R5bGVTaGVldExvY2F0aW9uID0gUVVybCh1cmwp OworfQorCit2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRVc2VyU3R5bGVTaGVldEVuYWJs ZWQoYm9vbCBlbmFibGVkKQoreworICAgIFFXZWJTZXR0aW5ncyogc2V0dGluZ3MgPSBtX3RvcExv YWRpbmdGcmFtZS0+cGFnZSgpLT5zZXR0aW5ncygpOworICAgIGlmIChzZXR0aW5ncykgeworICAg ICAgICBpZiAoZW5hYmxlZCkKKyAgICAgICAgICAgIHNldHRpbmdzLT5zZXRVc2VyU3R5bGVTaGVl dFVybCh1c2VyU3R5bGVTaGVldExvY2F0aW9uKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg c2V0dGluZ3MtPnNldFVzZXJTdHlsZVNoZWV0VXJsKFFVcmwoIiIpKTsKKyAgICB9Cit9CmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxl clF0LmggYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxl clF0LmgKaW5kZXggNDQ1MWI3YS4uOTQ1YjRkMyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVt cFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5oCisrKyBiL1dlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuaApAQCAtMTMzLDYgKzEz Myw4IEBAIHB1YmxpYyBzbG90czoKIAogICAgIHZvaWQgd2FpdEZvclBvbGljeURlbGVnYXRlKCk7 CiAgICAgdm9pZCBvdmVycmlkZVByZWZlcmVuY2UoY29uc3QgUVN0cmluZyYgbmFtZSwgY29uc3Qg UVZhcmlhbnQmIHZhbHVlKTsKKyAgICB2b2lkIHNldFVzZXJTdHlsZVNoZWV0TG9jYXRpb24oY29u c3QgUVN0cmluZyYgdXJsKTsKKyAgICB2b2lkIHNldFVzZXJTdHlsZVNoZWV0RW5hYmxlZChib29s IGVuYWJsZWQpOwogCiBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgcHJvY2Vzc1dvcmsoKTsK 46507 2010-01-13 14:23:25 -0800 2010-01-14 01:47:32 -0800 Proposed patch v0.2 userStyleSheet.diff text/plain 4292 diegohcg ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiNTBjN2U4Li44ODRhMzljIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDEt MTMgIERpZWdvIEdvbnphbGV6ICA8ZGllZ28uZ29uemFsZXpAb3BlbmJvc3NhLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIERSVCBtaXNz aW5nIHNldFVzZXJTdHlsZVNoZWV0TG9jYXRpb24gYW5kIHNldFVzZXJTdHlsZVNoZWV0RW5hYmxl ZCBpbiBMYXlvdXRUZXN0Q29udHJvbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MzM2MTcKKworICAgICAgICAqIHBsYXRmb3JtL3F0L1NraXBwZWQ6 CisKIDIwMTAtMDEtMTMgIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgVW5yZXZpZXdlZC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1Nr aXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDVjZDA0NTMuLjRi MWE3YzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApAQCAtMjA0LDkgKzIwNCw2IEBAIGh0dHAv dGVzdHMvc2VjdXJpdHkvaXNvbGF0ZWRXb3JsZAogaHR0cC90ZXN0cy9zZWN1cml0eS9taXhlZENv bnRlbnQKIGh0dHAvdGVzdHMvY2FjaGUvc3VicmVzb3VyY2UtZmFpbG92ZXItdG8tbmV0d29yay5o dG1sCiAKLSMgTWlzc2luZyBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRVc2VyU3R5bGVTaGVldExv Y2F0aW9uKCkgYW5kIGxheW91dFRlc3RDb250cm9sbGVyLnNldFVzZXJTdHlsZVNoZWV0RW5hYmxl ZCgpCi1odHRwL3Rlc3RzL3NlY3VyaXR5L2xvY2FsLXVzZXItQ1NTLWZyb20tcmVtb3RlLmh0bWwK LQogIyBNaXNzaW5nIGxheW91dFRlc3RDb250cm9sbGVyLmV2YWx1YXRlSW5XZWJJbnNwZWN0b3Io KQogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzMwOTYKIGluc3Bl Y3Rvci9jb29raWUtcmVzb3VyY2UtbWF0Y2guaHRtbApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv Q2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDg1MzEzYTMuLjQ2OTcwNzMg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wMS0xMyAgRGllZ28gR29uemFsZXogIDxkaWVn by5nb256YWxlekBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtRdF0gRFJUIG1pc3Npbmcgc2V0VXNlclN0eWxlU2hlZXRMb2Nh dGlvbiBhbmQgc2V0VXNlclN0eWxlU2hlZXRFbmFibGVkIGluIExheW91dFRlc3RDb250cm9sbGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzYxNwor CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpXZWJQYWdlOjpyZXNldFNldHRpbmdzKToKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcDoKKyAgICAgICAgKExheW91dFRl c3RDb250cm9sbGVyOjpzZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uKToKKyAgICAgICAgKExheW91 dFRlc3RDb250cm9sbGVyOjpzZXRVc2VyU3R5bGVTaGVldEVuYWJsZWQpOgorICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuaDoKKwogMjAxMC0wMS0xMyAg Sm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVt cFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVu ZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcAppbmRleCA2MzY3ZmUzLi41MjkzOWU0IDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0 LmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0 LmNwcApAQCAtMTcxLDYgKzE3MSw3IEBAIHZvaWQgV2ViUGFnZTo6cmVzZXRTZXR0aW5ncygpCiAg ICAgbV9kcnQtPmxheW91dFRlc3RDb250cm9sbGVyKCktPnNldFhTU0F1ZGl0b3JFbmFibGVkKGZh bHNlKTsKIAogICAgIFFXZWJTZXR0aW5nczo6c2V0TWF4aW11bVBhZ2VzSW5DYWNoZSgwKTsgLy8g cmVzZXQgdG8gZGVmYXVsdAorICAgIHNldHRpbmdzKCktPnNldFVzZXJTdHlsZVNoZWV0VXJsKFFV cmwoKSk7IC8vIHJlc2V0IHRvIGRlZmF1bHQKIH0KIAogUVdlYlBhZ2UgKldlYlBhZ2U6OmNyZWF0 ZVdpbmRvdyhRV2ViUGFnZTo6V2ViV2luZG93VHlwZSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwIGIvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAKaW5kZXggZTAx N2VlNy4uYzJlMDk3YiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQv TGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAKQEAgLTM5MSwzICszOTEsMTYgQEAgdm9p ZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6b3ZlcnJpZGVQcmVmZXJlbmNlKGNvbnN0IFFTdHJpbmcm IG5hbWUsIGNvbnN0IFFWYXJpYW4KICAgICBlbHNlIGlmIChuYW1lID09ICJXZWJLaXRVc2VzUGFn ZUNhY2hlUHJlZmVyZW5jZUtleSIpCiAgICAgICAgIFFXZWJTZXR0aW5nczo6c2V0TWF4aW11bVBh Z2VzSW5DYWNoZSh2YWx1ZS50b0ludCgpKTsKIH0KKwordm9pZCBMYXlvdXRUZXN0Q29udHJvbGxl cjo6c2V0VXNlclN0eWxlU2hlZXRMb2NhdGlvbihjb25zdCBRU3RyaW5nJiB1cmwpCit7CisgICAg bV91c2VyU3R5bGVTaGVldExvY2F0aW9uID0gUVVybCh1cmwpOworfQorCit2b2lkIExheW91dFRl c3RDb250cm9sbGVyOjpzZXRVc2VyU3R5bGVTaGVldEVuYWJsZWQoYm9vbCBlbmFibGVkKQorewor ICAgIGlmIChlbmFibGVkKQorICAgICAgICBtX2RydC0+d2ViUGFnZSgpLT5zZXR0aW5ncygpLT5z ZXRVc2VyU3R5bGVTaGVldFVybChtX3VzZXJTdHlsZVNoZWV0TG9jYXRpb24pOworICAgIGVsc2UK KyAgICAgICAgbV9kcnQtPndlYlBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0VXNlclN0eWxlU2hlZXRV cmwoUVVybCgpKTsKK30KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0 L0xheW91dFRlc3RDb250cm9sbGVyUXQuaCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0 L0xheW91dFRlc3RDb250cm9sbGVyUXQuaAppbmRleCA0NDUxYjdhLi5jZmY4NDc0IDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0 LmgKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xs ZXJRdC5oCkBAIC0xMzMsNiArMTMzLDggQEAgcHVibGljIHNsb3RzOgogCiAgICAgdm9pZCB3YWl0 Rm9yUG9saWN5RGVsZWdhdGUoKTsKICAgICB2b2lkIG92ZXJyaWRlUHJlZmVyZW5jZShjb25zdCBR U3RyaW5nJiBuYW1lLCBjb25zdCBRVmFyaWFudCYgdmFsdWUpOworICAgIHZvaWQgc2V0VXNlclN0 eWxlU2hlZXRMb2NhdGlvbihjb25zdCBRU3RyaW5nJiB1cmwpOworICAgIHZvaWQgc2V0VXNlclN0 eWxlU2hlZXRFbmFibGVkKGJvb2wgZW5hYmxlZCk7CiAKIHByaXZhdGUgc2xvdHM6CiAgICAgdm9p ZCBwcm9jZXNzV29yaygpOwpAQCAtMTUxLDYgKzE1Myw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBt X2hhbmRsZUVycm9yUGFnZXM7CiAgICAgYm9vbCBtX2xvYWRGaW5pc2hlZDsKIAorICAgIFFVcmwg bV91c2VyU3R5bGVTaGVldExvY2F0aW9uOwogICAgIFFCYXNpY1RpbWVyIG1fdGltZW91dFRpbWVy OwogICAgIFFXZWJGcmFtZSogbV90b3BMb2FkaW5nRnJhbWU7CiAgICAgV2ViQ29yZTo6RHVtcFJl bmRlclRyZWUqIG1fZHJ0Owo=