215847 2020-08-26 03:24:06 -0700 [GTK] Include the run loop source name in frame rendering timeline 2020-08-27 02:57:15 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk, InRadar P2 Normal --- 1 cgarcia webkit-unassigned aperez bburg benjamin bugs-noreply cdumez cmarcelo ews-watchlist hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1682953 0 cgarcia 2020-08-26 03:24:06 -0700 It's useful to know the name of the source corresponding to each frame. 1682954 1 407287 cgarcia 2020-08-26 03:34:10 -0700 Created attachment 407287 Patch 1683280 2 407287 bburg 2020-08-26 21:50:42 -0700 Comment on attachment 407287 Patch Looks good to me. 1683322 3 cgarcia 2020-08-27 02:56:16 -0700 Committed r266227: <https://trac.webkit.org/changeset/266227> 1683323 4 webkit-bug-importer 2020-08-27 02:57:15 -0700 <rdar://problem/67862306> 407287 2020-08-26 03:34:10 -0700 2020-08-26 04:30:28 -0700 Patch wkgtk-inspector-frame-names.diff text/plain 11488 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggOTlhOTY0OWY5YzAwLi5kZmVlNGQ3ZmU4MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIw MjAtMDgtMjYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFtHVEtdIEluY2x1ZGUgdGhlIHJ1biBsb29wIHNvdXJjZSBuYW1lIGluIGZyYW1lIHJl bmRlcmluZyB0aW1lbGluZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE1ODQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUGFzcyB0aGUgcnVuIGxvb3Agc291cmNlIG5hbWUgdG8gdGhlIG9ic2VydmVyLgor CisgICAgICAgICogd3RmL1J1bkxvb3AuaDoKKyAgICAgICAgKiB3dGYvZ2xpYi9SdW5Mb29wR0xp Yi5jcHA6CisgICAgICAgIChXVEY6OlJ1bkxvb3A6OlJ1bkxvb3ApOgorICAgICAgICAoV1RGOjpS dW5Mb29wOjpub3RpZnkpOgorCiAyMDIwLTA4LTI0ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBJbXBsZW1lbnQgcmVuZGVyaW5nIGZy YW1lcyB0aW1lbGluZSBwYW5lbCBmb3IgR1RLKyBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RG L3d0Zi9SdW5Mb29wLmggYi9Tb3VyY2UvV1RGL3d0Zi9SdW5Mb29wLmgKaW5kZXggNDk0YTg3NDkz ODY2Li5mYzI2NzdiZDRjMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1J1bkxvb3AuaAor KysgYi9Tb3VyY2UvV1RGL3d0Zi9SdW5Mb29wLmgKQEAgLTk5LDcgKzk5LDcgQEAgcHVibGljOgog I2lmIFVTRShHTElCX0VWRU5UX0xPT1ApCiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIEdNYWluQ29u dGV4dCogbWFpbkNvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX21haW5Db250ZXh0LmdldCgpOyB9 CiAgICAgZW51bSBjbGFzcyBFdmVudCB7IFdpbGxEaXNwYXRjaCwgRGlkRGlzcGF0Y2ggfTsKLSAg ICB1c2luZyBPYnNlcnZlciA9IFdURjo6T2JzZXJ2ZXI8dm9pZChFdmVudCk+OworICAgIHVzaW5n IE9ic2VydmVyID0gV1RGOjpPYnNlcnZlcjx2b2lkKEV2ZW50LCBjb25zdCBTdHJpbmcmKT47CiAg ICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgb2JzZXJ2ZShjb25zdCBPYnNlcnZlciYpOwogI2Vu ZGlmCiAKQEAgLTIyNiw3ICsyMjYsNyBAQCBwcml2YXRlOgogICAgIFJldGFpblB0cjxDRlJ1bkxv b3BSZWY+IG1fcnVuTG9vcDsKICAgICBSZXRhaW5QdHI8Q0ZSdW5Mb29wU291cmNlUmVmPiBtX3J1 bkxvb3BTb3VyY2U7CiAjZWxpZiBVU0UoR0xJQl9FVkVOVF9MT09QKQotICAgIHZvaWQgbm90aWZ5 KEV2ZW50KTsKKyAgICB2b2lkIG5vdGlmeShFdmVudCwgY29uc3QgY2hhciopOwogCiAgICAgc3Rh dGljIEdTb3VyY2VGdW5jcyBzX3J1bkxvb3BTb3VyY2VGdW5jdGlvbnM7CiAgICAgR1JlZlB0cjxH TWFpbkNvbnRleHQ+IG1fbWFpbkNvbnRleHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9n bGliL1J1bkxvb3BHTGliLmNwcCBiL1NvdXJjZS9XVEYvd3RmL2dsaWIvUnVuTG9vcEdMaWIuY3Bw CmluZGV4IDQ1NjBjNDgxNjIxOS4uYzA0Y2ZlOTVhYTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RG L3d0Zi9nbGliL1J1bkxvb3BHTGliLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9nbGliL1J1bkxv b3BHTGliLmNwcApAQCAtNDcsMTAgKzQ3LDExIEBAIEdTb3VyY2VGdW5jcyBSdW5Mb29wOjpzX3J1 bkxvb3BTb3VyY2VGdW5jdGlvbnMgPSB7CiAgICAgICAgIGlmIChnX3NvdXJjZV9nZXRfcmVhZHlf dGltZShzb3VyY2UpID09IC0xKQogICAgICAgICAgICAgcmV0dXJuIEdfU09VUkNFX0NPTlRJTlVF OwogICAgICAgICBnX3NvdXJjZV9zZXRfcmVhZHlfdGltZShzb3VyY2UsIC0xKTsKKyAgICAgICAg Y29uc3QgY2hhciogbmFtZSA9IGdfc291cmNlX2dldF9uYW1lKHNvdXJjZSk7CiAgICAgICAgIGF1 dG8mIHJ1bkxvb3BTb3VyY2UgPSAqcmVpbnRlcnByZXRfY2FzdDxSdW5Mb29wU291cmNlKj4oc291 cmNlKTsKLSAgICAgICAgcnVuTG9vcFNvdXJjZS5ydW5Mb29wLT5ub3RpZnkoUnVuTG9vcDo6RXZl bnQ6OldpbGxEaXNwYXRjaCk7CisgICAgICAgIHJ1bkxvb3BTb3VyY2UucnVuTG9vcC0+bm90aWZ5 KFJ1bkxvb3A6OkV2ZW50OjpXaWxsRGlzcGF0Y2gsIG5hbWUpOwogICAgICAgICBhdXRvIHJldHVy blZhbHVlID0gY2FsbGJhY2sodXNlckRhdGEpOwotICAgICAgICBydW5Mb29wU291cmNlLnJ1bkxv b3AtPm5vdGlmeShSdW5Mb29wOjpFdmVudDo6RGlkRGlzcGF0Y2gpOworICAgICAgICBydW5Mb29w U291cmNlLnJ1bkxvb3AtPm5vdGlmeShSdW5Mb29wOjpFdmVudDo6RGlkRGlzcGF0Y2gsIG5hbWUp OwogICAgICAgICByZXR1cm4gcmV0dXJuVmFsdWU7CiAgICAgfSwKICAgICBudWxscHRyLCAvLyBm aW5hbGl6ZQpAQCAtMTQ2LDEzICsxNDcsMTMgQEAgdm9pZCBSdW5Mb29wOjpvYnNlcnZlKGNvbnN0 IFJ1bkxvb3A6Ok9ic2VydmVyJiBvYnNlcnZlcikKICAgICBtX29ic2VydmVycy5hZGQob2JzZXJ2 ZXIpOwogfQogCi12b2lkIFJ1bkxvb3A6Om5vdGlmeShSdW5Mb29wOjpFdmVudCBldmVudCkKK3Zv aWQgUnVuTG9vcDo6bm90aWZ5KFJ1bkxvb3A6OkV2ZW50IGV2ZW50LCBjb25zdCBjaGFyKiBuYW1l KQogewogICAgIGlmIChtX29ic2VydmVycy5jb21wdXRlc0VtcHR5KCkpCiAgICAgICAgIHJldHVy bjsKIAotICAgIG1fb2JzZXJ2ZXJzLmZvckVhY2goW2V2ZW50XShhdXRvJiBvYnNlcnZlcikgewot ICAgICAgICBvYnNlcnZlcihldmVudCk7CisgICAgbV9vYnNlcnZlcnMuZm9yRWFjaChbZXZlbnQs IG5hbWUgPSBTdHJpbmc6OmZyb21VVEY4KG5hbWUpXShhdXRvJiBvYnNlcnZlcikgeworICAgICAg ICBvYnNlcnZlcihldmVudCwgbmFtZSk7CiAgICAgfSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMTBm NGU2Y2RmODMuLmY5MjU5MzZjNWI0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIw LTA4LTI2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAg ICAgICBbR1RLXSBJbmNsdWRlIHRoZSBydW4gbG9vcCBzb3VyY2UgbmFtZSBpbiBmcmFtZSByZW5k ZXJpbmcgdGltZWxpbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNTg0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEluY2x1ZGUgdGhlIGdpdmVuIG5hbWUgaW4gcmVuZGVyaW5nIGZyYW1lIHJlY29yZCBk YXRhLgorCisgICAgICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVJlbmRlcmluZ0Zy YW1lRGF0YSk6CisgICAgICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oOgor ICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjppbnRlcm5hbFN0YXJ0KToK KwogMjAyMC0wOC0yNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW1NPVVBdIEluaXRpYWxpemUgSFNUUyBzdG9yYWdlIGRpcmVjdG9yeSBmcm9t IG5ldHdvcmsgc2Vzc2lvbiBpbml0aWFsaXphdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcAppbmRleCBlZWRlZDhmNDgyOWMuLjM2 M2QxNjhlODA1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5l UmVjb3JkRmFjdG9yeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5l UmVjb3JkRmFjdG9yeS5jcHAKQEAgLTU2LDYgKzU2LDEzIEBAIFJlZjxKU09OOjpPYmplY3Q+IFRp bWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChkb3VibGUgc3RhcnRUaW1l LCBpCiAgICAgcmV0dXJuIHJlY29yZDsKIH0KIAorUmVmPEpTT046Ok9iamVjdD4gVGltZWxpbmVS ZWNvcmRGYWN0b3J5OjpjcmVhdGVSZW5kZXJpbmdGcmFtZURhdGEoY29uc3QgU3RyaW5nJiBuYW1l KQoreworICAgIFJlZjxKU09OOjpPYmplY3Q+IGRhdGEgPSBKU09OOjpPYmplY3Q6OmNyZWF0ZSgp OworICAgIGRhdGEtPnNldFN0cmluZygibmFtZSJfcywgbmFtZSk7CisgICAgcmV0dXJuIGRhdGE7 Cit9CisKIFJlZjxKU09OOjpPYmplY3Q+IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRnVu Y3Rpb25DYWxsRGF0YShjb25zdCBTdHJpbmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lLCBp bnQgc2NyaXB0Q29sdW1uKQogewogICAgIFJlZjxKU09OOjpPYmplY3Q+IGRhdGEgPSBKU09OOjpP YmplY3Q6OmNyZWF0ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1Rp bWVsaW5lUmVjb3JkRmFjdG9yeS5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5l UmVjb3JkRmFjdG9yeS5oCmluZGV4IDQxYjZkZDY0NTA5ZC4uNDhmNDMwZTliZWQ5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmgKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCkBAIC00 Niw2ICs0Niw3IEBAIGNsYXNzIFRpbWVsaW5lUmVjb3JkRmFjdG9yeSB7CiBwdWJsaWM6CiAgICAg c3RhdGljIFJlZjxKU09OOjpPYmplY3Q+IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZG91YmxlIHN0YXJ0 VGltZSwgaW50IG1heENhbGxTdGFja0RlcHRoKTsKIAorICAgIHN0YXRpYyBSZWY8SlNPTjo6T2Jq ZWN0PiBjcmVhdGVSZW5kZXJpbmdGcmFtZURhdGEoY29uc3QgU3RyaW5nJiBuYW1lKTsKICAgICBz dGF0aWMgUmVmPEpTT046Ok9iamVjdD4gY3JlYXRlRnVuY3Rpb25DYWxsRGF0YShjb25zdCBTdHJp bmcmIHNjcmlwdE5hbWUsIGludCBzY3JpcHRMaW5lLCBpbnQgc2NyaXB0Q29sdW1uKTsKICAgICBz dGF0aWMgUmVmPEpTT046Ok9iamVjdD4gY3JlYXRlQ29uc29sZVByb2ZpbGVEYXRhKGNvbnN0IFN0 cmluZyYgdGl0bGUpOwogICAgIHN0YXRpYyBSZWY8SlNPTjo6T2JqZWN0PiBjcmVhdGVQcm9iZVNh bXBsZURhdGEoSlNDOjpCcmVha3BvaW50QWN0aW9uSUQsIHVuc2lnbmVkIHNhbXBsZUlkKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxp bmVBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRp bWVsaW5lQWdlbnQuY3BwCmluZGV4IGViMGU0ZDI5MzgyNy4uMGI0NjYwNjhkOTBmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRpbWVsaW5lQWdl bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudC5jcHAKQEAgLTIyNywxMyArMjI3LDEzIEBAIHZvaWQgSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6aW50ZXJuYWxTdGFydChjb25zdCBpbnQqIG1heENhbGxTdGFja0RlcHRoKQogCiAg ICAgbV9ydW5Mb29wTmVzdGluZ0xldmVsID0gMTsKICNlbGlmIFVTRShHTElCX0VWRU5UX0xPT1Ap Ci0gICAgbV9ydW5Mb29wT2JzZXJ2ZXIgPSBtYWtlVW5pcXVlPFJ1bkxvb3A6Ok9ic2VydmVyPihb dGhpc10oUnVuTG9vcDo6RXZlbnQgZXZlbnQpIHsKKyAgICBtX3J1bkxvb3BPYnNlcnZlciA9IG1h a2VVbmlxdWU8UnVuTG9vcDo6T2JzZXJ2ZXI+KFt0aGlzXShSdW5Mb29wOjpFdmVudCBldmVudCwg Y29uc3QgU3RyaW5nJiBuYW1lKSB7CiAgICAgICAgIGlmICghbV90cmFja2luZyB8fCBtX2Vudmly b25tZW50LmRlYnVnZ2VyKCkuaXNQYXVzZWQoKSkKICAgICAgICAgICAgIHJldHVybjsKIAogICAg ICAgICBzd2l0Y2ggKGV2ZW50KSB7CiAgICAgICAgIGNhc2UgUnVuTG9vcDo6RXZlbnQ6OldpbGxE aXNwYXRjaDoKLSAgICAgICAgICAgIHB1c2hDdXJyZW50UmVjb3JkKEpTT046Ok9iamVjdDo6Y3Jl YXRlKCksIFRpbWVsaW5lUmVjb3JkVHlwZTo6UmVuZGVyaW5nRnJhbWUsIGZhbHNlLCBudWxscHRy KTsKKyAgICAgICAgICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6 Y3JlYXRlUmVuZGVyaW5nRnJhbWVEYXRhKG5hbWUpLCBUaW1lbGluZVJlY29yZFR5cGU6OlJlbmRl cmluZ0ZyYW1lLCBmYWxzZSwgbnVsbHB0cik7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg Y2FzZSBSdW5Mb29wOjpFdmVudDo6RGlkRGlzcGF0Y2g6CiAgICAgICAgICAgICBkaWRDb21wbGV0 ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBlOjpSZW5kZXJpbmdGcmFtZSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL0NoYW5nZUxvZwppbmRleCBmZmVlYTNhOTQ1ZTUuLjNlMjBhNzc2Y2MyMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjAtMDgtMjYgIENhcmxvcyBH YXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEluY2x1 ZGUgdGhlIHJ1biBsb29wIHNvdXJjZSBuYW1lIGluIGZyYW1lIHJlbmRlcmluZyB0aW1lbGluZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE1ODQ3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2hvdyB0aGUg ZnJhbWUgbmFtZSBpZiBwcmVzZW50IGluIHRpbWVsaW5lIHBhbmVsLgorCisgICAgICAgICogTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzOgorICAgICAgICAoV0kuVGlt ZWxpbmVNYW5hZ2VyLnByb3RvdHlwZS5fcHJvY2Vzc1JlY29yZCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9Nb2RlbHMvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZC5qczoKKyAgICAgICAg KFdJLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVSZWNvcmQpOgorICAgICAgICAoV0kuUmVuZGVyaW5n RnJhbWVUaW1lbGluZVJlY29yZC5wcm90b3R5cGUuZ2V0IG5hbWUpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlRp bWVsaW5lVGFiQ29udGVudFZpZXcuZGlzcGxheU5hbWVGb3JSZWNvcmQpOgorCiAyMDIwLTA4LTI0 ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiByZW1vdmUgbGVnYWN5IGNvZGUgZm9yIHJlcGxhY2luZyB0aGUgUmVzb3VyY2VzIFRhYiBh bmQgRGVidWdnZXIgVGFiIHdpdGggdGhlIFNvdXJjZXMgVGFiCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcwppbmRleCAzMGM3NzgyOWQ5OWIuLmM1ODA3MzkxNWIyMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3Ry aW5ncy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC02MDIsNiArNjAyLDcgQEAgbG9jYWxpemVkU3RyaW5n c1siRm9yd2FyZCAoJXMpIl0gPSAiRm9yd2FyZCAoJXMpIjsKIGxvY2FsaXplZFN0cmluZ3NbIkZy YWdtZW50Il0gPSAiRnJhZ21lbnQiOwogbG9jYWxpemVkU3RyaW5nc1siRnJhZ21lbnQgU2hhZGVy Il0gPSAiRnJhZ21lbnQgU2hhZGVyIjsKIGxvY2FsaXplZFN0cmluZ3NbIkZyYW1lICVkIl0gPSAi RnJhbWUgJWQiOworbG9jYWxpemVkU3RyaW5nc1siRnJhbWUgJWQgXHUyMDE0ICVzIl0gPSAiRnJh bWUgJWQgXHUyMDE0ICVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkZyYW1lIFVSTCJdID0gIkZyYW1l IFVSTCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJGcmFtZXMiXSA9ICJGcmFtZXMiOwogbG9jYWxpemVk U3RyaW5nc1siRnJhbWVzICVkIFx1MjAxMyAlZCJdID0gIkZyYW1lcyAlZCBcdTIwMTMgJWQiOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvVGltZWxpbmVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCmluZGV4IDEzZjIwYjA4MjJmMC4uYmYw OTc4Y2U4OTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCkBAIC04NTQs NyArODU0LDcgQEAgV0kuVGltZWxpbmVNYW5hZ2VyID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4 dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICBpZiAoIXJlY29yZFBheWxvYWQuY2hpbGRyZW4g fHwgIXJlY29yZFBheWxvYWQuY2hpbGRyZW4ubGVuZ3RoKQogICAgICAgICAgICAgICAgIHJldHVy biBudWxsOwogCi0gICAgICAgICAgICByZXR1cm4gbmV3IFdJLlJlbmRlcmluZ0ZyYW1lVGltZWxp bmVSZWNvcmQoc3RhcnRUaW1lLCBlbmRUaW1lKTsKKyAgICAgICAgICAgIHJldHVybiBuZXcgV0ku UmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZChzdGFydFRpbWUsIGVuZFRpbWUsIHJlY29yZFBh eWxvYWQuZGF0YS5uYW1lKTsKIAogICAgICAgICBjYXNlIEluc3BlY3RvckJhY2tlbmQuRW51bS5U aW1lbGluZS5FdmVudFR5cGUuRXZhbHVhdGVTY3JpcHQ6CiAgICAgICAgICAgICBpZiAoIXNvdXJj ZUNvZGVMb2NhdGlvbikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVSZWNvcmQuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVuZGVyaW5nRnJhbWVUaW1lbGlu ZVJlY29yZC5qcwppbmRleCBkMTAzN2U1MTQyMDQuLmZjZTM4MjQ0ZjZkZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1JlbmRlcmluZ0ZyYW1l VGltZWxpbmVSZWNvcmQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVSZWNvcmQuanMKQEAgLTI1LDEwICsyNSwx MSBAQAogCiBXSS5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lUmVjb3JkID0gY2xhc3MgUmVuZGVyaW5n RnJhbWVUaW1lbGluZVJlY29yZCBleHRlbmRzIFdJLlRpbWVsaW5lUmVjb3JkCiB7Ci0gICAgY29u c3RydWN0b3Ioc3RhcnRUaW1lLCBlbmRUaW1lKQorICAgIGNvbnN0cnVjdG9yKHN0YXJ0VGltZSwg ZW5kVGltZSwgbmFtZSkKICAgICB7CiAgICAgICAgIHN1cGVyKFdJLlRpbWVsaW5lUmVjb3JkLlR5 cGUuUmVuZGVyaW5nRnJhbWUsIHN0YXJ0VGltZSwgZW5kVGltZSk7CiAKKyAgICAgICAgdGhpcy5f bmFtZSA9IG5hbWUgfHwgIiI7CiAgICAgICAgIHRoaXMuX2R1cmF0aW9uQnlUYXNrVHlwZSA9IG5l dyBNYXA7CiAgICAgICAgIHRoaXMuX2ZyYW1lSW5kZXggPSAtMTsKICAgICB9CkBAIC0xMDIsNiAr MTAzLDExIEBAIFdJLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVSZWNvcmQgPSBjbGFzcyBSZW5kZXJp bmdGcmFtZVRpbWVsaW5lUmVjb3JkIGV4dGVuZHMgV0kuCiAgICAgICAgIHJldHVybiB0aGlzLl9m cmFtZUluZGV4ICsgMTsKICAgICB9CiAKKyAgICBnZXQgbmFtZSgpCisgICAgeworICAgICAgICBy ZXR1cm4gdGhpcy5fbmFtZTsKKyAgICB9CisKICAgICBzZXR1cEZyYW1lSW5kZXgoKQogICAgIHsK ICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fZnJhbWVJbmRleCA9PT0gLTEsICJGcmFtZSBp bmRleCBzaG91bGQgb25seSBiZSBzZXQgb25jZS4iKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNv bnRlbnRWaWV3LmpzCmluZGV4IDYxZDNkNjNiZDFlNS4uZTA2M2Q1NzY4NzY5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNv bnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanMKQEAgLTI4OCw2ICsyODgsOCBAQCBXSS5UaW1l bGluZVRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVUYWJDb250ZW50VmlldyBleHRlbmRz IFdJLkNvbnRlbnRCcm93cwogICAgICAgICBjYXNlIFdJLlRpbWVsaW5lUmVjb3JkLlR5cGUuU2Ny aXB0OgogICAgICAgICAgICAgcmV0dXJuIFdJLlNjcmlwdFRpbWVsaW5lUmVjb3JkLkV2ZW50VHlw ZS5kaXNwbGF5TmFtZSh0aW1lbGluZVJlY29yZC5ldmVudFR5cGUsIHRpbWVsaW5lUmVjb3JkLmRl dGFpbHMsIGluY2x1ZGVEZXRhaWxzSW5NYWluVGl0bGUpOwogICAgICAgICBjYXNlIFdJLlRpbWVs aW5lUmVjb3JkLlR5cGUuUmVuZGVyaW5nRnJhbWU6CisgICAgICAgICAgICBpZiAodGltZWxpbmVS ZWNvcmQubmFtZSkKKyAgICAgICAgICAgICAgICByZXR1cm4gV0kuVUlTdHJpbmcoIkZyYW1lICVk IFx1MjAxNCAlcyIpLmZvcm1hdCh0aW1lbGluZVJlY29yZC5mcmFtZU51bWJlciwgdGltZWxpbmVS ZWNvcmQubmFtZSk7CiAgICAgICAgICAgICByZXR1cm4gV0kuVUlTdHJpbmcoIkZyYW1lICVkIiku Zm9ybWF0KHRpbWVsaW5lUmVjb3JkLmZyYW1lTnVtYmVyKTsKICAgICAgICAgY2FzZSBXSS5UaW1l bGluZVJlY29yZC5UeXBlLkhlYXBBbGxvY2F0aW9uczoKICAgICAgICAgICAgIGlmICh0aW1lbGlu ZVJlY29yZC5oZWFwU25hcHNob3QuaW1wb3J0ZWQpCg==