30861 2009-10-28 08:30:17 -0700 WebInspector: Adds InspectorTimelineAgent instrumentation for <script> tag processing 2009-10-28 12:52:53 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 zundel webkit-unassigned commit-queue knorton pfeldman timothy oldest_to_newest 158566 0 zundel 2009-10-28 08:30:17 -0700 This change adds another instrumentation point for the InspectorTimelineAgent - reporting the time spent processing a script tag. In order to report the URL and line number for the tag, I updated SourceSourceCode to provide accessors for these values. I could have de-referenced the JSC object, but that would cause a fork with Chrome. 158570 1 42031 zundel 2009-10-28 08:40:35 -0700 Created attachment 42031 WebInspector: Adds instrumentation of the script tag, and getters to ScriptSourceCode 158589 2 42031 timothy 2009-10-28 09:28:11 -0700 Comment on attachment 42031 WebInspector: Adds instrumentation of the script tag, and getters to ScriptSourceCode > + timelineAgent->willScriptTag(sourceCode.url().isNull() ? String() : sourceCode.url().string(), sourceCode.startLine()); > + timelineAgent->didScriptTag(); > + ScriptTagTimelineRecordType = 10, The wording is weird here. Would be better as willEvaluateScriptTag/didEvaluateScriptTag/EvaluateScriptTagTimelineRecordType. Otherwise r+. 158635 3 42042 zundel 2009-10-28 10:44:07 -0700 Created attachment 42042 WebInspector: Renames ScriptTagTimelineRecord to EvaluateScriptTagTimelineRecord 158668 4 42042 commit-queue 2009-10-28 12:52:49 -0700 Comment on attachment 42042 WebInspector: Renames ScriptTagTimelineRecord to EvaluateScriptTagTimelineRecord Clearing flags on attachment: 42042 Committed r50230: <http://trac.webkit.org/changeset/50230> 158669 5 commit-queue 2009-10-28 12:52:53 -0700 All reviewed patches have been landed. Closing bug. 42031 2009-10-28 08:40:35 -0700 2009-10-28 09:28:11 -0700 WebInspector: Adds instrumentation of the script tag, and getters to ScriptSourceCode webkit-inspectortimelineagent-script-tag.patch text/plain 8639 zundel SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDIxNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMDktMTAtMjggIEVyaWMgWi4gQXllcnMgIDx6dW5kZWxAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGRzIEluc3BlY3RvclRpbWVsaW5lQWdlbnQgIGluc3RydW1lbnRhdGlvbiBmb3IgZW5jb3VudGVy aW5nIGEKKyAgICAgICAgPFNDUklQVD4gdGFnIHdoZW4gcGFyc2luZyBhbiBIVE1MIGRvY3VtZW50 LiAKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA4 NjEKKworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdFNvdXJjZUNvZGUuaDoKKyAgICAgICAg KFdlYkNvcmU6OlNjcmlwdFNvdXJjZUNvZGU6OlNjcmlwdFNvdXJjZUNvZGUpOgorICAgICAgICAo V2ViQ29yZTo6U2NyaXB0U291cmNlQ29kZTo6c3RhcnRMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6 OlNjcmlwdFNvdXJjZUNvZGU6OnVybCk6CisgICAgICAgICogaHRtbC9IVE1MVG9rZW5pemVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUb2tlbml6ZXI6OnNjcmlwdEhhbmRsZXIpOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTFRva2VuaXplcjo6c2NyaXB0RXhlY3V0aW9uKToKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsTG9hZFhIUik6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsU2NyaXB0VGFnKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZFNjcmlwdFRhZyk6CisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6Oik6Cisg ICAgICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVNjcmlwdFRhZ1RpbWVsaW5lUmVj b3JkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5Lmg6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50LmpzOgorCiAyMDA5LTEwLTI4 ICBTdGV2ZSBCbG9jayAgPHN0ZXZlYmxvY2tAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0U291cmNl Q29kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0U291cmNlQ29k ZS5oCShyZXZpc2lvbiA1MDIxNikKKysrIFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0U291cmNl Q29kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00NCw2ICs0NCw3IEBAIHB1YmxpYzoKICAgICBTY3Jp cHRTb3VyY2VDb2RlKGNvbnN0IFN0cmluZyYgc291cmNlLCBjb25zdCBLVVJMJiB1cmwgPSBLVVJM KCksIGludCBzdGFydExpbmUgPSAxKQogICAgICAgICA6IG1fcHJvdmlkZXIoU3RyaW5nU291cmNl UHJvdmlkZXI6OmNyZWF0ZShzb3VyY2UsIHVybC5pc051bGwoKSA/IFN0cmluZygpIDogdXJsLnN0 cmluZygpKSkKICAgICAgICAgLCBtX2NvZGUobV9wcm92aWRlciwgc3RhcnRMaW5lKQorICAgICAg ICAsIG1fdXJsKHVybCkKICAgICB7CiAgICAgfQogCkBAIC01OSwxMCArNjAsMTcgQEAgcHVibGlj OgogCiAgICAgY29uc3QgU3RyaW5nJiBzb3VyY2UoKSBjb25zdCB7IHJldHVybiBtX3Byb3ZpZGVy LT5zb3VyY2UoKTsgfQogCisgICAgaW50IHN0YXJ0TGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29k ZS5maXJzdExpbmUoKTsgfQorCisgICAgY29uc3QgS1VSTCYgdXJsKCkgY29uc3QgeyByZXR1cm4g bV91cmw7IH0KKyAgICAKIHByaXZhdGU6CiAgICAgUmVmUHRyPFNjcmlwdFNvdXJjZVByb3ZpZGVy PiBtX3Byb3ZpZGVyOwogICAgIAogICAgIEpTQzo6U291cmNlQ29kZSBtX2NvZGU7CisgICAgCisg ICAgS1VSTCBtX3VybDsKKwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9I VE1MVG9rZW5pemVyLmNwcAkocmV2aXNpb24gNTAyMTYpCisrKyBXZWJDb3JlL2h0bWwvSFRNTFRv a2VuaXplci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxNiwxMyArNDE2LDEzIEBAIEhUTUxUb2tl bml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnMKIAogICAgIHJldHVybiBzdGF0ZTsKIH0K LQorICAgIAogSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaXB0SGFuZGxl cihTdGF0ZSBzdGF0ZSkKIHsKICAgICAvLyBXZSBhcmUgaW5zaWRlIGEgPHNjcmlwdD4KICAgICBi b29sIGRvU2NyaXB0RXhlYyA9IGZhbHNlOwogICAgIGludCBzdGFydExpbmUgPSBtX2N1cnJlbnRT Y3JpcHRUYWdTdGFydExpbmVOdW1iZXIgKyAxOyAvLyBTY3JpcHQgbGluZSBudW1iZXJzIGFyZSAx IGJhc2VkLCBIVE1MVG9rZW56aWVyIGxpbmUgbnVtYmVycyBhcmUgMCBiYXNlZAotCisgICAgCiAg ICAgLy8gUmVzZXQgbV9jdXJyZW50U2NyaXB0VGFnU3RhcnRMaW5lTnVtYmVyIHRvIGluZGljYXRl IHRoYXQgd2UndmUgZmluaXNoZWQgcGFyc2luZyB0aGUgY3VycmVudCBzY3JpcHQgZWxlbWVudAog ICAgIG1fY3VycmVudFNjcmlwdFRhZ1N0YXJ0TGluZU51bWJlciA9IDA7CiAKQEAgLTU1MSw3ICs1 NTEsMTMgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaQogICAgIGlm IChtX2ZyYWdtZW50IHx8ICFtX2RvYy0+ZnJhbWUoKSkKICAgICAgICAgcmV0dXJuIHN0YXRlOwog ICAgIG1fZXhlY3V0aW5nU2NyaXB0Kys7Ci0KKyAgICAKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQor ICAgIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBtX2RvYy0+aW5zcGVj dG9yVGltZWxpbmVBZ2VudCgpOworICAgIGlmICh0aW1lbGluZUFnZW50KQorICAgICAgICB0aW1l bGluZUFnZW50LT53aWxsU2NyaXB0VGFnKHNvdXJjZUNvZGUudXJsKCkuaXNOdWxsKCkgPyBTdHJp bmcoKSA6IHNvdXJjZUNvZGUudXJsKCkuc3RyaW5nKCksIHNvdXJjZUNvZGUuc3RhcnRMaW5lKCkp OworI2VuZGlmCisgICAgCiAgICAgU2VnbWVudGVkU3RyaW5nKiBzYXZlZFByZXBlbmRpbmdTcmMg PSBtX2N1cnJlbnRQcmVwZW5kaW5nU3JjOwogICAgIFNlZ21lbnRlZFN0cmluZyBwcmVwZW5kaW5n U3JjOwogICAgIG1fY3VycmVudFByZXBlbmRpbmdTcmMgPSAmcHJlcGVuZGluZ1NyYzsKQEAgLTYw OCw3ICs2MTQsMTIgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaQog ICAgIH0KIAogICAgIG1fY3VycmVudFByZXBlbmRpbmdTcmMgPSBzYXZlZFByZXBlbmRpbmdTcmM7 Ci0KKyAgICAKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQorICAgIGlmICh0aW1lbGluZUFnZW50KQor ICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRTY3JpcHRUYWcoKTsKKyNlbmRpZgorICAgIAogICAg IHJldHVybiBzdGF0ZTsKIH0KIApAQCAtMTYxMyw3ICsxNjI0LDcgQEAgaW5saW5lIGJvb2wgSFRN TFRva2VuaXplcjo6Y29udGludWVQcm9jZQogICAgIHByb2Nlc3NlZENvdW50Kys7CiAgICAgcmV0 dXJuIHRydWU7CiB9Ci0KKyAgICAKIHZvaWQgSFRNTFRva2VuaXplcjo6d3JpdGUoY29uc3QgU2Vn bWVudGVkU3RyaW5nJiBzdHIsIGJvb2wgYXBwZW5kRGF0YSkKIHsKICAgICBpZiAoIW1fYnVmZmVy KQpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAJ KHJldmlzaW9uIDUwMjE2KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVB Z2VudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMCw3ICsxMDAsNyBAQCB2b2lkIEluc3BlY3Rv clRpbWVsaW5lQWdlbnQ6OmRpZFdyaXRlSFRNCiB7CiAgICAgZGlkQ29tcGxldGVDdXJyZW50UmVj b3JkKFBhcnNlSFRNTFRpbWVsaW5lUmVjb3JkVHlwZSk7CiB9Ci0KKyAgIAogdm9pZCBJbnNwZWN0 b3JUaW1lbGluZUFnZW50OjpkaWRJbnN0YWxsVGltZXIoaW50IHRpbWVySWQsIGludCB0aW1lb3V0 LCBib29sIHNpbmdsZVNob3QpCiB7CiAgICAgYWRkUmVjb3JkVG9UaW1lbGluZShUaW1lbGluZVJl Y29yZEZhY3Rvcnk6OmNyZWF0ZVRpbWVySW5zdGFsbFJlY29yZChtX2Zyb250ZW5kLCBjdXJyZW50 VGltZUluTWlsbGlzZWNvbmRzKCksIHRpbWVySWQsCkBAIC0xMzUsNyArMTM1LDggQEAgdm9pZCBJ bnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDaGFuZ2VYSAogICAgIGRpZENvbXBsZXRlQ3VycmVu dFJlY29yZChYSFJSZWFkeVN0YXRlQ2hhbmdlUmVjb3JkVHlwZSk7CiB9CiAKLXZvaWQgSW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6d2lsbExvYWRYSFIoY29uc3QgU3RyaW5nJiB1cmwpIHsKK3ZvaWQg SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6d2lsbExvYWRYSFIoY29uc3QgU3RyaW5nJiB1cmwpIAor ewogICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlWEhS TG9hZFRpbWVsaW5lUmVjb3JkKG1fZnJvbnRlbmQsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMo KSwgdXJsKSwgWEhSTG9hZFJlY29yZFR5cGUpOwogfQogCkBAIC0xNDQsNiArMTQ1LDE2IEBAIHZv aWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTG9hZFhIUigKICAgICBkaWRDb21wbGV0ZUN1 cnJlbnRSZWNvcmQoWEhSTG9hZFJlY29yZFR5cGUpOwogfQogCit2b2lkIEluc3BlY3RvclRpbWVs aW5lQWdlbnQ6OndpbGxTY3JpcHRUYWcoY29uc3QgU3RyaW5nJiB1cmwsIGludCBsaW5lTnVtYmVy KQoreworICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRl U2NyaXB0VGFnVGltZWxpbmVSZWNvcmQobV9mcm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vj b25kcygpLCB1cmwsIGxpbmVOdW1iZXIpLCBTY3JpcHRUYWdUaW1lbGluZVJlY29yZFR5cGUpOwor fQorICAgIAordm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRTY3JpcHRUYWcoKQorewor ICAgIGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChTY3JpcHRUYWdUaW1lbGluZVJlY29yZFR5cGUp OworfQorCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJlc2V0KCkKIHsKICAgICBtX3Jl Y29yZFN0YWNrLmNsZWFyKCk7CkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1l bGluZUFnZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudC5oCShyZXZpc2lvbiA1MDIxNikKKysrIFdlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclRpbWVsaW5lQWdlbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNTMsNiArNTMsNyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFRpbWVyRmlyZVRpbWVsaW5lUmVjb3JkVHlwZSA9IDcs CiAgICAgICAgIFhIUlJlYWR5U3RhdGVDaGFuZ2VSZWNvcmRUeXBlID0gOCwKICAgICAgICAgWEhS TG9hZFJlY29yZFR5cGUgPSA5LAorICAgICAgICBTY3JpcHRUYWdUaW1lbGluZVJlY29yZFR5cGUg PSAxMCwKICAgICB9OwogCiAgICAgY2xhc3MgSW5zcGVjdG9yVGltZWxpbmVBZ2VudCB7CkBAIC04 OCw2ICs4OSw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCB3aWxsTG9hZFhI Uihjb25zdCBTdHJpbmcmKTsKICAgICAgICAgdm9pZCBkaWRMb2FkWEhSKCk7CiAKKyAgICAgICAg dm9pZCB3aWxsU2NyaXB0VGFnKGNvbnN0IFN0cmluZyYsIGludCk7CisgICAgICAgIHZvaWQgZGlk U2NyaXB0VGFnKCk7CisKICAgICAgICAgc3RhdGljIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHJl dHJpZXZlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqKTsKICAgICBwcml2YXRlOgogICAgICAgICBz dHJ1Y3QgVGltZWxpbmVSZWNvcmRFbnRyeSB7CkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9UaW1l bGluZVJlY29yZEZhY3RvcnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL1Rp bWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAJKHJldmlzaW9uIDUwMjE2KQorKysgV2ViQ29yZS9pbnNw ZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAwLDYg KzEwMCwxNyBAQCBTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhCiAgICAg cmV0dXJuIHJlY29yZDsKIH0KIAorLy8gc3RhdGljCitTY3JpcHRPYmplY3QgVGltZWxpbmVSZWNv cmRGYWN0b3J5OjpjcmVhdGVTY3JpcHRUYWdUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVu ZCogZnJvbnRlbmQsIGRvdWJsZSBzdGFydFRpbWUsIGNvbnN0IFN0cmluZyYgdXJsLCBkb3VibGUg bGluZU51bWJlcikgCit7CisgICAgU2NyaXB0T2JqZWN0IGl0ZW0gPSBjcmVhdGVHZW5lcmljUmVj b3JkKGZyb250ZW5kLCBzdGFydFRpbWUpOworICAgIFNjcmlwdE9iamVjdCBkYXRhID0gZnJvbnRl bmQtPm5ld1NjcmlwdE9iamVjdCgpOworICAgIGRhdGEuc2V0KCJ1cmwiLCB1cmwpOworICAgIGRh dGEuc2V0KCJsaW5lTnVtYmVyIiwgbGluZU51bWJlcik7CisgICAgaXRlbS5zZXQoImRhdGEiLCBk YXRhKTsKKyAgICByZXR1cm4gaXRlbTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAj ZW5kaWYgLy8gRU5BQkxFKElOU1BFQ1RPUikKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL1RpbWVs aW5lUmVjb3JkRmFjdG9yeS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL1RpbWVs aW5lUmVjb3JkRmFjdG9yeS5oCShyZXZpc2lvbiA1MDIxNikKKysrIFdlYkNvcmUvaW5zcGVjdG9y L1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5oCSh3b3JraW5nIGNvcHkpCkBAIC01MCw5ICs1MCwxMCBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHN0YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRl VGltZXJJbnN0YWxsUmVjb3JkKEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwg aW50IHRpbWVySWQsIGludCB0aW1lb3V0LCBib29sIHNpbmdsZVNob3QpOwogCiAgICAgICAgIHN0 YXRpYyBTY3JpcHRPYmplY3QgY3JlYXRlWEhSUmVhZHlTdGF0ZUNoYW5nZVRpbWVsaW5lUmVjb3Jk KEluc3BlY3RvckZyb250ZW5kKiwgZG91YmxlIHN0YXJ0VGltZSwgY29uc3QgU3RyaW5nJiB1cmws IGludCByZWFkeVN0YXRlKTsKLQogICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVhI UkxvYWRUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUs IGNvbnN0IFN0cmluZyYgdXJsKTsKICAgICAgICAgCisgICAgICAgIHN0YXRpYyBTY3JpcHRPYmpl Y3QgY3JlYXRlU2NyaXB0VGFnVGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBkb3Vi bGUgc3RhcnRUaW1lLCBjb25zdCBTdHJpbmcmLCBkb3VibGUgbGluZU51bWJlcik7CisKICAgICBw cml2YXRlOgogICAgICAgICBUaW1lbGluZVJlY29yZEZhY3RvcnkoKSB7IH0KICAgICB9OwpJbmRl eDogV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMJKHJldmlz aW9uIDUwMjE2KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQu anMJKHdvcmtpbmcgY29weSkKQEAgLTQzLDcgKzQzLDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l QWdlbnQuUmVjb3JkVHlwZSA9IAogICAgIFRpbWVyUmVtb3ZlICAgICAgICAgOiA2LAogICAgIFRp bWVyRmlyZSAgICAgICAgICAgOiA3LAogICAgIFhIUlJlYWR5U3RhdGVDaGFuZ2UgOiA4LAotICAg IFhIUkxvYWQgICAgICAgICAgICAgOiA5CisgICAgWEhSTG9hZCAgICAgICAgICAgICA6IDksCisg ICAgU2NyaXB0VGFnICAgICAgICAgICA6IDEwCiB9OwogCiBXZWJJbnNwZWN0b3IuYWRkUmVjb3Jk VG9UaW1lbGluZSA9IGZ1bmN0aW9uKHJlY29yZCkgewo= 42042 2009-10-28 10:44:07 -0700 2009-10-28 12:52:48 -0700 WebInspector: Renames ScriptTagTimelineRecord to EvaluateScriptTagTimelineRecord webkit-inspectortimelineagent-script-tag2.patch text/plain 8735 zundel SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDIxNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMDktMTAtMjggIEVyaWMgWi4gQXllcnMgIDx6dW5kZWxAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGRzIEluc3BlY3RvclRpbWVsaW5lQWdlbnQgIGluc3RydW1lbnRhdGlvbiBmb3IgZW5jb3VudGVy aW5nIGEKKyAgICAgICAgPFNDUklQVD4gdGFnIHdoZW4gcGFyc2luZyBhbiBIVE1MIGRvY3VtZW50 LiAKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA4 NjEKKworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdFNvdXJjZUNvZGUuaDoKKyAgICAgICAg KFdlYkNvcmU6OlNjcmlwdFNvdXJjZUNvZGU6OlNjcmlwdFNvdXJjZUNvZGUpOgorICAgICAgICAo V2ViQ29yZTo6U2NyaXB0U291cmNlQ29kZTo6c3RhcnRMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6 OlNjcmlwdFNvdXJjZUNvZGU6OnVybCk6CisgICAgICAgICogaHRtbC9IVE1MVG9rZW5pemVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUb2tlbml6ZXI6OnNjcmlwdEhhbmRsZXIpOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTFRva2VuaXplcjo6c2NyaXB0RXhlY3V0aW9uKToKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsTG9hZFhIUik6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsU2NyaXB0VGFnKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZFNjcmlwdFRhZyk6CisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6Oik6Cisg ICAgICAgICogaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZVNjcmlwdFRhZ1RpbWVsaW5lUmVj b3JkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5Lmg6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUFnZW50LmpzOgorCiAyMDA5LTEwLTI4 ICBTdGV2ZSBCbG9jayAgPHN0ZXZlYmxvY2tAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0U291cmNl Q29kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0U291cmNlQ29k ZS5oCShyZXZpc2lvbiA1MDIxNikKKysrIFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0U291cmNl Q29kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00NCw2ICs0NCw3IEBAIHB1YmxpYzoKICAgICBTY3Jp cHRTb3VyY2VDb2RlKGNvbnN0IFN0cmluZyYgc291cmNlLCBjb25zdCBLVVJMJiB1cmwgPSBLVVJM KCksIGludCBzdGFydExpbmUgPSAxKQogICAgICAgICA6IG1fcHJvdmlkZXIoU3RyaW5nU291cmNl UHJvdmlkZXI6OmNyZWF0ZShzb3VyY2UsIHVybC5pc051bGwoKSA/IFN0cmluZygpIDogdXJsLnN0 cmluZygpKSkKICAgICAgICAgLCBtX2NvZGUobV9wcm92aWRlciwgc3RhcnRMaW5lKQorICAgICAg ICAsIG1fdXJsKHVybCkKICAgICB7CiAgICAgfQogCkBAIC01OSwxMCArNjAsMTcgQEAgcHVibGlj OgogCiAgICAgY29uc3QgU3RyaW5nJiBzb3VyY2UoKSBjb25zdCB7IHJldHVybiBtX3Byb3ZpZGVy LT5zb3VyY2UoKTsgfQogCisgICAgaW50IHN0YXJ0TGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29k ZS5maXJzdExpbmUoKTsgfQorCisgICAgY29uc3QgS1VSTCYgdXJsKCkgY29uc3QgeyByZXR1cm4g bV91cmw7IH0KKyAgICAKIHByaXZhdGU6CiAgICAgUmVmUHRyPFNjcmlwdFNvdXJjZVByb3ZpZGVy PiBtX3Byb3ZpZGVyOwogICAgIAogICAgIEpTQzo6U291cmNlQ29kZSBtX2NvZGU7CisgICAgCisg ICAgS1VSTCBtX3VybDsKKwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2Vi Q29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9I VE1MVG9rZW5pemVyLmNwcAkocmV2aXNpb24gNTAyMTYpCisrKyBXZWJDb3JlL2h0bWwvSFRNTFRv a2VuaXplci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxNiwxMyArNDE2LDEzIEBAIEhUTUxUb2tl bml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnBhcnMKIAogICAgIHJldHVybiBzdGF0ZTsKIH0K LQorICAgIAogSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaXB0SGFuZGxl cihTdGF0ZSBzdGF0ZSkKIHsKICAgICAvLyBXZSBhcmUgaW5zaWRlIGEgPHNjcmlwdD4KICAgICBi b29sIGRvU2NyaXB0RXhlYyA9IGZhbHNlOwogICAgIGludCBzdGFydExpbmUgPSBtX2N1cnJlbnRT Y3JpcHRUYWdTdGFydExpbmVOdW1iZXIgKyAxOyAvLyBTY3JpcHQgbGluZSBudW1iZXJzIGFyZSAx IGJhc2VkLCBIVE1MVG9rZW56aWVyIGxpbmUgbnVtYmVycyBhcmUgMCBiYXNlZAotCisgICAgCiAg ICAgLy8gUmVzZXQgbV9jdXJyZW50U2NyaXB0VGFnU3RhcnRMaW5lTnVtYmVyIHRvIGluZGljYXRl IHRoYXQgd2UndmUgZmluaXNoZWQgcGFyc2luZyB0aGUgY3VycmVudCBzY3JpcHQgZWxlbWVudAog ICAgIG1fY3VycmVudFNjcmlwdFRhZ1N0YXJ0TGluZU51bWJlciA9IDA7CiAKQEAgLTU1MSw3ICs1 NTEsMTMgQEAgSFRNTFRva2VuaXplcjo6U3RhdGUgSFRNTFRva2VuaXplcjo6c2NyaQogICAgIGlm IChtX2ZyYWdtZW50IHx8ICFtX2RvYy0+ZnJhbWUoKSkKICAgICAgICAgcmV0dXJuIHN0YXRlOwog ICAgIG1fZXhlY3V0aW5nU2NyaXB0Kys7Ci0KKyAgICAKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQor ICAgIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBtX2RvYy0+aW5zcGVj dG9yVGltZWxpbmVBZ2VudCgpOworICAgIGlmICh0aW1lbGluZUFnZW50KQorICAgICAgICB0aW1l bGluZUFnZW50LT53aWxsRXZhbHVhdGVTY3JpcHRUYWcoc291cmNlQ29kZS51cmwoKS5pc051bGwo KSA/IFN0cmluZygpIDogc291cmNlQ29kZS51cmwoKS5zdHJpbmcoKSwgc291cmNlQ29kZS5zdGFy dExpbmUoKSk7CisjZW5kaWYKKyAgICAKICAgICBTZWdtZW50ZWRTdHJpbmcqIHNhdmVkUHJlcGVu ZGluZ1NyYyA9IG1fY3VycmVudFByZXBlbmRpbmdTcmM7CiAgICAgU2VnbWVudGVkU3RyaW5nIHBy ZXBlbmRpbmdTcmM7CiAgICAgbV9jdXJyZW50UHJlcGVuZGluZ1NyYyA9ICZwcmVwZW5kaW5nU3Jj OwpAQCAtNjA4LDcgKzYxNCwxMiBAQCBIVE1MVG9rZW5pemVyOjpTdGF0ZSBIVE1MVG9rZW5pemVy OjpzY3JpCiAgICAgfQogCiAgICAgbV9jdXJyZW50UHJlcGVuZGluZ1NyYyA9IHNhdmVkUHJlcGVu ZGluZ1NyYzsKLQorICAgIAorI2lmIEVOQUJMRShJTlNQRUNUT1IpCisgICAgaWYgKHRpbWVsaW5l QWdlbnQpCisgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZEV2YWx1YXRlU2NyaXB0VGFnKCk7Cisj ZW5kaWYKKyAgICAKICAgICByZXR1cm4gc3RhdGU7CiB9CiAKQEAgLTE2MTMsNyArMTYyNCw3IEBA IGlubGluZSBib29sIEhUTUxUb2tlbml6ZXI6OmNvbnRpbnVlUHJvY2UKICAgICBwcm9jZXNzZWRD b3VudCsrOwogICAgIHJldHVybiB0cnVlOwogfQotCisgICAgCiB2b2lkIEhUTUxUb2tlbml6ZXI6 OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0cmluZyYgc3RyLCBib29sIGFwcGVuZERhdGEpCiB7CiAg ICAgaWYgKCFtX2J1ZmZlcikKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVs aW5lQWdlbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRp bWVsaW5lQWdlbnQuY3BwCShyZXZpc2lvbiA1MDIxNikKKysrIFdlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAsNyArMTAwLDcg QEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRXcml0ZUhUTQogewogICAgIGRpZENv bXBsZXRlQ3VycmVudFJlY29yZChQYXJzZUhUTUxUaW1lbGluZVJlY29yZFR5cGUpOwogfQotCisg ICAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkSW5zdGFsbFRpbWVyKGludCB0aW1l cklkLCBpbnQgdGltZW91dCwgYm9vbCBzaW5nbGVTaG90KQogewogICAgIGFkZFJlY29yZFRvVGlt ZWxpbmUoVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVUaW1lckluc3RhbGxSZWNvcmQobV9m cm9udGVuZCwgY3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpLCB0aW1lcklkLApAQCAtMTM1LDcg KzEzNSw4IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ2hhbmdlWEgKICAgICBk aWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoWEhSUmVhZHlTdGF0ZUNoYW5nZVJlY29yZFR5cGUpOwog fQogCi12b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxMb2FkWEhSKGNvbnN0IFN0cmlu ZyYgdXJsKSB7Cit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OndpbGxMb2FkWEhSKGNvbnN0 IFN0cmluZyYgdXJsKSAKK3sKICAgICBwdXNoQ3VycmVudFJlY29yZChUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZVhIUkxvYWRUaW1lbGluZVJlY29yZChtX2Zyb250ZW5kLCBjdXJyZW50VGlt ZUluTWlsbGlzZWNvbmRzKCksIHVybCksIFhIUkxvYWRSZWNvcmRUeXBlKTsKIH0KIApAQCAtMTQ0 LDYgKzE0NSwxNiBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZExvYWRYSFIoCiAg ICAgZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKFhIUkxvYWRSZWNvcmRUeXBlKTsKIH0KIAordm9p ZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsRXZhbHVhdGVTY3JpcHRUYWcoY29uc3QgU3Ry aW5nJiB1cmwsIGludCBsaW5lTnVtYmVyKQoreworICAgIHB1c2hDdXJyZW50UmVjb3JkKFRpbWVs aW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlRXZhbHVhdGVTY3JpcHRUYWdUaW1lbGluZVJlY29yZCht X2Zyb250ZW5kLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCksIHVybCwgbGluZU51bWJlciks IEV2YWx1YXRlU2NyaXB0VGFnVGltZWxpbmVSZWNvcmRUeXBlKTsKK30KKyAgICAKK3ZvaWQgSW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkRXZhbHVhdGVTY3JpcHRUYWcoKQoreworICAgIGRpZENv bXBsZXRlQ3VycmVudFJlY29yZChFdmFsdWF0ZVNjcmlwdFRhZ1RpbWVsaW5lUmVjb3JkVHlwZSk7 Cit9CisKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cmVzZXQoKQogewogICAgIG1fcmVj b3JkU3RhY2suY2xlYXIoKTsKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVs aW5lQWdlbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1l bGluZUFnZW50LmgJKHJldmlzaW9uIDUwMjE2KQorKysgV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yVGltZWxpbmVBZ2VudC5oCSh3b3JraW5nIGNvcHkpCkBAIC01Myw2ICs1Myw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgVGltZXJGaXJlVGltZWxpbmVSZWNvcmRUeXBlID0gNywK ICAgICAgICAgWEhSUmVhZHlTdGF0ZUNoYW5nZVJlY29yZFR5cGUgPSA4LAogICAgICAgICBYSFJM b2FkUmVjb3JkVHlwZSA9IDksCisgICAgICAgIEV2YWx1YXRlU2NyaXB0VGFnVGltZWxpbmVSZWNv cmRUeXBlID0gMTAsCiAgICAgfTsKIAogICAgIGNsYXNzIEluc3BlY3RvclRpbWVsaW5lQWdlbnQg ewpAQCAtODgsNiArODksOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgd2ls bExvYWRYSFIoY29uc3QgU3RyaW5nJik7CiAgICAgICAgIHZvaWQgZGlkTG9hZFhIUigpOwogCisg ICAgICAgIHZvaWQgd2lsbEV2YWx1YXRlU2NyaXB0VGFnKGNvbnN0IFN0cmluZyYsIGludCk7Cisg ICAgICAgIHZvaWQgZGlkRXZhbHVhdGVTY3JpcHRUYWcoKTsKKwogICAgICAgICBzdGF0aWMgSW5z cGVjdG9yVGltZWxpbmVBZ2VudCogcmV0cmlldmUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCopOwog ICAgIHByaXZhdGU6CiAgICAgICAgIHN0cnVjdCBUaW1lbGluZVJlY29yZEVudHJ5IHsKSW5kZXg6 IFdlYkNvcmUvaW5zcGVjdG9yL1RpbWVsaW5lUmVjb3JkRmFjdG9yeS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9pbnNwZWN0b3IvVGltZWxpbmVSZWNvcmRGYWN0b3J5LmNwcAkocmV2aXNpb24g NTAyMTYpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMDAsNiArMTAwLDE3IEBAIFNjcmlwdE9iamVjdCBUaW1lbGluZVJl Y29yZEZhY3Rvcnk6OmNyZWEKICAgICByZXR1cm4gcmVjb3JkOwogfQogCisvLyBzdGF0aWMKK1Nj cmlwdE9iamVjdCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUV2YWx1YXRlU2NyaXB0VGFn VGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kLCBkb3VibGUgc3RhcnRU aW1lLCBjb25zdCBTdHJpbmcmIHVybCwgZG91YmxlIGxpbmVOdW1iZXIpIAoreworICAgIFNjcmlw dE9iamVjdCBpdGVtID0gY3JlYXRlR2VuZXJpY1JlY29yZChmcm9udGVuZCwgc3RhcnRUaW1lKTsK KyAgICBTY3JpcHRPYmplY3QgZGF0YSA9IGZyb250ZW5kLT5uZXdTY3JpcHRPYmplY3QoKTsKKyAg ICBkYXRhLnNldCgidXJsIiwgdXJsKTsKKyAgICBkYXRhLnNldCgibGluZU51bWJlciIsIGxpbmVO dW1iZXIpOworICAgIGl0ZW0uc2V0KCJkYXRhIiwgZGF0YSk7CisgICAgcmV0dXJuIGl0ZW07Cit9 CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShJTlNQRUNUT1Ip CkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaAkocmV2aXNp b24gNTAyMTYpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9UaW1lbGluZVJlY29yZEZhY3RvcnkuaAko d29ya2luZyBjb3B5KQpAQCAtNTAsOSArNTAsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVRpbWVySW5zdGFsbFJlY29yZChJbnNwZWN0 b3JGcm9udGVuZCosIGRvdWJsZSBzdGFydFRpbWUsIGludCB0aW1lcklkLCBpbnQgdGltZW91dCwg Ym9vbCBzaW5nbGVTaG90KTsKIAogICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZVhI UlJlYWR5U3RhdGVDaGFuZ2VUaW1lbGluZVJlY29yZChJbnNwZWN0b3JGcm9udGVuZCosIGRvdWJs ZSBzdGFydFRpbWUsIGNvbnN0IFN0cmluZyYgdXJsLCBpbnQgcmVhZHlTdGF0ZSk7Ci0KICAgICAg ICAgc3RhdGljIFNjcmlwdE9iamVjdCBjcmVhdGVYSFJMb2FkVGltZWxpbmVSZWNvcmQoSW5zcGVj dG9yRnJvbnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lLCBjb25zdCBTdHJpbmcmIHVybCk7CiAgICAg ICAgIAorICAgICAgICBzdGF0aWMgU2NyaXB0T2JqZWN0IGNyZWF0ZUV2YWx1YXRlU2NyaXB0VGFn VGltZWxpbmVSZWNvcmQoSW5zcGVjdG9yRnJvbnRlbmQqLCBkb3VibGUgc3RhcnRUaW1lLCBjb25z dCBTdHJpbmcmLCBkb3VibGUgbGluZU51bWJlcik7CisKICAgICBwcml2YXRlOgogICAgICAgICBU aW1lbGluZVJlY29yZEZhY3RvcnkoKSB7IH0KICAgICB9OwpJbmRleDogV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMJKHJldmlzaW9uIDUwMjE2KQorKysgV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lQWdlbnQuanMJKHdvcmtpbmcgY29weSkK QEAgLTQzLDcgKzQzLDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZSA9 IAogICAgIFRpbWVyUmVtb3ZlICAgICAgICAgOiA2LAogICAgIFRpbWVyRmlyZSAgICAgICAgICAg OiA3LAogICAgIFhIUlJlYWR5U3RhdGVDaGFuZ2UgOiA4LAotICAgIFhIUkxvYWQgICAgICAgICAg ICAgOiA5CisgICAgWEhSTG9hZCAgICAgICAgICAgICA6IDksCisgICAgRXZhbHVhdGVTY3JpcHRU YWcgICA6IDEwCiB9OwogCiBXZWJJbnNwZWN0b3IuYWRkUmVjb3JkVG9UaW1lbGluZSA9IGZ1bmN0 aW9uKHJlY29yZCkgewo=