51204 2010-12-16 11:59:48 -0800 [Qt] QtWebKit does not build if QT_NO_QFUTURE is defined 2011-01-11 08:19:27 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P2 Blocker --- 50251 1 laszlo.gombos jturcotte commit-queue jturcotte laszlo.gombos s.mathur oldest_to_newest 323327 0 laszlo.gombos 2010-12-16 11:59:48 -0800 Some ports of Qt (notably the Symbian port) does not (yet) support QFuture and QtConcurrent - see http://bugreports.qt.nokia.com/browse/QTBUG-5182. QtWebKit introduced a hard dependency on QFuture with r73710. this dependency should be build time configurable (with QT_NO_QFUTURE) to support Symbian port of QtWebKit. 323766 1 jturcotte 2010-12-17 07:43:24 -0800 (In reply to comment #0) Ok, I didn't know about that. The goal of using QFuture was to make the synchronization code simpler, so having two implementations depending on QT_NO_FUTURE isn't necessary. I think we should replace its use by something supported everywhere. I can take care of that after the Christmas vacations if it can wait. 324582 2 laszlo.gombos 2010-12-20 14:44:11 -0800 Thanks Jocelyn, I assigned the bug to you. The approach you suggested sounds good to me. 331869 3 s.mathur 2011-01-10 13:06:18 -0800 Gentle nudge to Jocelyn about fixing the code from Bug 50080 for Symbian. :) 332274 4 78518 jturcotte 2011-01-11 05:05:13 -0800 Created attachment 78518 Patch 332347 5 78518 commit-queue 2011-01-11 08:19:21 -0800 Comment on attachment 78518 Patch Clearing flags on attachment: 78518 Committed r75502: <http://trac.webkit.org/changeset/75502> 332348 6 commit-queue 2011-01-11 08:19:27 -0800 All reviewed patches have been landed. Closing bug. 78518 2011-01-11 05:05:13 -0800 2011-01-11 08:19:21 -0800 Patch noqfuture.patch text/plain 11182 jturcotte ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlNGRiNDc3Li4wZDM1ZTgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDEtMTEgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UXRdIFJlbW92ZSB1c2VzIG9mIFFGdXR1cmUgc2luY2UgaXQgaXNuJ3Qgc3VwcG9ydGVkIG9uIGFs bCBwbGF0Zm9ybXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01MTIwNAorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9xdC9RdE5BTVRocmVhZFNh ZmVQcm94eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpRdE5BTVRocmVhZFNhZmVQcm94eTo6UXRO QU1UaHJlYWRTYWZlUHJveHkpOgorICAgICAgICAoV2ViQ29yZTo6UXROQU1UaHJlYWRTYWZlUHJv eHk6OmxvY2FsQ29va2llc0ZvclVybCk6CisgICAgICAgIChXZWJDb3JlOjpRdE5BTVRocmVhZFNh ZmVQcm94eTo6bG9jYWxXaWxsTG9hZEZyb21DYWNoZSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0 d29yay9xdC9RdE5BTVRocmVhZFNhZmVQcm94eS5oOgorICAgICAgICAoV2ViQ29yZTo6UXROQU1U aHJlYWRTYWZlUHJveHk6OmNvb2tpZXNGb3JVcmwpOgorICAgICAgICAoV2ViQ29yZTo6UXROQU1U aHJlYWRTYWZlUHJveHk6OndpbGxMb2FkRnJvbUNhY2hlKToKKwogMjAxMS0wMS0xMCAgUGF2ZWwg UG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9xdC9RdE5BTVRocmVhZFNhZmVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3F0L1F0TkFNVGhyZWFkU2FmZVByb3h5LmNwcAppbmRleCAwY2FlYjA1Li5lMGQ2 ZTY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1F0TkFN VGhyZWFkU2FmZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3F0L1F0TkFNVGhyZWFkU2FmZVByb3h5LmNwcApAQCAtMjUsMTAgKzI1LDYgQEAKICNpbmNsdWRl IDxRTmV0d29ya0Nvb2tpZUphcj4KICNpbmNsdWRlIDxRU3RyaW5nTGlzdD4KIAotLy8gVXNlIHVu dXNlZCB2YXJpYWJsZXMgdG8gYmUgYWJsZSB0byBjYWxsIHFSZWdpc3Rlck1ldGFUeXBlIHN0YXRp Y2FsbHkuCi1zdGF0aWMgaW50IGR1bW15U3RhdGljVmFyMSA9IHFSZWdpc3Rlck1ldGFUeXBlPFFG dXR1cmVJbnRlcmZhY2U8Ym9vbD4gPigiUUZ1dHVyZUludGVyZmFjZTxib29sPiIpOwotc3RhdGlj IGludCBkdW1teVN0YXRpY1ZhcjIgPSBxUmVnaXN0ZXJNZXRhVHlwZTxRRnV0dXJlSW50ZXJmYWNl PFFMaXN0PFFOZXR3b3JrQ29va2llPiA+ID4oIlFGdXR1cmVJbnRlcmZhY2U8UUxpc3Q8UU5ldHdv cmtDb29raWU+ID4iKTsKLQogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBRdE5BTVRocmVhZFNhZmVQ cm94eTo6UXROQU1UaHJlYWRTYWZlUHJveHkoUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyICptYW5hZ2Vy KQpAQCAtMzcsOCArMzMsOCBAQCBRdE5BTVRocmVhZFNhZmVQcm94eTo6UXROQU1UaHJlYWRTYWZl UHJveHkoUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyICptYW5hZ2VyKQogICAgIG1vdmVUb1RocmVhZCht YW5hZ2VyLT50aHJlYWQoKSk7CiAKICAgICBjb25uZWN0KHRoaXMsIFNJR05BTChsb2NhbFNldENv b2tpZXNSZXF1ZXN0ZWQoY29uc3QgUVVybCYsIGNvbnN0IFFTdHJpbmcmKSksIFNMT1QobG9jYWxT ZXRDb29raWVzKGNvbnN0IFFVcmwmLCBjb25zdCBRU3RyaW5nJikpKTsKLSAgICBjb25uZWN0KHRo aXMsIFNJR05BTChsb2NhbENvb2tpZXNGb3JVcmxSZXF1ZXN0ZWQoUUZ1dHVyZUludGVyZmFjZTxR TGlzdDxRTmV0d29ya0Nvb2tpZT4gPiwgY29uc3QgUVVybCYpKSwgU0xPVChsb2NhbENvb2tpZXNG b3JVcmwoUUZ1dHVyZUludGVyZmFjZTxRTGlzdDxRTmV0d29ya0Nvb2tpZT4gPiwgY29uc3QgUVVy bCYpKSk7Ci0gICAgY29ubmVjdCh0aGlzLCBTSUdOQUwobG9jYWxXaWxsTG9hZEZyb21DYWNoZVJl cXVlc3RlZChRRnV0dXJlSW50ZXJmYWNlPGJvb2w+LCBjb25zdCBRVXJsJikpLCBTTE9UKGxvY2Fs V2lsbExvYWRGcm9tQ2FjaGUoUUZ1dHVyZUludGVyZmFjZTxib29sPiwgY29uc3QgUVVybCYpKSk7 CisgICAgY29ubmVjdCh0aGlzLCBTSUdOQUwobG9jYWxDb29raWVzRm9yVXJsUmVxdWVzdGVkKGNv bnN0IFFVcmwmLCBib29sKiwgUUxpc3Q8UU5ldHdvcmtDb29raWU+KikpLCBTTE9UKGxvY2FsQ29v a2llc0ZvclVybChjb25zdCBRVXJsJiwgYm9vbCosIFFMaXN0PFFOZXR3b3JrQ29va2llPiopKSk7 CisgICAgY29ubmVjdCh0aGlzLCBTSUdOQUwobG9jYWxXaWxsTG9hZEZyb21DYWNoZVJlcXVlc3Rl ZChjb25zdCBRVXJsJiwgYm9vbCosIGJvb2wqKSksIFNMT1QobG9jYWxXaWxsTG9hZEZyb21DYWNo ZShjb25zdCBRVXJsJiwgYm9vbCosIGJvb2wqKSkpOwogfQogCiB2b2lkIFF0TkFNVGhyZWFkU2Fm ZVByb3h5Ojpsb2NhbFNldENvb2tpZXMoY29uc3QgUVVybCYgdXJsLCBjb25zdCBRU3RyaW5nJiBj b29raWVzKQpAQCAtNTQsMTkgKzUwLDIzIEBAIHZvaWQgUXROQU1UaHJlYWRTYWZlUHJveHk6Omxv Y2FsU2V0Q29va2llcyhjb25zdCBRVXJsJiB1cmwsIGNvbnN0IFFTdHJpbmcmIGNvb2tpCiAgICAg bV9tYW5hZ2VyLT5jb29raWVKYXIoKS0+c2V0Q29va2llc0Zyb21VcmwoY29va2llTGlzdCwgdXJs KTsKIH0KIAotdm9pZCBRdE5BTVRocmVhZFNhZmVQcm94eTo6bG9jYWxDb29raWVzRm9yVXJsKFFG dXR1cmVJbnRlcmZhY2U8UUxpc3Q8UU5ldHdvcmtDb29raWU+ID4gZmksIGNvbnN0IFFVcmwmIHVy bCkKK3ZvaWQgUXROQU1UaHJlYWRTYWZlUHJveHk6OmxvY2FsQ29va2llc0ZvclVybChjb25zdCBR VXJsJiB1cmwsIGJvb2wqIGRvbmUsIFFMaXN0PFFOZXR3b3JrQ29va2llPiogcmVzdWx0KQogewot ICAgIGZpLnJlcG9ydFJlc3VsdChtX21hbmFnZXItPmNvb2tpZUphcigpLT5jb29raWVzRm9yVXJs KHVybCkpOwotICAgIGZpLnJlcG9ydEZpbmlzaGVkKCk7CisgICAgUU11dGV4TG9ja2VyIGxvY2so Jm1fcmVzdWx0TXV0ZXgpOworICAgICpyZXN1bHQgPSBtX21hbmFnZXItPmNvb2tpZUphcigpLT5j b29raWVzRm9yVXJsKHVybCk7CisgICAgKmRvbmUgPSB0cnVlOworICAgIG1fcmVzdWx0V2FpdENv bmRpdGlvbi53YWtlQWxsKCk7CiB9CiAKLXZvaWQgUXROQU1UaHJlYWRTYWZlUHJveHk6OmxvY2Fs V2lsbExvYWRGcm9tQ2FjaGUoUUZ1dHVyZUludGVyZmFjZTxib29sPiBmaSwgY29uc3QgUVVybCYg dXJsKQordm9pZCBRdE5BTVRocmVhZFNhZmVQcm94eTo6bG9jYWxXaWxsTG9hZEZyb21DYWNoZShj b25zdCBRVXJsJiB1cmwsIGJvb2wqIGRvbmUsIGJvb2wqIHJlc3VsdCkKIHsKLSAgICBib29sIHJl dFZhbCA9IGZhbHNlOworICAgIFFNdXRleExvY2tlciBsb2NrKCZtX3Jlc3VsdE11dGV4KTsKICAg ICBpZiAobV9tYW5hZ2VyLT5jYWNoZSgpKQotICAgICAgICByZXRWYWwgPSBtX21hbmFnZXItPmNh Y2hlKCktPm1ldGFEYXRhKHVybCkuaXNWYWxpZCgpOwotCi0gICAgZmkucmVwb3J0RmluaXNoZWQo JnJldFZhbCk7CisgICAgICAgICpyZXN1bHQgPSBtX21hbmFnZXItPmNhY2hlKCktPm1ldGFEYXRh KHVybCkuaXNWYWxpZCgpOworICAgIGVsc2UKKyAgICAgICAgKnJlc3VsdCA9IGZhbHNlOworICAg ICpkb25lID0gdHJ1ZTsKKyAgICBtX3Jlc3VsdFdhaXRDb25kaXRpb24ud2FrZUFsbCgpOwogfQog CiBRdE5ldHdvcmtSZXBseVRocmVhZFNhZmVQcm94eTo6UXROZXR3b3JrUmVwbHlUaHJlYWRTYWZl UHJveHkoUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyICptYW5hZ2VyKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9RdE5BTVRocmVhZFNhZmVQcm94eS5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9RdE5BTVRocmVhZFNhZmVQcm94eS5oCmlu ZGV4IGEyZmE0ZWUuLmFlOTYzY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvcXQvUXROQU1UaHJlYWRTYWZlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL3F0L1F0TkFNVGhyZWFkU2FmZVByb3h5LmgKQEAgLTE5LDExICsxOSwx MSBAQAogI2lmbmRlZiBRdE5BTVRocmVhZFNhZmVQcm94eV9oCiAjZGVmaW5lIFF0TkFNVGhyZWFk U2FmZVByb3h5X2gKIAotI2luY2x1ZGUgPFFGdXR1cmU+CiAjaW5jbHVkZSA8UU11dGV4PgogI2lu Y2x1ZGUgPFFOZXR3b3JrQ29va2llPgogI2luY2x1ZGUgPFFOZXR3b3JrUmVwbHk+CiAjaW5jbHVk ZSA8UU9iamVjdD4KKyNpbmNsdWRlIDxRV2FpdENvbmRpdGlvbj4KIAogUVRfQkVHSU5fTkFNRVNQ QUNFCiBjbGFzcyBRTmV0d29ya0FjY2Vzc01hbmFnZXI7CkBAIC00MywzNCArNDMsNDQgQEAgcHVi bGljOgogICAgICAgICBlbWl0IGxvY2FsU2V0Q29va2llc1JlcXVlc3RlZCh1cmwsIGNvb2tpZXMp OwogICAgIH0KIAotICAgIFFGdXR1cmU8UUxpc3Q8UU5ldHdvcmtDb29raWU+ID4gY29va2llc0Zv clVybChjb25zdCBRVXJsJiB1cmwpCisgICAgUUxpc3Q8UU5ldHdvcmtDb29raWU+IGNvb2tpZXNG b3JVcmwoY29uc3QgUVVybCYgdXJsKQogICAgIHsKLSAgICAgICAgUUZ1dHVyZUludGVyZmFjZTxR TGlzdDxRTmV0d29ya0Nvb2tpZT4gPiBmaTsKLSAgICAgICAgZmkucmVwb3J0U3RhcnRlZCgpOwot ICAgICAgICBlbWl0IGxvY2FsQ29va2llc0ZvclVybFJlcXVlc3RlZChmaSwgdXJsKTsKLSAgICAg ICAgcmV0dXJuIGZpLmZ1dHVyZSgpOworICAgICAgICBib29sIGRvbmUgPSBmYWxzZTsKKyAgICAg ICAgUUxpc3Q8UU5ldHdvcmtDb29raWU+IHJlc3VsdDsKKyAgICAgICAgZW1pdCBsb2NhbENvb2tp ZXNGb3JVcmxSZXF1ZXN0ZWQodXJsLCAmZG9uZSwgJnJlc3VsdCk7CisKKyAgICAgICAgUU11dGV4 TG9ja2VyIGxvY2soJm1fcmVzdWx0TXV0ZXgpOworICAgICAgICB3aGlsZSAoIWRvbmUpCisgICAg ICAgICAgICBtX3Jlc3VsdFdhaXRDb25kaXRpb24ud2FpdCgmbV9yZXN1bHRNdXRleCk7CisgICAg ICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQogCi0gICAgUUZ1dHVyZTxib29sPiB3aWxsTG9hZEZy b21DYWNoZShjb25zdCBRVXJsJiB1cmwpCisgICAgYm9vbCB3aWxsTG9hZEZyb21DYWNoZShjb25z dCBRVXJsJiB1cmwpCiAgICAgewotICAgICAgICBRRnV0dXJlSW50ZXJmYWNlPGJvb2w+IGZpOwot ICAgICAgICBmaS5yZXBvcnRTdGFydGVkKCk7Ci0gICAgICAgIGVtaXQgbG9jYWxXaWxsTG9hZEZy b21DYWNoZVJlcXVlc3RlZChmaSwgdXJsKTsKLSAgICAgICAgcmV0dXJuIGZpLmZ1dHVyZSgpOwor ICAgICAgICBib29sIGRvbmUgPSBmYWxzZTsKKyAgICAgICAgYm9vbCByZXN1bHQ7CisgICAgICAg IGVtaXQgbG9jYWxXaWxsTG9hZEZyb21DYWNoZVJlcXVlc3RlZCh1cmwsICZkb25lLCAmcmVzdWx0 KTsKKworICAgICAgICBRTXV0ZXhMb2NrZXIgbG9jaygmbV9yZXN1bHRNdXRleCk7CisgICAgICAg IHdoaWxlICghZG9uZSkKKyAgICAgICAgICAgIG1fcmVzdWx0V2FpdENvbmRpdGlvbi53YWl0KCZt X3Jlc3VsdE11dGV4KTsKKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAKIHNpZ25hbHM6 Ci0gICAgdm9pZCBsb2NhbFNldENvb2tpZXNSZXF1ZXN0ZWQoY29uc3QgUVVybCYgdXJsLCBjb25z dCBRU3RyaW5nJiBjb29raWVzKTsKLSAgICB2b2lkIGxvY2FsQ29va2llc0ZvclVybFJlcXVlc3Rl ZChRRnV0dXJlSW50ZXJmYWNlPFFMaXN0PFFOZXR3b3JrQ29va2llPiA+IGZpLCBjb25zdCBRVXJs JiB1cmwpOwotICAgIHZvaWQgbG9jYWxXaWxsTG9hZEZyb21DYWNoZVJlcXVlc3RlZChRRnV0dXJl SW50ZXJmYWNlPGJvb2w+IGZpLCBjb25zdCBRVXJsJiB1cmwpOworICAgIHZvaWQgbG9jYWxTZXRD b29raWVzUmVxdWVzdGVkKGNvbnN0IFFVcmwmLCBjb25zdCBRU3RyaW5nJiBjb29raWVzKTsKKyAg ICB2b2lkIGxvY2FsQ29va2llc0ZvclVybFJlcXVlc3RlZChjb25zdCBRVXJsJiwgYm9vbCogZG9u ZSwgUUxpc3Q8UU5ldHdvcmtDb29raWU+KiByZXN1bHQpOworICAgIHZvaWQgbG9jYWxXaWxsTG9h ZEZyb21DYWNoZVJlcXVlc3RlZChjb25zdCBRVXJsJiwgYm9vbCogZG9uZSwgYm9vbCogcmVzdWx0 KTsKIAogcHJpdmF0ZSBzbG90czoKLSAgICB2b2lkIGxvY2FsU2V0Q29va2llcyhjb25zdCBRVXJs JiB1cmwsIGNvbnN0IFFTdHJpbmcmIGNvb2tpZXMpOwotICAgIHZvaWQgbG9jYWxDb29raWVzRm9y VXJsKFFGdXR1cmVJbnRlcmZhY2U8UUxpc3Q8UU5ldHdvcmtDb29raWU+ID4gZmksIGNvbnN0IFFV cmwmIHVybCk7Ci0gICAgdm9pZCBsb2NhbFdpbGxMb2FkRnJvbUNhY2hlKFFGdXR1cmVJbnRlcmZh Y2U8Ym9vbD4gZmksIGNvbnN0IFFVcmwmIHVybCk7CisgICAgdm9pZCBsb2NhbFNldENvb2tpZXMo Y29uc3QgUVVybCYsIGNvbnN0IFFTdHJpbmcmIGNvb2tpZXMpOworICAgIHZvaWQgbG9jYWxDb29r aWVzRm9yVXJsKGNvbnN0IFFVcmwmLCBib29sKiBkb25lLCBRTGlzdDxRTmV0d29ya0Nvb2tpZT4q IHJlc3VsdCk7CisgICAgdm9pZCBsb2NhbFdpbGxMb2FkRnJvbUNhY2hlKGNvbnN0IFFVcmwmLCBi b29sKiBkb25lLCBib29sKiByZXN1bHQpOwogCiBwcml2YXRlOgogICAgIFFOZXR3b3JrQWNjZXNz TWFuYWdlciogbV9tYW5hZ2VyOworICAgIFFNdXRleCBtX3Jlc3VsdE11dGV4OworICAgIFFXYWl0 Q29uZGl0aW9uIG1fcmVzdWx0V2FpdENvbmRpdGlvbjsKIH07CiAKIApkaWZmIC0tZ2l0IGEvVG9v bHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDI5NDNiOTIuLmM2ODU0NjcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNSBAQAorMjAxMS0wMS0xMSAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVA bm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFtRdF0gUmVtb3ZlIHVzZXMgb2YgUUZ1dHVyZSBzaW5jZSBpdCBpc24ndCBzdXBwb3J0ZWQg b24gYWxsIHBsYXRmb3Jtcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUxMjA0CisKKyAgICAgICAgKiBRdFRlc3RCcm93c2VyL3dlYnBhZ2UuaDoKKyAg ICAgICAgKFF0TkFNVGhyZWFkOjpRdE5BTVRocmVhZCk6CisgICAgICAgIChRdE5BTVRocmVhZDo6 bmV0d29ya0FjY2Vzc01hbmFnZXIpOgorICAgICAgICAoUXROQU1UaHJlYWQ6OnJ1bik6CisKIDIw MTEtMDEtMTAgIEpvaG4gS25vdHRlbmJlbHQgIDxqa25vdHRlbkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvVG9vbHMvUXRUZXN0 QnJvd3Nlci93ZWJwYWdlLmggYi9Ub29scy9RdFRlc3RCcm93c2VyL3dlYnBhZ2UuaAppbmRleCBm YTkzYmFiLi4zYjg1NmM5IDEwMDY0NAotLS0gYS9Ub29scy9RdFRlc3RCcm93c2VyL3dlYnBhZ2Uu aAorKysgYi9Ub29scy9RdFRlc3RCcm93c2VyL3dlYnBhZ2UuaApAQCAtMzMsOSArMzMsMTAgQEAK ICNpZm5kZWYgd2VicGFnZV9oCiAjZGVmaW5lIHdlYnBhZ2VfaAogCi0jaW5jbHVkZSA8UUZ1dHVy ZT4KKyNpbmNsdWRlIDxRTXV0ZXg+CiAjaW5jbHVkZSA8UVNjb3BlZFBvaW50ZXI+CiAjaW5jbHVk ZSA8UVRocmVhZD4KKyNpbmNsdWRlIDxRV2FpdENvbmRpdGlvbj4KICNpbmNsdWRlIDxxd2ViZnJh bWUuaD4KICNpbmNsdWRlIDxxd2VicGFnZS5oPgogCkBAIC03OCw4ICs3OSw4IEBAIGNsYXNzIFF0 TkFNVGhyZWFkIDogcHVibGljIFFUaHJlYWQgewogcHVibGljOgogICAgIFF0TkFNVGhyZWFkKFFP YmplY3QgKnBhcmVudCA9IDApCiAgICAgICAgIDogUVRocmVhZChwYXJlbnQpCisgICAgICAgICwg bV9xbmFtKDApCiAgICAgewotICAgICAgICBtX3FuYW1GdXR1cmUucmVwb3J0U3RhcnRlZCgpOwog ICAgIH0KICAgICB+UXROQU1UaHJlYWQoKQogICAgIHsKQEAgLTg3LDIwICs4OCwyOSBAQCBwdWJs aWM6CiAgICAgICAgIHdhaXQoKTsKICAgICB9CiAKLSAgICBRRnV0dXJlPFFOZXR3b3JrQWNjZXNz TWFuYWdlcio+IG5ldHdvcmtBY2Nlc3NNYW5hZ2VyKCkKKyAgICBRTmV0d29ya0FjY2Vzc01hbmFn ZXIqIG5ldHdvcmtBY2Nlc3NNYW5hZ2VyKCkKICAgICB7Ci0gICAgICAgIHJldHVybiBtX3FuYW1G dXR1cmUuZnV0dXJlKCk7CisgICAgICAgIFFNdXRleExvY2tlciBsb2NrKCZtX211dGV4KTsKKyAg ICAgICAgd2hpbGUgKCFtX3FuYW0pCisgICAgICAgICAgICBtX3dhaXRDb25kaXRpb24ud2FpdCgm bV9tdXRleCk7CisgICAgICAgIHJldHVybiBtX3FuYW07CiAgICAgfQogcHJvdGVjdGVkOgogICAg IHZvaWQgcnVuKCkKICAgICB7Ci0gICAgICAgIFFOZXR3b3JrQWNjZXNzTWFuYWdlciBxbmFtOwot ICAgICAgICBtX3FuYW1GdXR1cmUucmVwb3J0UmVzdWx0KCZxbmFtKTsKLSAgICAgICAgbV9xbmFt RnV0dXJlLnJlcG9ydEZpbmlzaGVkKCk7CisgICAgICAgIFFfQVNTRVJUKCFtX3FuYW0pOworICAg ICAgICB7CisgICAgICAgICAgICBRTXV0ZXhMb2NrZXIgbG9jaygmbV9tdXRleCk7CisgICAgICAg ICAgICBtX3FuYW0gPSBuZXcgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOworICAgICAgICAgICAgbV93 YWl0Q29uZGl0aW9uLndha2VBbGwoKTsKKyAgICAgICAgfQogICAgICAgICBleGVjKCk7CisgICAg ICAgIGRlbGV0ZSBtX3FuYW07CiAgICAgfQogcHJpdmF0ZToKLSAgICBRRnV0dXJlSW50ZXJmYWNl PFFOZXR3b3JrQWNjZXNzTWFuYWdlcio+IG1fcW5hbUZ1dHVyZTsKKyAgICBRTmV0d29ya0FjY2Vz c01hbmFnZXIqIG1fcW5hbTsKKyAgICBRTXV0ZXggbV9tdXRleDsKKyAgICBRV2FpdENvbmRpdGlv biBtX3dhaXRDb25kaXRpb247CiB9OwogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9D aGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGQyOGMzOTQuLmYzMzQ2NTcgMTAw NjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpA QCAtMSwzICsxLDE1IEBACisyMDExLTAxLTExICBKb2NlbHluIFR1cmNvdHRlICA8am9jZWx5bi50 dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgW1F0XSBSZW1vdmUgdXNlcyBvZiBRRnV0dXJlIHNpbmNlIGl0IGlzbid0IHN1 cHBvcnRlZCBvbiBhbGwgcGxhdGZvcm1zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTEyMDQKKworICAgICAgICAqIHRlc3RzL3F3ZWJwYWdlL3RzdF9x d2VicGFnZS5jcHA6CisgICAgICAgIChRdE5BTVRocmVhZDo6UXROQU1UaHJlYWQpOgorICAgICAg ICAoUXROQU1UaHJlYWQ6Om5ldHdvcmtBY2Nlc3NNYW5hZ2VyKToKKyAgICAgICAgKFF0TkFNVGhy ZWFkOjpydW4pOgorCiAyMDExLTAxLTA5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90 QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNzUzMzcuCmRp ZmYgLS1naXQgYS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcCBiL1dl YktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCmluZGV4IGI3MWY2NjUuLjYz MmQ4MWUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2Uu Y3BwCisrKyBiL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCkBAIC0y NjczLDggKzI2NzMsOCBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6c3VwcG9ydGVkQ29udGVudFR5cGUo KQogY2xhc3MgUXROQU1UaHJlYWQgOiBwdWJsaWMgUVRocmVhZCB7CiBwdWJsaWM6CiAgICAgUXRO QU1UaHJlYWQoKQorICAgICAgICA6IG1fcW5hbSgwKQogICAgIHsKLSAgICAgICAgbV9xbmFtRnV0 dXJlLnJlcG9ydFN0YXJ0ZWQoKTsKICAgICB9CiAgICAgflF0TkFNVGhyZWFkKCkKICAgICB7CkBA IC0yNjgyLDIwICsyNjgyLDI5IEBAIHB1YmxpYzoKICAgICAgICAgd2FpdCgpOwogICAgIH0KIAot ICAgIFFGdXR1cmU8UU5ldHdvcmtBY2Nlc3NNYW5hZ2VyKj4gbmV0d29ya0FjY2Vzc01hbmFnZXIo KQorICAgIFFOZXR3b3JrQWNjZXNzTWFuYWdlciogbmV0d29ya0FjY2Vzc01hbmFnZXIoKQogICAg IHsKLSAgICAgICAgcmV0dXJuIG1fcW5hbUZ1dHVyZS5mdXR1cmUoKTsKKyAgICAgICAgUU11dGV4 TG9ja2VyIGxvY2soJm1fbXV0ZXgpOworICAgICAgICB3aGlsZSAoIW1fcW5hbSkKKyAgICAgICAg ICAgIG1fd2FpdENvbmRpdGlvbi53YWl0KCZtX211dGV4KTsKKyAgICAgICAgcmV0dXJuIG1fcW5h bTsKICAgICB9CiBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBydW4oKQogICAgIHsKLSAgICAgICAgUU5l dHdvcmtBY2Nlc3NNYW5hZ2VyKiBxbmFtID0gbmV3IFFOZXR3b3JrQWNjZXNzTWFuYWdlcjsKLSAg ICAgICAgbV9xbmFtRnV0dXJlLnJlcG9ydEZpbmlzaGVkKCZxbmFtKTsKKyAgICAgICAgUV9BU1NF UlQoIW1fcW5hbSk7CisgICAgICAgIHsKKyAgICAgICAgICAgIFFNdXRleExvY2tlciBsb2NrKCZt X211dGV4KTsKKyAgICAgICAgICAgIG1fcW5hbSA9IG5ldyBRTmV0d29ya0FjY2Vzc01hbmFnZXI7 CisgICAgICAgICAgICBtX3dhaXRDb25kaXRpb24ud2FrZUFsbCgpOworICAgICAgICB9CiAgICAg ICAgIGV4ZWMoKTsKLSAgICAgICAgZGVsZXRlIHFuYW07CisgICAgICAgIGRlbGV0ZSBtX3FuYW07 CiAgICAgfQogcHJpdmF0ZToKLSAgICBRRnV0dXJlSW50ZXJmYWNlPFFOZXR3b3JrQWNjZXNzTWFu YWdlcio+IG1fcW5hbUZ1dHVyZTsKKyAgICBRTmV0d29ya0FjY2Vzc01hbmFnZXIqIG1fcW5hbTsK KyAgICBRTXV0ZXggbV9tdXRleDsKKyAgICBRV2FpdENvbmRpdGlvbiBtX3dhaXRDb25kaXRpb247 CiB9OwogCiB2b2lkIHRzdF9RV2ViUGFnZTo6bmV0d29ya0FjY2Vzc01hbmFnZXJPbkRpZmZlcmVu dFRocmVhZCgpCg==