72704 2011-11-18 01:48:08 -0800 [Qt] Use QEvent for dispatchFunctionsFromMainThread() 2011-11-24 05:28:14 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt P2 Normal --- 1 paroga paroga hausmann ossy webkit.review.bot oldest_to_newest 505605 0 paroga 2011-11-18 01:48:08 -0800 [Qt] Use QEvent for dispatchFunctionsFromMainThread() 505610 1 115767 paroga 2011-11-18 01:59:07 -0800 Created attachment 115767 Patch 505728 2 115795 paroga 2011-11-18 06:19:35 -0800 Created attachment 115795 Patch 506754 3 115795 hausmann 2011-11-21 00:19:57 -0800 Comment on attachment 115795 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115795&action=review r=me. QMetaObject::invokeMethod is implemented using posted events behind the scenes and this patch removes the unnecessary layer of indirection (which does things like setting the current QObject::sender, which we don't need). It would be nice if you could fix the nitpicks before landing :) > Source/JavaScriptCore/wtf/qt/MainThreadQt.cpp:36 > +#include <QtCore/QEvent> In general we don't need #include <ModuelName/ClassName> includes and we should just use #include <classname> or #include <header.h>. The only place where we _need_ to use this pattern is in header files used for the public API in Qt (ask me on IRC if you're curious :) > Source/JavaScriptCore/wtf/qt/MainThreadQt.cpp:52 > + s_mainThreadInvokerEventType = QEvent::registerEventType(); Nitpick: Technically it's QCoreEvent::registerEventType ;) > Source/JavaScriptCore/wtf/qt/MainThreadQt.cpp:58 > + if (e->type() == s_mainThreadInvokerEventType) > + dispatchFunctionsFromMainThread(); Nitpick: Missing {} with "return" in the body? (no need to call QObject::event for _our_ event type) 508456 4 116441 paroga 2011-11-23 15:21:06 -0800 Created attachment 116441 Patch 508678 5 115795 paroga 2011-11-24 01:59:57 -0800 Comment on attachment 115795 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115795&action=review >> Source/JavaScriptCore/wtf/qt/MainThreadQt.cpp:36 >> +#include <QtCore/QEvent> > > In general we don't need #include <ModuelName/ClassName> includes and we should just use #include <classname> or #include <header.h>. > The only place where we _need_ to use this pattern is in header files used for the public API in Qt (ask me on IRC if you're curious :) Copy&Paste ;-) >> Source/JavaScriptCore/wtf/qt/MainThreadQt.cpp:52 >> + s_mainThreadInvokerEventType = QEvent::registerEventType(); > > Nitpick: Technically it's QCoreEvent::registerEventType ;) I don't think so! ;-) It's defined in qcoreevent.h, but the class is still QEvent! 508696 6 116441 webkit.review.bot 2011-11-24 03:37:46 -0800 Comment on attachment 116441 Patch Clearing flags on attachment: 116441 Committed r101131: <http://trac.webkit.org/changeset/101131> 508697 7 webkit.review.bot 2011-11-24 03:37:50 -0800 All reviewed patches have been landed. Closing bug. 508703 8 ossy 2011-11-24 04:12:38 -0800 It broke _all_ http/tests/appcache test with "FAIL: Timed out waiting for notifyDone to be called" timeout. Could you check it please as soon as possible? (Now all of our tester bot is broken because of this regression.) 508728 9 hausmann 2011-11-24 05:28:14 -0800 Fix landed in http://trac.webkit.org/changeset/101134 115767 2011-11-18 01:59:07 -0800 2011-11-18 06:19:27 -0800 Patch bug-72704-20111118105908.patch text/plain 2532 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 NDIyMGY5MThmOTUyMTcyNWEwNDg3NWY3MGE3ZDk4ZDM2MmEwMDEzLi5jMWUxNjU4M2UxZmQ2NGRm NmIzMTYxMmQ0ZTI0ZjAzMjBjN2FhN2ViIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMS0xMS0xOCAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0 Lm9yZz4KKworICAgICAgICBbUXRdIFVzZSBRRXZlbnQgZm9yIGRpc3BhdGNoRnVuY3Rpb25zRnJv bU1haW5UaHJlYWQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzI3MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSZXBsYWNlIFFNZXRhT2JqZWN0OjppbnZva2VNZXRob2Qgd2l0aCBRQ29yZUFwcGxpY2F0 aW9uOjpwb3N0RXZlbnQuCisgICAgICAgIFRoaXMgaXMgdGhlIHNhbWUgYXMgd2hhdCBpbnZva2VN ZXRob2QgZG9lcyBpbnRlcm5hbGx5LCBidXQgcmVkdWNlcworICAgICAgICB0aGUgZGVwZW5kZW5j eSBvbiBzb21lIGludGVybmFsIFFUaHJlYWQgc3R1ZmYuCisKKyAgICAgICAgKiB3dGYvcXQvTWFp blRocmVhZFF0LmNwcDoKKyAgICAgICAgKFdURjo6TWFpblRocmVhZEludm9rZXI6Ok1haW5UaHJl YWRJbnZva2VyKToKKyAgICAgICAgKFdURjo6TWFpblRocmVhZEludm9rZXI6OmV2ZW50KToKKyAg ICAgICAgKFdURjo6c2NoZWR1bGVEaXNwYXRjaEZ1bmN0aW9uc09uTWFpblRocmVhZCk6CisKIDIw MTEtMTEtMTcgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAg W1F0XSBSRUdSRVNTSU9OKHIxMDA1MTApOiBFbmFibGUgOCBCaXQgU3RyaW5ncyBpbiBKYXZhU2Ny aXB0Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9xdC9NYWluVGhy ZWFkUXQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9xdC9NYWluVGhyZWFkUXQuY3Bw CmluZGV4IDk4YjZhMGM0ZDUwM2ZkZWMxMTczOWYwNDU2MDVjYjMzOTNlNDYyOTguLmIzODk0YWI2 YWExZDA5ODgyYTZkOTg5YzUwMzNhZTNlYzkyZDgzYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS93dGYvcXQvTWFpblRocmVhZFF0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvd3RmL3F0L01haW5UaHJlYWRRdC5jcHAKQEAgLTMzLDI3ICszMywzMCBAQAogCiAjaW5j bHVkZSA8UXRDb3JlL1FPYmplY3Q+CiAjaW5jbHVkZSA8UXRDb3JlL1FDb3JlQXBwbGljYXRpb24+ CisjaW5jbHVkZSA8UXRDb3JlL1FFdmVudD4KICNpbmNsdWRlIDxRVGhyZWFkPgogCiBuYW1lc3Bh Y2UgV1RGIHsKIAorc3RhdGljIGludCBzX21haW5UaHJlYWRJbnZva2VyRXZlbnRUeXBlOworCiBj bGFzcyBNYWluVGhyZWFkSW52b2tlciA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09CSkVDVAog cHVibGljOgogICAgIE1haW5UaHJlYWRJbnZva2VyKCk7Ci0KLXByaXZhdGUgUV9TTE9UUzoKLSAg ICB2b2lkIGRpc3BhdGNoKCk7CisgICAgdmlydHVhbCBib29sIGV2ZW50KFFFdmVudCopOwogfTsK IAogTWFpblRocmVhZEludm9rZXI6Ok1haW5UaHJlYWRJbnZva2VyKCkKIHsKLSAgICBtb3ZlVG9U aHJlYWQoUUNvcmVBcHBsaWNhdGlvbjo6aW5zdGFuY2UoKS0+dGhyZWFkKCkpOworICAgIHNfbWFp blRocmVhZEludm9rZXJFdmVudFR5cGUgPSBRRXZlbnQ6OnJlZ2lzdGVyRXZlbnRUeXBlKCk7CiB9 CiAKLXZvaWQgTWFpblRocmVhZEludm9rZXI6OmRpc3BhdGNoKCkKK2Jvb2wgTWFpblRocmVhZElu dm9rZXI6OmV2ZW50KFFFdmVudCogZSkKIHsKLSAgICBkaXNwYXRjaEZ1bmN0aW9uc0Zyb21NYWlu VGhyZWFkKCk7CisgICAgaWYgKGUtPnR5cGUoKSA9PSBzX21haW5UaHJlYWRJbnZva2VyRXZlbnRU eXBlKQorICAgICAgICBkaXNwYXRjaEZ1bmN0aW9uc0Zyb21NYWluVGhyZWFkKCk7CisgICAgcmV0 dXJuIFFPYmplY3Q6OmV2ZW50KGUpOwogfQogCiBRX0dMT0JBTF9TVEFUSUMoTWFpblRocmVhZElu dm9rZXIsIHdlYmtpdF9tYWluX3RocmVhZF9pbnZva2VyKQpAQCAtNjQsNyArNjcsNyBAQCB2b2lk IGluaXRpYWxpemVNYWluVGhyZWFkUGxhdGZvcm0oKQogCiB2b2lkIHNjaGVkdWxlRGlzcGF0Y2hG dW5jdGlvbnNPbk1haW5UaHJlYWQoKQogewotICAgIFFNZXRhT2JqZWN0OjppbnZva2VNZXRob2Qo d2Via2l0X21haW5fdGhyZWFkX2ludm9rZXIoKSwgImRpc3BhdGNoIiwgUXQ6OlF1ZXVlZENvbm5l Y3Rpb24pOworICAgIFFDb3JlQXBwbGljYXRpb246OnBvc3RFdmVudCh3ZWJraXRfbWFpbl90aHJl YWRfaW52b2tlciwgbmV3IFFFdmVudChzX21haW5UaHJlYWRJbnZva2VyRXZlbnRUeXBlKSk7CiB9 CiAKIGJvb2wgaXNNYWluVGhyZWFkKCkK 115795 2011-11-18 06:19:35 -0800 2011-11-24 01:59:57 -0800 Patch bug-72704-20111118151932.patch text/plain 2561 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 NDIyMGY5MThmOTUyMTcyNWEwNDg3NWY3MGE3ZDk4ZDM2MmEwMDEzLi5jMWUxNjU4M2UxZmQ2NGRm NmIzMTYxMmQ0ZTI0ZjAzMjBjN2FhN2ViIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMS0xMS0xOCAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0 Lm9yZz4KKworICAgICAgICBbUXRdIFVzZSBRRXZlbnQgZm9yIGRpc3BhdGNoRnVuY3Rpb25zRnJv bU1haW5UaHJlYWQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzI3MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSZXBsYWNlIFFNZXRhT2JqZWN0OjppbnZva2VNZXRob2Qgd2l0aCBRQ29yZUFwcGxpY2F0 aW9uOjpwb3N0RXZlbnQuCisgICAgICAgIFRoaXMgaXMgdGhlIHNhbWUgYXMgd2hhdCBpbnZva2VN ZXRob2QgZG9lcyBpbnRlcm5hbGx5LCBidXQgcmVkdWNlcworICAgICAgICB0aGUgZGVwZW5kZW5j eSBvbiBzb21lIGludGVybmFsIFFUaHJlYWQgc3R1ZmYuCisKKyAgICAgICAgKiB3dGYvcXQvTWFp blRocmVhZFF0LmNwcDoKKyAgICAgICAgKFdURjo6TWFpblRocmVhZEludm9rZXI6Ok1haW5UaHJl YWRJbnZva2VyKToKKyAgICAgICAgKFdURjo6TWFpblRocmVhZEludm9rZXI6OmV2ZW50KToKKyAg ICAgICAgKFdURjo6c2NoZWR1bGVEaXNwYXRjaEZ1bmN0aW9uc09uTWFpblRocmVhZCk6CisKIDIw MTEtMTEtMTcgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAg W1F0XSBSRUdSRVNTSU9OKHIxMDA1MTApOiBFbmFibGUgOCBCaXQgU3RyaW5ncyBpbiBKYXZhU2Ny aXB0Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9xdC9NYWluVGhy ZWFkUXQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9xdC9NYWluVGhyZWFkUXQuY3Bw CmluZGV4IDk4YjZhMGM0ZDUwM2ZkZWMxMTczOWYwNDU2MDVjYjMzOTNlNDYyOTguLjhhZGU4MTYz MWFkZWE5ZTZlMGMwYjRjOGEzYTE4MWY2YmQ4ZjYxZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS93dGYvcXQvTWFpblRocmVhZFF0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvd3RmL3F0L01haW5UaHJlYWRRdC5jcHAKQEAgLTMzLDI3ICszMywzMCBAQAogCiAjaW5j bHVkZSA8UXRDb3JlL1FPYmplY3Q+CiAjaW5jbHVkZSA8UXRDb3JlL1FDb3JlQXBwbGljYXRpb24+ CisjaW5jbHVkZSA8UXRDb3JlL1FFdmVudD4KICNpbmNsdWRlIDxRVGhyZWFkPgogCiBuYW1lc3Bh Y2UgV1RGIHsKIAorc3RhdGljIGludCBzX21haW5UaHJlYWRJbnZva2VyRXZlbnRUeXBlOworCiBj bGFzcyBNYWluVGhyZWFkSW52b2tlciA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09CSkVDVAog cHVibGljOgogICAgIE1haW5UaHJlYWRJbnZva2VyKCk7Ci0KLXByaXZhdGUgUV9TTE9UUzoKLSAg ICB2b2lkIGRpc3BhdGNoKCk7CisgICAgdmlydHVhbCBib29sIGV2ZW50KFFFdmVudCopOwogfTsK IAogTWFpblRocmVhZEludm9rZXI6Ok1haW5UaHJlYWRJbnZva2VyKCkKIHsKLSAgICBtb3ZlVG9U aHJlYWQoUUNvcmVBcHBsaWNhdGlvbjo6aW5zdGFuY2UoKS0+dGhyZWFkKCkpOworICAgIHNfbWFp blRocmVhZEludm9rZXJFdmVudFR5cGUgPSBRRXZlbnQ6OnJlZ2lzdGVyRXZlbnRUeXBlKCk7CiB9 CiAKLXZvaWQgTWFpblRocmVhZEludm9rZXI6OmRpc3BhdGNoKCkKK2Jvb2wgTWFpblRocmVhZElu dm9rZXI6OmV2ZW50KFFFdmVudCogZSkKIHsKLSAgICBkaXNwYXRjaEZ1bmN0aW9uc0Zyb21NYWlu VGhyZWFkKCk7CisgICAgaWYgKGUtPnR5cGUoKSA9PSBzX21haW5UaHJlYWRJbnZva2VyRXZlbnRU eXBlKQorICAgICAgICBkaXNwYXRjaEZ1bmN0aW9uc0Zyb21NYWluVGhyZWFkKCk7CisgICAgcmV0 dXJuIFFPYmplY3Q6OmV2ZW50KGUpOwogfQogCiBRX0dMT0JBTF9TVEFUSUMoTWFpblRocmVhZElu dm9rZXIsIHdlYmtpdF9tYWluX3RocmVhZF9pbnZva2VyKQpAQCAtNjQsNyArNjcsNyBAQCB2b2lk IGluaXRpYWxpemVNYWluVGhyZWFkUGxhdGZvcm0oKQogCiB2b2lkIHNjaGVkdWxlRGlzcGF0Y2hG dW5jdGlvbnNPbk1haW5UaHJlYWQoKQogewotICAgIFFNZXRhT2JqZWN0OjppbnZva2VNZXRob2Qo d2Via2l0X21haW5fdGhyZWFkX2ludm9rZXIoKSwgImRpc3BhdGNoIiwgUXQ6OlF1ZXVlZENvbm5l Y3Rpb24pOworICAgIFFDb3JlQXBwbGljYXRpb246OnBvc3RFdmVudCh3ZWJraXRfbWFpbl90aHJl YWRfaW52b2tlcigpLCBuZXcgUUV2ZW50KHN0YXRpY19jYXN0PFFFdmVudDo6VHlwZT4oc19tYWlu VGhyZWFkSW52b2tlckV2ZW50VHlwZSkpKTsKIH0KIAogYm9vbCBpc01haW5UaHJlYWQoKQo= 116441 2011-11-23 15:21:06 -0800 2011-11-24 03:37:46 -0800 Patch bug-72704-20111124002104.patch text/plain 2634 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw YjhmZTUwMDEwZWQ0MDEwNjZjZmIyOWE2NDkwYWM4MmI3ZjM4NWI1Li5iZjc1YjYzMmRhNWU5NDM0 MWY2N2VmYzNkMDY3NDZmYzlkYWY0MjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMS0xMS0yMyAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0 Lm9yZz4KKworICAgICAgICBbUXRdIFVzZSBRRXZlbnQgZm9yIGRpc3BhdGNoRnVuY3Rpb25zRnJv bU1haW5UaHJlYWQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzI3MDQKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KKworICAg ICAgICBSZXBsYWNlIFFNZXRhT2JqZWN0OjppbnZva2VNZXRob2Qgd2l0aCBRQ29yZUFwcGxpY2F0 aW9uOjpwb3N0RXZlbnQuCisgICAgICAgIFRoaXMgaXMgdGhlIHNhbWUgYXMgd2hhdCBpbnZva2VN ZXRob2QgZG9lcyBpbnRlcm5hbGx5LCBidXQgcmVkdWNlcworICAgICAgICB0aGUgZGVwZW5kZW5j eSBvbiBzb21lIGludGVybmFsIFFUaHJlYWQgc3R1ZmYuCisKKyAgICAgICAgKiB3dGYvcXQvTWFp blRocmVhZFF0LmNwcDoKKyAgICAgICAgKFdURjo6TWFpblRocmVhZEludm9rZXI6Ok1haW5UaHJl YWRJbnZva2VyKToKKyAgICAgICAgKFdURjo6TWFpblRocmVhZEludm9rZXI6OmV2ZW50KToKKyAg ICAgICAgKFdURjo6c2NoZWR1bGVEaXNwYXRjaEZ1bmN0aW9uc09uTWFpblRocmVhZCk6CisKIDIw MTEtMTEtMjMgIEdlb3JnZSBTdGFpa29zICA8c3RhaWtvc0B3ZWJraXQub3JnPgogCiAgICAgICAg IFJlbW92ZSBCbGFja0JlcnJ5IE9TIHN1cHBvcnQgZnJvbSBSYW5kb21OdW1iZXJTZWVkLCBtYWtp bmcgUU5YPVVOSVguCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL3F0L01h aW5UaHJlYWRRdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL3F0L01haW5UaHJlYWRR dC5jcHAKaW5kZXggOThiNmEwYzRkNTAzZmRlYzExNzM5ZjA0NTYwNWNiMzM5M2U0NjI5OC4uMDkw MjE1NDk2YmVlZTI1ZGJkNGFkOWU5OWUzMDRkNDUwODNmNTkyNCAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3d0Zi9xdC9NYWluVGhyZWFkUXQuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS93dGYvcXQvTWFpblRocmVhZFF0LmNwcApAQCAtMzEsMjkgKzMxLDM0IEBACiAj aW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiTWFpblRocmVhZC5oIgogCi0jaW5jbHVkZSA8 UXRDb3JlL1FPYmplY3Q+Ci0jaW5jbHVkZSA8UXRDb3JlL1FDb3JlQXBwbGljYXRpb24+CisjaW5j bHVkZSA8UUNvcmVBcHBsaWNhdGlvbj4KKyNpbmNsdWRlIDxRRXZlbnQ+CisjaW5jbHVkZSA8UU9i amVjdD4KICNpbmNsdWRlIDxRVGhyZWFkPgogCiBuYW1lc3BhY2UgV1RGIHsKIAorc3RhdGljIGlu dCBzX21haW5UaHJlYWRJbnZva2VyRXZlbnRUeXBlOworCiBjbGFzcyBNYWluVGhyZWFkSW52b2tl ciA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09CSkVDVAogcHVibGljOgogICAgIE1haW5UaHJl YWRJbnZva2VyKCk7Ci0KLXByaXZhdGUgUV9TTE9UUzoKLSAgICB2b2lkIGRpc3BhdGNoKCk7Cisg ICAgdmlydHVhbCBib29sIGV2ZW50KFFFdmVudCopOwogfTsKIAogTWFpblRocmVhZEludm9rZXI6 Ok1haW5UaHJlYWRJbnZva2VyKCkKIHsKLSAgICBtb3ZlVG9UaHJlYWQoUUNvcmVBcHBsaWNhdGlv bjo6aW5zdGFuY2UoKS0+dGhyZWFkKCkpOworICAgIHNfbWFpblRocmVhZEludm9rZXJFdmVudFR5 cGUgPSBRRXZlbnQ6OnJlZ2lzdGVyRXZlbnRUeXBlKCk7CiB9CiAKLXZvaWQgTWFpblRocmVhZElu dm9rZXI6OmRpc3BhdGNoKCkKK2Jvb2wgTWFpblRocmVhZEludm9rZXI6OmV2ZW50KFFFdmVudCog ZSkKIHsKKyAgICBpZiAoZS0+dHlwZSgpICE9IHNfbWFpblRocmVhZEludm9rZXJFdmVudFR5cGUp CisgICAgICAgIHJldHVybiBRT2JqZWN0OjpldmVudChlKTsKKwogICAgIGRpc3BhdGNoRnVuY3Rp b25zRnJvbU1haW5UaHJlYWQoKTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogUV9HTE9CQUxfU1RB VElDKE1haW5UaHJlYWRJbnZva2VyLCB3ZWJraXRfbWFpbl90aHJlYWRfaW52b2tlcikKQEAgLTY0 LDcgKzY5LDcgQEAgdm9pZCBpbml0aWFsaXplTWFpblRocmVhZFBsYXRmb3JtKCkKIAogdm9pZCBz Y2hlZHVsZURpc3BhdGNoRnVuY3Rpb25zT25NYWluVGhyZWFkKCkKIHsKLSAgICBRTWV0YU9iamVj dDo6aW52b2tlTWV0aG9kKHdlYmtpdF9tYWluX3RocmVhZF9pbnZva2VyKCksICJkaXNwYXRjaCIs IFF0OjpRdWV1ZWRDb25uZWN0aW9uKTsKKyAgICBRQ29yZUFwcGxpY2F0aW9uOjpwb3N0RXZlbnQo d2Via2l0X21haW5fdGhyZWFkX2ludm9rZXIoKSwgbmV3IFFFdmVudChzdGF0aWNfY2FzdDxRRXZl bnQ6OlR5cGU+KHNfbWFpblRocmVhZEludm9rZXJFdmVudFR5cGUpKSk7CiB9CiAKIGJvb2wgaXNN YWluVGhyZWFkKCkK