30999 2009-11-01 13:55:57 -0800 Web Inspector: Convert script tag event into a more generic script event in timeline. 2009-11-02 01:25:43 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman knorton timothy zundel oldest_to_newest 159670 0 pfeldman 2009-11-01 13:55:57 -0800 That's basically what I suggest doing (will attach the patch shortly). Let us collect pros and cons under this bug. 159673 1 42282 pfeldman 2009-11-01 14:02:14 -0800 Created attachment 42282 [PATCH] Proposed change 159692 2 zundel 2009-11-01 17:37:04 -0800 I was thinking this weekend that if we handled the window.eval() with a different event, we'd be able to tell these Script tags apart from window.eval(). 159697 3 timothy 2009-11-01 18:09:30 -0800 Right now window.eval isn't handled at all, since it is done directly in JSC. 159759 4 pfeldman 2009-11-02 01:25:43 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/bindings/js/ScriptController.cpp M WebCore/bindings/v8/V8Proxy.cpp M WebCore/html/HTMLTokenizer.cpp M WebCore/inspector/InspectorTimelineAgent.cpp M WebCore/inspector/InspectorTimelineAgent.h M WebCore/inspector/TimelineRecordFactory.cpp M WebCore/inspector/TimelineRecordFactory.h M WebCore/inspector/front-end/TimelineAgent.js M WebCore/inspector/front-end/TimelinePanel.js Committed r50406 42282 2009-11-01 14:02:14 -0800 2009-11-01 14:04:42 -0800 [PATCH] Proposed change script_eval text/plain 10983 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDg2OTJiYS4uMWFkOGE0OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAwOS0xMS0wMSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb252ZXJ0IHNjcmlwdCB0YWcgZXZl bnQgaW50byBhIG1vcmUgZ2VuZXJpYworICAgICAgICBzY3JpcHQgZXZhbCBldmVudCBpbiB0aW1l bGluZS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzA5OTkKKworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6ZXZhbHVhdGVJbldvcmxkKToKKyAgICAg ICAgKiBiaW5kaW5ncy92OC9WOFByb3h5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4UHJveHk6 OmV2YWx1YXRlKToKKyAgICAgICAgKiBodG1sL0hUTUxUb2tlbml6ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SFRNTFRva2VuaXplcjo6c2NyaXB0RXhlY3V0aW9uKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsRXZhbHVhdGVTY3JpcHQpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkRXZhbHVhdGVTY3JpcHQpOgorICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjop OgorICAgICAgICAqIGluc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6VGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdFRp bWVsaW5lUmVjb3JkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5 Lmg6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50LmpzOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fZm9ybWF0UmVjb3JkKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fZ2V0UmVjb3JkRGV0YWls cyk6CisKIDIwMDktMTEtMDEgIEtlaXNoaSBIYXR0b3JpICA8Y2FzZXkuaGF0dG9yaUBnbWFpbC5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcCBiL1dlYkNvcmUvYmluZGlu Z3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHAKaW5kZXggNGExZDQxMy4uNTc5MWRkNyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAorKysgYi9XZWJD b3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAj aW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJHQ0NvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJI VE1MUGx1Z0luRWxlbWVudC5oIgorI2luY2x1ZGUgIkluc3BlY3RvclRpbWVsaW5lQWdlbnQuaCIK ICNpbmNsdWRlICJKU0RvY3VtZW50LmgiCiAjaW5jbHVkZSAiTlBfanNvYmplY3QuaCIKICNpbmNs dWRlICJQYWdlLmgiCkBAIC0xMTcsMTAgKzExOCwyMSBAQCBTY3JpcHRWYWx1ZSBTY3JpcHRDb250 cm9sbGVyOjpldmFsdWF0ZUluV29ybGQoY29uc3QgU2NyaXB0U291cmNlQ29kZSYgc291cmNlQ29k ZQogCiAgICAgUmVmUHRyPEZyYW1lPiBwcm90ZWN0ID0gbV9mcmFtZTsKIAorI2lmIEVOQUJMRShJ TlNQRUNUT1IpCisgICAgSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IG1f ZnJhbWUtPnBhZ2UoKSA/IG1fZnJhbWUtPnBhZ2UoKS0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgp IDogMDsKKyAgICBpZiAodGltZWxpbmVBZ2VudCkKKyAgICAgICAgdGltZWxpbmVBZ2VudC0+d2ls bEV2YWx1YXRlU2NyaXB0KHNvdXJjZVVSTCwgc291cmNlQ29kZS5zdGFydExpbmUoKSk7CisjZW5k aWYKKwogICAgIGV4ZWMtPmdsb2JhbERhdGEoKS50aW1lb3V0Q2hlY2tlci5zdGFydCgpOwogICAg IENvbXBsZXRpb24gY29tcCA9IFdlYkNvcmU6OmV2YWx1YXRlSW5Xb3JsZChleGVjLCBleGVjLT5k eW5hbWljR2xvYmFsT2JqZWN0KCktPmdsb2JhbFNjb3BlQ2hhaW4oKSwganNTb3VyY2VDb2RlLCBz aGVsbCwgd29ybGQpOwogICAgIGV4ZWMtPmdsb2JhbERhdGEoKS50aW1lb3V0Q2hlY2tlci5zdG9w KCk7CiAKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQorICAgIGlmICh0aW1lbGluZUFnZW50KQorICAg ICAgICB0aW1lbGluZUFnZW50LT5kaWRFdmFsdWF0ZVNjcmlwdCgpOworI2VuZGlmCisKICAgICAv LyBFdmFsdWF0aW5nIHRoZSBKYXZhU2NyaXB0IGNvdWxkIGNhdXNlIHRoZSBmcmFtZSB0byBiZSBk ZWFsbG9jYXRlZAogICAgIC8vIHNvIHdlIHN0YXJ0IHRoZSBrZWVwIGFsaXZlIHRpbWVyIGhlcmUu CiAgICAgbV9mcmFtZS0+a2VlcEFsaXZlKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdz L3Y4L1Y4UHJveHkuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAppbmRleCA5 OTY5NzU1Li4yYTA4ODM5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHku Y3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAKQEAgLTM3LDYgKzM3LDcg QEAKICNpbmNsdWRlICJET01PYmplY3RzSW5jbHVkZS5oIgogI2luY2x1ZGUgIkRvY3VtZW50TG9h ZGVyLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGllbnQuaCIKKyNpbmNsdWRlICJJbnNwZWN0 b3JUaW1lbGluZUFnZW50LmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlBhZ2VHcm91 cC5oIgogI2luY2x1ZGUgIlNjcmlwdENvbnRyb2xsZXIuaCIKQEAgLTM3Myw2ICszNzQsMTIgQEAg djg6OkxvY2FsPHY4OjpWYWx1ZT4gVjhQcm94eTo6ZXZhbHVhdGUoY29uc3QgU2NyaXB0U291cmNl Q29kZSYgc291cmNlLCBOb2RlKiBub2QKIHsKICAgICBBU1NFUlQodjg6OkNvbnRleHQ6OkluQ29u dGV4dCgpKTsKIAorI2lmIEVOQUJMRShJTlNQRUNUT1IpCisgICAgSW5zcGVjdG9yVGltZWxpbmVB Z2VudCogdGltZWxpbmVBZ2VudCA9IG1fZnJhbWUtPnBhZ2UoKSA/IG1fZnJhbWUtPnBhZ2UoKS0+ aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpIDogMDsKKyAgICBpZiAodGltZWxpbmVBZ2VudCkKKyAg ICAgICAgdGltZWxpbmVBZ2VudC0+d2lsbEV2YWx1YXRlU2NyaXB0KHNvdXJjZS51cmwoKS5pc051 bGwoKSA/IFN0cmluZygpIDogc291cmNlQ29kZS51cmwoKS5zdHJpbmcoKSwgc291cmNlLnN0YXJ0 TGluZSgpKTsKKyNlbmRpZgorCiAgICAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gcmVzdWx0OwogICAg IHsKICAgICAgICAgLy8gSXNvbGF0ZSBleGNlcHRpb25zIHRoYXQgb2NjdXIgd2hlbiBjb21waWxp bmcgYW5kIGV4ZWN1dGluZwpAQCAtMzk4LDYgKzQwNSwxMiBAQCB2ODo6TG9jYWw8djg6OlZhbHVl PiBWOFByb3h5OjpldmFsdWF0ZShjb25zdCBTY3JpcHRTb3VyY2VDb2RlJiBzb3VyY2UsIE5vZGUq IG5vZAogICAgICAgICByZXN1bHQgPSBydW5TY3JpcHQoc2NyaXB0LCBzb3VyY2UudXJsKCkuc3Ry aW5nKCkuaXNOdWxsKCkpOwogICAgIH0KICAgICBDaHJvbWl1bUJyaWRnZTo6dHJhY2VFdmVudEVu ZCgidjgucnVuIiwgbm9kZSwgIiIpOworCisjaWYgRU5BQkxFKElOU1BFQ1RPUikKKyAgICBpZiAo dGltZWxpbmVBZ2VudCkKKyAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkRXZhbHVhdGVTY3JpcHQo KTsKKyNlbmRpZgorCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3Bw CmluZGV4IDkxMjg1ZDkuLjAyOTcwYmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVG9r ZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKQEAgLTU1Miwx MiArNTUyLDYgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaXB0RXhl Y3V0aW9uKGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXIKICAgICAgICAgcmV0dXJuIHN0YXRl OwogICAgIG1fZXhlY3V0aW5nU2NyaXB0Kys7CiAgICAgCi0jaWYgRU5BQkxFKElOU1BFQ1RPUikK LSAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gbV9kb2MtPmluc3Bl Y3RvclRpbWVsaW5lQWdlbnQoKTsKLSAgICBpZiAodGltZWxpbmVBZ2VudCkKLSAgICAgICAgdGlt ZWxpbmVBZ2VudC0+d2lsbEV2YWx1YXRlU2NyaXB0VGFnKHNvdXJjZUNvZGUudXJsKCkuaXNOdWxs KCkgPyBTdHJpbmcoKSA6IHNvdXJjZUNvZGUudXJsKCkuc3RyaW5nKCksIHNvdXJjZUNvZGUuc3Rh cnRMaW5lKCkpOwotI2VuZGlmCi0gICAgCiAgICAgU2VnbWVudGVkU3RyaW5nKiBzYXZlZFByZXBl bmRpbmdTcmMgPSBtX2N1cnJlbnRQcmVwZW5kaW5nU3JjOwogICAgIFNlZ21lbnRlZFN0cmluZyBw cmVwZW5kaW5nU3JjOwogICAgIG1fY3VycmVudFByZXBlbmRpbmdTcmMgPSAmcHJlcGVuZGluZ1Ny YzsKQEAgLTYxNSwxMSArNjA5LDYgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXpl cjo6c2NyaXB0RXhlY3V0aW9uKGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXIKIAogICAgIG1f Y3VycmVudFByZXBlbmRpbmdTcmMgPSBzYXZlZFByZXBlbmRpbmdTcmM7CiAgICAgCi0jaWYgRU5B QkxFKElOU1BFQ1RPUikKLSAgICBpZiAodGltZWxpbmVBZ2VudCkKLSAgICAgICAgdGltZWxpbmVB Z2VudC0+ZGlkRXZhbHVhdGVTY3JpcHRUYWcoKTsKLSNlbmRpZgotICAgIAogICAgIHJldHVybiBz dGF0ZTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxp bmVBZ2VudC5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNw cAppbmRleCA0ZjdiNzM2Li4yMzdlMzRlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JUaW1lbGluZUFnZW50LmNwcApAQCAtMTQ1LDE0ICsxNDUsMTQgQEAgdm9pZCBJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpkaWRMb2FkWEhSKCkKICAgICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQo WEhSTG9hZFJlY29yZFR5cGUpOwogfQogCi12b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6Ondp bGxFdmFsdWF0ZVNjcmlwdFRhZyhjb25zdCBTdHJpbmcmIHVybCwgaW50IGxpbmVOdW1iZXIpCit2 b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxFdmFsdWF0ZVNjcmlwdChjb25zdCBTdHJp bmcmIHVybCwgaW50IGxpbmVOdW1iZXIpCiB7Ci0gICAgcHVzaEN1cnJlbnRSZWNvcmQoVGltZWxp bmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdFRhZ1RpbWVsaW5lUmVjb3JkKG1f ZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKSwgdXJsLCBsaW5lTnVtYmVyKSwg RXZhbHVhdGVTY3JpcHRUYWdUaW1lbGluZVJlY29yZFR5cGUpOworICAgIHB1c2hDdXJyZW50UmVj b3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZhbHVhdGVTY3JpcHRUaW1lbGluZVJl Y29yZChtX2Zyb250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCksIHVybCwgbGluZU51 bWJlciksIEV2YWx1YXRlU2NyaXB0VGltZWxpbmVSZWNvcmRUeXBlKTsKIH0KICAgICAKLXZvaWQg SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkRXZhbHVhdGVTY3JpcHRUYWcoKQordm9pZCBJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpkaWRFdmFsdWF0ZVNjcmlwdCgpCiB7Ci0gICAgZGlkQ29tcGxl dGVDdXJyZW50UmVjb3JkKEV2YWx1YXRlU2NyaXB0VGFnVGltZWxpbmVSZWNvcmRUeXBlKTsKKyAg ICBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoRXZhbHVhdGVTY3JpcHRUaW1lbGluZVJlY29yZFR5 cGUpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJlc2V0KCkKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaCBiL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAppbmRleCAwNDAxOTc3Li42NmY1NjAx IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgK KysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCkBAIC01Myw3 ICs1Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgVGltZXJGaXJlVGltZWxpbmVS ZWNvcmRUeXBlID0gNywKICAgICAgICAgWEhSUmVhZHlTdGF0ZUNoYW5nZVJlY29yZFR5cGUgPSA4 LAogICAgICAgICBYSFJMb2FkUmVjb3JkVHlwZSA9IDksCi0gICAgICAgIEV2YWx1YXRlU2NyaXB0 VGFnVGltZWxpbmVSZWNvcmRUeXBlID0gMTAsCisgICAgICAgIEV2YWx1YXRlU2NyaXB0VGltZWxp bmVSZWNvcmRUeXBlID0gMTAsCiAgICAgfTsKIAogICAgIGNsYXNzIEluc3BlY3RvclRpbWVsaW5l QWdlbnQgewpAQCAtOTAsOCArOTAsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZv aWQgd2lsbExvYWRYSFIoY29uc3QgU3RyaW5nJik7CiAgICAgICAgIHZvaWQgZGlkTG9hZFhIUigp OwogCi0gICAgICAgIHZvaWQgd2lsbEV2YWx1YXRlU2NyaXB0VGFnKGNvbnN0IFN0cmluZyYsIGlu dCk7Ci0gICAgICAgIHZvaWQgZGlkRXZhbHVhdGVTY3JpcHRUYWcoKTsKKyAgICAgICAgdm9pZCB3 aWxsRXZhbHVhdGVTY3JpcHQoY29uc3QgU3RyaW5nJiwgaW50KTsKKyAgICAgICAgdm9pZCBkaWRF dmFsdWF0ZVNjcmlwdCgpOwogCiAgICAgICAgIHN0YXRpYyBJbnNwZWN0b3JUaW1lbGluZUFnZW50 KiByZXRyaWV2ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7CiAgICAgcHJpdmF0ZToKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAgYi9XZWJD b3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwCmluZGV4IDA4NWJjZDkuLjlh MGE1ODQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9y eS5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcApA QCAtMTAxLDcgKzEwMSw3IEBAIFNjcmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNy ZWF0ZVhIUkxvYWRUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuCiB9CiAKIC8vIHN0YXRp YwotU2NyaXB0T2JqZWN0IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZhbHVhdGVTY3Jp cHRUYWdUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQsIGRvdWJsZSBz dGFydFRpbWUsIGNvbnN0IFN0cmluZyYgdXJsLCBkb3VibGUgbGluZU51bWJlcikgCitTY3JpcHRP YmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVFdmFsdWF0ZVNjcmlwdFRpbWVsaW5l UmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiBmcm9udGVuZCwgZG91YmxlIHN0YXJ0VGltZSwgY29u c3QgU3RyaW5nJiB1cmwsIGRvdWJsZSBsaW5lTnVtYmVyKSAKIHsKICAgICBTY3JpcHRPYmplY3Qg aXRlbSA9IGNyZWF0ZUdlbmVyaWNSZWNvcmQoZnJvbnRlbmQsIHN0YXJ0VGltZSk7CiAgICAgU2Ny aXB0T2JqZWN0IGRhdGEgPSBmcm9udGVuZC0+bmV3U2NyaXB0T2JqZWN0KCk7CmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaCBiL1dlYkNvcmUvaW5z cGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCmluZGV4IDNkMzY2NDkuLmE0Mzc1OGUgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCisrKyBi L1dlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCkBAIC01Miw3ICs1Miw3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVh dGVYSFJSZWFkeVN0YXRlQ2hhbmdlVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBk b3VibGUgc3RhcnRUaW1lLCBjb25zdCBTdHJpbmcmIHVybCwgaW50IHJlYWR5U3RhdGUpOwogICAg ICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVhIUkxvYWRUaW1lbGluZVJlY29yZChJbnNw ZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IFN0cmluZyYgdXJsKTsKICAg ICAgICAgCi0gICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlRXZhbHVhdGVTY3JpcHRU YWdUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUsIGNv bnN0IFN0cmluZyYsIGRvdWJsZSBsaW5lTnVtYmVyKTsKKyAgICAgICAgc3RhdGljIFNjcmlwdE9i amVjdCBjcmVhdGVFdmFsdWF0ZVNjcmlwdFRpbWVsaW5lUmVjb3JkKEluc3BlY3RvckZyb250ZW5k KiwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgU3RyaW5nJiwgZG91YmxlIGxpbmVOdW1iZXIpOwog CiAgICAgcHJpdmF0ZToKICAgICAgICAgVGltZWxpbmVSZWNvcmRGYWN0b3J5KCkgeyB9CmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVBZ2VudC5qcyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50LmpzCmluZGV4IGNiYmI3MzYu LmIzMDlmMDEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGlu ZUFnZW50LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50 LmpzCkBAIC00NCw3ICs0NCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5 cGUgPSB7CiAgICAgVGltZXJGaXJlICAgICAgICAgICA6IDcsCiAgICAgWEhSUmVhZHlTdGF0ZUNo YW5nZSA6IDgsCiAgICAgWEhSTG9hZCAgICAgICAgICAgICA6IDksCi0gICAgRXZhbHVhdGVTY3Jp cHRUYWcgICA6IDEwCisgICAgRXZhbHVhdGVTY3JpcHQgICAgICA6IDEwCiB9OwogCiBXZWJJbnNw ZWN0b3IuYWRkUmVjb3JkVG9UaW1lbGluZSA9IGZ1bmN0aW9uKHJlY29yZCkgewpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwppbmRleCBjZTRlMzliLi44MTYw NzY2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5l bC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwpA QCAtMTUxLDcgKzE1MSw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIHRoaXMuX3JlY29yZFN0eWxlc1tyZWNvcmRUeXBlcy5UaW1lckZpcmVd ID0geyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lciBGaXJlZCIpLCBjYXRlZ29y eTogdGhpcy5jYXRlZ29yaWVzLnNjcmlwdGluZyB9OwogICAgICAgICAgICAgdGhpcy5fcmVjb3Jk U3R5bGVzW3JlY29yZFR5cGVzLlhIUlJlYWR5U3RhdGVDaGFuZ2VdID0geyB0aXRsZTogV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJYSFIgUmVhZHkgU3RhdGUgQ2hhbmdlIiksIGNhdGVnb3J5OiB0aGlz LmNhdGVnb3JpZXMuc2NyaXB0aW5nIH07CiAgICAgICAgICAgICB0aGlzLl9yZWNvcmRTdHlsZXNb cmVjb3JkVHlwZXMuWEhSTG9hZF0gPSB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlhI UiBMb2FkIiksIGNhdGVnb3J5OiB0aGlzLmNhdGVnb3JpZXMuc2NyaXB0aW5nIH07Ci0gICAgICAg ICAgICB0aGlzLl9yZWNvcmRTdHlsZXNbcmVjb3JkVHlwZXMuRXZhbHVhdGVTY3JpcHRUYWddID0g eyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFdmFsdWF0ZSBTY3JpcHQiKSwgY2F0ZWdv cnk6IHRoaXMuY2F0ZWdvcmllcy5zY3JpcHRpbmcgfTsKKyAgICAgICAgICAgIHRoaXMuX3JlY29y ZFN0eWxlc1tyZWNvcmRUeXBlcy5FdmFsdWF0ZVNjcmlwdF0gPSB7IHRpdGxlOiBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkV2YWx1YXRlIFNjcmlwdCIpLCBjYXRlZ29yeTogdGhpcy5jYXRlZ29yaWVz LnNjcmlwdGluZyB9OwogICAgICAgICAgICAgdGhpcy5fcmVjb3JkU3R5bGVzWyJPdGhlciJdID0g eyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJPdGhlciIpLCBpY29uOiAwLCBjYXRlZ29y eTogdGhpcy5jYXRlZ29yaWVzLm90aGVyIH07CiAgICAgICAgIH0KIApAQCAtMTgyLDcgKzE4Miw3 IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IHJldHVybiByZWNvcmQuZGF0YS50aW1lcklkOwogICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5U aW1lbGluZUFnZW50LlJlY29yZFR5cGUuWEhSUmVhZHlTdGF0ZUNoYW5nZToKICAgICAgICAgY2Fz ZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLlhIUkxvYWQ6Ci0gICAgICAg IGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5FdmFsdWF0ZVNjcmlw dFRhZzoKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBl LkV2YWx1YXRlU2NyaXB0OgogICAgICAgICAgICAgcmV0dXJuIHJlY29yZC5kYXRhLnVybDsKICAg ICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIHJldHVybiAiIjsK