150592 2015-10-27 10:14:51 -0700 [GTK] Use RunLoop::Timer instead of GMainLoopSource 2015-10-30 05:13:05 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 150590 1 cgarcia webkit-unassigned bugs-noreply zan oldest_to_newest 1136828 0 cgarcia 2015-10-27 10:14:51 -0700 For now only in the cases where the default priority is used. 1136830 1 264135 cgarcia 2015-10-27 10:17:09 -0700 Created attachment 264135 Patch 1137074 2 264135 zan 2015-10-28 00:57:18 -0700 Comment on attachment 264135 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=264135&action=review > Source/WebKit2/UIProcess/gtk/GestureController.cpp:130 > + dragGesture->m_longPressTimeout.startOneShot(delay / 1000.0); Not in the scope of this patch, but RunLoop::Timer::startOneShot() sure could use an overload that takes in std::chrono::something. 1137856 3 cgarcia 2015-10-30 05:13:05 -0700 Committed r191787: <http://trac.webkit.org/changeset/191787> 264135 2015-10-27 10:17:09 -0700 2015-10-28 00:57:18 -0700 Patch wk-runloop-timer.diff text/plain 13064 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0OWNhZmU1Li5iOGUyNDJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTUtMTAtMjcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFVzZSBSdW5Mb29wOjpUaW1lciBpbnN0ZWFkIG9mIEdNYWluTG9v cFNvdXJjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTUwNTkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmg6CisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmg6CisgICAgICAgIChXZWJDb3JlOjpSZXNv dXJjZUhhbmRsZUludGVybmFsOjpSZXNvdXJjZUhhbmRsZUludGVybmFsKToKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OmNsZWFudXBTb3VwUmVxdWVzdE9wZXJhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZUhhbmRsZTo6dGltZW91dEZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNl SGFuZGxlOjpzZW5kUGVuZGluZ1JlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VI YW5kbGU6OnBsYXRmb3JtU2V0RGVmZXJzTG9hZGluZyk6CisKIDIwMTUtMTAtMjUgIENhcmxvcyBH YXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIE1ha2UgZXZlcnkg cG9ydCBpbXBsZW1lbnQgTWFpblRocmVhZFNoYXJlZFRpbWVyIGluc3RlYWQgb2YgdXNpbmcgZ2xv YmFsIGZ1bmN0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9SZXNvdXJjZUhhbmRsZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNv dXJjZUhhbmRsZS5oCmluZGV4IGExZjU5MWUuLjUyZGQ0NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmgKQEAgLTI4OSw2ICsyODksMTAg QEAgcHJpdmF0ZToKIHN0YXRpYyB2b2lkIGdldENvbm5lY3Rpb25UaW1pbmdEYXRhKE5TRGljdGlv bmFyeSAqdGltaW5nRGF0YSwgUmVzb3VyY2VMb2FkVGltaW5nJik7CiAjZW5kaWYKIAorI2lmIFVT RShTT1VQKQorICAgIHZvaWQgdGltZW91dEZpcmVkKCk7CisjZW5kaWYKKwogICAgIGZyaWVuZCBj bGFzcyBSZXNvdXJjZUhhbmRsZUludGVybmFsOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxSZXNvdXJj ZUhhbmRsZUludGVybmFsPiBkOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5oCmluZGV4IGNjZWQ4YjIuLjYxMjNm MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VI YW5kbGVJbnRlcm5hbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVz b3VyY2VIYW5kbGVJbnRlcm5hbC5oCkBAIC01Miw3ICs1Miw3IEBACiAjaWYgVVNFKFNPVVApCiAj aW5jbHVkZSAiR1VuaXF1ZVB0clNvdXAuaCIKICNpbmNsdWRlIDxsaWJzb3VwL3NvdXAuaD4KLSNp bmNsdWRlIDx3dGYvZ2xpYi9HTWFpbkxvb3BTb3VyY2UuaD4KKyNpbmNsdWRlIDx3dGYvUnVuTG9v cC5oPgogI2luY2x1ZGUgPHd0Zi9nbGliL0dSZWZQdHIuaD4KICNlbmRpZgogCkBAIC05MSw2ICs5 MSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICNlbmRpZgogI2lmIFVTRShTT1VQKQogICAgICAg ICAgICAgLCBtX2NhbmNlbGxlZChmYWxzZSkKKyAgICAgICAgICAgICwgbV90aW1lb3V0U291cmNl KFJ1bkxvb3A6Om1haW4oKSwgbG9hZGVyLCAmUmVzb3VyY2VIYW5kbGU6OnRpbWVvdXRGaXJlZCkK ICAgICAgICAgICAgICwgbV9ib2R5U2l6ZSgwKQogICAgICAgICAgICAgLCBtX2JvZHlEYXRhU2Vu dCgwKQogICAgICAgICAgICAgLCBtX3JlZGlyZWN0Q291bnQoMCkKQEAgLTE2OSw3ICsxNzAsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIEdSZWZQdHI8U291cE11bHRpcGFydElucHV0 U3RyZWFtPiBtX211bHRpcGFydElucHV0U3RyZWFtOwogICAgICAgICBHUmVmUHRyPEdDYW5jZWxs YWJsZT4gbV9jYW5jZWxsYWJsZTsKICAgICAgICAgR1JlZlB0cjxHQXN5bmNSZXN1bHQ+IG1fZGVm ZXJyZWRSZXN1bHQ7Ci0gICAgICAgIEdNYWluTG9vcFNvdXJjZSBtX3RpbWVvdXRTb3VyY2U7Cisg ICAgICAgIFJ1bkxvb3A6OlRpbWVyPFJlc291cmNlSGFuZGxlPiBtX3RpbWVvdXRTb3VyY2U7CiAg ICAgICAgIEdVbmlxdWVQdHI8U291cEJ1ZmZlcj4gbV9zb3VwQnVmZmVyOwogICAgICAgICB1bnNp Z25lZCBsb25nIG1fYm9keVNpemU7CiAgICAgICAgIHVuc2lnbmVkIGxvbmcgbV9ib2R5RGF0YVNl bnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVz b3VyY2VIYW5kbGVTb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291 cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCmluZGV4IGRjMzkyNDIuLjk1Njg5N2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNv dXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJj ZUhhbmRsZVNvdXAuY3BwCkBAIC02MDEsNyArNjAxLDcgQEAgc3RhdGljIHZvaWQgY2xlYW51cFNv dXBSZXF1ZXN0T3BlcmF0aW9uKFJlc291cmNlSGFuZGxlKiBoYW5kbGUsIGJvb2wgaXNEZXN0cm95 aW4KICAgICAgICAgZC0+bV9zb3VwTWVzc2FnZS5jbGVhcigpOwogICAgIH0KIAotICAgIGQtPm1f dGltZW91dFNvdXJjZS5jYW5jZWwoKTsKKyAgICBkLT5tX3RpbWVvdXRTb3VyY2Uuc3RvcCgpOwog CiAgICAgaWYgKCFpc0Rlc3Ryb3lpbmcpCiAgICAgICAgIGhhbmRsZS0+ZGVyZWYoKTsKQEAgLTEw NDksMTkgKzEwNDksMjAgQEAgUmVmUHRyPFJlc291cmNlSGFuZGxlPiBSZXNvdXJjZUhhbmRsZTo6 cmVsZWFzZUZvckRvd25sb2FkKFJlc291cmNlSGFuZGxlQ2xpZW50KgogICAgIHJldHVybiBuZXdI YW5kbGU7CiB9CiAKK3ZvaWQgUmVzb3VyY2VIYW5kbGU6OnRpbWVvdXRGaXJlZCgpCit7CisgICAg Y2xpZW50KCktPmRpZEZhaWwodGhpcywgUmVzb3VyY2VFcnJvcjo6dGltZW91dEVycm9yKGZpcnN0 UmVxdWVzdCgpLnVybCgpLnN0cmluZygpKSk7CisgICAgY2FuY2VsKCk7Cit9CisKIHZvaWQgUmVz b3VyY2VIYW5kbGU6OnNlbmRQZW5kaW5nUmVxdWVzdCgpCiB7CiAjaWYgRU5BQkxFKFdFQl9USU1J TkcpCiAgICAgbV9yZXF1ZXN0VGltZSA9IG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpOwog I2VuZGlmCiAKLSAgICBpZiAoZC0+bV9maXJzdFJlcXVlc3QudGltZW91dEludGVydmFsKCkgPiAw KSB7Ci0gICAgICAgIGQtPm1fdGltZW91dFNvdXJjZS5zY2hlZHVsZUFmdGVyRGVsYXkoIltXZWJL aXRdIFJlc291cmNlSGFuZGxlIHJlcXVlc3QgdGltZW91dCIsIFt0aGlzXSB7Ci0gICAgICAgICAg ICBjbGllbnQoKS0+ZGlkRmFpbCh0aGlzLCBSZXNvdXJjZUVycm9yOjp0aW1lb3V0RXJyb3IoZmly c3RSZXF1ZXN0KCkudXJsKCkuc3RyaW5nKCkpKTsKLSAgICAgICAgICAgIGNhbmNlbCgpOwotICAg ICAgICB9LCBzdGQ6OmNocm9ubzo6ZHVyYXRpb25fY2FzdDxzdGQ6OmNocm9ubzo6bWljcm9zZWNv bmRzPihzdGQ6OmNocm9ubzo6ZHVyYXRpb248ZG91YmxlPihkLT5tX2ZpcnN0UmVxdWVzdC50aW1l b3V0SW50ZXJ2YWwoKSkpLAotICAgICAgICBHX1BSSU9SSVRZX0RFRkFVTFQsIG51bGxwdHIsIGdf bWFpbl9jb250ZXh0X2dldF90aHJlYWRfZGVmYXVsdCgpKTsKLSAgICB9CisgICAgaWYgKGQtPm1f Zmlyc3RSZXF1ZXN0LnRpbWVvdXRJbnRlcnZhbCgpID4gMCkKKyAgICAgICAgZC0+bV90aW1lb3V0 U291cmNlLnN0YXJ0T25lU2hvdChkLT5tX2ZpcnN0UmVxdWVzdC50aW1lb3V0SW50ZXJ2YWwoKSk7 CiAKICAgICAvLyBCYWxhbmNlZCBieSBhIGRlcmVmKCkgaW4gY2xlYW51cFNvdXBSZXF1ZXN0T3Bl cmF0aW9uLCB3aGljaCBzaG91bGQgYWx3YXlzIHJ1bi4KICAgICByZWYoKTsKQEAgLTEyNjUsNyAr MTI2Niw3IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVmZXJzTG9hZGluZyhi b29sIGRlZmVyc0xvYWRpbmcpCiAKICAgICAvLyBFeGNlcHQgd2hlbiBjYW5jZWxpbmcgYSBwb3Nz aWJsZSB0aW1lb3V0IHRpbWVyLCB3ZSBvbmx5IG5lZWQgdG8gdGFrZSBhY3Rpb24gaGVyZSB0byBV Ti1kZWZlciBsb2FkaW5nLgogICAgIGlmIChkZWZlcnNMb2FkaW5nKSB7Ci0gICAgICAgIGQtPm1f dGltZW91dFNvdXJjZS5jYW5jZWwoKTsKKyAgICAgICAgZC0+bV90aW1lb3V0U291cmNlLnN0b3Ao KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGYzZjU1ZTkuLjljNDM0 NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNiBAQAogMjAxNS0xMC0yNyAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gVXNlIFJ1bkxv b3A6OlRpbWVyIGluc3RlYWQgb2YgR01haW5Mb29wU291cmNlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA1OTIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9Eb3dubG9hZHMvc291cC9Eb3du bG9hZFNvdXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpEb3dubG9hZENsaWVudDo6RG93bmxvYWRD bGllbnQpOgorICAgICAgICAoV2ViS2l0OjpEb3dubG9hZENsaWVudDo6ZGlkUmVjZWl2ZURhdGEp OgorICAgICAgICAoV2ViS2l0OjpEb3dubG9hZENsaWVudDo6aGFuZGxlUmVzcG9uc2VMYXRlcik6 CisgICAgICAgICogVUlQcm9jZXNzL2d0ay9HZXN0dXJlQ29udHJvbGxlci5jcHA6CisgICAgICAg IChXZWJLaXQ6Okdlc3R1cmVDb250cm9sbGVyOjpEcmFnR2VzdHVyZTo6YmVnaW4pOgorICAgICAg ICAoV2ViS2l0OjpHZXN0dXJlQ29udHJvbGxlcjo6RHJhZ0dlc3R1cmU6OnVwZGF0ZSk6CisgICAg ICAgIChXZWJLaXQ6Okdlc3R1cmVDb250cm9sbGVyOjpEcmFnR2VzdHVyZTo6ZW5kKToKKyAgICAg ICAgKFdlYktpdDo6R2VzdHVyZUNvbnRyb2xsZXI6OkRyYWdHZXN0dXJlOjpsb25nUHJlc3NGaXJl ZCk6CisgICAgICAgIChXZWJLaXQ6Okdlc3R1cmVDb250cm9sbGVyOjpEcmFnR2VzdHVyZTo6RHJh Z0dlc3R1cmUpOgorICAgICAgICAoV2ViS2l0OjpHZXN0dXJlQ29udHJvbGxlcjo6Wm9vbUdlc3R1 cmU6OnNjYWxlQ2hhbmdlZCk6CisgICAgICAgIChXZWJLaXQ6Okdlc3R1cmVDb250cm9sbGVyOjpa b29tR2VzdHVyZTo6Wm9vbUdlc3R1cmUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvR2VzdHVy ZUNvbnRyb2xsZXIuaDoKKworMjAxNS0xMC0yNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10gVXNlIGEgcGVyc2lzdGVudCBtYWluIGxv b3Agc291cmNlIGluIFJ1bkxvb3AgZ2xpYiBpbXBsZW1lbnRhdGlvbgogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwNTkwCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9Eb3dubG9hZHMvc291cC9Eb3dubG9hZFNvdXAuY3BwIGIvU291 cmNlL1dlYktpdDIvU2hhcmVkL0Rvd25sb2Fkcy9zb3VwL0Rvd25sb2FkU291cC5jcHAKaW5kZXgg NzRmZjFhOC4uNTY1NWRmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0Rvd25s b2Fkcy9zb3VwL0Rvd25sb2FkU291cC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0Rv d25sb2Fkcy9zb3VwL0Rvd25sb2FkU291cC5jcHAKQEAgLTMyLDcgKzMyLDcgQEAKICNpbmNsdWRl IDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUhh bmRsZUludGVybmFsLmg+CiAjaW5jbHVkZSA8Z2lvL2dpby5oPgotI2luY2x1ZGUgPHd0Zi9nbGli L0dNYWluTG9vcFNvdXJjZS5oPgorI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+CiAjaW5jbHVkZSA8 d3RmL2dsaWIvR1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9nbGliL0dVbmlxdWVQdHIuaD4KICNp bmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC01MCw2ICs1MCw3IEBAIGNsYXNzIERvd25s b2FkQ2xpZW50IDogcHVibGljIFJlc291cmNlSGFuZGxlQ2xpZW50IHsKIHB1YmxpYzoKICAgICBE b3dubG9hZENsaWVudChEb3dubG9hZCogZG93bmxvYWQpCiAgICAgICAgIDogbV9kb3dubG9hZChk b3dubG9hZCkKKyAgICAgICAgLCBtX2hhbmRsZVJlc3BvbnNlTGF0ZXIoUnVuTG9vcDo6bWFpbigp LCB0aGlzLCAmRG93bmxvYWRDbGllbnQ6OmhhbmRsZVJlc3BvbnNlKQogICAgICAgICAsIG1fYWxs b3dPdmVyd3JpdGUoZmFsc2UpCiAgICAgewogICAgIH0KQEAgLTEzMSw4ICsxMzIsOCBAQCBwdWJs aWM6CiAKICAgICB2b2lkIGRpZFJlY2VpdmVEYXRhKFJlc291cmNlSGFuZGxlKiwgY29uc3QgY2hh ciogZGF0YSwgdW5zaWduZWQgbGVuZ3RoLCBpbnQgLyplbmNvZGVkRGF0YUxlbmd0aCovKQogICAg IHsKLSAgICAgICAgaWYgKG1faGFuZGxlUmVzcG9uc2VMYXRlci5pc1NjaGVkdWxlZCgpKSB7Ci0g ICAgICAgICAgICBtX2hhbmRsZVJlc3BvbnNlTGF0ZXIuY2FuY2VsKCk7CisgICAgICAgIGlmICht X2hhbmRsZVJlc3BvbnNlTGF0ZXIuaXNBY3RpdmUoKSkgeworICAgICAgICAgICAgbV9oYW5kbGVS ZXNwb25zZUxhdGVyLnN0b3AoKTsKICAgICAgICAgICAgIGhhbmRsZVJlc3BvbnNlKCk7CiAgICAg ICAgIH0KIApAQCAtMTk3LDEzICsxOTgsMTMgQEAgcHVibGljOgogICAgIHZvaWQgaGFuZGxlUmVz cG9uc2VMYXRlcihjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKICAgICB7CiAgICAg ICAgIEFTU0VSVChtX3Jlc3BvbnNlLmlzTnVsbCgpKTsKLSAgICAgICAgQVNTRVJUKCFtX2hhbmRs ZVJlc3BvbnNlTGF0ZXIuaXNTY2hlZHVsZWQoKSk7CisgICAgICAgIEFTU0VSVCghbV9oYW5kbGVS ZXNwb25zZUxhdGVyLmlzQWN0aXZlKCkpOwogCiAgICAgICAgIG1fZGVsYXllZFJlc3BvbnNlID0g cmVzcG9uc2U7CiAKICAgICAgICAgLy8gQ2FsbCBkaWRSZWNlaXZlUmVzcG9uc2UgaW4gYW4gaWRs ZSB0byBtYWtlIHN1cmUgdGhlIGRvd25sb2FkIGlzIGFkZGVkCiAgICAgICAgIC8vIHRvIHRoZSBE b3dubG9hZE1hbmFnZXIgZG93bmxvYWRzIG1hcC4KLSAgICAgICAgbV9oYW5kbGVSZXNwb25zZUxh dGVyLnNjaGVkdWxlKCJbV2ViS2l0XSBEb3dubG9hZEhhbmRsZVJlc3BvbnNlTGF0ZXIiLCBzdGQ6 OmZ1bmN0aW9uPHZvaWQoKT4oc3RkOjpiaW5kKCZEb3dubG9hZENsaWVudDo6aGFuZGxlUmVzcG9u c2UsIHRoaXMpKSk7CisgICAgICAgIG1faGFuZGxlUmVzcG9uc2VMYXRlci5zdGFydE9uZVNob3Qo MCk7CiAgICAgfQogCiAgICAgRG93bmxvYWQqIG1fZG93bmxvYWQ7CkBAIC0yMTIsNyArMjEzLDcg QEAgcHVibGljOgogICAgIEdSZWZQdHI8R0ZpbGU+IG1fZGVzdGluYXRpb25GaWxlOwogICAgIEdS ZWZQdHI8R0ZpbGU+IG1faW50ZXJtZWRpYXRlRmlsZTsKICAgICBSZXNvdXJjZVJlc3BvbnNlIG1f ZGVsYXllZFJlc3BvbnNlOwotICAgIEdNYWluTG9vcFNvdXJjZSBtX2hhbmRsZVJlc3BvbnNlTGF0 ZXI7CisgICAgUnVuTG9vcDo6VGltZXI8RG93bmxvYWRDbGllbnQ+IG1faGFuZGxlUmVzcG9uc2VM YXRlcjsKICAgICBib29sIG1fYWxsb3dPdmVyd3JpdGU7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL0dlc3R1cmVDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9ndGsvR2VzdHVyZUNvbnRyb2xsZXIuY3BwCmluZGV4IDk4N2ZiMTQu LjdlMTU3N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvR2VzdHVy ZUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvR2VzdHVy ZUNvbnRyb2xsZXIuY3BwCkBAIC0xMjcsOSArMTI3LDcgQEAgdm9pZCBHZXN0dXJlQ29udHJvbGxl cjo6RHJhZ0dlc3R1cmU6OmJlZ2luKERyYWdHZXN0dXJlKiBkcmFnR2VzdHVyZSwgZG91YmxlIHgs IGQKICAgICBHdGtXaWRnZXQqIHdpZGdldCA9IGd0a19ldmVudF9jb250cm9sbGVyX2dldF93aWRn ZXQoR1RLX0VWRU5UX0NPTlRST0xMRVIoZ2VzdHVyZSkpOwogICAgIHVuc2lnbmVkIGRlbGF5Owog ICAgIGdfb2JqZWN0X2dldChndGtfd2lkZ2V0X2dldF9zZXR0aW5ncyh3aWRnZXQpLCAiZ3RrLWxv bmctcHJlc3MtdGltZSIsICZkZWxheSwgbnVsbHB0cik7Ci0gICAgZHJhZ0dlc3R1cmUtPm1fbG9u Z1ByZXNzVGltZW91dC5zY2hlZHVsZUFmdGVyRGVsYXkoIltXZWJLaXRdIERyYWdHZXN0dXJlIGxv bmcgcHJlc3MgdGltZW91dCIsIFtkcmFnR2VzdHVyZV0oKSB7Ci0gICAgICAgIGRyYWdHZXN0dXJl LT5tX2luRHJhZyA9IHRydWU7Ci0gICAgfSwgc3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcyhkZWxh eSkpOworICAgIGRyYWdHZXN0dXJlLT5tX2xvbmdQcmVzc1RpbWVvdXQuc3RhcnRPbmVTaG90KGRl bGF5IC8gMTAwMC4wKTsKIH0KIAogdm9pZCBHZXN0dXJlQ29udHJvbGxlcjo6RHJhZ0dlc3R1cmU6 OnVwZGF0ZShEcmFnR2VzdHVyZSogZHJhZ0dlc3R1cmUsIGRvdWJsZSB4LCBkb3VibGUgeSwgR3Rr R2VzdHVyZSogZ2VzdHVyZSkKQEAgLTE0MCw3ICsxMzgsNyBAQCB2b2lkIEdlc3R1cmVDb250cm9s bGVyOjpEcmFnR2VzdHVyZTo6dXBkYXRlKERyYWdHZXN0dXJlKiBkcmFnR2VzdHVyZSwgZG91Ymxl IHgsCiAgICAgR3RrV2lkZ2V0KiB3aWRnZXQgPSBndGtfZXZlbnRfY29udHJvbGxlcl9nZXRfd2lk Z2V0KEdUS19FVkVOVF9DT05UUk9MTEVSKGdlc3R1cmUpKTsKICAgICBpZiAoIWRyYWdHZXN0dXJl LT5tX2luRHJhZyAmJiBndGtfZHJhZ19jaGVja190aHJlc2hvbGQod2lkZ2V0LCBkcmFnR2VzdHVy ZS0+bV9zdGFydC54KCksIGRyYWdHZXN0dXJlLT5tX3N0YXJ0LnkoKSwgZHJhZ0dlc3R1cmUtPm1f c3RhcnQueCgpICsgeCwgZHJhZ0dlc3R1cmUtPm1fc3RhcnQueSgpICsgeSkpIHsKICAgICAgICAg ZHJhZ0dlc3R1cmUtPm1faW5EcmFnID0gdHJ1ZTsKLSAgICAgICAgZHJhZ0dlc3R1cmUtPm1fbG9u Z1ByZXNzVGltZW91dC5jYW5jZWwoKTsKKyAgICAgICAgZHJhZ0dlc3R1cmUtPm1fbG9uZ1ByZXNz VGltZW91dC5zdG9wKCk7CiAgICAgfQogCiAgICAgaWYgKGRyYWdHZXN0dXJlLT5tX2luRHJhZykK QEAgLTE1MCw3ICsxNDgsNyBAQCB2b2lkIEdlc3R1cmVDb250cm9sbGVyOjpEcmFnR2VzdHVyZTo6 dXBkYXRlKERyYWdHZXN0dXJlKiBkcmFnR2VzdHVyZSwgZG91YmxlIHgsCiAKIHZvaWQgR2VzdHVy ZUNvbnRyb2xsZXI6OkRyYWdHZXN0dXJlOjplbmQoRHJhZ0dlc3R1cmUqIGRyYWdHZXN0dXJlLCBH ZGtFdmVudFNlcXVlbmNlKiBzZXF1ZW5jZSwgR3RrR2VzdHVyZSogZ2VzdHVyZSkKIHsKLSAgICBk cmFnR2VzdHVyZS0+bV9sb25nUHJlc3NUaW1lb3V0LmNhbmNlbCgpOworICAgIGRyYWdHZXN0dXJl LT5tX2xvbmdQcmVzc1RpbWVvdXQuc3RvcCgpOwogICAgIGlmICghZHJhZ0dlc3R1cmUtPm1faW5E cmFnKSB7CiAgICAgICAgIGRyYWdHZXN0dXJlLT5oYW5kbGVUYXAoZ3RrX2dlc3R1cmVfZ2V0X2xh c3RfZXZlbnQoZ2VzdHVyZSwgc2VxdWVuY2UpKTsKICAgICAgICAgZ3RrX2dlc3R1cmVfc2V0X3N0 YXRlKGdlc3R1cmUsIEdUS19FVkVOVF9TRVFVRU5DRV9ERU5JRUQpOwpAQCAtMTU4LDggKzE1Niwx NCBAQCB2b2lkIEdlc3R1cmVDb250cm9sbGVyOjpEcmFnR2VzdHVyZTo6ZW5kKERyYWdHZXN0dXJl KiBkcmFnR2VzdHVyZSwgR2RrRXZlbnRTZXF1ZQogICAgICAgICBndGtfZ2VzdHVyZV9zZXRfc3Rh dGUoZ2VzdHVyZSwgR1RLX0VWRU5UX1NFUVVFTkNFX0RFTklFRCk7CiB9CiAKK3ZvaWQgR2VzdHVy ZUNvbnRyb2xsZXI6OkRyYWdHZXN0dXJlOjpsb25nUHJlc3NGaXJlZCgpCit7CisgICAgbV9pbkRy YWcgPSB0cnVlOworfQorCiBHZXN0dXJlQ29udHJvbGxlcjo6RHJhZ0dlc3R1cmU6OkRyYWdHZXN0 dXJlKFdlYlBhZ2VQcm94eSYgcGFnZSkKICAgICA6IEdlc3R1cmUoZ3RrX2dlc3R1cmVfZHJhZ19u ZXcocGFnZS52aWV3V2lkZ2V0KCkpLCBwYWdlKQorICAgICwgbV9sb25nUHJlc3NUaW1lb3V0KFJ1 bkxvb3A6Om1haW4oKSwgdGhpcywgJkdlc3R1cmVDb250cm9sbGVyOjpEcmFnR2VzdHVyZTo6bG9u Z1ByZXNzRmlyZWQpCiAgICAgLCBtX2luRHJhZyhmYWxzZSkKIHsKICAgICBndGtfZ2VzdHVyZV9z aW5nbGVfc2V0X3RvdWNoX29ubHkoR1RLX0dFU1RVUkVfU0lOR0xFKG1fZ2VzdHVyZS5nZXQoKSks IFRSVUUpOwpAQCAtMTk5LDE2ICsyMDMsMTcgQEAgdm9pZCBHZXN0dXJlQ29udHJvbGxlcjo6Wm9v bUdlc3R1cmU6OnNjYWxlQ2hhbmdlZChab29tR2VzdHVyZSogem9vbUdlc3R1cmUsIGRvdWIKIHsK ICAgICB6b29tR2VzdHVyZS0+bV9zY2FsZSA9IHpvb21HZXN0dXJlLT5tX2luaXRpYWxTY2FsZSAq IHNjYWxlOwogICAgIHpvb21HZXN0dXJlLT5tX3ZpZXdQb2ludCA9IHpvb21HZXN0dXJlLT5jZW50 ZXIoKTsKLSAgICBpZiAoem9vbUdlc3R1cmUtPm1faWRsZS5pc1NjaGVkdWxlZCgpKQorICAgIGlm ICh6b29tR2VzdHVyZS0+bV9pZGxlLmlzQWN0aXZlKCkpCiAgICAgICAgIHJldHVybjsKIAotICAg IHpvb21HZXN0dXJlLT5tX2lkbGUuc2NoZWR1bGUoIltXZWJLaXRdIFpvb20gR2VzdHVyZSBJZGxl Iiwgc3RkOjpiaW5kKCZHZXN0dXJlQ29udHJvbGxlcjo6Wm9vbUdlc3R1cmU6OmhhbmRsZVpvb20s IHpvb21HZXN0dXJlKSk7CisgICAgem9vbUdlc3R1cmUtPm1faWRsZS5zdGFydE9uZVNob3QoMCk7 CiB9CiAKIEdlc3R1cmVDb250cm9sbGVyOjpab29tR2VzdHVyZTo6Wm9vbUdlc3R1cmUoV2ViUGFn ZVByb3h5JiBwYWdlKQogICAgIDogR2VzdHVyZShndGtfZ2VzdHVyZV96b29tX25ldyhwYWdlLnZp ZXdXaWRnZXQoKSksIHBhZ2UpCiAgICAgLCBtX2luaXRpYWxTY2FsZSgwKQogICAgICwgbV9zY2Fs ZSgwKQorICAgICwgbV9pZGxlKFJ1bkxvb3A6Om1haW4oKSwgdGhpcywgJkdlc3R1cmVDb250cm9s bGVyOjpab29tR2VzdHVyZTo6aGFuZGxlWm9vbSkKIHsKICAgICBnX3NpZ25hbF9jb25uZWN0X3N3 YXBwZWQobV9nZXN0dXJlLmdldCgpLCAiYmVnaW4iLCBHX0NBTExCQUNLKGJlZ2luKSwgdGhpcyk7 CiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKG1fZ2VzdHVyZS5nZXQoKSwgInNjYWxlLWNo YW5nZWQiLCBHX0NBTExCQUNLKHNjYWxlQ2hhbmdlZCksIHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9HZXN0dXJlQ29udHJvbGxlci5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2d0ay9HZXN0dXJlQ29udHJvbGxlci5oCmluZGV4IDc4ZmMyY2IuLjg2 NzkyZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvR2VzdHVyZUNv bnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL0dlc3R1cmVDb250 cm9sbGVyLmgKQEAgLTMwLDcgKzMwLDcgQEAKIAogI2luY2x1ZGUgPFdlYkNvcmUvRmxvYXRQb2lu dC5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgotI2luY2x1ZGUgPHd0Zi9nbGliL0dN YWluTG9vcFNvdXJjZS5oPgorI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+CiAjaW5jbHVkZSA8d3Rm L2dsaWIvR1JlZlB0ci5oPgogCiB0eXBlZGVmIHVuaW9uIF9HZGtFdmVudCBHZGtFdmVudDsKQEAg LTY5LDYgKzY5LDcgQEAgcHJpdmF0ZToKICAgICBwcml2YXRlOgogICAgICAgICB2b2lkIGhhbmRs ZURyYWcoY29uc3QgR2RrRXZlbnQqLCBkb3VibGUgeCwgZG91YmxlIHkpOwogICAgICAgICB2b2lk IGhhbmRsZVRhcChjb25zdCBHZGtFdmVudCopOworICAgICAgICB2b2lkIGxvbmdQcmVzc0ZpcmVk KCk7CiAKICAgICAgICAgc3RhdGljIHZvaWQgYmVnaW4oRHJhZ0dlc3R1cmUqLCBkb3VibGUgeCwg ZG91YmxlIHksIEd0a0dlc3R1cmUqKTsKICAgICAgICAgc3RhdGljIHZvaWQgdXBkYXRlKERyYWdH ZXN0dXJlKiwgZG91YmxlIHgsIGRvdWJsZSB5LCBHdGtHZXN0dXJlKik7CkBAIC03Niw3ICs3Nyw3 IEBAIHByaXZhdGU6CiAKICAgICAgICAgV2ViQ29yZTo6RmxvYXRQb2ludCBtX3N0YXJ0OwogICAg ICAgICBXZWJDb3JlOjpGbG9hdFBvaW50IG1fb2Zmc2V0OwotICAgICAgICBHTWFpbkxvb3BTb3Vy Y2UgbV9sb25nUHJlc3NUaW1lb3V0OworICAgICAgICBSdW5Mb29wOjpUaW1lcjxEcmFnR2VzdHVy ZT4gbV9sb25nUHJlc3NUaW1lb3V0OwogICAgICAgICBHUmVmUHRyPEd0a0dlc3R1cmU+IG1fbG9u Z1ByZXNzOwogICAgICAgICBib29sIG1faW5EcmFnOwogICAgIH07CkBAIC05Niw3ICs5Nyw3IEBA IHByaXZhdGU6CiAgICAgICAgIGdkb3VibGUgbV9zY2FsZTsKICAgICAgICAgV2ViQ29yZTo6SW50 UG9pbnQgbV9pbml0aWFsUG9pbnQ7CiAgICAgICAgIFdlYkNvcmU6OkludFBvaW50IG1fdmlld1Bv aW50OwotICAgICAgICBHTWFpbkxvb3BTb3VyY2UgbV9pZGxlOworICAgICAgICBSdW5Mb29wOjpU aW1lcjxab29tR2VzdHVyZT4gbV9pZGxlOwogICAgIH07CiAKICAgICBEcmFnR2VzdHVyZSBtX2Ry YWdHZXN0dXJlOwo=