121459 2013-09-16 15:35:59 -0700 Add RunLoop::isMain and use it in WebKit2 2013-09-16 16:31:50 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned andersca benjamin cgarcia commit-queue gustavo joepeck mrobinson oldest_to_newest 929956 0 joepeck 2013-09-16 15:35:59 -0700 Rather than "thread" logic like isMainThread we should use RunLoop logic. 929957 1 211838 joepeck 2013-09-16 15:37:58 -0700 Created attachment 211838 [PATCH] Proposed Fix 929958 2 commit-queue 2013-09-16 15:40:11 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 929959 3 211838 commit-queue 2013-09-16 15:46:13 -0700 Comment on attachment 211838 [PATCH] Proposed Fix Rejecting attachment 211838 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 211838, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/1869241 929960 4 211838 darin 2013-09-16 15:49:48 -0700 Comment on attachment 211838 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=211838&action=review > Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm:126 > + ASSERT(RunLoop::isMain()); // This funciton calls the client, which should only be done on main thread. funciton! 929969 5 joepeck 2013-09-16 16:31:50 -0700 Committed <http://trac.webkit.org/changeset/155911>. 211838 2013-09-16 15:37:58 -0700 2013-09-16 15:49:48 -0700 [PATCH] Proposed Fix runloop-main.patch text/plain 13033 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmYzE4MzFhLi42NjMyYTU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTMtMDktMTYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBBZGQgUnVuTG9vcDo6aXNNYWluIGFuZCB1c2UgaXQgaW4gV2ViS2l0MgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxNDU5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChP T1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiBwbGF0Zm9ybS9S dW5Mb29wLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJ1bkxvb3A6OmlzTWFpbik6CisgICAgICAg ICogcGxhdGZvcm0vUnVuTG9vcC5oOgorCiAyMDEzLTA5LTE0ICBKb3NlcGggUGVjb3Jhcm8gIDxw ZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgWE1MVmlld2VyX2pzIGFuZCBYTUxWaWV3ZXJf Y3NzIHNob3VsZCBiZSBtaW5pZmllZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCBjOWIwMTVmLi44 MTI2ODRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMTAzMiw2ICsxMDMyLDcgQEAgX19aTjdX ZWJDb3JlN1J1bkxvb3AzN3NldFVzZUFwcGxpY2F0aW9uUnVuTG9vcE9uTWFpblJ1bkxvb3BFdgog X19aTjdXZWJDb3JlN1J1bkxvb3AzcnVuRXYKIF9fWk43V2ViQ29yZTdSdW5Mb29wNG1haW5Fdgog X19aTjdXZWJDb3JlN1J1bkxvb3A0c3RvcEV2CitfX1pON1dlYkNvcmU3UnVuTG9vcDZpc01haW5F dgogX19aTjdXZWJDb3JlN1J1bkxvb3A2d2FrZVVwRXYKIF9fWk43V2ViQ29yZTdSdW5Mb29wN2N1 cnJlbnRFdgogX19aTjdXZWJDb3JlN1J1bkxvb3A4ZGlzcGF0Y2hFUktOM1dURjhGdW5jdGlvbklG dnZFRUUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bkxvb3AuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVuTG9vcC5jcHAKaW5kZXggNGQxZDI1NC4uMzhmM2Ux YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVuTG9vcC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVuTG9vcC5jcHAKQEAgLTcyLDYgKzcyLDEyIEBAIFJ1 bkxvb3AqIFJ1bkxvb3A6Om1haW4oKQogICAgIHJldHVybiBzX21haW5SdW5Mb29wOwogfQogCiti b29sIFJ1bkxvb3A6OmlzTWFpbigpCit7CisgICAgQVNTRVJUKHNfbWFpblJ1bkxvb3ApOworICAg IHJldHVybiBzX21haW5SdW5Mb29wID09IFJ1bkxvb3A6OmN1cnJlbnQoKTsKK30KKwogdm9pZCBS dW5Mb29wOjpwZXJmb3JtV29yaygpCiB7CiAgICAgLy8gSXQgaXMgaW1wb3J0YW50IHRvIGhhbmRs ZSB0aGUgZnVuY3Rpb25zIGluIHRoZSBxdWV1ZSBvbmUgYXQgYSB0aW1lIGJlY2F1c2Ugd2hpbGUg aW5zaWRlIG9uZSBvZiB0aGVzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v UnVuTG9vcC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVuTG9vcC5oCmluZGV4IDE2ZDFh OWUuLmUyOGY1NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bkxvb3Au aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW5Mb29wLmgKQEAgLTU3LDYgKzU3LDcg QEAgcHVibGljOgogCiAgICAgc3RhdGljIFJ1bkxvb3AqIGN1cnJlbnQoKTsKICAgICBzdGF0aWMg UnVuTG9vcCogbWFpbigpOworICAgIHN0YXRpYyBib29sIGlzTWFpbigpOwogICAgIH5SdW5Mb29w KCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2goY29uc3QgRnVuY3Rpb248dm9pZCgpPiYp IE9WRVJSSURFOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDAwYjM0MzAuLjNhYzNhODYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAg LTEsMyArMSwzMSBAQAorMjAxMy0wOS0xNiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBw bGUuY29tPgorCisgICAgICAgIEFkZCBSdW5Mb29wOjppc01haW4gYW5kIHVzZSBpdCBpbiBXZWJL aXQyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjE0 NTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZhdmljb25EYXRhYmFzZS5jcHA6CisgICAgICAgIChnZXRJ Y29uU3VyZmFjZVN5bmNocm9ub3VzbHkpOgorICAgICAgICAoaWNvbkRhdGFSZWFkeUZvclBhZ2VV UkxDYWxsYmFjayk6CisgICAgICAgICh3ZWJraXRfZmF2aWNvbl9kYXRhYmFzZV9nZXRfZmF2aWNv bl91cmkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLUHJpbnRpbmdWaWV3Lm1tOgor ICAgICAgICAoLVtXS1ByaW50aW5nVmlldyBfZGVsYXllZFJlc3VtZUF1dG9kaXNwbGF5VGltZXJG aXJlZF0pOgorICAgICAgICAoLVtXS1ByaW50aW5nVmlldyBfYWRqdXN0UHJpbnRpbmdNYXJnaW5z Rm9ySGVhZGVyQW5kRm9vdGVyXSk6CisgICAgICAgIChwYWdlRGlkRHJhd1RvSW1hZ2UpOgorICAg ICAgICAocGFnZURpZERyYXdUb1BERik6CisgICAgICAgICgtW1dLUHJpbnRpbmdWaWV3IF9wcmVw YXJlUERGRGF0YUZvclByaW50aW5nT25TZWNvbmRhcnlUaHJlYWRdKToKKyAgICAgICAgKHBhZ2VE aWRDb21wdXRlUGFnZVJlY3RzKToKKyAgICAgICAgKC1bV0tQcmludGluZ1ZpZXcgX2Fza1BhZ2VU b0NvbXB1dGVQYWdlUmVjdHNdKToKKyAgICAgICAgKHByZXBhcmVEYXRhRm9yUHJpbnRpbmdPblNl Y29uZGFyeVRocmVhZCk6CisgICAgICAgICgtW1dLUHJpbnRpbmdWaWV3IGtub3dzUGFnZVJhbmdl Ol0pOgorICAgICAgICAoLVtXS1ByaW50aW5nVmlldyBfZHJhd1ByZXZpZXc6XSk6CisgICAgICAg ICgtW1dLUHJpbnRpbmdWaWV3IGRyYXdSZWN0Ol0pOgorICAgICAgICAoLVtXS1ByaW50aW5nVmll dyBfZHJhd1BhZ2VCb3JkZXJXaXRoU2l6ZU9uTWFpblRocmVhZDpdKToKKyAgICAgICAgKC1bV0tQ cmludGluZ1ZpZXcgZHJhd1BhZ2VCb3JkZXJXaXRoU2l6ZTpdKToKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Z2xvYmFsUGFnZU1hcCk6 CisKIDIwMTMtMDktMTQgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAg ICBSZW1vdmUgbm9uLUFwcGxlIGNydWZ0IGZyb20gdGhlIGluc3RhbGxlZCBXS0Jhc2UuaApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmF2aWNvbkRh dGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZhdmlj b25EYXRhYmFzZS5jcHAKaW5kZXggYWYyNzRiOS4uNTFmZWY1YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGYXZpY29uRGF0YWJhc2Uu Y3BwCkBAIC0yNyw4ICsyNyw4IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9JbWFnZS5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvSW50U2l6ZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVmUHRyQ2Fpcm8uaD4K KyNpbmNsdWRlIDxXZWJDb3JlL1J1bkxvb3AuaD4KICNpbmNsdWRlIDxnbGliL2dpMThuLWxpYi5o PgotI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW5jbHVkZSA8d3RmL2dvYmplY3QvR093 blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYv dGV4dC9DU3RyaW5nLmg+CkBAIC0xMzIsNyArMTMyLDcgQEAgV0VCS0lUX0RFRklORV9BU1lOQ19E QVRBX1NUUlVDVChHZXRGYXZpY29uU3VyZmFjZUFzeW5jRGF0YSkKIAogc3RhdGljIFBhc3NSZWZQ dHI8Y2Fpcm9fc3VyZmFjZV90PiBnZXRJY29uU3VyZmFjZVN5bmNocm9ub3VzbHkoV2ViS2l0RmF2 aWNvbkRhdGFiYXNlKiBkYXRhYmFzZSwgY29uc3QgU3RyaW5nJiBwYWdlVVJMLCBHRXJyb3IqKiBl cnJvcikKIHsKLSAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOworICAgIEFTU0VSVChSdW5Mb29w Ojppc01haW4oKSk7CiAKICAgICAvLyBUaGUgZXhhY3Qgc2l6ZSB3ZSBwYXNzIGlzIGlycmVsZXZh bnQgdG8gdGhlIGljb25EYXRhYmFzZSBjb2RlLgogICAgIC8vIFdlIG11c3QgcGFzcyBzb21ldGhp bmcgZ3JlYXRlciB0aGFuIDB4MCB0byBnZXQgYW4gaWNvbi4KQEAgLTIwNCw3ICsyMDQsNyBAQCBz dGF0aWMgdm9pZCBkaWRDaGFuZ2VJY29uRm9yUGFnZVVSTENhbGxiYWNrKFdLSWNvbkRhdGFiYXNl UmVmIHdrSWNvbkRhdGFiYXNlLCBXSwogCiBzdGF0aWMgdm9pZCBpY29uRGF0YVJlYWR5Rm9yUGFn ZVVSTENhbGxiYWNrKFdLSWNvbkRhdGFiYXNlUmVmIHdrSWNvbkRhdGFiYXNlLCBXS1VSTFJlZiB3 a1BhZ2VVUkwsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7Ci0gICAgQVNTRVJUKGlzTWFpblRo cmVhZCgpKTsKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogICAgIHByb2Nlc3NQZW5k aW5nSWNvbnNGb3JQYWdlVVJMKFdFQktJVF9GQVZJQ09OX0RBVEFCQVNFKGNsaWVudEluZm8pLCB0 b0ltcGwod2tQYWdlVVJMKS0+c3RyaW5nKCkpOwogfQogCkBAIC0zNTcsNyArMzU3LDcgQEAgZ2No YXIqIHdlYmtpdF9mYXZpY29uX2RhdGFiYXNlX2dldF9mYXZpY29uX3VyaShXZWJLaXRGYXZpY29u RGF0YWJhc2UqIGRhdGFiYXNlLAogewogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9J U19GQVZJQ09OX0RBVEFCQVNFKGRhdGFiYXNlKSwgMCk7CiAgICAgZ19yZXR1cm5fdmFsX2lmX2Zh aWwocGFnZVVSTCwgMCk7Ci0gICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKyAgICBBU1NFUlQo UnVuTG9vcDo6aXNNYWluKCkpOwogCiAgICAgU3RyaW5nIGljb25VUkxGb3JQYWdlVVJMOwogICAg IGRhdGFiYXNlLT5wcml2LT5pY29uRGF0YWJhc2UtPnN5bmNocm9ub3VzSWNvblVSTEZvclBhZ2VV UkwoU3RyaW5nOjpmcm9tVVRGOChwYWdlVVJMKSwgaWNvblVSTEZvclBhZ2VVUkwpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tQcmludGluZ1ZpZXcubW0g Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ByaW50aW5nVmlldy5tbQppbmRl eCAzNTBhZDU0Li45MDZiMTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL21hYy9XS1ByaW50aW5nVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL21hYy9XS1ByaW50aW5nVmlldy5tbQpAQCAtMzQsOCArMzQsOCBAQAogI2ltcG9ydCAiV2Vi UGFnZVByb3h5LmgiCiAjaW1wb3J0IDxQREZLaXQvUERGS2l0Lmg+CiAjaW1wb3J0IDxXZWJDb3Jl L0dyYXBoaWNzQ29udGV4dC5oPgorI2ltcG9ydCA8V2ViQ29yZS9SdW5Mb29wLmg+CiAjaW1wb3J0 IDxXZWJDb3JlL1dlYkNvcmVPYmpDRXh0cmFzLmg+Ci0jaW1wb3J0IDx3dGYvTWFpblRocmVhZC5o PgogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBA IC0xMDAsNyArMTAwLDcgQEAgc3RhdGljIEJPT0wgaXNGb3JjaW5nUHJldmlld1VwZGF0ZTsKIAog LSAodm9pZClfZGVsYXllZFJlc3VtZUF1dG9kaXNwbGF5VGltZXJGaXJlZAogewotICAgIEFTU0VS VChpc01haW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICAK ICAgICBfYXV0b2Rpc3BsYXlSZXN1bWVUaW1lciA9IG5pbDsKICAgICBbc2VsZiBfc2V0QXV0b2Rp c3BsYXk6WUVTXTsKQEAgLTEyMyw3ICsxMjMsNyBAQCBzdGF0aWMgQk9PTCBpc0ZvcmNpbmdQcmV2 aWV3VXBkYXRlOwogCiAtICh2b2lkKV9hZGp1c3RQcmludGluZ01hcmdpbnNGb3JIZWFkZXJBbmRG b290ZXIKIHsKLSAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOyAvLyBUaGlzIGZ1bmNpdG9uIGNh bGxzIHRoZSBjbGllbnQsIHdoaWNoIHNob3VsZCBvbmx5IGJlIGRvbmUgb24gbWFpbiB0aHJlYWQu CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsgLy8gVGhpcyBmdW5jaXRvbiBjYWxscyB0 aGUgY2xpZW50LCB3aGljaCBzaG91bGQgb25seSBiZSBkb25lIG9uIG1haW4gdGhyZWFkLgogCiAg ICAgTlNQcmludEluZm8gKmluZm8gPSBbX3ByaW50T3BlcmF0aW9uIHByaW50SW5mb107CiAgICAg TlNNdXRhYmxlRGljdGlvbmFyeSAqaW5mb0RpY3Rpb25hcnkgPSBbaW5mbyBkaWN0aW9uYXJ5XTsK QEAgLTIwOSw3ICsyMDksNyBAQCBzdHJ1Y3QgSVBDQ2FsbGJhY2tDb250ZXh0IHsKIAogc3RhdGlj IHZvaWQgcGFnZURpZERyYXdUb0ltYWdlKGNvbnN0IFNoYXJlYWJsZUJpdG1hcDo6SGFuZGxlJiBp bWFnZUhhbmRsZSwgV0tFcnJvclJlZiwgdm9pZCogdW50eXBlZENvbnRleHQpCiB7Ci0gICAgQVNT RVJUKGlzTWFpblRocmVhZCgpKTsKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogCiAg ICAgT3duUHRyPElQQ0NhbGxiYWNrQ29udGV4dD4gY29udGV4dCA9IGFkb3B0UHRyKHN0YXRpY19j YXN0PElQQ0NhbGxiYWNrQ29udGV4dCo+KHVudHlwZWRDb250ZXh0KSk7CiAgICAgV0tQcmludGlu Z1ZpZXcgKnZpZXcgPSBjb250ZXh0LT52aWV3LmdldCgpOwpAQCAtMjM4LDcgKzIzOCw3IEBAIHN0 YXRpYyB2b2lkIHBhZ2VEaWREcmF3VG9JbWFnZShjb25zdCBTaGFyZWFibGVCaXRtYXA6OkhhbmRs ZSYgaW1hZ2VIYW5kbGUsIFdLRXJyCiAKIHN0YXRpYyB2b2lkIHBhZ2VEaWREcmF3VG9QREYoV0tE YXRhUmVmIGRhdGFSZWYsIFdLRXJyb3JSZWYsIHZvaWQqIHVudHlwZWRDb250ZXh0KQogewotICAg IEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsK IAogICAgIE93blB0cjxJUENDYWxsYmFja0NvbnRleHQ+IGNvbnRleHQgPSBhZG9wdFB0cihzdGF0 aWNfY2FzdDxJUENDYWxsYmFja0NvbnRleHQqPih1bnR5cGVkQ29udGV4dCkpOwogICAgIFdLUHJp bnRpbmdWaWV3ICp2aWV3ID0gY29udGV4dC0+dmlldy5nZXQoKTsKQEAgLTI1Nyw3ICsyNTcsNyBA QCBzdGF0aWMgdm9pZCBwYWdlRGlkRHJhd1RvUERGKFdLRGF0YVJlZiBkYXRhUmVmLCBXS0Vycm9y UmVmLCB2b2lkKiB1bnR5cGVkQ29udGV4dAogCiAtICh2b2lkKV9wcmVwYXJlUERGRGF0YUZvclBy aW50aW5nT25TZWNvbmRhcnlUaHJlYWQKIHsKLSAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwor ICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAKICAgICBpZiAoIV93ZWJGcmFtZS0+cGFn ZSgpKSB7CiAgICAgICAgIF9wcmludGluZ0NhbGxiYWNrQ29uZGl0aW9uLnNpZ25hbCgpOwpAQCAt Mjk0LDE0ICsyOTQsMTQgQEAgc3RhdGljIHZvaWQgcGFnZURpZERyYXdUb1BERihXS0RhdGFSZWYg ZGF0YVJlZiwgV0tFcnJvclJlZiwgdm9pZCogdW50eXBlZENvbnRleHQKIAogc3RhdGljIHZvaWQg cGFnZURpZENvbXB1dGVQYWdlUmVjdHMoY29uc3QgVmVjdG9yPFdlYkNvcmU6OkludFJlY3Q+JiBw YWdlUmVjdHMsIGRvdWJsZSB0b3RhbFNjYWxlRmFjdG9yRm9yUHJpbnRpbmcsIFdLRXJyb3JSZWYs IHZvaWQqIHVudHlwZWRDb250ZXh0KQogewotICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Cisg ICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIAogICAgIE93blB0cjxJUENDYWxsYmFja0Nv bnRleHQ+IGNvbnRleHQgPSBhZG9wdFB0cihzdGF0aWNfY2FzdDxJUENDYWxsYmFja0NvbnRleHQq Pih1bnR5cGVkQ29udGV4dCkpOwogICAgIFdLUHJpbnRpbmdWaWV3ICp2aWV3ID0gY29udGV4dC0+ dmlldy5nZXQoKTsKIAogICAgIC8vIElmIHRoZSB1c2VyIGhhcyBhbHJlYWR5IGNoYW5nZWQgcHJp bnQgc2V0dXAsIHRoZW4gdGhpcyByZXNwb25zZSBpcyBvYnNvbGV0ZS4KICAgICBpZiAoY29udGV4 dC0+Y2FsbGJhY2tJRCA9PSB2aWV3LT5fZXhwZWN0ZWRDb21wdXRlZFBhZ2VzQ2FsbGJhY2spIHsK LSAgICAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKyAgICAgICAgQVNTRVJUKFJ1bkxvb3A6 OmlzTWFpbigpKTsKICAgICAgICAgQVNTRVJUKHZpZXctPl9leHBlY3RlZFByZXZpZXdDYWxsYmFj a3MuaXNFbXB0eSgpKTsKICAgICAgICAgQVNTRVJUKCF2aWV3LT5fbGF0ZXN0RXhwZWN0ZWRQcmV2 aWV3Q2FsbGJhY2spOwogICAgICAgICBBU1NFUlQoIXZpZXctPl9leHBlY3RlZFByaW50Q2FsbGJh Y2spOwpAQCAtMzM2LDcgKzMzNiw3IEBAIHN0YXRpYyB2b2lkIHBhZ2VEaWRDb21wdXRlUGFnZVJl Y3RzKGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpJbnRSZWN0PiYgcGFnZVJlY3RzLCBkCiAKIC0gKEJP T0wpX2Fza1BhZ2VUb0NvbXB1dGVQYWdlUmVjdHMKIHsKLSAgICBBU1NFUlQoaXNNYWluVGhyZWFk KCkpOworICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAKICAgICBpZiAoIV93ZWJGcmFt ZS0+cGFnZSgpKQogICAgICAgICByZXR1cm4gTk87CkBAIC0zNTUsNyArMzU1LDcgQEAgc3RhdGlj IHZvaWQgcGFnZURpZENvbXB1dGVQYWdlUmVjdHMoY29uc3QgVmVjdG9yPFdlYkNvcmU6OkludFJl Y3Q+JiBwYWdlUmVjdHMsIGQKIAogc3RhdGljIHZvaWQgcHJlcGFyZURhdGFGb3JQcmludGluZ09u U2Vjb25kYXJ5VGhyZWFkKHZvaWQqIHVudHlwZWRDb250ZXh0KQogewotICAgIEFTU0VSVChpc01h aW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIAogICAgIFdLUHJp bnRpbmdWaWV3ICp2aWV3ID0gc3RhdGljX2Nhc3Q8V0tQcmludGluZ1ZpZXcgKj4odW50eXBlZENv bnRleHQpOwogICAgIE11dGV4TG9ja2VyIGxvY2sodmlldy0+X3ByaW50aW5nQ2FsbGJhY2tNdXRl eCk7CkBAIC0zNzUsMTIgKzM3NSwxMiBAQCBzdGF0aWMgdm9pZCBwcmVwYXJlRGF0YUZvclByaW50 aW5nT25TZWNvbmRhcnlUaHJlYWQodm9pZCogdW50eXBlZENvbnRleHQpCiAKIC0gKEJPT0wpa25v d3NQYWdlUmFuZ2U6KE5TUmFuZ2VQb2ludGVyKXJhbmdlCiB7Ci0gICAgTE9HKFZpZXcsICItW1dL UHJpbnRpbmdWaWV3ICVwIGtub3dzUGFnZVJhbmdlOl0sICVzLCAlcyIsIHNlbGYsIFtzZWxmIF9o YXNQYWdlUmVjdHNdID8gInByaW50IGRhdGEgaXMgYXZhaWxhYmxlIiA6ICJwcmludCBkYXRhIGlz IG5vdCBhdmFpbGFibGUgeWV0IiwgaXNNYWluVGhyZWFkKCkgPyAib24gbWFpbiB0aHJlYWQiIDog Im9uIHNlY29uZGFyeSB0aHJlYWQiKTsKKyAgICBMT0coVmlldywgIi1bV0tQcmludGluZ1ZpZXcg JXAga25vd3NQYWdlUmFuZ2U6XSwgJXMsICVzIiwgc2VsZiwgW3NlbGYgX2hhc1BhZ2VSZWN0c10g PyAicHJpbnQgZGF0YSBpcyBhdmFpbGFibGUiIDogInByaW50IGRhdGEgaXMgbm90IGF2YWlsYWJs ZSB5ZXQiLCBSdW5Mb29wOjppc01haW4oKSA/ICJvbiBtYWluIHRocmVhZCIgOiAib24gc2Vjb25k YXJ5IHRocmVhZCIpOwogICAgIEFTU0VSVChfcHJpbnRPcGVyYXRpb24gPT0gW05TUHJpbnRPcGVy YXRpb24gY3VycmVudE9wZXJhdGlvbl0pOwogCiAgICAgLy8gQXNzdW1pbmcgdGhhdCBvbmNlIHdl IHN3aXRjaCB0byBwcmludGluZyBmcm9tIGEgc2Vjb25kYXJ5IHRocmVhZCwgd2UgZG9uJ3QgZ28g YmFjay4KLSAgICBBU1NFUlQoIV9pc1ByaW50aW5nRnJvbVNlY29uZGFyeVRocmVhZCB8fCAhaXNN YWluVGhyZWFkKCkpOwotICAgIGlmICghaXNNYWluVGhyZWFkKCkpCisgICAgQVNTRVJUKCFfaXNQ cmludGluZ0Zyb21TZWNvbmRhcnlUaHJlYWQgfHwgIVJ1bkxvb3A6OmlzTWFpbigpKTsKKyAgICBp ZiAoIVJ1bkxvb3A6OmlzTWFpbigpKQogICAgICAgICBfaXNQcmludGluZ0Zyb21TZWNvbmRhcnlU aHJlYWQgPSBZRVM7CiAKICAgICBpZiAoIV93ZWJGcmFtZS0+cGFnZSgpKSB7CkBAIC0zOTQsNyAr Mzk0LDcgQEAgc3RhdGljIHZvaWQgcHJlcGFyZURhdGFGb3JQcmludGluZ09uU2Vjb25kYXJ5VGhy ZWFkKHZvaWQqIHVudHlwZWRDb250ZXh0KQogCiAgICAgaWYgKFtzZWxmIF9oYXNQYWdlUmVjdHNd KQogICAgICAgICAqcmFuZ2UgPSBOU01ha2VSYW5nZSgxLCBfcHJpbnRpbmdQYWdlUmVjdHMuc2l6 ZSgpKTsKLSAgICBlbHNlIGlmICghaXNNYWluVGhyZWFkKCkpIHsKKyAgICBlbHNlIGlmICghUnVu TG9vcDo6aXNNYWluKCkpIHsKICAgICAgICAgQVNTRVJUKCFbc2VsZiBfaXNQcmludGluZ1ByZXZp ZXddKTsKICAgICAgICAgTXV0ZXhMb2NrZXIgbG9jayhfcHJpbnRpbmdDYWxsYmFja011dGV4KTsK ICAgICAgICAgY2FsbE9uTWFpblRocmVhZChwcmVwYXJlRGF0YUZvclByaW50aW5nT25TZWNvbmRh cnlUaHJlYWQsIHNlbGYpOwpAQCAtNDcwLDcgKzQ3MCw3IEBAIHN0YXRpYyB2b2lkIHByZXBhcmVE YXRhRm9yUHJpbnRpbmdPblNlY29uZGFyeVRocmVhZCh2b2lkKiB1bnR5cGVkQ29udGV4dCkKIAog LSAodm9pZClfZHJhd1ByZXZpZXc6KE5TUmVjdCluc1JlY3QKIHsKLSAgICBBU1NFUlQoaXNNYWlu VGhyZWFkKCkpOworICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAKICAgICBJbnRSZWN0 IHNjYWxlZFByaW50aW5nUmVjdChuc1JlY3QpOwogICAgIHNjYWxlZFByaW50aW5nUmVjdC5zY2Fs ZSgxIC8gX3RvdGFsU2NhbGVGYWN0b3JGb3JQcmludGluZyk7CkBAIC01MzIsNyArNTMyLDcgQEAg c3RhdGljIHZvaWQgcHJlcGFyZURhdGFGb3JQcmludGluZ09uU2Vjb25kYXJ5VGhyZWFkKHZvaWQq IHVudHlwZWRDb250ZXh0KQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgQVNTRVJUKCFp c01haW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CiAgICAgQVNT RVJUKCFfcHJpbnRlZFBhZ2VzRGF0YS5pc0VtcHR5KCkpOyAvLyBQcmVwYXJlZCBieSBrbm93c1Bh Z2VSYW5nZToKIAogICAgIGlmICghX3ByaW50ZWRQYWdlc1BERkRvY3VtZW50KSB7CkBAIC01NDYs NyArNTQ2LDcgQEAgc3RhdGljIHZvaWQgcHJlcGFyZURhdGFGb3JQcmludGluZ09uU2Vjb25kYXJ5 VGhyZWFkKHZvaWQqIHVudHlwZWRDb250ZXh0KQogCiAtICh2b2lkKV9kcmF3UGFnZUJvcmRlcldp dGhTaXplT25NYWluVGhyZWFkOihOU1NpemUpYm9yZGVyU2l6ZQogewotICAgIEFTU0VSVChpc01h aW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIAogICAgIC8vIFdo ZW4gcHJpbnRpbmcgZnJvbSBhIHNlY29uZGFyeSB0aHJlYWQsIHRoZSBtYWluIHRocmVhZCBkb2Vz bid0IGhhdmUgZ3JhcGhpY3MgY29udGV4dCBhbmQgcHJpbnRpbmcgb3BlcmF0aW9uIHNldCB1cC4K ICAgICBOU0dyYXBoaWNzQ29udGV4dCAqY3VycmVudENvbnRleHQgPSBbTlNHcmFwaGljc0NvbnRl eHQgY3VycmVudENvbnRleHRdOwpAQCAtNTY2LDcgKzU2Niw3IEBAIHN0YXRpYyB2b2lkIHByZXBh cmVEYXRhRm9yUHJpbnRpbmdPblNlY29uZGFyeVRocmVhZCh2b2lkKiB1bnR5cGVkQ29udGV4dCkK ICAgICBBU1NFUlQoTlNFcXVhbFNpemVzKGJvcmRlclNpemUsIFtbX3ByaW50T3BlcmF0aW9uIHBy aW50SW5mb10gcGFwZXJTaXplXSkpOyAgICAKICAgICBBU1NFUlQoX3ByaW50T3BlcmF0aW9uID09 IFtOU1ByaW50T3BlcmF0aW9uIGN1cnJlbnRPcGVyYXRpb25dKTsKIAotICAgIGlmICghaXNNYWlu VGhyZWFkKCkpIHsKKyAgICBpZiAoIVJ1bkxvb3A6OmlzTWFpbigpKSB7CiAgICAgICAgIC8vIERv bid0IGNhbGwgdGhlIGNsaWVudCBmcm9tIGEgc2Vjb25kYXJ5IHRocmVhZC4KICAgICAgICAgTlNJ bnZvY2F0aW9uICppbnZvY2F0aW9uID0gW05TSW52b2NhdGlvbiBpbnZvY2F0aW9uV2l0aE1ldGhv ZFNpZ25hdHVyZTpbV0tQcmludGluZ1ZpZXcgaW5zdGFuY2VNZXRob2RTaWduYXR1cmVGb3JTZWxl Y3RvcjpAc2VsZWN0b3IoX2RyYXdQYWdlQm9yZGVyV2l0aFNpemVPbk1haW5UaHJlYWQ6KV1dOwog ICAgICAgICBbaW52b2NhdGlvbiBzZXRTZWxlY3RvcjpAc2VsZWN0b3IoX2RyYXdQYWdlQm9yZGVy V2l0aFNpemVPbk1haW5UaHJlYWQ6KV07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUHJveHkuY3BwCmluZGV4IGIyZDc1YTguLjI2ZTU2NTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCkBAIC00MSw5ICs0MSw5IEBACiAjaW5j bHVkZSAiV2ViUHJvY2Vzc01lc3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5TWVz c2FnZXMuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0tVUkwuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1J1 bkxvb3AuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1N1ZGRlblRlcm1pbmF0aW9uLmg+CiAjaW5jbHVk ZSA8c3RkaW8uaD4KLSNpbmNsdWRlIDx3dGYvTWFpblRocmVhZC5oPgogI2luY2x1ZGUgPHd0Zi90 ZXh0L0NTdHJpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIApAQCAtNzQs NyArNzQsNyBAQCBzdGF0aWMgdWludDY0X3QgZ2VuZXJhdGVQYWdlSUQoKQogCiBzdGF0aWMgV2Vi UHJvY2Vzc1Byb3h5OjpXZWJQYWdlUHJveHlNYXAmIGdsb2JhbFBhZ2VNYXAoKQogewotICAgIEFT U0VSVChpc01haW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAg ICBERUZJTkVfU1RBVElDX0xPQ0FMKFdlYlByb2Nlc3NQcm94eTo6V2ViUGFnZVByb3h5TWFwLCBw YWdlTWFwLCAoKSk7CiAgICAgcmV0dXJuIHBhZ2VNYXA7CiB9Cg==