66016 2011-08-10 15:25:53 -0700 [Qt] Add test for correct order of load signals in QWebPage 2011-09-05 09:41:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cmarcelo cmarcelo ademar benjamin oldest_to_newest 449427 0 cmarcelo 2011-08-10 15:25:53 -0700 [Qt] Add test for correct order of loadProgress() and loadFinished() signals 449431 1 103541 cmarcelo 2011-08-10 15:27:10 -0700 Created attachment 103541 Patch 449437 2 103541 luiz 2011-08-10 15:31:51 -0700 Comment on attachment 103541 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103541&action=review > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:3178 > + QSignalSpy(&page, SIGNAL(loadFinished(bool))); Is it needed? 449441 3 103543 cmarcelo 2011-08-10 15:41:16 -0700 Created attachment 103543 Patch 449863 4 103543 benjamin 2011-08-11 10:21:13 -0700 Comment on attachment 103543 Patch For the sake of code coverage, could you ensure loadStarted() is also send before loadProgress()? +page.mainFrame()->load(QUrl("data:text/html,This is first page")); This is a special case. I would like another load() with a local URL. 449987 5 103661 cmarcelo 2011-08-11 13:25:29 -0700 Created attachment 103661 Patch 450007 6 103661 benjamin 2011-08-11 13:45:07 -0700 Comment on attachment 103661 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103661&action=review Great patch. > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:3151 > + SpyForLoadSignalsOrder(QWebPage* page) > + : QStateMachine(page) This is setting the parent of the QStateMachine to page. I think they should be two separate things: SpyForLoadSignalsOrder(QWebPage* page, QObject* parent= 0); This is because I am not a fan of: SpyForLoadSignalsOrder loadSpy(&page); (parenting something on the stack by a QObject on the stack) > Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:3195 > + if (loadSpy.isRunning()) > + QVERIFY(waitForSignal(&loadSpy, SIGNAL(finished()))); May I suggest to add QVERIFY(loadSpy.isComplete()); after the if() {} ? The isComplete() would just return !isRunning(); This is totally superfluous, your test is already correct. But I think that would make it easier for people to read the test. If someone read the test without knowing anything about how SpyForLoadSignalsOrder works, she will think: the QVERIFY is in a branch, it is probably wrong because loadSpy could have finished before the if(). 450435 7 cmarcelo 2011-08-12 08:16:14 -0700 Committed r92963: <http://trac.webkit.org/changeset/92963> 462174 8 ademar 2011-09-05 09:41:40 -0700 Revision r92963 cherry-picked into qtwebkit-2.2 with commit 85204c9 <http://gitorious.org/webkit/qtwebkit/commit/85204c9> 103541 2011-08-10 15:27:10 -0700 2011-08-10 15:41:10 -0700 Patch bug-66016-20110810192708.patch text/plain 3354 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogOTI3NjkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggMTM4ZTNmODRmOWU2 ZDgzNmJiNmZjZjJhNzY1YTg3YzYwYzEyMmU5MS4uODJmZTdiYjc3OGRjZGY2NDdkZDk4YjhmZjdk YWFmNGJmMGE2Yjc0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0wOC0x MCAgQ2FpbyBNYXJjZWxvIGRlIE9saXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2ZWlyYUBvcGVuYm9z c2Eub3JnPgorCisgICAgICAgIFtRdF0gQWRkIHRlc3QgZm9yIGNvcnJlY3Qgb3JkZXIgb2YgbG9h ZFByb2dyZXNzKCkgYW5kIGxvYWRGaW5pc2hlZCgpIHNpZ25hbHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MDE2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGFuIEFQSSB0ZXN0IHRvIGVuc3VyZSB0 aGUgbG9hZFByb2dyZXNzKDEwMCkgc2lnbmFsIGFycml2ZXMgYmVmb3JlIHRoZQorICAgICAgICBs b2FkRmluaXNoZWQuIFRoaXMgcmlnaHQgbm93IGlzIGJyb2tlbiwgdGhlIGJ1ZworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg4NTEgdHJhY2tzIG9uZSBw b3NzaWJsZSB3YXkgdG8gZml4LgorCisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJw YWdlLmNwcDoKKyAgICAgICAgKFNweUZvckxvYWRGaW5pc2hlZEFuZExvYWRQcm9ncmVzczo6U3B5 Rm9yTG9hZEZpbmlzaGVkQW5kTG9hZFByb2dyZXNzKToKKyAgICAgICAgKFNweUZvckxvYWRGaW5p c2hlZEFuZExvYWRQcm9ncmVzczo6cmVjZWl2ZWRTaWduYWxzSW5PcmRlcik6CisgICAgICAgIChT cHlGb3JMb2FkRmluaXNoZWRBbmRMb2FkUHJvZ3Jlc3M6Om9uTG9hZFByb2dyZXNzKToKKyAgICAg ICAgKFNweUZvckxvYWRGaW5pc2hlZEFuZExvYWRQcm9ncmVzczo6b25Mb2FkRmluaXNoZWQpOgor ICAgICAgICAodHN0X1FXZWJQYWdlOjpsb2FkRmluaXNoZWRBZnRlckxhc3RMb2FkUHJvZ3Jlc3Mp OgorCiAyMDExLTA4LTA5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByOTI2ODMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXggZTFmODVj ODI0YjZhYTA3YTk5ZDViNjdkOGZhZTcxYjdiNDdkY2YwOC4uZDFmZDRhMWMzNWY4YTc4MWM1Nzcw YTZjMGYwZmQxNGUyMGY4YmEyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x d2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdl YnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcApAQCAtMTU5LDYgKzE1OSw3IEBAIHByaXZhdGUgc2xvdHM6 CiAgICAgdm9pZCBuYXZpZ2F0b3JDb29raWVFbmFibGVkKCk7CiAgICAgdm9pZCBkZWxldGVRV2Vi Vmlld1R3aWNlKCk7CiAgICAgdm9pZCByZW5kZXJPblJlcGFpbnRSZXF1ZXN0ZWRTaG91bGROb3RS ZWN1cnNlKCk7CisgICAgdm9pZCBsb2FkRmluaXNoZWRBZnRlckxhc3RMb2FkUHJvZ3Jlc3MoKTsK IAogI2lmZGVmIFFfT1NfTUFDCiAgICAgdm9pZCBtYWNDb3B5VW5pY29kZVRvQ2xpcGJvYXJkKCk7 CkBAIC0zMTQxLDUgKzMxNDIsNDYgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OnJlbmRlck9uUmVwYWlu dFJlcXVlc3RlZFNob3VsZE5vdFJlY3Vyc2UoKQogICAgIFFWRVJJRlkoOjp3YWl0Rm9yU2lnbmFs KCZyLCBTSUdOQUwoZmluaXNoZWQoKSkpKTsKIH0KIAorY2xhc3MgU3B5Rm9yTG9hZEZpbmlzaGVk QW5kTG9hZFByb2dyZXNzIDogcHVibGljIFFPYmplY3QgeworICAgIFFfT0JKRUNUCitwdWJsaWM6 CisgICAgU3B5Rm9yTG9hZEZpbmlzaGVkQW5kTG9hZFByb2dyZXNzKFFXZWJQYWdlKiBwYWdlKQor ICAgICAgICA6IFFPYmplY3QocGFnZSkKKyAgICAgICAgLCBtX3JlY2VpdmVkTGFzdExvYWRQcm9n cmVzcyhmYWxzZSkKKyAgICAgICAgLCBtX3JlY2VpdmVkSW5Db3JyZWN0T3JkZXIoZmFsc2UpCisg ICAgeworICAgICAgICBjb25uZWN0KHBhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpLCBT TE9UKG9uTG9hZEZpbmlzaGVkKGJvb2wpKSk7CisgICAgICAgIGNvbm5lY3QocGFnZSwgU0lHTkFM KGxvYWRQcm9ncmVzcyhpbnQpKSwgU0xPVChvbkxvYWRQcm9ncmVzcyhpbnQpKSk7CisgICAgfQor ICAgIGJvb2wgcmVjZWl2ZWRTaWduYWxzSW5PcmRlcigpIGNvbnN0CisgICAgeworICAgICAgICBy ZXR1cm4gbV9yZWNlaXZlZEluQ29ycmVjdE9yZGVyOworICAgIH0KK3ByaXZhdGUgUV9TTE9UUzoK KyAgICB2b2lkIG9uTG9hZFByb2dyZXNzKGludCBwcm9ncmVzcykKKyAgICB7CisgICAgICAgIGlm IChwcm9ncmVzcyA9PSAxMDApCisgICAgICAgICAgICBtX3JlY2VpdmVkTGFzdExvYWRQcm9ncmVz cyA9IHRydWU7CisgICAgfQorICAgIHZvaWQgb25Mb2FkRmluaXNoZWQoYm9vbCkKKyAgICB7Cisg ICAgICAgIG1fcmVjZWl2ZWRJbkNvcnJlY3RPcmRlciA9IG1fcmVjZWl2ZWRMYXN0TG9hZFByb2dy ZXNzOworICAgIH0KK3ByaXZhdGU6CisgICAgYm9vbCBtX3JlY2VpdmVkTGFzdExvYWRQcm9ncmVz czsKKyAgICBib29sIG1fcmVjZWl2ZWRJbkNvcnJlY3RPcmRlcjsKK307CisKK3ZvaWQgdHN0X1FX ZWJQYWdlOjpsb2FkRmluaXNoZWRBZnRlckxhc3RMb2FkUHJvZ3Jlc3MoKQoreworICAgIFFXZWJQ YWdlIHBhZ2U7CisgICAgUVNpZ25hbFNweSgmcGFnZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29s KSkpOworICAgIFNweUZvckxvYWRGaW5pc2hlZEFuZExvYWRQcm9ncmVzcyBvcmRlclNweSgmcGFn ZSk7CisgICAgcGFnZS5tYWluRnJhbWUoKS0+bG9hZChRVXJsKCJkYXRhOnRleHQvaHRtbCxUaGlz IGlzIGZpcnN0IHBhZ2UiKSk7CisgICAgUVZFUklGWSg6OndhaXRGb3JTaWduYWwoJnBhZ2UsIFNJ R05BTChsb2FkRmluaXNoZWQoYm9vbCkpKSk7CisgICAgUUVYUEVDVF9GQUlMKCIiLCAiaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4ODUxIiwgQ29udGludWUpOworICAg IFFWRVJJRlkob3JkZXJTcHkucmVjZWl2ZWRTaWduYWxzSW5PcmRlcigpKTsKK30KKwogUVRFU1Rf TUFJTih0c3RfUVdlYlBhZ2UpCiAjaW5jbHVkZSAidHN0X3F3ZWJwYWdlLm1vYyIK 103543 2011-08-10 15:41:16 -0700 2011-08-11 13:25:22 -0700 Patch bug-66016-20110810194114.patch text/plain 3302 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogOTI3NjkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggMTM4ZTNmODRmOWU2 ZDgzNmJiNmZjZjJhNzY1YTg3YzYwYzEyMmU5MS4uODJmZTdiYjc3OGRjZGY2NDdkZDk4YjhmZjdk YWFmNGJmMGE2Yjc0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0wOC0x MCAgQ2FpbyBNYXJjZWxvIGRlIE9saXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2ZWlyYUBvcGVuYm9z c2Eub3JnPgorCisgICAgICAgIFtRdF0gQWRkIHRlc3QgZm9yIGNvcnJlY3Qgb3JkZXIgb2YgbG9h ZFByb2dyZXNzKCkgYW5kIGxvYWRGaW5pc2hlZCgpIHNpZ25hbHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MDE2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGFuIEFQSSB0ZXN0IHRvIGVuc3VyZSB0 aGUgbG9hZFByb2dyZXNzKDEwMCkgc2lnbmFsIGFycml2ZXMgYmVmb3JlIHRoZQorICAgICAgICBs b2FkRmluaXNoZWQuIFRoaXMgcmlnaHQgbm93IGlzIGJyb2tlbiwgdGhlIGJ1ZworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg4NTEgdHJhY2tzIG9uZSBw b3NzaWJsZSB3YXkgdG8gZml4LgorCisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJw YWdlLmNwcDoKKyAgICAgICAgKFNweUZvckxvYWRGaW5pc2hlZEFuZExvYWRQcm9ncmVzczo6U3B5 Rm9yTG9hZEZpbmlzaGVkQW5kTG9hZFByb2dyZXNzKToKKyAgICAgICAgKFNweUZvckxvYWRGaW5p c2hlZEFuZExvYWRQcm9ncmVzczo6cmVjZWl2ZWRTaWduYWxzSW5PcmRlcik6CisgICAgICAgIChT cHlGb3JMb2FkRmluaXNoZWRBbmRMb2FkUHJvZ3Jlc3M6Om9uTG9hZFByb2dyZXNzKToKKyAgICAg ICAgKFNweUZvckxvYWRGaW5pc2hlZEFuZExvYWRQcm9ncmVzczo6b25Mb2FkRmluaXNoZWQpOgor ICAgICAgICAodHN0X1FXZWJQYWdlOjpsb2FkRmluaXNoZWRBZnRlckxhc3RMb2FkUHJvZ3Jlc3Mp OgorCiAyMDExLTA4LTA5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByOTI2ODMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXggZTFmODVj ODI0YjZhYTA3YTk5ZDViNjdkOGZhZTcxYjdiNDdkY2YwOC4uYjNkYTNmZjQzYzFlMTExY2NmYmEw NjY2ZDhiMjA4NjllNjZhNDZlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x d2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdl YnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcApAQCAtMTU5LDYgKzE1OSw3IEBAIHByaXZhdGUgc2xvdHM6 CiAgICAgdm9pZCBuYXZpZ2F0b3JDb29raWVFbmFibGVkKCk7CiAgICAgdm9pZCBkZWxldGVRV2Vi Vmlld1R3aWNlKCk7CiAgICAgdm9pZCByZW5kZXJPblJlcGFpbnRSZXF1ZXN0ZWRTaG91bGROb3RS ZWN1cnNlKCk7CisgICAgdm9pZCBsb2FkRmluaXNoZWRBZnRlckxhc3RMb2FkUHJvZ3Jlc3MoKTsK IAogI2lmZGVmIFFfT1NfTUFDCiAgICAgdm9pZCBtYWNDb3B5VW5pY29kZVRvQ2xpcGJvYXJkKCk7 CkBAIC0zMTQxLDUgKzMxNDIsNDUgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OnJlbmRlck9uUmVwYWlu dFJlcXVlc3RlZFNob3VsZE5vdFJlY3Vyc2UoKQogICAgIFFWRVJJRlkoOjp3YWl0Rm9yU2lnbmFs KCZyLCBTSUdOQUwoZmluaXNoZWQoKSkpKTsKIH0KIAorY2xhc3MgU3B5Rm9yTG9hZEZpbmlzaGVk QW5kTG9hZFByb2dyZXNzIDogcHVibGljIFFPYmplY3QgeworICAgIFFfT0JKRUNUCitwdWJsaWM6 CisgICAgU3B5Rm9yTG9hZEZpbmlzaGVkQW5kTG9hZFByb2dyZXNzKFFXZWJQYWdlKiBwYWdlKQor ICAgICAgICA6IFFPYmplY3QocGFnZSkKKyAgICAgICAgLCBtX3JlY2VpdmVkTGFzdExvYWRQcm9n cmVzcyhmYWxzZSkKKyAgICAgICAgLCBtX3JlY2VpdmVkSW5Db3JyZWN0T3JkZXIoZmFsc2UpCisg ICAgeworICAgICAgICBjb25uZWN0KHBhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpLCBT TE9UKG9uTG9hZEZpbmlzaGVkKGJvb2wpKSk7CisgICAgICAgIGNvbm5lY3QocGFnZSwgU0lHTkFM KGxvYWRQcm9ncmVzcyhpbnQpKSwgU0xPVChvbkxvYWRQcm9ncmVzcyhpbnQpKSk7CisgICAgfQor ICAgIGJvb2wgcmVjZWl2ZWRTaWduYWxzSW5PcmRlcigpIGNvbnN0CisgICAgeworICAgICAgICBy ZXR1cm4gbV9yZWNlaXZlZEluQ29ycmVjdE9yZGVyOworICAgIH0KK3ByaXZhdGUgUV9TTE9UUzoK KyAgICB2b2lkIG9uTG9hZFByb2dyZXNzKGludCBwcm9ncmVzcykKKyAgICB7CisgICAgICAgIGlm IChwcm9ncmVzcyA9PSAxMDApCisgICAgICAgICAgICBtX3JlY2VpdmVkTGFzdExvYWRQcm9ncmVz cyA9IHRydWU7CisgICAgfQorICAgIHZvaWQgb25Mb2FkRmluaXNoZWQoYm9vbCkKKyAgICB7Cisg ICAgICAgIG1fcmVjZWl2ZWRJbkNvcnJlY3RPcmRlciA9IG1fcmVjZWl2ZWRMYXN0TG9hZFByb2dy ZXNzOworICAgIH0KK3ByaXZhdGU6CisgICAgYm9vbCBtX3JlY2VpdmVkTGFzdExvYWRQcm9ncmVz czsKKyAgICBib29sIG1fcmVjZWl2ZWRJbkNvcnJlY3RPcmRlcjsKK307CisKK3ZvaWQgdHN0X1FX ZWJQYWdlOjpsb2FkRmluaXNoZWRBZnRlckxhc3RMb2FkUHJvZ3Jlc3MoKQoreworICAgIFFXZWJQ YWdlIHBhZ2U7CisgICAgU3B5Rm9yTG9hZEZpbmlzaGVkQW5kTG9hZFByb2dyZXNzIG9yZGVyU3B5 KCZwYWdlKTsKKyAgICBwYWdlLm1haW5GcmFtZSgpLT5sb2FkKFFVcmwoImRhdGE6dGV4dC9odG1s LFRoaXMgaXMgZmlyc3QgcGFnZSIpKTsKKyAgICBRVkVSSUZZKDo6d2FpdEZvclNpZ25hbCgmcGFn ZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpKTsKKyAgICBRRVhQRUNUX0ZBSUwoIiIsICJo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg4NTEiLCBDb250aW51ZSk7 CisgICAgUVZFUklGWShvcmRlclNweS5yZWNlaXZlZFNpZ25hbHNJbk9yZGVyKCkpOworfQorCiBR VEVTVF9NQUlOKHRzdF9RV2ViUGFnZSkKICNpbmNsdWRlICJ0c3RfcXdlYnBhZ2UubW9jIgo= 103661 2011-08-11 13:25:29 -0700 2011-08-11 13:45:07 -0700 Patch bug-66016-20110811172527.patch text/plain 3911 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogOTI4NzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggMTM4ZTNmODRmOWU2 ZDgzNmJiNmZjZjJhNzY1YTg3YzYwYzEyMmU5MS4uMmI0ZDJmOTYzNDIxNzM0NWYwYjMzYzFmZDRk YjhkODA0NGQ0ODY3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMS0wOC0x MSAgQ2FpbyBNYXJjZWxvIGRlIE9saXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2ZWlyYUBvcGVuYm9z c2Eub3JnPgorCisgICAgICAgIFtRdF0gQWRkIHRlc3QgZm9yIGNvcnJlY3Qgb3JkZXIgb2YgbG9h ZCBzaWduYWxzIGluIFFXZWJQYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NjAxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBBUEkgdGVzdCB0byBlbnN1cmUgdGhlIG9yZGVyIG9mIGxvYWQgc2ln bmFsczogbG9hZFN0YXJ0ZWQoKSBuZWVkcyB0byBiZSBlbWl0dGVkCisgICAgICAgIGZpcnN0LCB0 aGVuIGxvYWRQcm9ncmVzcygxMDApLCBmb2xsb3dlZCBieSBsb2FkRmluaXNoZWQoKS4KKworICAg ICAgICBUaGUgdGVzdCBpcyBza2lwcGVkIHNpbmNlIHRoaXMgcmlnaHQgbm93IGlzIGJyb2tlbiwg dGhlIGJ1ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjg4NTEgdHJhY2tzIG9uZSBwb3NzaWJsZSB3YXkgdG8gZml4LgorCisgICAgICAgICogdGVzdHMv cXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFNweUZvckxvYWRTaWduYWxzT3Jk ZXI6OlNweUZvckxvYWRTaWduYWxzT3JkZXIpOgorICAgICAgICAoU3B5Rm9yTG9hZFNpZ25hbHNP cmRlcjo6b25Mb2FkUHJvZ3Jlc3MpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpsb2FkU2lnbmFs c09yZGVyX2RhdGEpOgorICAgICAgICAodHN0X1FXZWJQYWdlOjpsb2FkU2lnbmFsc09yZGVyKToK KwogMjAxMS0wOC0wOSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjkyNjgzLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwIGIvU291cmNl L1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCmluZGV4IGUxZjg1Yzgy NGI2YWEwN2E5OWQ1YjY3ZDhmYWU3MWI3YjQ3ZGNmMDguLjZhNDZiNThiMzA2NDliOGJjM2NkZTJm NzJkZDVhNTZkNDMxZDVhOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdl YnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJw YWdlL3RzdF9xd2VicGFnZS5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlIDxRTWFpbldp bmRvdz4KICNpbmNsdWRlIDxRTWVudT4KICNpbmNsdWRlIDxRUHVzaEJ1dHRvbj4KKyNpbmNsdWRl IDxRU3RhdGVNYWNoaW5lPgogI2luY2x1ZGUgPFFTdHlsZT4KICNpbmNsdWRlIDxRdFRlc3QvUXRU ZXN0PgogI2luY2x1ZGUgPFFUZXh0Q2hhckZvcm1hdD4KQEAgLTE1OSw2ICsxNjAsOCBAQCBwcml2 YXRlIHNsb3RzOgogICAgIHZvaWQgbmF2aWdhdG9yQ29va2llRW5hYmxlZCgpOwogICAgIHZvaWQg ZGVsZXRlUVdlYlZpZXdUd2ljZSgpOwogICAgIHZvaWQgcmVuZGVyT25SZXBhaW50UmVxdWVzdGVk U2hvdWxkTm90UmVjdXJzZSgpOworICAgIHZvaWQgbG9hZFNpZ25hbHNPcmRlcl9kYXRhKCk7Cisg ICAgdm9pZCBsb2FkU2lnbmFsc09yZGVyKCk7CiAKICNpZmRlZiBRX09TX01BQwogICAgIHZvaWQg bWFjQ29weVVuaWNvZGVUb0NsaXBib2FyZCgpOwpAQCAtMzE0MSw1ICszMTQ0LDU2IEBAIHZvaWQg dHN0X1FXZWJQYWdlOjpyZW5kZXJPblJlcGFpbnRSZXF1ZXN0ZWRTaG91bGROb3RSZWN1cnNlKCkK ICAgICBRVkVSSUZZKDo6d2FpdEZvclNpZ25hbCgmciwgU0lHTkFMKGZpbmlzaGVkKCkpKSk7CiB9 CiAKK2NsYXNzIFNweUZvckxvYWRTaWduYWxzT3JkZXIgOiBwdWJsaWMgUVN0YXRlTWFjaGluZSB7 CisgICAgUV9PQkpFQ1QKK3B1YmxpYzoKKyAgICBTcHlGb3JMb2FkU2lnbmFsc09yZGVyKFFXZWJQ YWdlKiBwYWdlKQorICAgICAgICA6IFFTdGF0ZU1hY2hpbmUocGFnZSkKKyAgICB7CisgICAgICAg IGNvbm5lY3QocGFnZSwgU0lHTkFMKGxvYWRQcm9ncmVzcyhpbnQpKSwgU0xPVChvbkxvYWRQcm9n cmVzcyhpbnQpKSk7CisKKyAgICAgICAgUVN0YXRlKiB3YWl0aW5nRm9yTG9hZFN0YXJ0ZWQgPSBu ZXcgUVN0YXRlKHRoaXMpOworICAgICAgICBRU3RhdGUqIHdhaXRpbmdGb3JMYXN0TG9hZFByb2dy ZXNzID0gbmV3IFFTdGF0ZSh0aGlzKTsKKyAgICAgICAgUVN0YXRlKiB3YWl0aW5nRm9yTG9hZEZp bmlzaGVkID0gbmV3IFFTdGF0ZSh0aGlzKTsKKyAgICAgICAgUUZpbmFsU3RhdGUqIGZpbmFsID0g bmV3IFFGaW5hbFN0YXRlKHRoaXMpOworCisgICAgICAgIHdhaXRpbmdGb3JMb2FkU3RhcnRlZC0+ YWRkVHJhbnNpdGlvbihwYWdlLCBTSUdOQUwobG9hZFN0YXJ0ZWQoKSksIHdhaXRpbmdGb3JMYXN0 TG9hZFByb2dyZXNzKTsKKyAgICAgICAgd2FpdGluZ0Zvckxhc3RMb2FkUHJvZ3Jlc3MtPmFkZFRy YW5zaXRpb24odGhpcywgU0lHTkFMKGxhc3RMb2FkUHJvZ3Jlc3MoKSksIHdhaXRpbmdGb3JMb2Fk RmluaXNoZWQpOworICAgICAgICB3YWl0aW5nRm9yTG9hZEZpbmlzaGVkLT5hZGRUcmFuc2l0aW9u KHBhZ2UsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpLCBmaW5hbCk7CisKKyAgICAgICAgc2V0 SW5pdGlhbFN0YXRlKHdhaXRpbmdGb3JMb2FkU3RhcnRlZCk7CisgICAgICAgIHN0YXJ0KCk7Cisg ICAgfQorcHVibGljIFFfU0xPVFM6CisgICAgdm9pZCBvbkxvYWRQcm9ncmVzcyhpbnQgcHJvZ3Jl c3MpCisgICAgeworICAgICAgICBpZiAocHJvZ3Jlc3MgPT0gMTAwKQorICAgICAgICAgICAgZW1p dCBsYXN0TG9hZFByb2dyZXNzKCk7CisgICAgfQorc2lnbmFsczoKKyAgICB2b2lkIGxhc3RMb2Fk UHJvZ3Jlc3MoKTsKK307CisKK3ZvaWQgdHN0X1FXZWJQYWdlOjpsb2FkU2lnbmFsc09yZGVyX2Rh dGEoKQoreworICAgIFFUZXN0OjphZGRDb2x1bW48UVVybD4oInVybCIpOworICAgIFFUZXN0Ojpu ZXdSb3coImlubGluZSBkYXRhIikgPDwgUVVybCgiZGF0YTp0ZXh0L2h0bWwsVGhpcyBpcyBmaXJz dCBwYWdlIik7CisgICAgUVRlc3Q6Om5ld1Jvdygic2ltcGxlIHBhZ2UiKSA8PCBRVXJsKCJxcmM6 Ly8vcmVzb3VyY2VzL2NvbnRlbnQuaHRtbCIpOworICAgIFFUZXN0OjpuZXdSb3coImZyYW1lc2V0 IHBhZ2UiKSA8PCBRVXJsKCJxcmM6Ly8vcmVzb3VyY2VzL2luZGV4Lmh0bWwiKTsKK30KKwordm9p ZCB0c3RfUVdlYlBhZ2U6OmxvYWRTaWduYWxzT3JkZXIoKQoreworICAgIFFTS0lQKCJodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg4NTEiLCBTa2lwQWxsKTsKKworICAg IFFGRVRDSChRVXJsLCB1cmwpOworICAgIFFXZWJQYWdlIHBhZ2U7CisgICAgU3B5Rm9yTG9hZFNp Z25hbHNPcmRlciBsb2FkU3B5KCZwYWdlKTsKKyAgICB3YWl0Rm9yU2lnbmFsKCZsb2FkU3B5LCBT SUdOQUwoc3RhcnRlZCgpKSk7CisgICAgcGFnZS5tYWluRnJhbWUoKS0+bG9hZCh1cmwpOworICAg IGlmIChsb2FkU3B5LmlzUnVubmluZygpKQorICAgICAgICBRVkVSSUZZKHdhaXRGb3JTaWduYWwo JmxvYWRTcHksIFNJR05BTChmaW5pc2hlZCgpKSkpOworfQorCiBRVEVTVF9NQUlOKHRzdF9RV2Vi UGFnZSkKICNpbmNsdWRlICJ0c3RfcXdlYnBhZ2UubW9jIgo=