31080 2009-11-03 12:55:53 -0800 WebInspector: Handle turning TimelineAgent on/off in the middle of an event dispatch 2009-11-03 16:00:32 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 zundel webkit-unassigned commit-queue knorton pfeldman timothy oldest_to_newest 160172 0 zundel 2009-11-03 12:55:53 -0800 Currently, If you enable or disable the timeline agent in the middle of a dispatch, you get undefined behavior when it hits the end of an instrumentation point. The InspectorTimelineAgent* is being saved from the time the event started to the time it ended. To fix the problem when timeline profiling is turned off in the middle of processing an event, the pointer needs to be retrieved each time to make sure it is still valid. For the case where timeline profiling is turned on in the middle of an event, the case where the stack of instrumented events is empty should be silently ignore, not asserted. This patch doesn't fix each instrumentation point, but gives an example of what I propose. I can add on to this patch or submit a subsequent patch. I made an unrelated change to make the check-webkit-style script run cleanly on ScriptController.cpp 160176 1 42408 zundel 2009-11-03 12:58:37 -0800 Created attachment 42408 WebInspector: Handle turning timeline profiling on/off in the middle of event dispatch 160194 2 42413 zundel 2009-11-03 13:33:37 -0800 Created attachment 42413 WebInspector: Adds test to bug 31080, Handle turning profiling on/off in the middle of event dispatch 160198 3 42413 pfeldman 2009-11-03 13:43:54 -0800 Comment on attachment 42413 WebInspector: Adds test to bug 31080, Handle turning profiling on/off in the middle of event dispatch Please refer to a bug from the ChangeLog (s)! > - type == eventNames().clickEvent || type == eventNames().mousedownEvent || > - type == eventNames().mouseupEvent || type == eventNames().dblclickEvent || > + type == eventNames().clickEvent || type == eventNames().mousedownEvent > + || type == eventNames().mouseupEvent || type == eventNames().dblclickEvent > // keyboard events > - type == eventNames().keydownEvent || type == eventNames().keypressEvent || > - type == eventNames().keyupEvent || > + || type == eventNames().keydownEvent || type == eventNames().keypressEvent > + || type == eventNames().keyupEvent > // other accepted events > - type == eventNames().selectEvent || type == eventNames().changeEvent || > - type == eventNames().focusEvent || type == eventNames().blurEvent || > - type == eventNames().submitEvent) > + || type == eventNames().selectEvent || type == eventNames().changeEvent > + || type == eventNames().focusEvent || type == eventNames().blurEvent > + || type == eventNames().submitEvent) > return true; Nothing changed, right? > + // An empty stack could merely mean that the timeline agent was turned on in the middle of > + // an event. Don't treat as an error. We are now forgiving too much and it could be error-prone. I think it is Ok for now though. > + if (!m_recordStack.isEmpty()) { > + TimelineRecordEntry entry = m_recordStack.last(); > + m_recordStack.removeLast(); > + ASSERT(entry.type == type); There is no guarantee that the top of the stack is the matching event, is there? Counter and a map would save the world, but will make things more complex. Returning timelineagent "version" from will* methods and passing it back to did* method would be Ok. 160200 4 42413 timothy 2009-11-03 13:49:42 -0800 Comment on attachment 42413 WebInspector: Adds test to bug 31080, Handle turning profiling on/off in the middle of event dispatch > + if (InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0) > + timelineAgent->didEvaluateScript(); Bad indentation. > + <div id="frontend-script" style="display:none"> > +function startTimeline() { > + /* This test seems silly, but originally it tickled bug 31080 */ > + InspectorController.startTimelineProfiler(); > + return true; > +} > + </div> Indent to match the </div>. Also use 4 space indents in the test. 160201 5 timothy 2009-11-03 13:53:48 -0800 You could also habd back a TimelineAgent** and have it nulled out when disabled. We do this in JSC for the profiler. static Profiler** enabledProfilerReference() { return &s_sharedEnabledProfilerReference; } Profiler** profiler = Profiler::enabledProfilerReference(); if (*profiler) … 160229 6 42423 zundel 2009-11-03 15:08:09 -0800 Created attachment 42423 WebInspector: bug 31080, Handle turning profiling on/off in the middle of event dispatch Addresses review feedback: ScriptController.cpp: Change of || characters was just to satisfy lint, no real change) - Fix formatting of test case Discussed alternative schemes for tracking a change in the InspectorTimelineAgent but in the end decided to leave that code alone. 160236 7 42423 timothy 2009-11-03 15:15:56 -0800 Comment on attachment 42423 WebInspector: bug 31080, Handle turning profiling on/off in the middle of event dispatch > - if (timelineAgent) > - timelineAgent->didFireTimer(); > + if (InspectorTimelineAgent* timelineAgent = InspectorTimelineAgent::retrieve(context)) > + timelineAgent->didFireTimer(); > #endif > return; Bad indent. 160239 8 42428 zundel 2009-11-03 15:22:46 -0800 Created attachment 42428 WebInspector: bug 31080, Handle turning profiling on/off in the middle of event dispatch Corrects formatting glitch in DOMTimer.cpp 160245 9 42428 commit-queue 2009-11-03 15:42:11 -0800 Comment on attachment 42428 WebInspector: bug 31080, Handle turning profiling on/off in the middle of event dispatch Rejecting patch 42428 from commit-queue. Failed to run "['git', 'svn', 'dcommit']" exit_code: 1 Last 500 characters of output: orTimelineAgent.cpp M WebCore/page/DOMTimer.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/LayoutTests/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 160247 10 42431 zundel 2009-11-03 15:46:28 -0800 Created attachment 42431 WebInspector: bug 31080, Handle turning profiling on/off in the middle of event dispatch gets rid of Tabs in Layout/ChangeLog 160255 11 42431 commit-queue 2009-11-03 16:00:26 -0800 Comment on attachment 42431 WebInspector: bug 31080, Handle turning profiling on/off in the middle of event dispatch Clearing flags on attachment: 42431 Committed r50489: <http://trac.webkit.org/changeset/50489> 160256 12 commit-queue 2009-11-03 16:00:32 -0800 All reviewed patches have been landed. Closing bug. 42408 2009-11-03 12:58:37 -0800 2009-11-03 13:33:37 -0800 WebInspector: Handle turning timeline profiling on/off in the middle of event dispatch webkit-31080-1.patch text/plain 5672 zundel SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDQ3MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMTEtMDMgIEVyaWMgWi4gQXllcnMgIDx6dW5kZWxAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBI YW5kbGUgY2FzZSB3aGVyZSB0aW1lbGluZSBhZ2VudCBpcyB0dXJuZWQgb24gb3Igb2ZmIGluIHRo ZQorICAgICAgICBtaWRkbGUgb2YgcHJvY2Vzc2luZyBhbiBldmVudCBvbiB0aGUgZXZlbnQgbG9v cC4KKworCWh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTA4MAorCisg ICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTY3JpcHRDb250cm9sbGVyOjpldmFsdWF0ZUluV29ybGQpOgorICAgICAgICAoV2ViQ29y ZTo6U2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlRXZlbnQpOgorICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZCk6Cisg ICAgICAgICogcGFnZS9ET01UaW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01UaW1lcjo6 ZmlyZWQpOgorCiAyMDA5LTExLTAzICBLZWlzaGkgSGF0dG9yaSAgPGNhc2V5LmhhdHRvcmlAZ21h aWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KSW5kZXg6IFdl YkNvcmUvcGFnZS9ET01UaW1lci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0RPTVRp bWVyLmNwcAkocmV2aXNpb24gNTA0MjUpCisrKyBXZWJDb3JlL3BhZ2UvRE9NVGltZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMTksOCArMTE5LDcgQEAKICAgICB0aW1lck5lc3RpbmdMZXZlbCA9 IG1fbmVzdGluZ0xldmVsOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBJbnNwZWN0b3JU aW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cmV0 cmlldmUoY29udGV4dCk7Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAgaWYgKEluc3BlY3Rv clRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojpy ZXRyaWV2ZShjb250ZXh0KSkKICAgICAgICAgdGltZWxpbmVBZ2VudC0+d2lsbEZpcmVUaW1lciht X3RpbWVvdXRJZCk7CiAjZW5kaWYKIApAQCAtMTM1LDggKzEzNCw4IEBACiAgICAgICAgIC8vIE5v IGFjY2VzcyB0byBtZW1iZXIgdmFyaWFibGVzIGFmdGVyIHRoaXMgcG9pbnQsIGl0IGNhbiBkZWxl dGUgdGhlIHRpbWVyLgogICAgICAgICBtX2FjdGlvbi0+ZXhlY3V0ZShjb250ZXh0KTsKICNpZiBF TkFCTEUoSU5TUEVDVE9SKQotICAgICAgICBpZiAodGltZWxpbmVBZ2VudCkKLSAgICAgICAgICAg IHRpbWVsaW5lQWdlbnQtPmRpZEZpcmVUaW1lcigpOworICAgIGlmIChJbnNwZWN0b3JUaW1lbGlu ZUFnZW50KiB0aW1lbGluZUFnZW50ID0gSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cmV0cmlldmUo Y29udGV4dCkpCisgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZEZpcmVUaW1lcigpOwogI2VuZGlm CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0xNDksNyArMTQ4LDcgQEAKIAogICAgIGFjdGlv bi0+ZXhlY3V0ZShjb250ZXh0KTsKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIGlmICh0aW1l bGluZUFnZW50KQorICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50 ID0gSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cmV0cmlldmUoY29udGV4dCkpCiAgICAgICAgIHRp bWVsaW5lQWdlbnQtPmRpZEZpcmVUaW1lcigpOwogI2VuZGlmCiAgICAgZGVsZXRlIGFjdGlvbjsK SW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAkocmV2aXNpb24g NTA0MjUpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMTksOCArMTE5LDcgQEAKICAgICBSZWZQdHI8RnJhbWU+IHByb3RlY3Qg PSBtX2ZyYW1lOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50KiB0aW1lbGluZUFnZW50ID0gbV9mcmFtZS0+cGFnZSgpID8gbV9mcmFtZS0+cGFnZSgp LT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkgOiAwOwotICAgIGlmICh0aW1lbGluZUFnZW50KQor ICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gbV9mcmFtZS0+ cGFnZSgpID8gbV9mcmFtZS0+cGFnZSgpLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkgOiAwKQog ICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsRXZhbHVhdGVTY3JpcHQoc291cmNlVVJMLCBzb3Vy Y2VDb2RlLnN0YXJ0TGluZSgpKTsKICNlbmRpZgogCkBAIC0xMjksOCArMTI4LDggQEAKICAgICBl eGVjLT5nbG9iYWxEYXRhKCkudGltZW91dENoZWNrZXIuc3RvcCgpOwogCiAjaWYgRU5BQkxFKElO U1BFQ1RPUikKLSAgICBpZiAodGltZWxpbmVBZ2VudCkKLSAgICAgICAgdGltZWxpbmVBZ2VudC0+ ZGlkRXZhbHVhdGVTY3JpcHQoKTsKKyAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGlt ZWxpbmVBZ2VudCA9IG1fZnJhbWUtPnBhZ2UoKSA/IG1fZnJhbWUtPnBhZ2UoKS0+aW5zcGVjdG9y VGltZWxpbmVBZ2VudCgpIDogMCkKKyAgICAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZEV2YWx1 YXRlU2NyaXB0KCk7CiAjZW5kaWYKIAogICAgIC8vIEV2YWx1YXRpbmcgdGhlIEphdmFTY3JpcHQg Y291bGQgY2F1c2UgdGhlIGZyYW1lIHRvIGJlIGRlYWxsb2NhdGVkCkBAIC0yNzYsMTUgKzI3NSwx NSBAQAogCiAgICAgICAgIGNvbnN0IEF0b21pY1N0cmluZyYgdHlwZSA9IGV2ZW50LT50eXBlKCk7 CiAgICAgICAgIGlmICggLy8gbW91c2UgZXZlbnRzCi0gICAgICAgICAgICB0eXBlID09IGV2ZW50 TmFtZXMoKS5jbGlja0V2ZW50IHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLm1vdXNlZG93bkV2ZW50 IHx8Ci0gICAgICAgICAgICB0eXBlID09IGV2ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQgfHwgdHlw ZSA9PSBldmVudE5hbWVzKCkuZGJsY2xpY2tFdmVudCB8fAorICAgICAgICAgICAgdHlwZSA9PSBl dmVudE5hbWVzKCkuY2xpY2tFdmVudCB8fCB0eXBlID09IGV2ZW50TmFtZXMoKS5tb3VzZWRvd25F dmVudCAKKyAgICAgICAgICAgIHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLm1vdXNldXBFdmVudCB8 fCB0eXBlID09IGV2ZW50TmFtZXMoKS5kYmxjbGlja0V2ZW50IAogICAgICAgICAgICAgLy8ga2V5 Ym9hcmQgZXZlbnRzCi0gICAgICAgICAgICB0eXBlID09IGV2ZW50TmFtZXMoKS5rZXlkb3duRXZl bnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkua2V5cHJlc3NFdmVudCB8fAotICAgICAgICAgICAg dHlwZSA9PSBldmVudE5hbWVzKCkua2V5dXBFdmVudCB8fAorICAgICAgICAgICAgfHwgdHlwZSA9 PSBldmVudE5hbWVzKCkua2V5ZG93bkV2ZW50IHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLmtleXBy ZXNzRXZlbnQKKyAgICAgICAgICAgIHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLmtleXVwRXZlbnQK ICAgICAgICAgICAgIC8vIG90aGVyIGFjY2VwdGVkIGV2ZW50cwotICAgICAgICAgICAgdHlwZSA9 PSBldmVudE5hbWVzKCkuc2VsZWN0RXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkuY2hhbmdl RXZlbnQgfHwKLSAgICAgICAgICAgIHR5cGUgPT0gZXZlbnROYW1lcygpLmZvY3VzRXZlbnQgfHwg dHlwZSA9PSBldmVudE5hbWVzKCkuYmx1ckV2ZW50IHx8Ci0gICAgICAgICAgICB0eXBlID09IGV2 ZW50TmFtZXMoKS5zdWJtaXRFdmVudCkKKyAgICAgICAgICAgIHx8IHR5cGUgPT0gZXZlbnROYW1l cygpLnNlbGVjdEV2ZW50IHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLmNoYW5nZUV2ZW50CisgICAg ICAgICAgICB8fCB0eXBlID09IGV2ZW50TmFtZXMoKS5mb2N1c0V2ZW50IHx8IHR5cGUgPT0gZXZl bnROYW1lcygpLmJsdXJFdmVudAorICAgICAgICAgICAgfHwgdHlwZSA9PSBldmVudE5hbWVzKCku c3VibWl0RXZlbnQpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgCkluZGV4 OiBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAkocmV2aXNp b24gNTA0MjUpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTgxLDEzICsxODEsMTYgQEAKIAogdm9pZCBJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoVGltZWxpbmVSZWNvcmRUeXBl IHR5cGUpCiB7Ci0gICAgQVNTRVJUKCFtX3JlY29yZFN0YWNrLmlzRW1wdHkoKSk7Ci0gICAgVGlt ZWxpbmVSZWNvcmRFbnRyeSBlbnRyeSA9IG1fcmVjb3JkU3RhY2subGFzdCgpOwotICAgIG1fcmVj b3JkU3RhY2sucmVtb3ZlTGFzdCgpOwotICAgIEFTU0VSVChlbnRyeS50eXBlID09IHR5cGUpOwot ICAgIGVudHJ5LnJlY29yZC5zZXQoImNoaWxkcmVuIiwgZW50cnkuY2hpbGRyZW4pOwotICAgIGVu dHJ5LnJlY29yZC5zZXQoImVuZFRpbWUiLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCkpOwot ICAgIGFkZFJlY29yZFRvVGltZWxpbmUoZW50cnkucmVjb3JkLCB0eXBlKTsKKyAgICAvLyBBbiBl bXB0eSBzdGFjayBjb3VsZCBtZXJlbHkgbWVhbiB0aGF0IHRoZSB0aW1lbGluZSBhZ2VudCB3YXMg dHVybmVkIG9uIGluIHRoZSBtaWRkbGUgb2YKKyAgICAvLyBhbiBldmVudC4gIERvbid0IHRyZWF0 IGFzIGFuIGVycm9yLgorICAgIGlmICghbV9yZWNvcmRTdGFjay5pc0VtcHR5KCkpIHsKKyAgICAg ICAgVGltZWxpbmVSZWNvcmRFbnRyeSBlbnRyeSA9IG1fcmVjb3JkU3RhY2subGFzdCgpOworICAg ICAgICBtX3JlY29yZFN0YWNrLnJlbW92ZUxhc3QoKTsKKyAgICAgICAgQVNTRVJUKGVudHJ5LnR5 cGUgPT0gdHlwZSk7CisgICAgICAgIGVudHJ5LnJlY29yZC5zZXQoImNoaWxkcmVuIiwgZW50cnku Y2hpbGRyZW4pOworICAgICAgICBlbnRyeS5yZWNvcmQuc2V0KCJlbmRUaW1lIiwgY3VycmVudFRp bWVJbk1pbGxpc2Vjb25kcygpKTsKKyAgICAgICAgYWRkUmVjb3JkVG9UaW1lbGluZShlbnRyeS5y ZWNvcmQsIHR5cGUpOworICAgIH0KIH0KIAogZG91YmxlIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6 OmN1cnJlbnRUaW1lSW5NaWxsaXNlY29uZHMoKQo= 42413 2009-11-03 13:33:37 -0800 2009-11-03 15:08:09 -0800 WebInspector: Adds test to bug 31080, Handle turning profiling on/off in the middle of event dispatch webkit-31080-2.patch text/plain 7700 zundel SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDQ4MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMTEtMDMgIEVyaWMgWi4gQXllcnMgIDx6dW5kZWxAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXhlcyBhIHByb2JsZW0gd2hlcmUgdGhlIHRpbWVsaW5lIGluc3RydW1lbnRhdGlvbiBjcmFzaGVz IGlmCisgICAgICAgIHRpbWVsaW5lIHByb2ZpbGluZyBpcyBlbmFibGVkIG9yIGRpc2FibGVkIGlu IHRoZSBtaWRkbGUgb2YgYW4KKyAgICAgICAgZXZlbnQgZGlzcGF0Y2guCisKKyAgICAgICAgVGVz dDogaW5zcGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwuaHRtbAorCisgICAgICAgICogYmluZGluZ3Mv anMvU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9s bGVyOjpldmFsdWF0ZUluV29ybGQpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxl cjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlRXZlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JUaW1lbGluZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVs aW5lQWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZCk6CisgICAgICAgICogcGFnZS9ET01U aW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01UaW1lcjo6ZmlyZWQpOgorCiAyMDA5LTEx LTAzICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0 Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRD b250cm9sbGVyLmNwcAkocmV2aXNpb24gNTA0MjUpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL1Nj cmlwdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTksOCArMTE5LDcgQEAgU2Ny aXB0VmFsdWUgU2NyaXB0Q29udHJvbGxlcjo6ZXZhbHVhdGVJbgogICAgIFJlZlB0cjxGcmFtZT4g cHJvdGVjdCA9IG1fZnJhbWU7CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIEluc3BlY3Rv clRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBtX2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1l LT5wYWdlKCktPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSA6IDA7Ci0gICAgaWYgKHRpbWVsaW5l QWdlbnQpCisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBt X2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1lLT5wYWdlKCktPmluc3BlY3RvclRpbWVsaW5lQWdlbnQo KSA6IDApCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxFdmFsdWF0ZVNjcmlwdChzb3VyY2VV UkwsIHNvdXJjZUNvZGUuc3RhcnRMaW5lKCkpOwogI2VuZGlmCiAKQEAgLTEyOSw4ICsxMjgsOCBA QCBTY3JpcHRWYWx1ZSBTY3JpcHRDb250cm9sbGVyOjpldmFsdWF0ZUluCiAgICAgZXhlYy0+Z2xv YmFsRGF0YSgpLnRpbWVvdXRDaGVja2VyLnN0b3AoKTsKIAogI2lmIEVOQUJMRShJTlNQRUNUT1Ip Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCi0gICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZEV2YWx1 YXRlU2NyaXB0KCk7CisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdl bnQgPSBtX2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1lLT5wYWdlKCktPmluc3BlY3RvclRpbWVsaW5l QWdlbnQoKSA6IDApCisgICAgICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRFdmFsdWF0ZVNjcmlw dCgpOwogI2VuZGlmCiAKICAgICAvLyBFdmFsdWF0aW5nIHRoZSBKYXZhU2NyaXB0IGNvdWxkIGNh dXNlIHRoZSBmcmFtZSB0byBiZSBkZWFsbG9jYXRlZApAQCAtMjc2LDE1ICsyNzUsMTUgQEAgYm9v bCBTY3JpcHRDb250cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdlcwogCiAgICAgICAgIGNvbnN0IEF0 b21pY1N0cmluZyYgdHlwZSA9IGV2ZW50LT50eXBlKCk7CiAgICAgICAgIGlmICggLy8gbW91c2Ug ZXZlbnRzCi0gICAgICAgICAgICB0eXBlID09IGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50IHx8IHR5 cGUgPT0gZXZlbnROYW1lcygpLm1vdXNlZG93bkV2ZW50IHx8Ci0gICAgICAgICAgICB0eXBlID09 IGV2ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkuZGJsY2xp Y2tFdmVudCB8fAorICAgICAgICAgICAgdHlwZSA9PSBldmVudE5hbWVzKCkuY2xpY2tFdmVudCB8 fCB0eXBlID09IGV2ZW50TmFtZXMoKS5tb3VzZWRvd25FdmVudCAKKyAgICAgICAgICAgIHx8IHR5 cGUgPT0gZXZlbnROYW1lcygpLm1vdXNldXBFdmVudCB8fCB0eXBlID09IGV2ZW50TmFtZXMoKS5k YmxjbGlja0V2ZW50IAogICAgICAgICAgICAgLy8ga2V5Ym9hcmQgZXZlbnRzCi0gICAgICAgICAg ICB0eXBlID09IGV2ZW50TmFtZXMoKS5rZXlkb3duRXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVz KCkua2V5cHJlc3NFdmVudCB8fAotICAgICAgICAgICAgdHlwZSA9PSBldmVudE5hbWVzKCkua2V5 dXBFdmVudCB8fAorICAgICAgICAgICAgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkua2V5ZG93bkV2 ZW50IHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLmtleXByZXNzRXZlbnQKKyAgICAgICAgICAgIHx8 IHR5cGUgPT0gZXZlbnROYW1lcygpLmtleXVwRXZlbnQKICAgICAgICAgICAgIC8vIG90aGVyIGFj Y2VwdGVkIGV2ZW50cwotICAgICAgICAgICAgdHlwZSA9PSBldmVudE5hbWVzKCkuc2VsZWN0RXZl bnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkuY2hhbmdlRXZlbnQgfHwKLSAgICAgICAgICAgIHR5 cGUgPT0gZXZlbnROYW1lcygpLmZvY3VzRXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkuYmx1 ckV2ZW50IHx8Ci0gICAgICAgICAgICB0eXBlID09IGV2ZW50TmFtZXMoKS5zdWJtaXRFdmVudCkK KyAgICAgICAgICAgIHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLnNlbGVjdEV2ZW50IHx8IHR5cGUg PT0gZXZlbnROYW1lcygpLmNoYW5nZUV2ZW50CisgICAgICAgICAgICB8fCB0eXBlID09IGV2ZW50 TmFtZXMoKS5mb2N1c0V2ZW50IHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLmJsdXJFdmVudAorICAg ICAgICAgICAgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkuc3VibWl0RXZlbnQpCiAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgCkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JUaW1lbGluZUFnZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAkocmV2aXNpb24gNTA0MjUpCisrKyBXZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgx LDEzICsxODEsMTYgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjphZGRSZWNvcmRUbwog CiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZChU aW1lbGluZVJlY29yZFR5cGUgdHlwZSkKIHsKLSAgICBBU1NFUlQoIW1fcmVjb3JkU3RhY2suaXNF bXB0eSgpKTsKLSAgICBUaW1lbGluZVJlY29yZEVudHJ5IGVudHJ5ID0gbV9yZWNvcmRTdGFjay5s YXN0KCk7Ci0gICAgbV9yZWNvcmRTdGFjay5yZW1vdmVMYXN0KCk7Ci0gICAgQVNTRVJUKGVudHJ5 LnR5cGUgPT0gdHlwZSk7Ci0gICAgZW50cnkucmVjb3JkLnNldCgiY2hpbGRyZW4iLCBlbnRyeS5j aGlsZHJlbik7Ci0gICAgZW50cnkucmVjb3JkLnNldCgiZW5kVGltZSIsIGN1cnJlbnRUaW1lSW5N aWxsaXNlY29uZHMoKSk7Ci0gICAgYWRkUmVjb3JkVG9UaW1lbGluZShlbnRyeS5yZWNvcmQsIHR5 cGUpOworICAgIC8vIEFuIGVtcHR5IHN0YWNrIGNvdWxkIG1lcmVseSBtZWFuIHRoYXQgdGhlIHRp bWVsaW5lIGFnZW50IHdhcyB0dXJuZWQgb24gaW4gdGhlIG1pZGRsZSBvZgorICAgIC8vIGFuIGV2 ZW50LiAgRG9uJ3QgdHJlYXQgYXMgYW4gZXJyb3IuCisgICAgaWYgKCFtX3JlY29yZFN0YWNrLmlz RW1wdHkoKSkgeworICAgICAgICBUaW1lbGluZVJlY29yZEVudHJ5IGVudHJ5ID0gbV9yZWNvcmRT dGFjay5sYXN0KCk7CisgICAgICAgIG1fcmVjb3JkU3RhY2sucmVtb3ZlTGFzdCgpOworICAgICAg ICBBU1NFUlQoZW50cnkudHlwZSA9PSB0eXBlKTsKKyAgICAgICAgZW50cnkucmVjb3JkLnNldCgi Y2hpbGRyZW4iLCBlbnRyeS5jaGlsZHJlbik7CisgICAgICAgIGVudHJ5LnJlY29yZC5zZXQoImVu ZFRpbWUiLCBjdXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCkpOworICAgICAgICBhZGRSZWNvcmRU b1RpbWVsaW5lKGVudHJ5LnJlY29yZCwgdHlwZSk7CisgICAgfQogfQogCiBkb3VibGUgSW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6Y3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpCkluZGV4OiBXZWJD b3JlL3BhZ2UvRE9NVGltZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9ET01UaW1l ci5jcHAJKHJldmlzaW9uIDUwNDI1KQorKysgV2ViQ29yZS9wYWdlL0RPTVRpbWVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTE5LDggKzExOSw3IEBAIHZvaWQgRE9NVGltZXI6OmZpcmVkKCkKICAg ICB0aW1lck5lc3RpbmdMZXZlbCA9IG1fbmVzdGluZ0xldmVsOwogCiAjaWYgRU5BQkxFKElOU1BF Q1RPUikKLSAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gSW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6cmV0cmlldmUoY29udGV4dCk7Ci0gICAgaWYgKHRpbWVsaW5lQWdl bnQpCisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBJbnNw ZWN0b3JUaW1lbGluZUFnZW50OjpyZXRyaWV2ZShjb250ZXh0KSkKICAgICAgICAgdGltZWxpbmVB Z2VudC0+d2lsbEZpcmVUaW1lcihtX3RpbWVvdXRJZCk7CiAjZW5kaWYKIApAQCAtMTM1LDggKzEz NCw4IEBAIHZvaWQgRE9NVGltZXI6OmZpcmVkKCkKICAgICAgICAgLy8gTm8gYWNjZXNzIHRvIG1l bWJlciB2YXJpYWJsZXMgYWZ0ZXIgdGhpcyBwb2ludCwgaXQgY2FuIGRlbGV0ZSB0aGUgdGltZXIu CiAgICAgICAgIG1fYWN0aW9uLT5leGVjdXRlKGNvbnRleHQpOwogI2lmIEVOQUJMRShJTlNQRUNU T1IpCi0gICAgICAgIGlmICh0aW1lbGluZUFnZW50KQotICAgICAgICAgICAgdGltZWxpbmVBZ2Vu dC0+ZGlkRmlyZVRpbWVyKCk7CisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVs aW5lQWdlbnQgPSBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpyZXRyaWV2ZShjb250ZXh0KSkKKyAg ICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkRmlyZVRpbWVyKCk7CiAjZW5kaWYKICAgICAgICAgcmV0 dXJuOwogICAgIH0KQEAgLTE0OSw3ICsxNDgsNyBAQCB2b2lkIERPTVRpbWVyOjpmaXJlZCgpCiAK ICAgICBhY3Rpb24tPmV4ZWN1dGUoY29udGV4dCk7CiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAg ICBpZiAodGltZWxpbmVBZ2VudCkKKyAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGlt ZWxpbmVBZ2VudCA9IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJldHJpZXZlKGNvbnRleHQpKQog ICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRGaXJlVGltZXIoKTsKICNlbmRpZgogICAgIGRlbGV0 ZSBhY3Rpb247CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1MDQ4MCkKKysrIExheW91dFRlc3RzL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDA5LTExLTAzICBFcmljIFou IEF5ZXJzICA8enVuZGVsQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIGFuZCBidWcgVVJM IChPT1BTISkKKworICAgICAgICAqIGluc3BlY3Rvci90aW1lbGluZS10cml2aWFsLWV4cGVjdGVk LnR4dDogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwuaHRtbDog QWRkZWQuCisKIDIwMDktMTEtMDMgIEJyYWRsZXkgR3JlZW4gIDxicmdAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERtaXRyeSBUaXRvdi4KSW5kZXg6IExheW91dFRlc3RzL2lu c3BlY3Rvci90aW1lbGluZS10cml2aWFsLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUtdHJpdmlhbC1leHBlY3RlZC50eHQJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUtdHJpdmlhbC1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNCBAQAorVHJpdmlhbCB1c2Ugb2YgaW5zcGVjdG9y IGZyb250ZW5kIHRlc3RzCisKK1RpbWVsaW5lIHN0YXJ0ZWQKKwpJbmRleDogTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9pbnNwZWN0b3IvdGltZWxpbmUtdHJpdmlhbC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAs MCArMSwzMSBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSJldmFsdWF0ZS1pbi1mcm9u dGVuZC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gZG9pdCgpCit7CisgIGZ1bmN0 aW9uIGNhbGxiYWNrKHJlc3VsdCkgeworICAgIG91dHB1dCgiVGltZWxpbmUgc3RhcnRlZCIpOwor ICAgIG5vdGlmeURvbmUoKTsKKyAgfQorICBldmFsdWF0ZUluV2ViSW5zcGVjdG9yKCJzdGFydFRp bWVsaW5lKCkiLCBjYWxsYmFjayk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKworPGJvZHkgb25s b2FkPSJvbmxvYWQoKSI+CisgPHA+IFRyaXZpYWwgdXNlIG9mIGluc3BlY3RvciBmcm9udGVuZCB0 ZXN0cyA8L3A+CisKKyAgPGRpdiBpZD0iZnJvbnRlbmQtc2NyaXB0IiBzdHlsZT0iZGlzcGxheTpu b25lIj4KK2Z1bmN0aW9uIHN0YXJ0VGltZWxpbmUoKSB7CisgIC8qIFRoaXMgdGVzdCBzZWVtcyBz aWxseSwgYnV0IG9yaWdpbmFsbHkgaXQgdGlja2xlZCBidWcgMzEwODAgKi8KKyAgSW5zcGVjdG9y Q29udHJvbGxlci5zdGFydFRpbWVsaW5lUHJvZmlsZXIoKTsKKyAgcmV0dXJuIHRydWU7Cit9Cisg IDwvZGl2PgorCisgIDxkaXYgaWQ9Im91dHB1dCI+CisgIDwvZGl2PgorCisgPC9ib2R5PgorPC9o dG1sPgo= 42423 2009-11-03 15:08:09 -0800 2009-11-03 15:22:46 -0800 WebInspector: bug 31080, Handle turning profiling on/off in the middle of event dispatch webkit-31080-3.patch text/plain 7811 zundel SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDQ4MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDktMTEtMDMgIEVyaWMgWi4gQXllcnMgIDx6dW5kZWxAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXhlcyBhIHByb2JsZW0gd2hlcmUgdGhlIHRpbWVsaW5lIGluc3RydW1lbnRhdGlvbiBjcmFzaGVz IGlmCisgICAgICAgIHRpbWVsaW5lIHByb2ZpbGluZyBpcyBlbmFibGVkIG9yIGRpc2FibGVkIGlu IHRoZSBtaWRkbGUgb2YgYW4KKyAgICAgICAgZXZlbnQgZGlzcGF0Y2guCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMDgwCisKKyAgICAgICAgVGVz dDogaW5zcGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwuaHRtbAorCisgICAgICAgICogYmluZGluZ3Mv anMvU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9s bGVyOjpldmFsdWF0ZUluV29ybGQpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxl cjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlRXZlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JUaW1lbGluZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVs aW5lQWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZCk6CisgICAgICAgICogcGFnZS9ET01U aW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01UaW1lcjo6ZmlyZWQpOgorCiAyMDA5LTEx LTAzICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0 Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRD b250cm9sbGVyLmNwcAkocmV2aXNpb24gNTA0MjUpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL1Nj cmlwdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTksOCArMTE5LDcgQEAgU2Ny aXB0VmFsdWUgU2NyaXB0Q29udHJvbGxlcjo6ZXZhbHVhdGVJbgogICAgIFJlZlB0cjxGcmFtZT4g cHJvdGVjdCA9IG1fZnJhbWU7CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIEluc3BlY3Rv clRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBtX2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1l LT5wYWdlKCktPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSA6IDA7Ci0gICAgaWYgKHRpbWVsaW5l QWdlbnQpCisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBt X2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1lLT5wYWdlKCktPmluc3BlY3RvclRpbWVsaW5lQWdlbnQo KSA6IDApCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxFdmFsdWF0ZVNjcmlwdChzb3VyY2VV UkwsIHNvdXJjZUNvZGUuc3RhcnRMaW5lKCkpOwogI2VuZGlmCiAKQEAgLTEyOSw3ICsxMjgsNyBA QCBTY3JpcHRWYWx1ZSBTY3JpcHRDb250cm9sbGVyOjpldmFsdWF0ZUluCiAgICAgZXhlYy0+Z2xv YmFsRGF0YSgpLnRpbWVvdXRDaGVja2VyLnN0b3AoKTsKIAogI2lmIEVOQUJMRShJTlNQRUNUT1Ip Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQq IHRpbWVsaW5lQWdlbnQgPSBtX2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1lLT5wYWdlKCktPmluc3Bl Y3RvclRpbWVsaW5lQWdlbnQoKSA6IDApCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZEV2YWx1 YXRlU2NyaXB0KCk7CiAjZW5kaWYKIApAQCAtMjc2LDE1ICsyNzUsMTUgQEAgYm9vbCBTY3JpcHRD b250cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdlcwogCiAgICAgICAgIGNvbnN0IEF0b21pY1N0cmlu ZyYgdHlwZSA9IGV2ZW50LT50eXBlKCk7CiAgICAgICAgIGlmICggLy8gbW91c2UgZXZlbnRzCi0g ICAgICAgICAgICB0eXBlID09IGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50IHx8IHR5cGUgPT0gZXZl bnROYW1lcygpLm1vdXNlZG93bkV2ZW50IHx8Ci0gICAgICAgICAgICB0eXBlID09IGV2ZW50TmFt ZXMoKS5tb3VzZXVwRXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkuZGJsY2xpY2tFdmVudCB8 fAorICAgICAgICAgICAgdHlwZSA9PSBldmVudE5hbWVzKCkuY2xpY2tFdmVudCB8fCB0eXBlID09 IGV2ZW50TmFtZXMoKS5tb3VzZWRvd25FdmVudCAKKyAgICAgICAgICAgIHx8IHR5cGUgPT0gZXZl bnROYW1lcygpLm1vdXNldXBFdmVudCB8fCB0eXBlID09IGV2ZW50TmFtZXMoKS5kYmxjbGlja0V2 ZW50IAogICAgICAgICAgICAgLy8ga2V5Ym9hcmQgZXZlbnRzCi0gICAgICAgICAgICB0eXBlID09 IGV2ZW50TmFtZXMoKS5rZXlkb3duRXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkua2V5cHJl c3NFdmVudCB8fAotICAgICAgICAgICAgdHlwZSA9PSBldmVudE5hbWVzKCkua2V5dXBFdmVudCB8 fAorICAgICAgICAgICAgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkua2V5ZG93bkV2ZW50IHx8IHR5 cGUgPT0gZXZlbnROYW1lcygpLmtleXByZXNzRXZlbnQKKyAgICAgICAgICAgIHx8IHR5cGUgPT0g ZXZlbnROYW1lcygpLmtleXVwRXZlbnQKICAgICAgICAgICAgIC8vIG90aGVyIGFjY2VwdGVkIGV2 ZW50cwotICAgICAgICAgICAgdHlwZSA9PSBldmVudE5hbWVzKCkuc2VsZWN0RXZlbnQgfHwgdHlw ZSA9PSBldmVudE5hbWVzKCkuY2hhbmdlRXZlbnQgfHwKLSAgICAgICAgICAgIHR5cGUgPT0gZXZl bnROYW1lcygpLmZvY3VzRXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkuYmx1ckV2ZW50IHx8 Ci0gICAgICAgICAgICB0eXBlID09IGV2ZW50TmFtZXMoKS5zdWJtaXRFdmVudCkKKyAgICAgICAg ICAgIHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLnNlbGVjdEV2ZW50IHx8IHR5cGUgPT0gZXZlbnRO YW1lcygpLmNoYW5nZUV2ZW50CisgICAgICAgICAgICB8fCB0eXBlID09IGV2ZW50TmFtZXMoKS5m b2N1c0V2ZW50IHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLmJsdXJFdmVudAorICAgICAgICAgICAg fHwgdHlwZSA9PSBldmVudE5hbWVzKCkuc3VibWl0RXZlbnQpCiAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICB9CiAgICAgCkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1l bGluZUFnZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JU aW1lbGluZUFnZW50LmNwcAkocmV2aXNpb24gNTA0MjUpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgxLDEzICsxODEs MTYgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjphZGRSZWNvcmRUbwogCiB2b2lkIElu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJl Y29yZFR5cGUgdHlwZSkKIHsKLSAgICBBU1NFUlQoIW1fcmVjb3JkU3RhY2suaXNFbXB0eSgpKTsK LSAgICBUaW1lbGluZVJlY29yZEVudHJ5IGVudHJ5ID0gbV9yZWNvcmRTdGFjay5sYXN0KCk7Ci0g ICAgbV9yZWNvcmRTdGFjay5yZW1vdmVMYXN0KCk7Ci0gICAgQVNTRVJUKGVudHJ5LnR5cGUgPT0g dHlwZSk7Ci0gICAgZW50cnkucmVjb3JkLnNldCgiY2hpbGRyZW4iLCBlbnRyeS5jaGlsZHJlbik7 Ci0gICAgZW50cnkucmVjb3JkLnNldCgiZW5kVGltZSIsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29u ZHMoKSk7Ci0gICAgYWRkUmVjb3JkVG9UaW1lbGluZShlbnRyeS5yZWNvcmQsIHR5cGUpOworICAg IC8vIEFuIGVtcHR5IHN0YWNrIGNvdWxkIG1lcmVseSBtZWFuIHRoYXQgdGhlIHRpbWVsaW5lIGFn ZW50IHdhcyB0dXJuZWQgb24gaW4gdGhlIG1pZGRsZSBvZgorICAgIC8vIGFuIGV2ZW50LiAgRG9u J3QgdHJlYXQgYXMgYW4gZXJyb3IuCisgICAgaWYgKCFtX3JlY29yZFN0YWNrLmlzRW1wdHkoKSkg eworICAgICAgICBUaW1lbGluZVJlY29yZEVudHJ5IGVudHJ5ID0gbV9yZWNvcmRTdGFjay5sYXN0 KCk7CisgICAgICAgIG1fcmVjb3JkU3RhY2sucmVtb3ZlTGFzdCgpOworICAgICAgICBBU1NFUlQo ZW50cnkudHlwZSA9PSB0eXBlKTsKKyAgICAgICAgZW50cnkucmVjb3JkLnNldCgiY2hpbGRyZW4i LCBlbnRyeS5jaGlsZHJlbik7CisgICAgICAgIGVudHJ5LnJlY29yZC5zZXQoImVuZFRpbWUiLCBj dXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCkpOworICAgICAgICBhZGRSZWNvcmRUb1RpbWVsaW5l KGVudHJ5LnJlY29yZCwgdHlwZSk7CisgICAgfQogfQogCiBkb3VibGUgSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6Y3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpCkluZGV4OiBXZWJDb3JlL3BhZ2Uv RE9NVGltZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9ET01UaW1lci5jcHAJKHJl dmlzaW9uIDUwNDI1KQorKysgV2ViQ29yZS9wYWdlL0RPTVRpbWVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTE5LDggKzExOSw3IEBAIHZvaWQgRE9NVGltZXI6OmZpcmVkKCkKICAgICB0aW1lck5l c3RpbmdMZXZlbCA9IG1fbmVzdGluZ0xldmVsOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAg ICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6cmV0cmlldmUoY29udGV4dCk7Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAg aWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBJbnNwZWN0b3JUaW1l bGluZUFnZW50OjpyZXRyaWV2ZShjb250ZXh0KSkKICAgICAgICAgdGltZWxpbmVBZ2VudC0+d2ls bEZpcmVUaW1lcihtX3RpbWVvdXRJZCk7CiAjZW5kaWYKIApAQCAtMTM1LDggKzEzNCw4IEBAIHZv aWQgRE9NVGltZXI6OmZpcmVkKCkKICAgICAgICAgLy8gTm8gYWNjZXNzIHRvIG1lbWJlciB2YXJp YWJsZXMgYWZ0ZXIgdGhpcyBwb2ludCwgaXQgY2FuIGRlbGV0ZSB0aGUgdGltZXIuCiAgICAgICAg IG1fYWN0aW9uLT5leGVjdXRlKGNvbnRleHQpOwogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAg ICAgIGlmICh0aW1lbGluZUFnZW50KQotICAgICAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkRmly ZVRpbWVyKCk7CisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQg PSBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpyZXRyaWV2ZShjb250ZXh0KSkKKyAgICAgICAgdGlt ZWxpbmVBZ2VudC0+ZGlkRmlyZVRpbWVyKCk7CiAjZW5kaWYKICAgICAgICAgcmV0dXJuOwogICAg IH0KQEAgLTE0OSw3ICsxNDgsNyBAQCB2b2lkIERPTVRpbWVyOjpmaXJlZCgpCiAKICAgICBhY3Rp b24tPmV4ZWN1dGUoY29udGV4dCk7CiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBpZiAodGlt ZWxpbmVBZ2VudCkKKyAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2Vu dCA9IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJldHJpZXZlKGNvbnRleHQpKQogICAgICAgICB0 aW1lbGluZUFnZW50LT5kaWRGaXJlVGltZXIoKTsKICNlbmRpZgogICAgIGRlbGV0ZSBhY3Rpb247 CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCShyZXZpc2lvbiA1MDQ4MCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDA5LTExLTAzICBFcmljIFouIEF5ZXJzICA8 enVuZGVsQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKwlBZGRzIGEgdGVzdCBmb3IgdHVybmluZyBvbiB0aGUgdGltZWxpbmUgcHJvZmlsZXIuICBU aGlzIGNhdXNlZAorICAgICAgICBhIGNyYXNoIGJlY2F1c2UgcHJvZmlsaW5nIHdhcyBlbmFibGVk IGluIHRoZSBtaWRkbGUgb2YgcHJvY2Vzc2luZworICAgICAgICBhbiBldmVudC4KKworCWh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTA4MAorCisgICAgICAgICogaW5z cGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBp bnNwZWN0b3IvdGltZWxpbmUtdHJpdmlhbC5odG1sOiBBZGRlZC4KKwogMjAwOS0xMS0wMyAgQnJh ZGxleSBHcmVlbiAgPGJyZ0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRG1p dHJ5IFRpdG92LgpJbmRleDogTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwt ZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGlu ZS10cml2aWFsLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2luc3Bl Y3Rvci90aW1lbGluZS10cml2aWFsLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSw0IEBACitUcml2aWFsIHVzZSBvZiBpbnNwZWN0b3IgZnJvbnRlbmQgdGVzdHMKKworVGltZWxp bmUgc3RhcnRlZAorCkluZGV4OiBMYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUtdHJpdmlh bC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS10cml2 aWFsLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUt dHJpdmlhbC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDM3IEBACis8aHRtbD4KKzxoZWFk PgorPHNjcmlwdCBzcmM9ImV2YWx1YXRlLWluLWZyb250ZW5kLmpzIj48L3NjcmlwdD4KKzxzY3Jp cHQ+CisKK2Z1bmN0aW9uIGRvaXQoKQoreworICAgIGZ1bmN0aW9uIGNhbGxiYWNrKHJlc3VsdCkg eworICAgICAgICBvdXRwdXQoIlRpbWVsaW5lIHN0YXJ0ZWQiKTsKKyAgICAgICAgbm90aWZ5RG9u ZSgpOworICAgIH0KKyAgICBldmFsdWF0ZUluV2ViSW5zcGVjdG9yKCJzdGFydFRpbWVsaW5lKCki LCBjYWxsYmFjayk7Cit9CisKKzwvc2NyaXB0PgorPC9oZWFkPgorCis8Ym9keSBvbmxvYWQ9Im9u bG9hZCgpIj4KKzxwPiAKK1RyaXZpYWwgdXNlIG9mIGluc3BlY3RvciBmcm9udGVuZCB0ZXN0cyAK KzwvcD4KKworPGRpdiBpZD0iZnJvbnRlbmQtc2NyaXB0IiBzdHlsZT0iZGlzcGxheTpub25lIj4K KworZnVuY3Rpb24gc3RhcnRUaW1lbGluZSgpIHsKKyAgICAvKiBUaGlzIHRlc3Qgc2VlbXMgc2ls bHksIGJ1dCBvcmlnaW5hbGx5IGl0IHRpY2tsZWQgYnVnIDMxMDgwICovCisgICAgSW5zcGVjdG9y Q29udHJvbGxlci5zdGFydFRpbWVsaW5lUHJvZmlsZXIoKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30K KworPC9kaXY+CisKKzxkaXYgaWQ9Im91dHB1dCI+Cis8L2Rpdj4KKworPC9ib2R5PgorPC9odG1s Pgo= 42428 2009-11-03 15:22:46 -0800 2009-11-03 15:46:28 -0800 WebInspector: bug 31080, Handle turning profiling on/off in the middle of event dispatch webkit-31080-4.patch text/plain 7768 zundel SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDQ4MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDktMTEtMDMgIEVyaWMgWi4gQXllcnMgIDx6dW5kZWxAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXhlcyBhIHByb2JsZW0gd2hlcmUgdGhlIHRpbWVsaW5lIGluc3RydW1lbnRhdGlvbiBjcmFzaGVz IGlmCisgICAgICAgIHRpbWVsaW5lIHByb2ZpbGluZyBpcyBlbmFibGVkIG9yIGRpc2FibGVkIGlu IHRoZSBtaWRkbGUgb2YgYW4KKyAgICAgICAgZXZlbnQgZGlzcGF0Y2guCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMDgwCisKKyAgICAgICAgVGVz dDogaW5zcGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwuaHRtbAorCisgICAgICAgICogYmluZGluZ3Mv anMvU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9s bGVyOjpldmFsdWF0ZUluV29ybGQpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxl cjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlRXZlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JUaW1lbGluZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVs aW5lQWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZCk6CisgICAgICAgICogcGFnZS9ET01U aW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01UaW1lcjo6ZmlyZWQpOgorCiAyMDA5LTEx LTAzICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0 Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRD b250cm9sbGVyLmNwcAkocmV2aXNpb24gNTA0MjUpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL1Nj cmlwdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTksOCArMTE5LDcgQEAgU2Ny aXB0VmFsdWUgU2NyaXB0Q29udHJvbGxlcjo6ZXZhbHVhdGVJbgogICAgIFJlZlB0cjxGcmFtZT4g cHJvdGVjdCA9IG1fZnJhbWU7CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIEluc3BlY3Rv clRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBtX2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1l LT5wYWdlKCktPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSA6IDA7Ci0gICAgaWYgKHRpbWVsaW5l QWdlbnQpCisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBt X2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1lLT5wYWdlKCktPmluc3BlY3RvclRpbWVsaW5lQWdlbnQo KSA6IDApCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxFdmFsdWF0ZVNjcmlwdChzb3VyY2VV UkwsIHNvdXJjZUNvZGUuc3RhcnRMaW5lKCkpOwogI2VuZGlmCiAKQEAgLTEyOSw3ICsxMjgsNyBA QCBTY3JpcHRWYWx1ZSBTY3JpcHRDb250cm9sbGVyOjpldmFsdWF0ZUluCiAgICAgZXhlYy0+Z2xv YmFsRGF0YSgpLnRpbWVvdXRDaGVja2VyLnN0b3AoKTsKIAogI2lmIEVOQUJMRShJTlNQRUNUT1Ip Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQq IHRpbWVsaW5lQWdlbnQgPSBtX2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1lLT5wYWdlKCktPmluc3Bl Y3RvclRpbWVsaW5lQWdlbnQoKSA6IDApCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZEV2YWx1 YXRlU2NyaXB0KCk7CiAjZW5kaWYKIApAQCAtMjc2LDE1ICsyNzUsMTUgQEAgYm9vbCBTY3JpcHRD b250cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdlcwogCiAgICAgICAgIGNvbnN0IEF0b21pY1N0cmlu ZyYgdHlwZSA9IGV2ZW50LT50eXBlKCk7CiAgICAgICAgIGlmICggLy8gbW91c2UgZXZlbnRzCi0g ICAgICAgICAgICB0eXBlID09IGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50IHx8IHR5cGUgPT0gZXZl bnROYW1lcygpLm1vdXNlZG93bkV2ZW50IHx8Ci0gICAgICAgICAgICB0eXBlID09IGV2ZW50TmFt ZXMoKS5tb3VzZXVwRXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkuZGJsY2xpY2tFdmVudCB8 fAorICAgICAgICAgICAgdHlwZSA9PSBldmVudE5hbWVzKCkuY2xpY2tFdmVudCB8fCB0eXBlID09 IGV2ZW50TmFtZXMoKS5tb3VzZWRvd25FdmVudCAKKyAgICAgICAgICAgIHx8IHR5cGUgPT0gZXZl bnROYW1lcygpLm1vdXNldXBFdmVudCB8fCB0eXBlID09IGV2ZW50TmFtZXMoKS5kYmxjbGlja0V2 ZW50IAogICAgICAgICAgICAgLy8ga2V5Ym9hcmQgZXZlbnRzCi0gICAgICAgICAgICB0eXBlID09 IGV2ZW50TmFtZXMoKS5rZXlkb3duRXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkua2V5cHJl c3NFdmVudCB8fAotICAgICAgICAgICAgdHlwZSA9PSBldmVudE5hbWVzKCkua2V5dXBFdmVudCB8 fAorICAgICAgICAgICAgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkua2V5ZG93bkV2ZW50IHx8IHR5 cGUgPT0gZXZlbnROYW1lcygpLmtleXByZXNzRXZlbnQKKyAgICAgICAgICAgIHx8IHR5cGUgPT0g ZXZlbnROYW1lcygpLmtleXVwRXZlbnQKICAgICAgICAgICAgIC8vIG90aGVyIGFjY2VwdGVkIGV2 ZW50cwotICAgICAgICAgICAgdHlwZSA9PSBldmVudE5hbWVzKCkuc2VsZWN0RXZlbnQgfHwgdHlw ZSA9PSBldmVudE5hbWVzKCkuY2hhbmdlRXZlbnQgfHwKLSAgICAgICAgICAgIHR5cGUgPT0gZXZl bnROYW1lcygpLmZvY3VzRXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkuYmx1ckV2ZW50IHx8 Ci0gICAgICAgICAgICB0eXBlID09IGV2ZW50TmFtZXMoKS5zdWJtaXRFdmVudCkKKyAgICAgICAg ICAgIHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLnNlbGVjdEV2ZW50IHx8IHR5cGUgPT0gZXZlbnRO YW1lcygpLmNoYW5nZUV2ZW50CisgICAgICAgICAgICB8fCB0eXBlID09IGV2ZW50TmFtZXMoKS5m b2N1c0V2ZW50IHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLmJsdXJFdmVudAorICAgICAgICAgICAg fHwgdHlwZSA9PSBldmVudE5hbWVzKCkuc3VibWl0RXZlbnQpCiAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICB9CiAgICAgCkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1l bGluZUFnZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JU aW1lbGluZUFnZW50LmNwcAkocmV2aXNpb24gNTA0MjUpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgxLDEzICsxODEs MTYgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjphZGRSZWNvcmRUbwogCiB2b2lkIElu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJl Y29yZFR5cGUgdHlwZSkKIHsKLSAgICBBU1NFUlQoIW1fcmVjb3JkU3RhY2suaXNFbXB0eSgpKTsK LSAgICBUaW1lbGluZVJlY29yZEVudHJ5IGVudHJ5ID0gbV9yZWNvcmRTdGFjay5sYXN0KCk7Ci0g ICAgbV9yZWNvcmRTdGFjay5yZW1vdmVMYXN0KCk7Ci0gICAgQVNTRVJUKGVudHJ5LnR5cGUgPT0g dHlwZSk7Ci0gICAgZW50cnkucmVjb3JkLnNldCgiY2hpbGRyZW4iLCBlbnRyeS5jaGlsZHJlbik7 Ci0gICAgZW50cnkucmVjb3JkLnNldCgiZW5kVGltZSIsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29u ZHMoKSk7Ci0gICAgYWRkUmVjb3JkVG9UaW1lbGluZShlbnRyeS5yZWNvcmQsIHR5cGUpOworICAg IC8vIEFuIGVtcHR5IHN0YWNrIGNvdWxkIG1lcmVseSBtZWFuIHRoYXQgdGhlIHRpbWVsaW5lIGFn ZW50IHdhcyB0dXJuZWQgb24gaW4gdGhlIG1pZGRsZSBvZgorICAgIC8vIGFuIGV2ZW50LiAgRG9u J3QgdHJlYXQgYXMgYW4gZXJyb3IuCisgICAgaWYgKCFtX3JlY29yZFN0YWNrLmlzRW1wdHkoKSkg eworICAgICAgICBUaW1lbGluZVJlY29yZEVudHJ5IGVudHJ5ID0gbV9yZWNvcmRTdGFjay5sYXN0 KCk7CisgICAgICAgIG1fcmVjb3JkU3RhY2sucmVtb3ZlTGFzdCgpOworICAgICAgICBBU1NFUlQo ZW50cnkudHlwZSA9PSB0eXBlKTsKKyAgICAgICAgZW50cnkucmVjb3JkLnNldCgiY2hpbGRyZW4i LCBlbnRyeS5jaGlsZHJlbik7CisgICAgICAgIGVudHJ5LnJlY29yZC5zZXQoImVuZFRpbWUiLCBj dXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCkpOworICAgICAgICBhZGRSZWNvcmRUb1RpbWVsaW5l KGVudHJ5LnJlY29yZCwgdHlwZSk7CisgICAgfQogfQogCiBkb3VibGUgSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6Y3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpCkluZGV4OiBXZWJDb3JlL3BhZ2Uv RE9NVGltZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9ET01UaW1lci5jcHAJKHJl dmlzaW9uIDUwNDI1KQorKysgV2ViQ29yZS9wYWdlL0RPTVRpbWVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTE5LDggKzExOSw3IEBAIHZvaWQgRE9NVGltZXI6OmZpcmVkKCkKICAgICB0aW1lck5l c3RpbmdMZXZlbCA9IG1fbmVzdGluZ0xldmVsOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAg ICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6cmV0cmlldmUoY29udGV4dCk7Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAg aWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBJbnNwZWN0b3JUaW1l bGluZUFnZW50OjpyZXRyaWV2ZShjb250ZXh0KSkKICAgICAgICAgdGltZWxpbmVBZ2VudC0+d2ls bEZpcmVUaW1lcihtX3RpbWVvdXRJZCk7CiAjZW5kaWYKIApAQCAtMTM1LDcgKzEzNCw3IEBAIHZv aWQgRE9NVGltZXI6OmZpcmVkKCkKICAgICAgICAgLy8gTm8gYWNjZXNzIHRvIG1lbWJlciB2YXJp YWJsZXMgYWZ0ZXIgdGhpcyBwb2ludCwgaXQgY2FuIGRlbGV0ZSB0aGUgdGltZXIuCiAgICAgICAg IG1fYWN0aW9uLT5leGVjdXRlKGNvbnRleHQpOwogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAg ICAgIGlmICh0aW1lbGluZUFnZW50KQorICAgICAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dCogdGltZWxpbmVBZ2VudCA9IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJldHJpZXZlKGNvbnRl eHQpKQogICAgICAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkRmlyZVRpbWVyKCk7CiAjZW5kaWYK ICAgICAgICAgcmV0dXJuOwpAQCAtMTQ5LDcgKzE0OCw3IEBAIHZvaWQgRE9NVGltZXI6OmZpcmVk KCkKIAogICAgIGFjdGlvbi0+ZXhlY3V0ZShjb250ZXh0KTsKICNpZiBFTkFCTEUoSU5TUEVDVE9S KQotICAgIGlmICh0aW1lbGluZUFnZW50KQorICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50 KiB0aW1lbGluZUFnZW50ID0gSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cmV0cmlldmUoY29udGV4 dCkpCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZEZpcmVUaW1lcigpOwogI2VuZGlmCiAgICAg ZGVsZXRlIGFjdGlvbjsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDUwNDgwKQorKysgTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMTEtMDMgIEVy aWMgWi4gQXllcnMgIDx6dW5kZWxAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworCUFkZHMgYSB0ZXN0IGZvciB0dXJuaW5nIG9uIHRoZSB0aW1lbGlu ZSBwcm9maWxlci4gIFRoaXMgY2F1c2VkCisgICAgICAgIGEgY3Jhc2ggYmVjYXVzZSBwcm9maWxp bmcgd2FzIGVuYWJsZWQgaW4gdGhlIG1pZGRsZSBvZiBwcm9jZXNzaW5nCisgICAgICAgIGFuIGV2 ZW50LgorCisJaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMDgwCisK KyAgICAgICAgKiBpbnNwZWN0b3IvdGltZWxpbmUtdHJpdmlhbC1leHBlY3RlZC50eHQ6IEFkZGVk LgorICAgICAgICAqIGluc3BlY3Rvci90aW1lbGluZS10cml2aWFsLmh0bWw6IEFkZGVkLgorCiAy MDA5LTExLTAzICBCcmFkbGV5IEdyZWVuICA8YnJnQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEbWl0cnkgVGl0b3YuCkluZGV4OiBMYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGlt ZWxpbmUtdHJpdmlhbC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwtZXhwZWN0ZWQudHh0CShyZXZpc2lv biAwKQpAQCAtMCwwICsxLDQgQEAKK1RyaXZpYWwgdXNlIG9mIGluc3BlY3RvciBmcm9udGVuZCB0 ZXN0cworCitUaW1lbGluZSBzdGFydGVkCisKSW5kZXg6IExheW91dFRlc3RzL2luc3BlY3Rvci90 aW1lbGluZS10cml2aWFsLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3RpbWVsaW5lLXRyaXZpYWwuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2luc3Bl Y3Rvci90aW1lbGluZS10cml2aWFsLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzcgQEAK KzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iZXZhbHVhdGUtaW4tZnJvbnRlbmQuanMiPjwv c2NyaXB0PgorPHNjcmlwdD4KKworZnVuY3Rpb24gZG9pdCgpCit7CisgICAgZnVuY3Rpb24gY2Fs bGJhY2socmVzdWx0KSB7CisgICAgICAgIG91dHB1dCgiVGltZWxpbmUgc3RhcnRlZCIpOworICAg ICAgICBub3RpZnlEb25lKCk7CisgICAgfQorICAgIGV2YWx1YXRlSW5XZWJJbnNwZWN0b3IoInN0 YXJ0VGltZWxpbmUoKSIsIGNhbGxiYWNrKTsKK30KKworPC9zY3JpcHQ+Cis8L2hlYWQ+CisKKzxi b2R5IG9ubG9hZD0ib25sb2FkKCkiPgorPHA+IAorVHJpdmlhbCB1c2Ugb2YgaW5zcGVjdG9yIGZy b250ZW5kIHRlc3RzIAorPC9wPgorCis8ZGl2IGlkPSJmcm9udGVuZC1zY3JpcHQiIHN0eWxlPSJk aXNwbGF5Om5vbmUiPgorCitmdW5jdGlvbiBzdGFydFRpbWVsaW5lKCkgeworICAgIC8qIFRoaXMg dGVzdCBzZWVtcyBzaWxseSwgYnV0IG9yaWdpbmFsbHkgaXQgdGlja2xlZCBidWcgMzEwODAgKi8K KyAgICBJbnNwZWN0b3JDb250cm9sbGVyLnN0YXJ0VGltZWxpbmVQcm9maWxlcigpOworICAgIHJl dHVybiB0cnVlOworfQorCis8L2Rpdj4KKworPGRpdiBpZD0ib3V0cHV0Ij4KKzwvZGl2PgorCis8 L2JvZHk+Cis8L2h0bWw+Cg== 42431 2009-11-03 15:46:28 -0800 2009-11-03 16:00:26 -0800 WebInspector: bug 31080, Handle turning profiling on/off in the middle of event dispatch webkit-31080-5.patch text/plain 7782 zundel SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDQ4MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDktMTEtMDMgIEVyaWMgWi4gQXllcnMgIDx6dW5kZWxAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXhlcyBhIHByb2JsZW0gd2hlcmUgdGhlIHRpbWVsaW5lIGluc3RydW1lbnRhdGlvbiBjcmFzaGVz IGlmCisgICAgICAgIHRpbWVsaW5lIHByb2ZpbGluZyBpcyBlbmFibGVkIG9yIGRpc2FibGVkIGlu IHRoZSBtaWRkbGUgb2YgYW4KKyAgICAgICAgZXZlbnQgZGlzcGF0Y2guCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMDgwCisKKyAgICAgICAgVGVz dDogaW5zcGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwuaHRtbAorCisgICAgICAgICogYmluZGluZ3Mv anMvU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9s bGVyOjpldmFsdWF0ZUluV29ybGQpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxl cjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlRXZlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JUaW1lbGluZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVs aW5lQWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZCk6CisgICAgICAgICogcGFnZS9ET01U aW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01UaW1lcjo6ZmlyZWQpOgorCiAyMDA5LTEx LTAzICBZYWFyIFNjaG5pdG1hbiAgPHlhYXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0 Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRD b250cm9sbGVyLmNwcAkocmV2aXNpb24gNTA0MjUpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL1Nj cmlwdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTksOCArMTE5LDcgQEAgU2Ny aXB0VmFsdWUgU2NyaXB0Q29udHJvbGxlcjo6ZXZhbHVhdGVJbgogICAgIFJlZlB0cjxGcmFtZT4g cHJvdGVjdCA9IG1fZnJhbWU7CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIEluc3BlY3Rv clRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBtX2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1l LT5wYWdlKCktPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSA6IDA7Ci0gICAgaWYgKHRpbWVsaW5l QWdlbnQpCisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBt X2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1lLT5wYWdlKCktPmluc3BlY3RvclRpbWVsaW5lQWdlbnQo KSA6IDApCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxFdmFsdWF0ZVNjcmlwdChzb3VyY2VV UkwsIHNvdXJjZUNvZGUuc3RhcnRMaW5lKCkpOwogI2VuZGlmCiAKQEAgLTEyOSw3ICsxMjgsNyBA QCBTY3JpcHRWYWx1ZSBTY3JpcHRDb250cm9sbGVyOjpldmFsdWF0ZUluCiAgICAgZXhlYy0+Z2xv YmFsRGF0YSgpLnRpbWVvdXRDaGVja2VyLnN0b3AoKTsKIAogI2lmIEVOQUJMRShJTlNQRUNUT1Ip Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQq IHRpbWVsaW5lQWdlbnQgPSBtX2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1lLT5wYWdlKCktPmluc3Bl Y3RvclRpbWVsaW5lQWdlbnQoKSA6IDApCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZEV2YWx1 YXRlU2NyaXB0KCk7CiAjZW5kaWYKIApAQCAtMjc2LDE1ICsyNzUsMTUgQEAgYm9vbCBTY3JpcHRD b250cm9sbGVyOjpwcm9jZXNzaW5nVXNlckdlcwogCiAgICAgICAgIGNvbnN0IEF0b21pY1N0cmlu ZyYgdHlwZSA9IGV2ZW50LT50eXBlKCk7CiAgICAgICAgIGlmICggLy8gbW91c2UgZXZlbnRzCi0g ICAgICAgICAgICB0eXBlID09IGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50IHx8IHR5cGUgPT0gZXZl bnROYW1lcygpLm1vdXNlZG93bkV2ZW50IHx8Ci0gICAgICAgICAgICB0eXBlID09IGV2ZW50TmFt ZXMoKS5tb3VzZXVwRXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkuZGJsY2xpY2tFdmVudCB8 fAorICAgICAgICAgICAgdHlwZSA9PSBldmVudE5hbWVzKCkuY2xpY2tFdmVudCB8fCB0eXBlID09 IGV2ZW50TmFtZXMoKS5tb3VzZWRvd25FdmVudCAKKyAgICAgICAgICAgIHx8IHR5cGUgPT0gZXZl bnROYW1lcygpLm1vdXNldXBFdmVudCB8fCB0eXBlID09IGV2ZW50TmFtZXMoKS5kYmxjbGlja0V2 ZW50IAogICAgICAgICAgICAgLy8ga2V5Ym9hcmQgZXZlbnRzCi0gICAgICAgICAgICB0eXBlID09 IGV2ZW50TmFtZXMoKS5rZXlkb3duRXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkua2V5cHJl c3NFdmVudCB8fAotICAgICAgICAgICAgdHlwZSA9PSBldmVudE5hbWVzKCkua2V5dXBFdmVudCB8 fAorICAgICAgICAgICAgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkua2V5ZG93bkV2ZW50IHx8IHR5 cGUgPT0gZXZlbnROYW1lcygpLmtleXByZXNzRXZlbnQKKyAgICAgICAgICAgIHx8IHR5cGUgPT0g ZXZlbnROYW1lcygpLmtleXVwRXZlbnQKICAgICAgICAgICAgIC8vIG90aGVyIGFjY2VwdGVkIGV2 ZW50cwotICAgICAgICAgICAgdHlwZSA9PSBldmVudE5hbWVzKCkuc2VsZWN0RXZlbnQgfHwgdHlw ZSA9PSBldmVudE5hbWVzKCkuY2hhbmdlRXZlbnQgfHwKLSAgICAgICAgICAgIHR5cGUgPT0gZXZl bnROYW1lcygpLmZvY3VzRXZlbnQgfHwgdHlwZSA9PSBldmVudE5hbWVzKCkuYmx1ckV2ZW50IHx8 Ci0gICAgICAgICAgICB0eXBlID09IGV2ZW50TmFtZXMoKS5zdWJtaXRFdmVudCkKKyAgICAgICAg ICAgIHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLnNlbGVjdEV2ZW50IHx8IHR5cGUgPT0gZXZlbnRO YW1lcygpLmNoYW5nZUV2ZW50CisgICAgICAgICAgICB8fCB0eXBlID09IGV2ZW50TmFtZXMoKS5m b2N1c0V2ZW50IHx8IHR5cGUgPT0gZXZlbnROYW1lcygpLmJsdXJFdmVudAorICAgICAgICAgICAg fHwgdHlwZSA9PSBldmVudE5hbWVzKCkuc3VibWl0RXZlbnQpCiAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICB9CiAgICAgCkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1l bGluZUFnZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JU aW1lbGluZUFnZW50LmNwcAkocmV2aXNpb24gNTA0MjUpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgxLDEzICsxODEs MTYgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjphZGRSZWNvcmRUbwogCiB2b2lkIElu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZChUaW1lbGluZVJl Y29yZFR5cGUgdHlwZSkKIHsKLSAgICBBU1NFUlQoIW1fcmVjb3JkU3RhY2suaXNFbXB0eSgpKTsK LSAgICBUaW1lbGluZVJlY29yZEVudHJ5IGVudHJ5ID0gbV9yZWNvcmRTdGFjay5sYXN0KCk7Ci0g ICAgbV9yZWNvcmRTdGFjay5yZW1vdmVMYXN0KCk7Ci0gICAgQVNTRVJUKGVudHJ5LnR5cGUgPT0g dHlwZSk7Ci0gICAgZW50cnkucmVjb3JkLnNldCgiY2hpbGRyZW4iLCBlbnRyeS5jaGlsZHJlbik7 Ci0gICAgZW50cnkucmVjb3JkLnNldCgiZW5kVGltZSIsIGN1cnJlbnRUaW1lSW5NaWxsaXNlY29u ZHMoKSk7Ci0gICAgYWRkUmVjb3JkVG9UaW1lbGluZShlbnRyeS5yZWNvcmQsIHR5cGUpOworICAg IC8vIEFuIGVtcHR5IHN0YWNrIGNvdWxkIG1lcmVseSBtZWFuIHRoYXQgdGhlIHRpbWVsaW5lIGFn ZW50IHdhcyB0dXJuZWQgb24gaW4gdGhlIG1pZGRsZSBvZgorICAgIC8vIGFuIGV2ZW50LiAgRG9u J3QgdHJlYXQgYXMgYW4gZXJyb3IuCisgICAgaWYgKCFtX3JlY29yZFN0YWNrLmlzRW1wdHkoKSkg eworICAgICAgICBUaW1lbGluZVJlY29yZEVudHJ5IGVudHJ5ID0gbV9yZWNvcmRTdGFjay5sYXN0 KCk7CisgICAgICAgIG1fcmVjb3JkU3RhY2sucmVtb3ZlTGFzdCgpOworICAgICAgICBBU1NFUlQo ZW50cnkudHlwZSA9PSB0eXBlKTsKKyAgICAgICAgZW50cnkucmVjb3JkLnNldCgiY2hpbGRyZW4i LCBlbnRyeS5jaGlsZHJlbik7CisgICAgICAgIGVudHJ5LnJlY29yZC5zZXQoImVuZFRpbWUiLCBj dXJyZW50VGltZUluTWlsbGlzZWNvbmRzKCkpOworICAgICAgICBhZGRSZWNvcmRUb1RpbWVsaW5l KGVudHJ5LnJlY29yZCwgdHlwZSk7CisgICAgfQogfQogCiBkb3VibGUgSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6Y3VycmVudFRpbWVJbk1pbGxpc2Vjb25kcygpCkluZGV4OiBXZWJDb3JlL3BhZ2Uv RE9NVGltZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9ET01UaW1lci5jcHAJKHJl dmlzaW9uIDUwNDI1KQorKysgV2ViQ29yZS9wYWdlL0RPTVRpbWVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTE5LDggKzExOSw3IEBAIHZvaWQgRE9NVGltZXI6OmZpcmVkKCkKICAgICB0aW1lck5l c3RpbmdMZXZlbCA9IG1fbmVzdGluZ0xldmVsOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAg ICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6cmV0cmlldmUoY29udGV4dCk7Ci0gICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAg aWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBJbnNwZWN0b3JUaW1l bGluZUFnZW50OjpyZXRyaWV2ZShjb250ZXh0KSkKICAgICAgICAgdGltZWxpbmVBZ2VudC0+d2ls bEZpcmVUaW1lcihtX3RpbWVvdXRJZCk7CiAjZW5kaWYKIApAQCAtMTM1LDcgKzEzNCw3IEBAIHZv aWQgRE9NVGltZXI6OmZpcmVkKCkKICAgICAgICAgLy8gTm8gYWNjZXNzIHRvIG1lbWJlciB2YXJp YWJsZXMgYWZ0ZXIgdGhpcyBwb2ludCwgaXQgY2FuIGRlbGV0ZSB0aGUgdGltZXIuCiAgICAgICAg IG1fYWN0aW9uLT5leGVjdXRlKGNvbnRleHQpOwogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAg ICAgIGlmICh0aW1lbGluZUFnZW50KQorICAgICAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dCogdGltZWxpbmVBZ2VudCA9IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJldHJpZXZlKGNvbnRl eHQpKQogICAgICAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkRmlyZVRpbWVyKCk7CiAjZW5kaWYK ICAgICAgICAgcmV0dXJuOwpAQCAtMTQ5LDcgKzE0OCw3IEBAIHZvaWQgRE9NVGltZXI6OmZpcmVk KCkKIAogICAgIGFjdGlvbi0+ZXhlY3V0ZShjb250ZXh0KTsKICNpZiBFTkFCTEUoSU5TUEVDVE9S KQotICAgIGlmICh0aW1lbGluZUFnZW50KQorICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50 KiB0aW1lbGluZUFnZW50ID0gSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cmV0cmlldmUoY29udGV4 dCkpCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZEZpcmVUaW1lcigpOwogI2VuZGlmCiAgICAg ZGVsZXRlIGFjdGlvbjsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDUwNDgwKQorKysgTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMTEtMDMgIEVy aWMgWi4gQXllcnMgIDx6dW5kZWxAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIGEgdGVzdCBmb3IgdHVybmluZyBvbiB0aGUg dGltZWxpbmUgcHJvZmlsZXIuICBUaGlzIGNhdXNlZAorICAgICAgICBhIGNyYXNoIGJlY2F1c2Ug cHJvZmlsaW5nIHdhcyBlbmFibGVkIGluIHRoZSBtaWRkbGUgb2YgcHJvY2Vzc2luZworICAgICAg ICBhbiBldmVudC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzEwODAKKworICAgICAgICAqIGluc3BlY3Rvci90aW1lbGluZS10cml2aWFsLWV4cGVj dGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwuaHRt bDogQWRkZWQuCisKIDIwMDktMTEtMDMgIEJyYWRsZXkgR3JlZW4gIDxicmdAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERtaXRyeSBUaXRvdi4KSW5kZXg6IExheW91dFRlc3Rz L2luc3BlY3Rvci90aW1lbGluZS10cml2aWFsLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUtdHJpdmlhbC1leHBlY3RlZC50eHQJKHJldmlz aW9uIDApCisrKyBMYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUtdHJpdmlhbC1leHBlY3Rl ZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNCBAQAorVHJpdmlhbCB1c2Ugb2YgaW5zcGVj dG9yIGZyb250ZW5kIHRlc3RzCisKK1RpbWVsaW5lIHN0YXJ0ZWQKKwpJbmRleDogTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUtdHJpdmlhbC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lLXRyaXZpYWwuaHRtbAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSwzNyBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSJldmFsdWF0ZS1pbi1m cm9udGVuZC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorCitmdW5jdGlvbiBkb2l0KCkKK3sKKyAg ICBmdW5jdGlvbiBjYWxsYmFjayhyZXN1bHQpIHsKKyAgICAgICAgb3V0cHV0KCJUaW1lbGluZSBz dGFydGVkIik7CisgICAgICAgIG5vdGlmeURvbmUoKTsKKyAgICB9CisgICAgZXZhbHVhdGVJbldl Ykluc3BlY3Rvcigic3RhcnRUaW1lbGluZSgpIiwgY2FsbGJhY2spOworfQorCis8L3NjcmlwdD4K KzwvaGVhZD4KKworPGJvZHkgb25sb2FkPSJvbmxvYWQoKSI+Cis8cD4gCitUcml2aWFsIHVzZSBv ZiBpbnNwZWN0b3IgZnJvbnRlbmQgdGVzdHMgCis8L3A+CisKKzxkaXYgaWQ9ImZyb250ZW5kLXNj cmlwdCIgc3R5bGU9ImRpc3BsYXk6bm9uZSI+CisKK2Z1bmN0aW9uIHN0YXJ0VGltZWxpbmUoKSB7 CisgICAgLyogVGhpcyB0ZXN0IHNlZW1zIHNpbGx5LCBidXQgb3JpZ2luYWxseSBpdCB0aWNrbGVk IGJ1ZyAzMTA4MCAqLworICAgIEluc3BlY3RvckNvbnRyb2xsZXIuc3RhcnRUaW1lbGluZVByb2Zp bGVyKCk7CisgICAgcmV0dXJuIHRydWU7Cit9CisKKzwvZGl2PgorCis8ZGl2IGlkPSJvdXRwdXQi PgorPC9kaXY+CisKKzwvYm9keT4KKzwvaHRtbD4K