127218 2014-01-18 07:30:14 -0800 Replace a couple of uses of WTF::Function with std::function 2014-01-18 14:56:04 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca cmarcelo commit-queue jamesr luiz tonikitoo oldest_to_newest 969435 0 andersca 2014-01-18 07:30:14 -0800 Replace a couple of uses of WTF::Function with std::function 969436 1 221547 andersca 2014-01-18 07:35:09 -0800 Created attachment 221547 Patch 969437 2 commit-queue 2014-01-18 07:37:45 -0800 Attachment 221547 did not pass style-queue: ERROR: Source/WebKit2/WebProcess/WebPage/DrawingArea.h:112: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/page/scrolling/ScrollingThread.cpp:49: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/page/scrolling/ScrollingThread.cpp:61: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/page/scrolling/ScrollingThread.cpp:63: Missing space before { [whitespace/braces] [5] ERROR: Source/WebCore/page/scrolling/ScrollingThread.cpp:87: More than one command on the same line [whitespace/newline] [4] ERROR: Source/WebCore/page/scrolling/ScrollingThread.cpp:87: Missing space before { [whitespace/braces] [5] ERROR: Source/WebCore/page/scrolling/ScrollingThread.cpp:106: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp:80: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/Shared/ChildProcess.cpp:53: Missing space before { [whitespace/braces] [5] ERROR: Source/WebKit2/Platform/WorkQueue.h:60: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/Platform/WorkQueue.h:61: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/page/scrolling/ScrollingThread.h:49: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/page/scrolling/ScrollingThread.h:53: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/page/scrolling/ScrollingThread.h:81: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/Platform/mac/WorkQueueMac.cpp:29: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/Platform/mac/WorkQueueMac.cpp:38: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/Platform/mac/WorkQueueMac.cpp:41: Missing space before { [whitespace/braces] [5] ERROR: Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:87: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp:104: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp:107: Missing space before { [whitespace/braces] [5] Total errors found: 20 in 15 files If any of these errors are false positives, please file a bug against check-webkit-style. 969531 3 221547 kling 2014-01-18 14:51:02 -0800 Comment on attachment 221547 Patch r=me 969533 4 andersca 2014-01-18 14:56:04 -0800 Committed r162276: <http://trac.webkit.org/changeset/162276> 221547 2014-01-18 07:35:09 -0800 2014-01-18 14:51:02 -0800 Patch bug-127218-20140118073508.patch text/plain 18373 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMjM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDM3YTA4MDQ2NDcyOTVk MDA1NGU1MzlhMTE1MWQ5NDc3MWMzMGVkMC4uNWJhMWRlM2I0ZTk0NmI0MGYzMzI4NDIzNDI1ZGEw ZTBmZmQxNDNlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAxLTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwbGFjZSBhIGNv dXBsZSBvZiB1c2VzIG9mIFdURjo6RnVuY3Rpb24gd2l0aCBzdGQ6OmZ1bmN0aW9uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjcyMTgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmlu OgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RocmVhZC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTY3JvbGxpbmdUaHJlYWQ6OmRpc3BhdGNoKToKKyAgICAgICAgKFdlYkNvcmU6 OlNjcm9sbGluZ1RocmVhZDo6ZGlzcGF0Y2hCYXJyaWVyKToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGluZ1RocmVhZDo6c2hhcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RocmVh ZDo6Y3JlYXRlVGhyZWFkSWZOZWVkZWQpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVGhy ZWFkOjpkaXNwYXRjaEZ1bmN0aW9uc0Zyb21TY3JvbGxpbmdUaHJlYWQpOgorICAgICAgICAqIHBh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RocmVhZC5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L21hYy9TY3JvbGxpbmdUaHJlYWRNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdU aHJlYWQ6OmluaXRpYWxpemVSdW5Mb29wKToKKwogMjAxNC0wMS0xNyAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIGNhbGxPbk1haW5UaHJlYWRB bmRXYWl0IHZhcmlhbnQgaW4gU29ja2V0U3RyZWFtSGFuZGxlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODg3YzRh MDNmMzg5N2JlYjUxZDk4OTNlZjM4NGFhMzFiODVjZmVhYy4uMzFiMmU0ODMwNjZhZmJjMzQ1YjQ5 YTBjMWZlY2Q3YzlmYWVkZjI0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTAx LTE4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVw bGFjZSBhIGNvdXBsZSBvZiB1c2VzIG9mIFdURjo6RnVuY3Rpb24gd2l0aCBzdGQ6OmZ1bmN0aW9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjcyMTgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRm b3JtL0lQQy9tYWMvQ29ubmVjdGlvbk1hYy5jcHA6CisgICAgICAgIChJUEM6OmNyZWF0ZURhdGFB dmFpbGFibGVTb3VyY2UpOgorICAgICAgICAqIFBsYXRmb3JtL1dvcmtRdWV1ZS5oOgorICAgICAg ICAqIFBsYXRmb3JtL21hYy9Xb3JrUXVldWVNYWMuY3BwOgorICAgICAgICAoV29ya1F1ZXVlOjpk aXNwYXRjaCk6CisgICAgICAgIChXb3JrUXVldWU6OmRpc3BhdGNoQWZ0ZXIpOgorICAgICAgICAq IFNoYXJlZC9DaGlsZFByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpkaWRDbG9zZU9uQ29u bmVjdGlvbldvcmtRdWV1ZSk6CisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9y YWdlRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6 c2NoZWR1bGVEYXRhYmFzZVVwZGF0ZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0Ry YXdpbmdBcmVhLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWE6OmRpc3BhdGNoQWZ0 ZXJFbnN1cmluZ1VwZGF0ZWRTY3JvbGxQb3NpdGlvbik6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL0RyYXdpbmdBcmVhLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW06CisgICAgICAgIChXZWJL aXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpkaXNwYXRjaEFmdGVyRW5zdXJpbmdV cGRhdGVkU2Nyb2xsUG9zaXRpb24pOgorCiAyMDE0LTAxLTE3ICBBbmRyZWFzIEtsaW5nICA8YWts aW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW51c2VkIFRPVUNIX0FESlVTVE1FTlQg Y29kZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggOGEyZDYwNzU3NGQ1ZTQxOWI4NDM4MDEzOWU0 NjZiNzYzMTA0YTMyNi4uODBmY2Y5ZGZhZTU2NGYzZmFkNDhmODUzNDRhZmY0M2ZhYTlmMDI1MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dl YkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTI5NzgsOCArMjk3OCw4IEBAIF9fWk43V2ViQ29yZTEz U2Nyb2xsaW5nVHJlZTM3c2V0U2Nyb2xsaW5nUGVyZm9ybWFuY2VMb2dnaW5nRW5hYmxlZEViCiBf X1pON1dlYkNvcmUxM1Njcm9sbGluZ1RyZWVDMkV2CiBfX1pON1dlYkNvcmUxM1Njcm9sbGluZ1Ry ZWVEMUV2CiBfX1pON1dlYkNvcmUxM1Njcm9sbGluZ1RyZWVEMkV2Ci1fX1pON1dlYkNvcmUxNVNj cm9sbGluZ1RocmVhZDE1ZGlzcGF0Y2hCYXJyaWVyRVJLTjNXVEY4RnVuY3Rpb25JRnZ2RUVFCi1f X1pON1dlYkNvcmUxNVNjcm9sbGluZ1RocmVhZDhkaXNwYXRjaEVSS04zV1RGOEZ1bmN0aW9uSUZ2 dkVFRQorX19aTjdXZWJDb3JlMTVTY3JvbGxpbmdUaHJlYWQxNWRpc3BhdGNoQmFycmllckVOU3Qz X18xOGZ1bmN0aW9uSUZ2dkVFRQorX19aTjdXZWJDb3JlMTVTY3JvbGxpbmdUaHJlYWQ4ZGlzcGF0 Y2hFTlN0M19fMThmdW5jdGlvbklGdnZFRUUKIF9fWk43V2ViQ29yZTE4U2Nyb2xsaW5nU3RhdGVO b2RlOHNldExheWVyRVJLTlNfMTlMYXllclJlcHJlc2VudGF0aW9uRQogX19aTjdXZWJDb3JlMThT Y3JvbGxpbmdTdGF0ZVRyZWUxMGF0dGFjaE5vZGVFTlNfMTdTY3JvbGxpbmdOb2RlVHlwZUV5eQog X19aTjdXZWJDb3JlMThTY3JvbGxpbmdTdGF0ZVRyZWUxNHN0YXRlTm9kZUZvcklERXkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RocmVhZC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUaHJlYWQuY3BwCmluZGV4 IDQ2OTBiZDljZWEwNWEwNTRlODgxYjAxMGJiMzE0ZDVjZGY0YjUwMmQuLjBiODkxNWViZmVmMzE2 NjM0NTNmYmE0NmQ4MmI4YjJjNGIzMmJhM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVGhyZWFkLmNwcApAQCAtMjksNiArMjksNyBAQAogI2lmIEVO QUJMRShBU1lOQ19TQ1JPTExJTkcpCiAKICNpbmNsdWRlIDx3dGYvTWFpblRocmVhZC5oPgorI2lu Y2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAg LTQ1LDMyICs0NiwyOSBAQCBib29sIFNjcm9sbGluZ1RocmVhZDo6aXNDdXJyZW50VGhyZWFkKCkK ICAgICByZXR1cm4gY3VycmVudFRocmVhZCgpID09IHNoYXJlZCgpLm1fdGhyZWFkSWRlbnRpZmll cjsKIH0KIAotdm9pZCBTY3JvbGxpbmdUaHJlYWQ6OmRpc3BhdGNoKGNvbnN0IEZ1bmN0aW9uPHZv aWQoKT4mIGZ1bmN0aW9uKQordm9pZCBTY3JvbGxpbmdUaHJlYWQ6OmRpc3BhdGNoKHN0ZDo6ZnVu Y3Rpb248dm9pZCAoKT4gZnVuY3Rpb24pCiB7CiAgICAgc2hhcmVkKCkuY3JlYXRlVGhyZWFkSWZO ZWVkZWQoKTsKIAogICAgIHsKLSAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKHNoYXJlZCgpLm1f ZnVuY3Rpb25zTXV0ZXgpOworICAgICAgICBzdGQ6OmxvY2tfZ3VhcmQ8c3RkOjptdXRleD4gbG9j ayhzaGFyZWQoKS5tX2Z1bmN0aW9uc011dGV4KTsKICAgICAgICAgc2hhcmVkKCkubV9mdW5jdGlv bnMuYXBwZW5kKGZ1bmN0aW9uKTsKICAgICB9CiAKICAgICBzaGFyZWQoKS53YWtlVXBSdW5Mb29w KCk7CiB9CiAKLXN0YXRpYyB2b2lkIGNhbGxGdW5jdGlvbk9uTWFpblRocmVhZChjb25zdCBGdW5j dGlvbjx2b2lkKCk+KiBmdW5jdGlvbikKK3ZvaWQgU2Nyb2xsaW5nVGhyZWFkOjpkaXNwYXRjaEJh cnJpZXIoc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBmdW5jdGlvbikKIHsKLSAgICBjYWxsT25NYWlu VGhyZWFkKCpmdW5jdGlvbik7Ci0gICAgZGVsZXRlIGZ1bmN0aW9uOwotfQotCi12b2lkIFNjcm9s bGluZ1RocmVhZDo6ZGlzcGF0Y2hCYXJyaWVyKGNvbnN0IEZ1bmN0aW9uPHZvaWQoKT4mIGZ1bmN0 aW9uKQotewotICAgIGRpc3BhdGNoKGJpbmQoY2FsbEZ1bmN0aW9uT25NYWluVGhyZWFkLCBuZXcg RnVuY3Rpb248dm9pZCgpPihmdW5jdGlvbikpKTsKKyAgICBkaXNwYXRjaChbZnVuY3Rpb25dewor ICAgICAgICBjYWxsT25NYWluVGhyZWFkKHN0ZDo6bW92ZShmdW5jdGlvbikpOworICAgIH0pOwog fQogCiBTY3JvbGxpbmdUaHJlYWQmIFNjcm9sbGluZ1RocmVhZDo6c2hhcmVkKCkKIHsKLSAgICBE RUZJTkVfU1RBVElDX0xPQ0FMKFNjcm9sbGluZ1RocmVhZCwgc2Nyb2xsaW5nVGhyZWFkLCAoKSk7 CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFNjcm9sbGluZ1RocmVhZD4gc2Nyb2xsaW5nVGhy ZWFkOworCiAgICAgcmV0dXJuIHNjcm9sbGluZ1RocmVhZDsKIH0KIApAQCAtODEsMTMgKzc5LDEy IEBAIHZvaWQgU2Nyb2xsaW5nVGhyZWFkOjpjcmVhdGVUaHJlYWRJZk5lZWRlZCgpCiAKICAgICAv LyBXYWl0IGZvciB0aGUgdGhyZWFkIHRvIGluaXRpYWxpemUgdGhlIHJ1biBsb29wLgogICAgIHsK LSAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1faW5pdGlhbGl6ZVJ1bkxvb3BDb25kaXRpb25N dXRleCk7CisgICAgICAgIHN0ZDo6dW5pcXVlX2xvY2s8c3RkOjptdXRleD4gbG9jayhtX2luaXRp YWxpemVSdW5Mb29wTXV0ZXgpOwogCiAgICAgICAgIG1fdGhyZWFkSWRlbnRpZmllciA9IGNyZWF0 ZVRocmVhZCh0aHJlYWRDYWxsYmFjaywgdGhpcywgIldlYkNvcmU6IFNjcm9sbGluZyIpOwogICAg ICAgICAKICNpZiBQTEFURk9STShNQUMpCi0gICAgICAgIHdoaWxlICghbV90aHJlYWRSdW5Mb29w KQotICAgICAgICAgICAgbV9pbml0aWFsaXplUnVuTG9vcENvbmRpdGlvbi53YWl0KG1faW5pdGlh bGl6ZVJ1bkxvb3BDb25kaXRpb25NdXRleCk7CisgICAgICAgIG1faW5pdGlhbGl6ZVJ1bkxvb3BD b25kaXRpb25WYXJpYWJsZS53YWl0KGxvY2ssIFt0aGlzXXsgcmV0dXJuIG1fdGhyZWFkUnVuTG9v cDsgfSk7CiAjZW5kaWYKICAgICB9CiB9CkBAIC0xMDYsMTUgKzEwMywxNSBAQCB2b2lkIFNjcm9s bGluZ1RocmVhZDo6ZGlzcGF0Y2hGdW5jdGlvbnNGcm9tU2Nyb2xsaW5nVGhyZWFkKCkKIHsKICAg ICBBU1NFUlQoaXNDdXJyZW50VGhyZWFkKCkpOwogCi0gICAgVmVjdG9yPEZ1bmN0aW9uPHZvaWQo KT4+IGZ1bmN0aW9uczsKKyAgICBWZWN0b3I8c3RkOjpmdW5jdGlvbjx2b2lkICgpPj4gZnVuY3Rp b25zOwogICAgIAogICAgIHsKLSAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fZnVuY3Rpb25z TXV0ZXgpOwotICAgICAgICBtX2Z1bmN0aW9ucy5zd2FwKGZ1bmN0aW9ucyk7CisgICAgICAgIHN0 ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4PiBsb2NrKG1fZnVuY3Rpb25zTXV0ZXgpOworICAgICAg ICBmdW5jdGlvbnMgPSBzdGQ6Om1vdmUobV9mdW5jdGlvbnMpOwogICAgIH0KLSAgICAKLSAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IGZ1bmN0aW9ucy5zaXplKCk7ICsraSkKLSAgICAgICAgZnVu Y3Rpb25zW2ldKCk7CisKKyAgICBmb3IgKGF1dG8mIGZ1bmN0aW9uIDogZnVuY3Rpb25zKQorICAg ICAgICBmdW5jdGlvbigpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUaHJlYWQuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RocmVhZC5oCmluZGV4IGNlM2I2OGYw MGQ1YjM4NWVhNWM0MWQ3YmE1NDJjMTNmNWU3YmNhY2UuLmIyNTg3NTNjNzFhM2U4ZTQ0ODkxODAw NDYxZGMzOWUzMzM1YjkxNGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1RocmVhZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ1RocmVhZC5oCkBAIC0yOCw3ICsyOCw5IEBACiAKICNpZiBFTkFCTEUoQVNZTkNf U0NST0xMSU5HKQogCi0jaW5jbHVkZSA8d3RmL0Z1bmN0aW9uYWwuaD4KKyNpbmNsdWRlIDxjb25k aXRpb25fdmFyaWFibGU+CisjaW5jbHVkZSA8ZnVuY3Rpb25hbD4KKyNpbmNsdWRlIDx3dGYvRm9y d2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogI2luY2x1ZGUgPHd0Zi9UaHJl YWRpbmcuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CkBAIC00NCwxMyArNDYsMTUgQEAgY2xh c3MgU2Nyb2xsaW5nVGhyZWFkIHsKIAogcHVibGljOgogICAgIHN0YXRpYyBib29sIGlzQ3VycmVu dFRocmVhZCgpOwotICAgIHN0YXRpYyB2b2lkIGRpc3BhdGNoKGNvbnN0IEZ1bmN0aW9uPHZvaWQo KT4mKTsKKyAgICBzdGF0aWMgdm9pZCBkaXNwYXRjaChzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+KTsK IAogICAgIC8vIFdpbGwgZGlzcGF0Y2ggdGhlIGdpdmVuIGZ1bmN0aW9uIG9uIHRoZSBtYWluIHRo cmVhZCBvbmNlIGFsbCBwZW5kaW5nIGZ1bmN0aW9ucwogICAgIC8vIG9uIHRoZSBzY3JvbGxpbmcg dGhyZWFkIGhhdmUgZmluaXNoZWQgZXhlY3V0aW5nLiBVc2VkIGZvciBzeW5jaHJvbml6YXRpb24g cHVycG9zZXMuCi0gICAgc3RhdGljIHZvaWQgZGlzcGF0Y2hCYXJyaWVyKGNvbnN0IEZ1bmN0aW9u PHZvaWQoKT4mKTsKKyAgICBzdGF0aWMgdm9pZCBkaXNwYXRjaEJhcnJpZXIoc3RkOjpmdW5jdGlv bjx2b2lkICgpPik7CiAKIHByaXZhdGU6CisgICAgZnJpZW5kIE5ldmVyRGVzdHJveWVkPFNjcm9s bGluZ1RocmVhZD47CisKICAgICBTY3JvbGxpbmdUaHJlYWQoKTsKIAogICAgIHN0YXRpYyBTY3Jv bGxpbmdUaHJlYWQmIHNoYXJlZCgpOwpAQCAtNzAsMTEgKzc0LDExIEBAIHByaXZhdGU6CiAKICAg ICBUaHJlYWRJZGVudGlmaWVyIG1fdGhyZWFkSWRlbnRpZmllcjsKIAotICAgIFRocmVhZENvbmRp dGlvbiBtX2luaXRpYWxpemVSdW5Mb29wQ29uZGl0aW9uOwotICAgIE11dGV4IG1faW5pdGlhbGl6 ZVJ1bkxvb3BDb25kaXRpb25NdXRleDsKKyAgICBzdGQ6OmNvbmRpdGlvbl92YXJpYWJsZSBtX2lu aXRpYWxpemVSdW5Mb29wQ29uZGl0aW9uVmFyaWFibGU7CisgICAgc3RkOjptdXRleCBtX2luaXRp YWxpemVSdW5Mb29wTXV0ZXg7CiAKLSAgICBNdXRleCBtX2Z1bmN0aW9uc011dGV4OwotICAgIFZl Y3RvcjxGdW5jdGlvbjx2b2lkKCk+PiBtX2Z1bmN0aW9uczsKKyAgICBzdGQ6Om11dGV4IG1fZnVu Y3Rpb25zTXV0ZXg7CisgICAgVmVjdG9yPHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4+IG1fZnVuY3Rp b25zOwogCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgdXNlIFdl YkNvcmU6OlJ1bkxvb3AgaGVyZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL21hYy9TY3JvbGxpbmdUaHJlYWRNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9tYWMvU2Nyb2xsaW5nVGhyZWFkTWFjLm1tCmluZGV4IDRiMjllYzBmMjRhMDNlY2Fh Y2ZiOGFjZDllZDdkNDE1YmMxYTZmY2UuLmVmOTYzZTAzODdkMGNlYmI3NjI1NzliYTA5MTBhY2Ix ODcyMWZmNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9T Y3JvbGxpbmdUaHJlYWRNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv bWFjL1Njcm9sbGluZ1RocmVhZE1hYy5tbQpAQCAtMzQsNyArMzQsNyBAQCB2b2lkIFNjcm9sbGlu Z1RocmVhZDo6aW5pdGlhbGl6ZVJ1bkxvb3AoKQogewogICAgIC8vIEluaXRpYWxpemUgdGhlIHJ1 biBsb29wLgogICAgIHsKLSAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1faW5pdGlhbGl6ZVJ1 bkxvb3BDb25kaXRpb25NdXRleCk7CisgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxzdGQ6Om11dGV4 PiBsb2NrKG1faW5pdGlhbGl6ZVJ1bkxvb3BNdXRleCk7CiAKICAgICAgICAgbV90aHJlYWRSdW5M b29wID0gQ0ZSdW5Mb29wR2V0Q3VycmVudCgpOwogCkBAIC00Miw3ICs0Miw3IEBAIHZvaWQgU2Ny b2xsaW5nVGhyZWFkOjppbml0aWFsaXplUnVuTG9vcCgpCiAgICAgICAgIG1fdGhyZWFkUnVuTG9v cFNvdXJjZSA9IGFkb3B0Q0YoQ0ZSdW5Mb29wU291cmNlQ3JlYXRlKDAsIDAsICZjb250ZXh0KSk7 CiAgICAgICAgIENGUnVuTG9vcEFkZFNvdXJjZShDRlJ1bkxvb3BHZXRDdXJyZW50KCksIG1fdGhy ZWFkUnVuTG9vcFNvdXJjZS5nZXQoKSwga0NGUnVuTG9vcERlZmF1bHRNb2RlKTsKIAotICAgICAg ICBtX2luaXRpYWxpemVSdW5Mb29wQ29uZGl0aW9uLmJyb2FkY2FzdCgpOworICAgICAgICBtX2lu aXRpYWxpemVSdW5Mb29wQ29uZGl0aW9uVmFyaWFibGUubm90aWZ5X2FsbCgpOwogICAgIH0KIAog ICAgIEFTU0VSVChpc0N1cnJlbnRUaHJlYWQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9QbGF0Zm9ybS9JUEMvbWFjL0Nvbm5lY3Rpb25NYWMuY3BwIGIvU291cmNlL1dlYktpdDIvUGxh dGZvcm0vSVBDL21hYy9Db25uZWN0aW9uTWFjLmNwcAppbmRleCAzOTJlMGY4ZjUwZDkwNjlkMGE1 MzBjZjQyMTZhOWNmZDZhOTUzNTkwLi5mZWEyYWYyOTgzZjk0Y2MwNWMzNzQzMTFmOTk5YWY2Nzg1 YjU5YjUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9JUEMvbWFjL0Nvbm5l Y3Rpb25NYWMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9tYWMvQ29ubmVj dGlvbk1hYy5jcHAKQEAgLTEwMSwxMCArMTAxLDEzIEBAIHZvaWQgQ29ubmVjdGlvbjo6cGxhdGZv cm1Jbml0aWFsaXplKElkZW50aWZpZXIgaWRlbnRpZmllcikKICAgICAgICAgeHBjX3JldGFpbiht X3hwY0Nvbm5lY3Rpb24pOwogfQogCi1zdGF0aWMgZGlzcGF0Y2hfc291cmNlX3QgY3JlYXRlRGF0 YUF2YWlsYWJsZVNvdXJjZShtYWNoX3BvcnRfdCByZWNlaXZlUG9ydCwgV29ya1F1ZXVlKiB3b3Jr UXVldWUsIGNvbnN0IEZ1bmN0aW9uPHZvaWQoKT4mIGZ1bmN0aW9uKQorc3RhdGljIGRpc3BhdGNo X3NvdXJjZV90IGNyZWF0ZURhdGFBdmFpbGFibGVTb3VyY2UobWFjaF9wb3J0X3QgcmVjZWl2ZVBv cnQsIFdvcmtRdWV1ZSogd29ya1F1ZXVlLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGZ1bmN0aW9u KQogewogICAgIGRpc3BhdGNoX3NvdXJjZV90IHNvdXJjZSA9IGRpc3BhdGNoX3NvdXJjZV9jcmVh dGUoRElTUEFUQ0hfU09VUkNFX1RZUEVfTUFDSF9SRUNWLCByZWNlaXZlUG9ydCwgMCwgd29ya1F1 ZXVlLT5kaXNwYXRjaFF1ZXVlKCkpOwotICAgIGRpc3BhdGNoX3NvdXJjZV9zZXRfZXZlbnRfaGFu ZGxlcihzb3VyY2UsIGZ1bmN0aW9uKTsKKyAgICBkaXNwYXRjaF9zb3VyY2Vfc2V0X2V2ZW50X2hh bmRsZXIoc291cmNlLCBeeworICAgICAgICBmdW5jdGlvbigpOworICAgIH0pOworCiAgICAgZGlz cGF0Y2hfc291cmNlX3NldF9jYW5jZWxfaGFuZGxlcihzb3VyY2UsIF57CiAgICAgICAgIG1hY2hf cG9ydF9tb2RfcmVmcyhtYWNoX3Rhc2tfc2VsZigpLCByZWNlaXZlUG9ydCwgTUFDSF9QT1JUX1JJ R0hUX1JFQ0VJVkUsIC0xKTsKICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1Bs YXRmb3JtL1dvcmtRdWV1ZS5oIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vV29ya1F1ZXVlLmgK aW5kZXggNzgxMWI1ODM0NmExYmEzMGQzY2VlNzhkZjI3YWJhZmNiZDBhYjJjYS4uYTQ4Y2NlNTZh NDE0ZThkZjdhNTEwNWNhNzY4MzAzNTk2ZWYyMTViOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvUGxhdGZvcm0vV29ya1F1ZXVlLmgKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vV29y a1F1ZXVlLmgKQEAgLTMxLDYgKzMxLDggQEAKICNpbmNsdWRlIDxkaXNwYXRjaC9kaXNwYXRjaC5o PgogI2VuZGlmCiAKKyNpbmNsdWRlIDxjaHJvbm8+CisjaW5jbHVkZSA8ZnVuY3Rpb25hbD4KICNp bmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9GdW5jdGlvbmFsLmg+CiAjaW5j bHVkZSA8d3RmL0hhc2hNYXAuaD4KQEAgLTU1LDExICs1Nyw4IEBAIHB1YmxpYzoKICAgICBzdGF0 aWMgUGFzc1JlZlB0cjxXb3JrUXVldWU+IGNyZWF0ZShjb25zdCBjaGFyKiBuYW1lKTsKICAgICB+ V29ya1F1ZXVlKCk7CiAKLSAgICAvLyBXaWxsIGRpc3BhdGNoIHRoZSBnaXZlbiBmdW5jdGlvbiB0 byBydW4gYXMgc29vbiBhcyBwb3NzaWJsZS4KLSAgICB2b2lkIGRpc3BhdGNoKGNvbnN0IEZ1bmN0 aW9uPHZvaWQoKT4mKTsKLQotICAgIC8vIFdpbGwgZGlzcGF0Y2ggdGhlIGdpdmVuIGZ1bmN0aW9u IGFmdGVyIHRoZSBnaXZlbiBkZWxheSAoaW4gc2Vjb25kcykuCi0gICAgdm9pZCBkaXNwYXRjaEFm dGVyRGVsYXkoY29uc3QgRnVuY3Rpb248dm9pZCgpPiYsIGRvdWJsZSBkZWxheSk7CisgICAgdm9p ZCBkaXNwYXRjaChzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+KTsKKyAgICB2b2lkIGRpc3BhdGNoQWZ0 ZXIoc3RkOjpjaHJvbm86Om5hbm9zZWNvbmRzLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+KTsKIAog I2lmIE9TKERBUldJTikKICAgICBkaXNwYXRjaF9xdWV1ZV90IGRpc3BhdGNoUXVldWUoKSBjb25z dCB7IHJldHVybiBtX2Rpc3BhdGNoUXVldWU7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1BsYXRmb3JtL21hYy9Xb3JrUXVldWVNYWMuY3BwIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0v bWFjL1dvcmtRdWV1ZU1hYy5jcHAKaW5kZXggOGIyMWY3ZWQ1NGI4N2FlNTNjMDc5ZDcwYTJmNTJl YTg3NjQ4MTQ2NC4uZTZkMzdjM2U5MGJhZDg0ZjZiOTUwZDUyZGZlMzhjYmVjZTk1YmU5OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vbWFjL1dvcmtRdWV1ZU1hYy5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vbWFjL1dvcmtRdWV1ZU1hYy5jcHAKQEAgLTI2LDI2 ICsyNiwyMCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldvcmtRdWV1ZS5oIgog Ci12b2lkIFdvcmtRdWV1ZTo6ZGlzcGF0Y2goY29uc3QgRnVuY3Rpb248dm9pZCgpPiYgZnVuY3Rp b24pCit2b2lkIFdvcmtRdWV1ZTo6ZGlzcGF0Y2goc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBmdW5j dGlvbikKIHsKLSAgICBGdW5jdGlvbjx2b2lkKCk+IGZ1bmN0aW9uQ29weSA9IGZ1bmN0aW9uOwot CiAgICAgcmVmKCk7CiAgICAgZGlzcGF0Y2hfYXN5bmMobV9kaXNwYXRjaFF1ZXVlLCBeewotICAg ICAgICBmdW5jdGlvbkNvcHkoKTsKKyAgICAgICAgZnVuY3Rpb24oKTsKICAgICAgICAgZGVyZWYo KTsKICAgICB9KTsKIH0KIAotdm9pZCBXb3JrUXVldWU6OmRpc3BhdGNoQWZ0ZXJEZWxheShjb25z dCBGdW5jdGlvbjx2b2lkKCk+JiBmdW5jdGlvbiwgZG91YmxlIGRlbGF5KQordm9pZCBXb3JrUXVl dWU6OmRpc3BhdGNoQWZ0ZXIoc3RkOjpjaHJvbm86Om5hbm9zZWNvbmRzIGR1cmF0aW9uLCBzdGQ6 OmZ1bmN0aW9uPHZvaWQgKCk+IGZ1bmN0aW9uKQogewotICAgIGRpc3BhdGNoX3RpbWVfdCBkZWxh eVRpbWUgPSBkaXNwYXRjaF90aW1lKERJU1BBVENIX1RJTUVfTk9XLCBkZWxheSAqIE5TRUNfUEVS X1NFQyk7Ci0KLSAgICBGdW5jdGlvbjx2b2lkKCk+IGZ1bmN0aW9uQ29weSA9IGZ1bmN0aW9uOwot CiAgICAgcmVmKCk7Ci0gICAgZGlzcGF0Y2hfYWZ0ZXIoZGVsYXlUaW1lLCBtX2Rpc3BhdGNoUXVl dWUsIF57Ci0gICAgICAgIGZ1bmN0aW9uQ29weSgpOworICAgIGRpc3BhdGNoX2FmdGVyKGRpc3Bh dGNoX3RpbWUoRElTUEFUQ0hfVElNRV9OT1csIGR1cmF0aW9uLmNvdW50KCkpLCBtX2Rpc3BhdGNo UXVldWUsIF57CisgICAgICAgIGZ1bmN0aW9uKCk7CiAgICAgICAgIGRlcmVmKCk7CiAgICAgfSk7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ2hpbGRQcm9jZXNzLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3MuY3BwCmluZGV4IGI4ZGRhOTE1YzJl NmNiZjE0ZjNiNmQxNjBiZmVkNjA3ZmM0MjE3MGUuLjc0OTAwOWU1NDU5Y2FiMjY0MDQ3MDU1OTQ1 MjE5ODBmZjFiNjcwMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFBy b2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3MuY3BwCkBA IC00NCwyMSArNDQsMTggQEAgQ2hpbGRQcm9jZXNzOjp+Q2hpbGRQcm9jZXNzKCkKIHsKIH0KIAot Tk9fUkVUVVJOIHN0YXRpYyB2b2lkIHdhdGNoZG9nQ2FsbGJhY2soKQotewotICAgIC8vIFdlIHVz ZSBfZXhpdCBoZXJlIHNpbmNlIHRoZSB3YXRjaGRvZyBjYWxsYmFjayBpcyBjYWxsZWQgZnJvbSBh bm90aGVyIHRocmVhZCBhbmQgd2UgZG9uJ3Qgd2FudCAKLSAgICAvLyBnbG9iYWwgZGVzdHJ1Y3Rv cnMgb3IgYXRleGl0IGhhbmRsZXJzIHRvIGJlIGNhbGxlZCBmcm9tIHRoaXMgdGhyZWFkIHdoaWxl IHRoZSBtYWluIHRocmVhZCBpcyBidXN5Ci0gICAgLy8gZG9pbmcgaXRzIHRoaW5nLgotICAgIF9l eGl0KEVYSVRfRkFJTFVSRSk7Ci19Ci0KIHN0YXRpYyB2b2lkIGRpZENsb3NlT25Db25uZWN0aW9u V29ya1F1ZXVlKElQQzo6Q29ubmVjdGlvbiopCiB7CiAgICAgLy8gSWYgdGhlIGNvbm5lY3Rpb24g aGFzIGJlZW4gY2xvc2VkIGFuZCB3ZSBoYXZlbid0IHJlc3BvbmRlZCBpbiB0aGUgbWFpbiB0aHJl YWQgZm9yIDEwIHNlY29uZHMKICAgICAvLyB0aGUgcHJvY2VzcyB3aWxsIGV4aXQgZm9yY2libHku Ci0gICAgY29uc3QgZG91YmxlIHdhdGNoZG9nRGVsYXkgPSAxMDsKLQotICAgIFdvcmtRdWV1ZTo6 Y3JlYXRlKCJjb20uYXBwbGUuV2ViS2l0LkNoaWxkUHJvY2Vzcy5XYXRjaERvZ1F1ZXVlIiktPmRp c3BhdGNoQWZ0ZXJEZWxheShiaW5kKHN0YXRpY19jYXN0PHZvaWQoKikoKT4od2F0Y2hkb2dDYWxs YmFjaykpLCB3YXRjaGRvZ0RlbGF5KTsKKyAgICBhdXRvIHdhdGNoZG9nRGVsYXkgPSBzdGQ6OmNo cm9ubzo6c2Vjb25kcygxMCk7CisKKyAgICBXb3JrUXVldWU6OmNyZWF0ZSgiY29tLmFwcGxlLldl YktpdC5DaGlsZFByb2Nlc3MuV2F0Y2hEb2dRdWV1ZSIpLT5kaXNwYXRjaEFmdGVyKHdhdGNoZG9n RGVsYXksIFtdeworICAgICAgICAvLyBXZSB1c2UgX2V4aXQgaGVyZSBzaW5jZSB0aGUgd2F0Y2hk b2cgY2FsbGJhY2sgaXMgY2FsbGVkIGZyb20gYW5vdGhlciB0aHJlYWQgYW5kIHdlIGRvbid0IHdh bnQKKyAgICAgICAgLy8gZ2xvYmFsIGRlc3RydWN0b3JzIG9yIGF0ZXhpdCBoYW5kbGVycyB0byBi ZSBjYWxsZWQgZnJvbSB0aGlzIHRocmVhZCB3aGlsZSB0aGUgbWFpbiB0aHJlYWQgaXMgYnVzeQor ICAgICAgICAvLyBkb2luZyBpdHMgdGhpbmcuCisgICAgICAgIF9leGl0KEVYSVRfRkFJTFVSRSk7 CisgICAgfSk7CiB9CiAKIHZvaWQgQ2hpbGRQcm9jZXNzOjppbml0aWFsaXplKGNvbnN0IENoaWxk UHJvY2Vzc0luaXRpYWxpemF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNl LmNwcAppbmRleCA3YzU4NTc4ZWJjYmZjNzU0YjE2ZTMyYmUyODk5MTZjODE0MzVkNTYwLi4yNTk1 ZjA3NGIwN2Y2ZTJhZGYyMTlkZTUzMDNkNzA5M2Y2ZWJlODE5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuY3Bw CkBAIC0zOSw3ICszOSw3IEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi1zdGF0aWMg Y29uc3QgZG91YmxlIGRhdGFiYXNlVXBkYXRlSW50ZXJ2YWxJblNlY29uZHMgPSAxLjA7CitzdGF0 aWMgY29uc3QgYXV0byBkYXRhYmFzZVVwZGF0ZUludGVydmFsID0gc3RkOjpjaHJvbm86OnNlY29u ZHMoMSk7CiAKIHN0YXRpYyBjb25zdCBpbnQgbWF4aW11bUl0ZW1zVG9VcGRhdGUgPSAxMDA7CiAK QEAgLTI0MSw3ICsyNDEsNyBAQCB2b2lkIExvY2FsU3RvcmFnZURhdGFiYXNlOjpzY2hlZHVsZURh dGFiYXNlVXBkYXRlKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9kaWRTY2hlZHVsZURhdGFi YXNlVXBkYXRlID0gdHJ1ZTsKLSAgICBtX3F1ZXVlLT5kaXNwYXRjaEFmdGVyRGVsYXkoYmluZCgm TG9jYWxTdG9yYWdlRGF0YWJhc2U6OnVwZGF0ZURhdGFiYXNlLCB0aGlzKSwgZGF0YWJhc2VVcGRh dGVJbnRlcnZhbEluU2Vjb25kcyk7CisgICAgbV9xdWV1ZS0+ZGlzcGF0Y2hBZnRlcihkYXRhYmFz ZVVwZGF0ZUludGVydmFsLCBiaW5kKCZMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6dXBkYXRlRGF0YWJh c2UsIHRoaXMpKTsKIH0KIAogdm9pZCBMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6dXBkYXRlRGF0YWJh c2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdp bmdBcmVhLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJl YS5jcHAKaW5kZXggZjE2MTVkMzc2Y2I1YjE0OGVlZjg0MGJjYThjZjliYTgzNjQ1NDYxNy4uZTQ3 NTBlNmMyN2VlYTI5N2NjNWZhODQ4ODAwNDVhMjFiOTA1ZWI2ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuY3BwCkBAIC03Nyw3ICs3Nyw3 IEBAIERyYXdpbmdBcmVhOjp+RHJhd2luZ0FyZWEoKQogewogfQogCi12b2lkIERyYXdpbmdBcmVh OjpkaXNwYXRjaEFmdGVyRW5zdXJpbmdVcGRhdGVkU2Nyb2xsUG9zaXRpb24oY29uc3QgRnVuY3Rp b248dm9pZCAoKT4mIGZ1bmN0aW9uKQordm9pZCBEcmF3aW5nQXJlYTo6ZGlzcGF0Y2hBZnRlckVu c3VyaW5nVXBkYXRlZFNjcm9sbFBvc2l0aW9uKHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gZnVuY3Rp b24pCiB7CiAgICAgLy8gU2Nyb2xsIHBvc2l0aW9uIHVwZGF0ZXMgYXJlIHN5bmNocm9ub3VzIGJ5 IGRlZmF1bHQgc28gd2UgY2FuIGp1c3QgY2FsbCB0aGUgZnVuY3Rpb24gcmlnaHQgYXdheSBoZXJl LgogICAgIGZ1bmN0aW9uKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9EcmF3aW5nQXJlYS5oCmluZGV4IDZhZDFiYmQ1ODBlMDk1NjVjMDcxY2U2NDRkNjJhZGRiNGRh MDkwZTIuLmFkZTJhODRmNTgzNzc5MDM0ZDI0NzkxNDEwYjAwZmFjYjE1ZjNiNWIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oCkBAIC0zMSw2 ICszMSw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9GbG9hdFJlY3QuaD4KICNpbmNsdWRlIDxXZWJD b3JlL0ludFJlY3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1ZpZXdTdGF0ZS5oPgorI2luY2x1ZGUg PGZ1bmN0aW9uYWw+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvTm9u Y29weWFibGUuaD4KIApAQCAtMTA4LDcgKzEwOSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZv aWQgZGlkUmVjZWl2ZUNvb3JkaW5hdGVkTGF5ZXJUcmVlSG9zdE1lc3NhZ2UoSVBDOjpDb25uZWN0 aW9uKiwgSVBDOjpNZXNzYWdlRGVjb2RlciYpID0gMDsKICNlbmRpZgogCi0gICAgdmlydHVhbCB2 b2lkIGRpc3BhdGNoQWZ0ZXJFbnN1cmluZ1VwZGF0ZWRTY3JvbGxQb3NpdGlvbihjb25zdCBGdW5j dGlvbjx2b2lkICgpPiYpOworICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaEFmdGVyRW5zdXJpbmdV cGRhdGVkU2Nyb2xsUG9zaXRpb24oc3RkOjpmdW5jdGlvbjx2b2lkICgpPik7CiAKICAgICB2aXJ0 dWFsIHZvaWQgdmlld1N0YXRlRGlkQ2hhbmdlKFdlYkNvcmU6OlZpZXdTdGF0ZTo6RmxhZ3MpIHsg fQogICAgIHZpcnR1YWwgdm9pZCBzZXRMYXllckhvc3RpbmdNb2RlKExheWVySG9zdGluZ01vZGUp IHsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCmluZGV4IDgxNTk4 Y2YzMTdjNjA1M2MzM2VmNTk0ZjE2NTA4YTY5YjM4NDMzNjUuLmJhYTkwZTgyYjFmNDczOGYwNWVi ZTg0NjM3ZGVhNjc4NGZhNjNhMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhLmgKQEAgLTg0LDcgKzg0LDcgQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1YWwgdm9pZCBk aWRDaGFuZ2VTY3JvbGxPZmZzZXRGb3JBbnlGcmFtZSgpIG92ZXJyaWRlOwogCi0gICAgdmlydHVh bCB2b2lkIGRpc3BhdGNoQWZ0ZXJFbnN1cmluZ1VwZGF0ZWRTY3JvbGxQb3NpdGlvbihjb25zdCBG dW5jdGlvbjx2b2lkKCk+Jikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoQWZ0 ZXJFbnN1cmluZ1VwZGF0ZWRTY3JvbGxQb3NpdGlvbihzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+KSBv dmVycmlkZTsKIAogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRVc2VUaWxlZEJhY2tpbmdGb3JGcmFt ZVZpZXcoY29uc3QgV2ViQ29yZTo6RnJhbWVWaWV3Kikgb3ZlcnJpZGU7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCmluZGV4IDkxNzg5N2M5ZTM5MGZiYWY5MTc3 ZTMyZTVjNGFlY2EyM2MyYjQ5YTQuLmQ5ZTg1MjU4YTE3NDE3M2JmOGI3MjFhNzc2OGRhYjI0ZTJm MWNlYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMv VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQpAQCAt MzAwLDEwICszMDAsOCBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRh dGVJbnRyaW5zaWNDb250ZW50U2l6ZVRpbWVyRmlyZWQoVGltZXI8VAogICAgIG1fd2ViUGFnZS0+ c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6SW50cmluc2ljQ29udGVudFNpemVEaWRD aGFuZ2UoY29udGVudFNpemUpKTsKIH0KIAotdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5n QXJlYTo6ZGlzcGF0Y2hBZnRlckVuc3VyaW5nVXBkYXRlZFNjcm9sbFBvc2l0aW9uKGNvbnN0IEZ1 bmN0aW9uPHZvaWQgKCk+JiBmdW5jdGlvblJlZikKK3ZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWE6OmRpc3BhdGNoQWZ0ZXJFbnN1cmluZ1VwZGF0ZWRTY3JvbGxQb3NpdGlvbihzdGQ6 OmZ1bmN0aW9uPHZvaWQgKCk+IGZ1bmN0aW9uKQogewotICAgIEZ1bmN0aW9uPHZvaWQgKCk+IGZ1 bmN0aW9uID0gZnVuY3Rpb25SZWY7Ci0KICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQogICAg IGlmICghbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5zY3JvbGxpbmdDb29yZGluYXRvcigpKSB7CiAg ICAgICAgIGZ1bmN0aW9uKCk7Cg==