31121 2009-11-04 08:02:32 -0800 WebInspector: Prevent crash when InspectorTimelineAgent is enabled/disabled: follow on to bug 31080 2009-11-04 12:04:31 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 zundel webkit-unassigned commit-queue eric knorton pfeldman timothy zundel oldest_to_newest 160440 0 zundel 2009-11-04 08:02:32 -0800 This patch completes the work started by bug 31080 to not save the timelineAgent pointer between beginning and ending an entry point. 160454 1 42488 zundel 2009-11-04 09:02:30 -0800 Created attachment 42488 WebInspector: Handle turning timeline profiling on/off in the middle of event dispatch 160458 2 42488 pfeldman 2009-11-04 09:12:33 -0800 Comment on attachment 42488 WebInspector: Handle turning timeline profiling on/off in the middle of event dispatch DOMWindow.cpp has somewhat large copypaste. Please consider extracting method in one of your next patches. 160464 3 42488 commit-queue 2009-11-04 09:25:35 -0800 Comment on attachment 42488 WebInspector: Handle turning timeline profiling on/off in the middle of event dispatch Rejecting patch 42488 from commit-queue. Failed to run "['git', 'svn', 'dcommit']" exit_code: 1 Last 500 characters of output: page/FrameView.cpp M WebCore/xml/XMLHttpRequest.cpp A repository hook failed: MERGE request failed on '/repository/webkit/trunk': Commit blocked by pre-commit hook (exit code 1) with output: svnlook: Can't write to stream: Broken pipe The following files contain tab characters: trunk/WebCore/ChangeLog Please use spaces instead to indent. If you must commit a file with tabs, use svn propset to set the "allow-tabs" property. at /usr/local/libexec/git-core//git-svn line 469 160465 4 eric 2009-11-04 09:29:10 -0800 We need to make some tool which knows how to warn contributors earlier than a pre-commit hook. :( 160468 5 timothy 2009-11-04 09:34:37 -0800 (In reply to comment #4) > We need to make some tool which knows how to warn contributors earlier than a > pre-commit hook. :( svn-create-patch? (Wont help the git users or direct users on svn diff.) 160470 6 42488 timothy 2009-11-04 09:36:36 -0800 Comment on attachment 42488 WebInspector: Handle turning timeline profiling on/off in the middle of event dispatch > #if ENABLE(INSPECTOR) > + timelineAgent = InspectorTimelineAgent::retrieve(scriptExecutionContext()); > bool callTimelineAgentOnLoad = timelineAgent && hasEventListeners(eventNames().loadEvent); Bad indentation here. Also remore the tabs from the ChangeLog. 160510 7 42494 zundel 2009-11-04 10:52:41 -0800 Created attachment 42494 WebInspector: Handle turning timeline profiling on/off in the middle of event dispatch Gets rid of tabs in Changelog, Fixes formatting in XMLHttpRequest.cpp Extracts some logic to a private method in DOMWindow.cpp 160545 8 42494 commit-queue 2009-11-04 12:04:26 -0800 Comment on attachment 42494 WebInspector: Handle turning timeline profiling on/off in the middle of event dispatch Clearing flags on attachment: 42494 Committed r50523: <http://trac.webkit.org/changeset/50523> 160546 9 commit-queue 2009-11-04 12:04:31 -0800 All reviewed patches have been landed. Closing bug. 42488 2009-11-04 09:02:30 -0800 2009-11-04 10:52:41 -0800 WebInspector: Handle turning timeline profiling on/off in the middle of event dispatch webkit-31121-1.patch text/plain 7676 zundel SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDUxMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMDktMTEtMDQgIEVyaWMgWi4gQXllcnMgIDx6dW5kZWxAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworCUZvbGxvd29u IHRvIGJ1ZyAzMTA4MCwgd2hpY2ggcHJvdGVjdHMgVGltZWxpbmUKKwlpbnN0cnVtZW50YXRpb24g aW4gdGhlIGNhc2Ugd2hlcmUgSW5zcGVjdG9yVGltZWxpbmVBZ2VudAorCWlzIGVuYWJsZWQgb3Ig ZGlzYWJsZWQgZHVyaW5nIGFuIGV2ZW50IGRpc3BhdGNoLgorCQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzExMjEKKworICAgICAgICAqIGJpbmRpbmdz L3Y4L1Y4UHJveHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhQcm94eTo6ZXZhbHVhdGUpOgor ICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6 cmVjYWxjU3R5bGUpOgorICAgICAgICAqIGRvbS9Ob2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok5vZGU6OmRpc3BhdGNoR2VuZXJpY0V2ZW50KToKKyAgICAgICAgKiBodG1sL0hUTUxUb2tlbml6 ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRva2VuaXplcjo6d3JpdGUpOgorICAgICAg ICAqIHBhZ2UvRE9NV2luZG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVdpbmRvdzo6ZGlz cGF0Y2hFdmVudCk6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVWaWV3OjpsYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojpw YWludENvbnRlbnRzKToKKyAgICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OmNhbGxSZWFkeVN0YXRlQ2hhbmdlTGlzdGVuZXIp OgorCiAyMDA5LTExLTA0ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAg ICBTb3J0IFdlYkNvcmUuYmFzZS5leHAKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94 eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAkocmV2 aXNpb24gNTA1MTEpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zNzUsOCArMzc1LDcgQEAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gVjhQcm94eTo6 ZXZhbHVhdGUoYwogICAgIEFTU0VSVCh2ODo6Q29udGV4dDo6SW5Db250ZXh0KCkpOwogCiAjaWYg RU5BQkxFKElOU1BFQ1RPUikKLSAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFn ZW50ID0gbV9mcmFtZS0+cGFnZSgpID8gbV9mcmFtZS0+cGFnZSgpLT5pbnNwZWN0b3JUaW1lbGlu ZUFnZW50KCkgOiAwOwotICAgIGlmICh0aW1lbGluZUFnZW50KQorICAgIGlmIChJbnNwZWN0b3JU aW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gbV9mcmFtZS0+cGFnZSgpID8gbV9mcmFtZS0+ cGFnZSgpLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkgOiAwKQogICAgICAgICB0aW1lbGluZUFn ZW50LT53aWxsRXZhbHVhdGVTY3JpcHQoc291cmNlLnVybCgpLmlzTnVsbCgpID8gU3RyaW5nKCkg OiBzb3VyY2UudXJsKCkuc3RyaW5nKCksIHNvdXJjZS5zdGFydExpbmUoKSk7CiAjZW5kaWYKIApA QCAtNDA3LDcgKzQwNiw3IEBAIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4UHJveHk6OmV2YWx1YXRl KGMKICAgICBDaHJvbWl1bUJyaWRnZTo6dHJhY2VFdmVudEVuZCgidjgucnVuIiwgbm9kZSwgIiIp OwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBpZiAodGltZWxpbmVBZ2VudCkKKyAgICBp ZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IG1fZnJhbWUtPnBhZ2Uo KSA/IG1fZnJhbWUtPnBhZ2UoKS0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpIDogMCkKICAgICAg ICAgdGltZWxpbmVBZ2VudC0+ZGlkRXZhbHVhdGVTY3JpcHQoKTsKICNlbmRpZgogCkluZGV4OiBX ZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwCShyZXZpc2lvbiA1MDUxMSkKKysrIFdlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTIzMSw4ICsxMjMxLDcgQEAgdm9pZCBEb2N1bWVudDo6cmVjYWxjU3R5 bGUoU3R5bGVDaGFuZ2UgYwogICAgICAgICByZXR1cm47IC8vIEd1YXJkIGFnYWluc3QgcmUtZW50 cmFuY3kuIC1kd2gKIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgSW5zcGVjdG9yVGltZWxp bmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IGluc3BlY3RvclRpbWVsaW5lQWdlbnQoKTsKLSAgICBp ZiAodGltZWxpbmVBZ2VudCkKKyAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxp bmVBZ2VudCA9IGluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKICAgICAgICAgdGltZWxpbmVBZ2Vu dC0+d2lsbFJlY2FsY3VsYXRlU3R5bGUoKTsKICNlbmRpZgogCkBAIC0xMzEyLDcgKzEzMTEsNyBA QCBiYWlsX291dDoKICAgICB9CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIGlmICh0aW1l bGluZUFnZW50KQorICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50 ID0gaW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpKQogICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRS ZWNhbGN1bGF0ZVN0eWxlKCk7CiAjZW5kaWYKIH0KSW5kZXg6IFdlYkNvcmUvZG9tL05vZGUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL05vZGUuY3BwCShyZXZpc2lvbiA1MDUxMSkKKysr IFdlYkNvcmUvZG9tL05vZGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTc2LDcgKzI1NzYsNyBA QCBkb25lRGlzcGF0Y2hpbmc6CiAKIGRvbmVXaXRoRGVmYXVsdDoKICNpZiBFTkFCTEUoSU5TUEVD VE9SKQotICAgIGlmICh0aW1lbGluZUFnZW50SXNBY3RpdmUpCisgICAgaWYgKHRpbWVsaW5lQWdl bnRJc0FjdGl2ZSAmJiAodGltZWxpbmVBZ2VudCA9IGRvY3VtZW50KCktPmluc3BlY3RvclRpbWVs aW5lQWdlbnQoKSkpCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZERpc3BhdGNoRXZlbnQoKTsK ICNlbmRpZgogCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwCShyZXZpc2lvbiA1MDUxMSkKKysr IFdlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY2Niw4 ICsxNjY2LDcgQEAgdm9pZCBIVE1MVG9rZW5pemVyOjp3cml0ZShjb25zdCBTZWdtZW50ZQogICAg IGRvdWJsZSBzdGFydFRpbWUgPSBjdXJyZW50VGltZSgpOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RP UikKLSAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gbV9kb2MtPmlu c3BlY3RvclRpbWVsaW5lQWdlbnQoKTsKLSAgICBpZiAodGltZWxpbmVBZ2VudCkKKyAgICBpZiAo SW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IG1fZG9jLT5pbnNwZWN0b3JU aW1lbGluZUFnZW50KCkpCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxXcml0ZUhUTUwoKTsK ICNlbmRpZgogICAKQEAgLTE3OTMsNyArMTc5Miw3IEBAIHZvaWQgSFRNTFRva2VuaXplcjo6d3Jp dGUoY29uc3QgU2VnbWVudGUKICNlbmRpZgogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBp ZiAodGltZWxpbmVBZ2VudCkKKyAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxp bmVBZ2VudCA9IG1fZG9jLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCiAgICAgICAgIHRpbWVs aW5lQWdlbnQtPmRpZFdyaXRlSFRNTCgpOwogI2VuZGlmCiAKSW5kZXg6IFdlYkNvcmUvcGFnZS9E T01XaW5kb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCShy ZXZpc2lvbiA1MDUxMSkKKysrIFdlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMzIzLDggKzEzMjMsMTIgQEAgYm9vbCBET01XaW5kb3c6OmRpc3BhdGNoRXZlbnQo UGFzc1JlZlB0cgogICAgIGJvb2wgcmVzdWx0ID0gZmlyZUV2ZW50TGlzdGVuZXJzKGV2ZW50Lmdl dCgpKTsKIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgaWYgKHRpbWVsaW5lQWdlbnRJc0Fj dGl2ZSkKLSAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkRGlzcGF0Y2hFdmVudCgpOworICAgIGlm ICh0aW1lbGluZUFnZW50SXNBY3RpdmUpIHsKKyAgICAgICAgaWYgKGZyYW1lKCkgJiYgZnJhbWUo KS0+cGFnZSgpKQorICAgICAgICAgICAgdGltZWxpbmVBZ2VudCA9IGZyYW1lKCktPnBhZ2UoKS0+ aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpOworICAgICAgICBpZiAodGltZWxpbmVBZ2VudCkKKyAg ICAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZERpc3BhdGNoRXZlbnQoKTsKKyAgICB9CiAjZW5k aWYKIAogICAgIHJldHVybiByZXN1bHQ7CkluZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gNTA1 MTEpCisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTA0 LDkgKzUwNCw4IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUKICAg ICBpZiAoaXNQYWludGluZygpKQogICAgICAgICByZXR1cm47CiAKLSNpZiBFTkFCTEUoSU5TUEVD VE9SKQotICAgIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBpbnNwZWN0 b3JUaW1lbGluZUFnZW50KCk7Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisjaWYgRU5BQkxFKElO U1BFQ1RPUikgICAgCisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdl bnQgPSBpbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPndp bGxMYXlvdXQoKTsKICNlbmRpZgogCkBAIC02OTYsNyArNjk1LDcgQEAgdm9pZCBGcmFtZVZpZXc6 OmxheW91dChib29sIGFsbG93U3VidHJlZQogICAgIH0KIAogI2lmIEVOQUJMRShJTlNQRUNUT1Ip Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQq IHRpbWVsaW5lQWdlbnQgPSBpbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCiAgICAgICAgIHRpbWVs aW5lQWdlbnQtPmRpZExheW91dCgpOwogI2VuZGlmCiAKQEAgLTE2MTUsOCArMTYxNCw3IEBAIHZv aWQgRnJhbWVWaWV3OjpwYWludENvbnRlbnRzKEdyYXBoaWNzQ28KICAgICAgICAgcmV0dXJuOwog CiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1l bGluZUFnZW50ID0gaW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpOwotICAgIGlmICh0aW1lbGluZUFn ZW50KQorICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5z cGVjdG9yVGltZWxpbmVBZ2VudCgpKQogICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsUGFpbnQo cmVjdCk7CiAjZW5kaWYKIApAQCAtMTY4NSw3ICsxNjgzLDcgQEAgdm9pZCBGcmFtZVZpZXc6OnBh aW50Q29udGVudHMoR3JhcGhpY3NDbwogICAgICAgICBzQ3VycmVudFBhaW50VGltZVN0YW1wID0g MDsKIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAg aWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBpbnNwZWN0b3JUaW1l bGluZUFnZW50KCkpCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZFBhaW50KCk7CiAjZW5kaWYK IH0KSW5kZXg6IFdlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAJKHJldmlzaW9uIDUwNTExKQorKysgV2ViQ29y ZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNjEsMTIgKzI2MSwx MyBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpjYWxsUmVhZHlTdGF0ZUNoYW5nCiAgICAgZGlzcGF0 Y2hFdmVudChYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCku cmVhZHlzdGF0ZWNoYW5nZUV2ZW50KSk7CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIGlm IChjYWxsVGltZWxpbmVBZ2VudE9uUmVhZHlTdGF0ZUNoYW5nZSkKKyAgICBpZiAoY2FsbFRpbWVs aW5lQWdlbnRPblJlYWR5U3RhdGVDaGFuZ2UgJiYgKHRpbWVsaW5lQWdlbnQgPSBJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpyZXRyaWV2ZShzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpKSkKICAgICAg ICAgdGltZWxpbmVBZ2VudC0+ZGlkQ2hhbmdlWEhSUmVhZHlTdGF0ZSgpOwogI2VuZGlmCiAKICAg ICBpZiAobV9zdGF0ZSA9PSBET05FICYmICFtX2Vycm9yKSB7CiAjaWYgRU5BQkxFKElOU1BFQ1RP UikKKyAgICAgIHRpbWVsaW5lQWdlbnQgPSBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpyZXRyaWV2 ZShzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOwogICAgICAgICBib29sIGNhbGxUaW1lbGluZUFn ZW50T25Mb2FkID0gdGltZWxpbmVBZ2VudCAmJiBoYXNFdmVudExpc3RlbmVycyhldmVudE5hbWVz KCkubG9hZEV2ZW50KTsKICAgICAgICAgaWYgKGNhbGxUaW1lbGluZUFnZW50T25Mb2FkKQogICAg ICAgICAgICAgdGltZWxpbmVBZ2VudC0+d2lsbExvYWRYSFIobV91cmwuc3RyaW5nKCkpOwpAQCAt Mjc1LDcgKzI3Niw3IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OmNhbGxSZWFkeVN0YXRlQ2hhbmcK ICAgICAgICAgZGlzcGF0Y2hFdmVudChYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQ6OmNyZWF0 ZShldmVudE5hbWVzKCkubG9hZEV2ZW50KSk7CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAg ICAgICBpZiAoY2FsbFRpbWVsaW5lQWdlbnRPbkxvYWQpCisgICAgICAgIGlmIChjYWxsVGltZWxp bmVBZ2VudE9uTG9hZCAmJiAodGltZWxpbmVBZ2VudCA9IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6 OnJldHJpZXZlKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkpKQogICAgICAgICAgICAgdGltZWxp bmVBZ2VudC0+ZGlkTG9hZFhIUigpOwogI2VuZGlmCiAgICAgfQo= 42494 2009-11-04 10:52:41 -0800 2009-11-04 12:04:26 -0800 WebInspector: Handle turning timeline profiling on/off in the middle of event dispatch webkit-31121-2.patch text/plain 9371 zundel SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDUxNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMDktMTEtMDQgIEVyaWMgWi4gQXllcnMgIDx6dW5kZWxAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG b2xsb3dvbiB0byBidWcgMzEwODAsIHdoaWNoIHByb3RlY3RzIFRpbWVsaW5lCisgICAgICAgIGlu c3RydW1lbnRhdGlvbiBpbiB0aGUgY2FzZSB3aGVyZSBJbnNwZWN0b3JUaW1lbGluZUFnZW50Cisg ICAgICAgIGlzIGVuYWJsZWQgb3IgZGlzYWJsZWQgZHVyaW5nIGFuIGV2ZW50IGRpc3BhdGNoLgor ICAgICAgICAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTMxMTIxCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFByb3h5LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlY4UHJveHk6OmV2YWx1YXRlKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJlY2FsY1N0eWxlKToKKyAgICAgICAgKiBkb20v Tm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpkaXNwYXRjaEdlbmVyaWNFdmVudCk6 CisgICAgICAgICogaHRtbC9IVE1MVG9rZW5pemVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxUb2tlbml6ZXI6OndyaXRlKToKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpET01XaW5kb3c6Omluc3BlY3RvclRpbWVsaW5lQWdlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6RE9NV2luZG93OjpkaXNwYXRjaEV2ZW50KToKKyAgICAgICAgKiBwYWdlL0RP TVdpbmRvdy5oOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lVmlldzo6bGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cGFp bnRDb250ZW50cyk6CisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpjYWxsUmVhZHlTdGF0ZUNoYW5nZUxpc3RlbmVyKToK KwogMjAwOS0xMS0wNCAgVmFkaW0gWmVpdGxpbiAgPHZhZGltQHd4d2lkZ2V0cy5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4UHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5j cHAJKHJldmlzaW9uIDUwNTExKQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzc1LDggKzM3NSw3IEBAIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4 UHJveHk6OmV2YWx1YXRlKGMKICAgICBBU1NFUlQodjg6OkNvbnRleHQ6OkluQ29udGV4dCgpKTsK IAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGlt ZWxpbmVBZ2VudCA9IG1fZnJhbWUtPnBhZ2UoKSA/IG1fZnJhbWUtPnBhZ2UoKS0+aW5zcGVjdG9y VGltZWxpbmVBZ2VudCgpIDogMDsKLSAgICBpZiAodGltZWxpbmVBZ2VudCkKKyAgICBpZiAoSW5z cGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IG1fZnJhbWUtPnBhZ2UoKSA/IG1f ZnJhbWUtPnBhZ2UoKS0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpIDogMCkKICAgICAgICAgdGlt ZWxpbmVBZ2VudC0+d2lsbEV2YWx1YXRlU2NyaXB0KHNvdXJjZS51cmwoKS5pc051bGwoKSA/IFN0 cmluZygpIDogc291cmNlLnVybCgpLnN0cmluZygpLCBzb3VyY2Uuc3RhcnRMaW5lKCkpOwogI2Vu ZGlmCiAKQEAgLTQwNyw3ICs0MDYsNyBAQCB2ODo6TG9jYWw8djg6OlZhbHVlPiBWOFByb3h5Ojpl dmFsdWF0ZShjCiAgICAgQ2hyb21pdW1CcmlkZ2U6OnRyYWNlRXZlbnRFbmQoInY4LnJ1biIsIG5v ZGUsICIiKTsKIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgaWYgKHRpbWVsaW5lQWdlbnQp CisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBtX2ZyYW1l LT5wYWdlKCkgPyBtX2ZyYW1lLT5wYWdlKCktPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSA6IDAp CiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZEV2YWx1YXRlU2NyaXB0KCk7CiAjZW5kaWYKIApJ bmRleDogV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAkocmV2aXNpb24gNTA1MTEpCisrKyBXZWJDb3JlL2RvbS9Eb2N1bWVudC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMzEsOCArMTIzMSw3IEBAIHZvaWQgRG9jdW1lbnQ6OnJl Y2FsY1N0eWxlKFN0eWxlQ2hhbmdlIGMKICAgICAgICAgcmV0dXJuOyAvLyBHdWFyZCBhZ2FpbnN0 IHJlLWVudHJhbmN5LiAtZHdoCiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIEluc3BlY3Rv clRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBpbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7 Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQq IHRpbWVsaW5lQWdlbnQgPSBpbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCiAgICAgICAgIHRpbWVs aW5lQWdlbnQtPndpbGxSZWNhbGN1bGF0ZVN0eWxlKCk7CiAjZW5kaWYKIApAQCAtMTMxMiw3ICsx MzExLDcgQEAgYmFpbF9vdXQ6CiAgICAgfQogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBp ZiAodGltZWxpbmVBZ2VudCkKKyAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxp bmVBZ2VudCA9IGluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKICAgICAgICAgdGltZWxpbmVBZ2Vu dC0+ZGlkUmVjYWxjdWxhdGVTdHlsZSgpOwogI2VuZGlmCiB9CkluZGV4OiBXZWJDb3JlL2RvbS9O b2RlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9Ob2RlLmNwcAkocmV2aXNpb24gNTA1 MTEpCisrKyBXZWJDb3JlL2RvbS9Ob2RlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjU3Niw3ICsy NTc2LDcgQEAgZG9uZURpc3BhdGNoaW5nOgogCiBkb25lV2l0aERlZmF1bHQ6CiAjaWYgRU5BQkxF KElOU1BFQ1RPUikKLSAgICBpZiAodGltZWxpbmVBZ2VudElzQWN0aXZlKQorICAgIGlmICh0aW1l bGluZUFnZW50SXNBY3RpdmUgJiYgKHRpbWVsaW5lQWdlbnQgPSBkb2N1bWVudCgpLT5pbnNwZWN0 b3JUaW1lbGluZUFnZW50KCkpKQogICAgICAgICB0aW1lbGluZUFnZW50LT5kaWREaXNwYXRjaEV2 ZW50KCk7CiAjZW5kaWYKIApJbmRleDogV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmNwcAkocmV2aXNpb24gNTA1 MTEpCisrKyBXZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTE2NjYsOCArMTY2Niw3IEBAIHZvaWQgSFRNTFRva2VuaXplcjo6d3JpdGUoY29uc3QgU2VnbWVu dGUKICAgICBkb3VibGUgc3RhcnRUaW1lID0gY3VycmVudFRpbWUoKTsKIAogI2lmIEVOQUJMRShJ TlNQRUNUT1IpCi0gICAgSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IG1f ZG9jLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisg ICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBtX2RvYy0+aW5z cGVjdG9yVGltZWxpbmVBZ2VudCgpKQogICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsV3JpdGVI VE1MKCk7CiAjZW5kaWYKICAgCkBAIC0xNzkzLDcgKzE3OTIsNyBAQCB2b2lkIEhUTUxUb2tlbml6 ZXI6OndyaXRlKGNvbnN0IFNlZ21lbnRlCiAjZW5kaWYKIAogI2lmIEVOQUJMRShJTlNQRUNUT1Ip Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQq IHRpbWVsaW5lQWdlbnQgPSBtX2RvYy0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpKQogICAgICAg ICB0aW1lbGluZUFnZW50LT5kaWRXcml0ZUhUTUwoKTsKICNlbmRpZgogCkluZGV4OiBXZWJDb3Jl L3BhZ2UvRE9NV2luZG93LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvRE9NV2luZG93 LmNwcAkocmV2aXNpb24gNTA1MTEpCisrKyBXZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTMwMiw2ICsxMzAyLDEzIEBAIHZvaWQgRE9NV2luZG93OjpkaXNwYXRj aExvYWRFdmVudCgpCiAjZW5kaWYKIH0KIAorSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogRE9NV2lu ZG93OjppbnNwZWN0b3JUaW1lbGluZUFnZW50KCkgCit7CisgICAgaWYgKGZyYW1lKCkgJiYgZnJh bWUoKS0+cGFnZSgpKQorICAgICAgICByZXR1cm4gZnJhbWUoKS0+cGFnZSgpLT5pbnNwZWN0b3JU aW1lbGluZUFnZW50KCk7CisgICAgcmV0dXJuIDA7Cit9CisKIGJvb2wgRE9NV2luZG93OjpkaXNw YXRjaEV2ZW50KFBhc3NSZWZQdHI8RXZlbnQ+IHBycEV2ZW50LCBQYXNzUmVmUHRyPEV2ZW50VGFy Z2V0PiBwcnBUYXJnZXQpCiB7CiAgICAgUmVmUHRyPEV2ZW50VGFyZ2V0PiBwcm90ZWN0ID0gdGhp czsKQEAgLTEzMTIsOSArMTMxOSw3IEBAIGJvb2wgRE9NV2luZG93OjpkaXNwYXRjaEV2ZW50KFBh c3NSZWZQdHIKICAgICBldmVudC0+c2V0RXZlbnRQaGFzZShFdmVudDo6QVRfVEFSR0VUKTsKIAog I2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxp bmVBZ2VudCA9IDA7Ci0gICAgaWYgKGZyYW1lKCkgJiYgZnJhbWUoKS0+cGFnZSgpKQotICAgICAg ICB0aW1lbGluZUFnZW50ID0gZnJhbWUoKS0+cGFnZSgpLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50 KCk7CisgICAgSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IGluc3BlY3Rv clRpbWVsaW5lQWdlbnQoKTsKICAgICBib29sIHRpbWVsaW5lQWdlbnRJc0FjdGl2ZSA9IHRpbWVs aW5lQWdlbnQgJiYgaGFzRXZlbnRMaXN0ZW5lcnMoZXZlbnQtPnR5cGUoKSk7CiAgICAgaWYgKHRp bWVsaW5lQWdlbnRJc0FjdGl2ZSkKICAgICAgICAgdGltZWxpbmVBZ2VudC0+d2lsbERpc3BhdGNo RXZlbnQoKmV2ZW50KTsKQEAgLTEzMjMsOCArMTMyOCwxMSBAQCBib29sIERPTVdpbmRvdzo6ZGlz cGF0Y2hFdmVudChQYXNzUmVmUHRyCiAgICAgYm9vbCByZXN1bHQgPSBmaXJlRXZlbnRMaXN0ZW5l cnMoZXZlbnQuZ2V0KCkpOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBpZiAodGltZWxp bmVBZ2VudElzQWN0aXZlKQotICAgICAgICB0aW1lbGluZUFnZW50LT5kaWREaXNwYXRjaEV2ZW50 KCk7CisgICAgaWYgKHRpbWVsaW5lQWdlbnRJc0FjdGl2ZSkgeworICAgICAgdGltZWxpbmVBZ2Vu dCA9IGluc3BlY3RvclRpbWVsaW5lQWdlbnQoKTsKKyAgICAgIGlmICh0aW1lbGluZUFnZW50KQor ICAgICAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkRGlzcGF0Y2hFdmVudCgpOworICAgIH0KICNl bmRpZgogCiAgICAgcmV0dXJuIHJlc3VsdDsKSW5kZXg6IFdlYkNvcmUvcGFnZS9ET01XaW5kb3cu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvRE9NV2luZG93LmgJKHJldmlzaW9uIDUwNTEx KQorKysgV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw2ICs1 Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBGbG9hdFJlY3Q7CiAgICAgY2xh c3MgRnJhbWU7CiAgICAgY2xhc3MgSGlzdG9yeTsKKyAgICBjbGFzcyBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OwogICAgIGNsYXNzIExvY2F0aW9uOwogICAgIGNsYXNzIE1lZGlhOwogICAgIGNsYXNz IE5hdmlnYXRvcjsKQEAgLTM1Miw2ICszNTMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgIHZpcnR1YWwgdm9pZCBkZXJlZkV2ZW50VGFyZ2V0KCkgeyBkZXJlZigpOyB9CiAgICAgICAg IHZpcnR1YWwgRXZlbnRUYXJnZXREYXRhKiBldmVudFRhcmdldERhdGEoKTsKICAgICAgICAgdmly dHVhbCBFdmVudFRhcmdldERhdGEqIGVuc3VyZUV2ZW50VGFyZ2V0RGF0YSgpOworICAgICAgICBJ bnNwZWN0b3JUaW1lbGluZUFnZW50KiBpbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7CiAKICAgICAg ICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBtX3NlY3VyaXR5T3JpZ2luOwogICAgICAgICBLVVJM IG1fdXJsOwpJbmRleDogV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHJldmlzaW9uIDUwNTExKQorKysgV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUwNCw5ICs1MDQsOCBAQCB2b2lk IEZyYW1lVmlldzo6bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVlCiAgICAgaWYgKGlzUGFpbnRpbmco KSkKICAgICAgICAgcmV0dXJuOwogCi0jaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBJbnNwZWN0 b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5zcGVjdG9yVGltZWxpbmVBZ2VudCgp OwotICAgIGlmICh0aW1lbGluZUFnZW50KQorI2lmIEVOQUJMRShJTlNQRUNUT1IpICAgIAorICAg IGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5zcGVjdG9yVGlt ZWxpbmVBZ2VudCgpKQogICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsTGF5b3V0KCk7CiAjZW5k aWYKIApAQCAtNjk2LDcgKzY5NSw3IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxv d1N1YnRyZWUKICAgICB9CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIGlmICh0aW1lbGlu ZUFnZW50KQorICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0g aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpKQogICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRMYXlv dXQoKTsKICNlbmRpZgogCkBAIC0xNjE1LDggKzE2MTQsNyBAQCB2b2lkIEZyYW1lVmlldzo6cGFp bnRDb250ZW50cyhHcmFwaGljc0NvCiAgICAgICAgIHJldHVybjsKIAogI2lmIEVOQUJMRShJTlNQ RUNUT1IpCi0gICAgSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IGluc3Bl Y3RvclRpbWVsaW5lQWdlbnQoKTsKLSAgICBpZiAodGltZWxpbmVBZ2VudCkKKyAgICBpZiAoSW5z cGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IGluc3BlY3RvclRpbWVsaW5lQWdl bnQoKSkKICAgICAgICAgdGltZWxpbmVBZ2VudC0+d2lsbFBhaW50KHJlY3QpOwogI2VuZGlmCiAK QEAgLTE2ODUsNyArMTY4Myw3IEBAIHZvaWQgRnJhbWVWaWV3OjpwYWludENvbnRlbnRzKEdyYXBo aWNzQ28KICAgICAgICAgc0N1cnJlbnRQYWludFRpbWVTdGFtcCA9IDA7CiAKICNpZiBFTkFCTEUo SU5TUEVDVE9SKQotICAgIGlmICh0aW1lbGluZUFnZW50KQorICAgIGlmIChJbnNwZWN0b3JUaW1l bGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpKQogICAg ICAgICB0aW1lbGluZUFnZW50LT5kaWRQYWludCgpOwogI2VuZGlmCiB9CkluZGV4OiBXZWJDb3Jl L3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS94bWwvWE1MSHR0 cFJlcXVlc3QuY3BwCShyZXZpc2lvbiA1MDUxMSkKKysrIFdlYkNvcmUveG1sL1hNTEh0dHBSZXF1 ZXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYxLDEyICsyNjEsMTMgQEAgdm9pZCBYTUxIdHRw UmVxdWVzdDo6Y2FsbFJlYWR5U3RhdGVDaGFuZwogICAgIGRpc3BhdGNoRXZlbnQoWE1MSHR0cFJl cXVlc3RQcm9ncmVzc0V2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnJlYWR5c3RhdGVjaGFuZ2VF dmVudCkpOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBpZiAoY2FsbFRpbWVsaW5lQWdl bnRPblJlYWR5U3RhdGVDaGFuZ2UpCisgICAgaWYgKGNhbGxUaW1lbGluZUFnZW50T25SZWFkeVN0 YXRlQ2hhbmdlICYmICh0aW1lbGluZUFnZW50ID0gSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cmV0 cmlldmUoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpKSkpCiAgICAgICAgIHRpbWVsaW5lQWdlbnQt PmRpZENoYW5nZVhIUlJlYWR5U3RhdGUoKTsKICNlbmRpZgogCiAgICAgaWYgKG1fc3RhdGUgPT0g RE9ORSAmJiAhbV9lcnJvcikgewogI2lmIEVOQUJMRShJTlNQRUNUT1IpCisgICAgICAgIHRpbWVs aW5lQWdlbnQgPSBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpyZXRyaWV2ZShzY3JpcHRFeGVjdXRp b25Db250ZXh0KCkpOwogICAgICAgICBib29sIGNhbGxUaW1lbGluZUFnZW50T25Mb2FkID0gdGlt ZWxpbmVBZ2VudCAmJiBoYXNFdmVudExpc3RlbmVycyhldmVudE5hbWVzKCkubG9hZEV2ZW50KTsK ICAgICAgICAgaWYgKGNhbGxUaW1lbGluZUFnZW50T25Mb2FkKQogICAgICAgICAgICAgdGltZWxp bmVBZ2VudC0+d2lsbExvYWRYSFIobV91cmwuc3RyaW5nKCkpOwpAQCAtMjc1LDcgKzI3Niw3IEBA IHZvaWQgWE1MSHR0cFJlcXVlc3Q6OmNhbGxSZWFkeVN0YXRlQ2hhbmcKICAgICAgICAgZGlzcGF0 Y2hFdmVudChYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCku bG9hZEV2ZW50KSk7CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgICAgICBpZiAoY2FsbFRp bWVsaW5lQWdlbnRPbkxvYWQpCisgICAgICAgIGlmIChjYWxsVGltZWxpbmVBZ2VudE9uTG9hZCAm JiAodGltZWxpbmVBZ2VudCA9IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJldHJpZXZlKHNjcmlw dEV4ZWN1dGlvbkNvbnRleHQoKSkpKQogICAgICAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkTG9h ZFhIUigpOwogI2VuZGlmCiAgICAgfQo=