36890 2010-03-31 10:17:13 -0700 Web Inspector: Timeline Events are not propagated to frontend. 2010-04-01 12:58:46 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 loislo webkit-unassigned commit-queue pfeldman timothy yurys oldest_to_newest 206565 0 loislo 2010-03-31 10:17:13 -0700 Sometimes js code can detach page from it's frame and in that case Events will stay in the TimelineAgent's events stack. Only immediate events will appear at frontend like Send Request 206568 1 52183 loislo 2010-03-31 10:19:46 -0700 Created attachment 52183 [patch] Initial version. 207121 2 52291 loislo 2010-04-01 06:47:26 -0700 Created attachment 52291 [patch] Second iteration. Pointer to page will be used for obtaining pointer to inspector. 207136 3 52291 yurys 2010-04-01 07:21:40 -0700 Comment on attachment 52291 [patch] Second iteration. > if (timelineAgent) { > v8::ScriptOrigin origin = function->GetScriptOrigin(); > if (!origin.ResourceName().IsEmpty()) > - timelineAgent->willCallFunction(v8ValueToWebCoreString(origin.ResourceName()), function->GetScriptLineNumber() + 1); > + timelineAgent->willCallFunction(toWebCoreString(origin.ResourceName()), function->GetScriptLineNumber() + 1); It may be useful to see function calls even if resource name is empty. > + if (inspectedPage) { > + InspectorTimelineAgent* timelineAgent = inspectedPage->inspectorTimelineAgent(); > + if (timelineAgent) > + timelineAgent->didCallFunction(); > + } If you move timelineAgent declaration out of the if before the function call above if (inspectedPage) can be removed. > + if (inspectedPage) { > + InspectorTimelineAgent* timelineAgent = inspectedPage->inspectorTimelineAgent(); > + if (timelineAgent) > + timelineAgent->didDispatchEvent(); > + } Ditto. > + if (inspectedPage) { > + InspectorTimelineAgent* timelineAgent = inspectedPage->inspectorTimelineAgent(); > + if (timelineAgent) > timelineAgent->didDispatchEvent(); > } Just checking if (timelineAgentIsActive) here would make the code more clear. Could we have a test for the case when frame is detached? 207180 4 52291 timothy 2010-04-01 08:50:50 -0700 Comment on attachment 52291 [patch] Second iteration. > + InspectorTimelineAgent* timelineAgent = inspectedPage->inspectorTimelineAgent(); > if (timelineAgent) { You should combine these two lines. > + InspectorTimelineAgent* timelineAgent = inspectedPage->inspectorTimelineAgent(); > + if (timelineAgent) Ditto. > + InspectorTimelineAgent* timelineAgent = inspectedPage->inspectorTimelineAgent(); > + if (timelineAgent) Ditto. 207227 5 52307 loislo 2010-04-01 10:16:28 -0700 Created attachment 52307 [patch] Third iteration. Just fixed style problems identified by Timothy. 207335 6 52307 commit-queue 2010-04-01 12:58:41 -0700 Comment on attachment 52307 [patch] Third iteration. Clearing flags on attachment: 52307 Committed r56931: <http://trac.webkit.org/changeset/56931> 207336 7 commit-queue 2010-04-01 12:58:46 -0700 All reviewed patches have been landed. Closing bug. 52183 2010-03-31 10:19:46 -0700 2010-04-01 06:47:26 -0700 [patch] Initial version. patch text/plain 2383 loislo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NWQ0Y2Y0Yy4uMTllMWM3YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wMy0zMSAgSWx5YSBUaWtob25v dnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU29tZXRpbWVzIGpzIGNvZGUgY2Fu IGRldGFjaCBwYWdlIGZyb20gaXQncyBmcmFtZSBhbmQgaW4gdGhhdCBjYXNlCisgICAgICAgIERp c3BhdGNoIEV2ZW50cyB3aWxsIHN0YXkgaW4gdGhlIFRpbWVsaW5lQWdlbnQncyBldmVudHMgc3Rh Y2suIE9ubHkgaW1tZWRpYXRlIGV2ZW50cyB3aWxsCisgICAgICAgIGFwcGVhciBhdCBmcm9udGVu ZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2ODkw CisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFByb3h5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlY4UHJveHk6OmNhbGxGdW5jdGlvbik6CisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Tm9kZTo6ZGlzcGF0Y2hHZW5lcmljRXZlbnQpOgorICAgICAgICAqIHBhZ2Uv RE9NV2luZG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVdpbmRvdzo6ZGlzcGF0Y2hFdmVu dCk6CisKIDIwMTAtMDMtMzAgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUu Y29tPgogCiAgICAgICAgIFJ1YmJlciBzdGFtcGVkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQg YS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4UHJveHkuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9W OFByb3h5LmNwcAppbmRleCBmNmQ3NDNkLi41YzMzNjI5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4UHJveHkuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5j cHAKQEAgLTQ5NCw3ICs0OTQsNyBAQCB2ODo6TG9jYWw8djg6OlZhbHVlPiBWOFByb3h5OjpjYWxs RnVuY3Rpb24odjg6OkhhbmRsZTx2ODo6RnVuY3Rpb24+IGZ1bmN0aW9uLCB2OAogICAgICAgICBt X3JlY3Vyc2lvbi0tOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICAgICAgaWYgKHRpbWVs aW5lQWdlbnQgJiYgbV9mcmFtZS0+cGFnZSgpICYmIHRpbWVsaW5lQWdlbnQgPT0gbV9mcmFtZS0+ cGFnZSgpLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCkpCisgICAgICAgIGlmICh0aW1lbGluZUFn ZW50KQogICAgICAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkQ2FsbEZ1bmN0aW9uKCk7CiAjZW5k aWYgLy8gIUVOQUJMRShJTlNQRUNUT1IpCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL05vZGUu Y3BwIGIvV2ViQ29yZS9kb20vTm9kZS5jcHAKaW5kZXggNTJhYWVlZC4uNmRlZDc3ZCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9kb20vTm9kZS5jcHAKKysrIGIvV2ViQ29yZS9kb20vTm9kZS5jcHAKQEAg LTI2OTcsNyArMjY5Nyw3IEBAIGRvbmVEaXNwYXRjaGluZzoKIAogZG9uZVdpdGhEZWZhdWx0Ogog I2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgaWYgKHRpbWVsaW5lQWdlbnRJc0FjdGl2ZSAmJiAo dGltZWxpbmVBZ2VudCA9IGRvY3VtZW50KCktPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkpCisg ICAgaWYgKHRpbWVsaW5lQWdlbnRJc0FjdGl2ZSkKICAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlk RGlzcGF0Y2hFdmVudCgpOwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9ET01X aW5kb3cuY3BwIGIvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKaW5kZXggNzUwZmZkNS4uZGJl MTFhZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKKysrIGIvV2ViQ29y ZS9wYWdlL0RPTVdpbmRvdy5jcHAKQEAgLTE0NDIsMTEgKzE0NDIsOCBAQCBib29sIERPTVdpbmRv dzo6ZGlzcGF0Y2hFdmVudChQYXNzUmVmUHRyPEV2ZW50PiBwcnBFdmVudCwgUGFzc1JlZlB0cjxF dmVudFRhcmdldAogICAgIGJvb2wgcmVzdWx0ID0gZmlyZUV2ZW50TGlzdGVuZXJzKGV2ZW50Lmdl dCgpKTsKIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgaWYgKHRpbWVsaW5lQWdlbnRJc0Fj dGl2ZSkgewotICAgICAgdGltZWxpbmVBZ2VudCA9IGluc3BlY3RvclRpbWVsaW5lQWdlbnQoKTsK LSAgICAgIGlmICh0aW1lbGluZUFnZW50KQorICAgIGlmICh0aW1lbGluZUFnZW50SXNBY3RpdmUg JiYgdGltZWxpbmVBZ2VudCkKICAgICAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZERpc3BhdGNo RXZlbnQoKTsKLSAgICB9CiAjZW5kaWYKIAogICAgIHJldHVybiByZXN1bHQ7Cg== 52291 2010-04-01 06:47:26 -0700 2010-04-01 10:16:28 -0700 [patch] Second iteration. patch text/plain 5692 loislo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTFmMWNjYy4uMWJhOTA2MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wMy0zMSAgSWx5YSBUaWtob25v dnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU29tZXRpbWVzIGpzIGNvZGUgY2Fu IGRldGFjaCBwYWdlIGZyb20gaXQncyBmcmFtZSBhbmQgaW4gdGhhdCBjYXNlCisgICAgICAgIERp c3BhdGNoIEV2ZW50cyB3aWxsIHN0YXkgaW4gdGhlIFRpbWVsaW5lQWdlbnQncyBldmVudHMgc3Rh Y2suIE9ubHkgaW1tZWRpYXRlIGV2ZW50cyB3aWxsCisgICAgICAgIGFwcGVhciBhdCBmcm9udGVu ZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2ODkw CisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFByb3h5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlY4UHJveHk6OmNhbGxGdW5jdGlvbik6CisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Tm9kZTo6ZGlzcGF0Y2hHZW5lcmljRXZlbnQpOgorICAgICAgICAqIHBhZ2Uv RE9NV2luZG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVdpbmRvdzo6ZGlzcGF0Y2hFdmVu dCk6CisKIDIwMTAtMDMtMzEgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTmF0ZSBDaGFwaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4UHJveHkuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcApp bmRleCBmNmQ3NDNkLi4zMmEyZmQzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 UHJveHkuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAKQEAgLTQ3Niwx NSArNDc2LDE1IEBAIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4UHJveHk6OmNhbGxGdW5jdGlvbih2 ODo6SGFuZGxlPHY4OjpGdW5jdGlvbj4gZnVuY3Rpb24sIHY4CiAgICAgICAgIG1fZnJhbWUtPmtl ZXBBbGl2ZSgpOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICAgICAgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IDA7Ci0gICAgICAgIGlmIChJbnNwZWN0b3JUaW1l bGluZUFnZW50OjppbnN0YW5jZUNvdW50KCkpIHsKLSAgICAgICAgICAgIHRpbWVsaW5lQWdlbnQg PSBtX2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1lLT5wYWdlKCktPmluc3BlY3RvclRpbWVsaW5lQWdl bnQoKSA6IDA7CisgICAgICAgIFBhZ2UqIGluc3BlY3RlZFBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7 CisgICAgICAgIGlmIChpbnNwZWN0ZWRQYWdlICYmIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6Omlu c3RhbmNlQ291bnQoKSkgeworICAgICAgICAgICAgSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGlt ZWxpbmVBZ2VudCA9IGluc3BlY3RlZFBhZ2UtPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKTsKICAg ICAgICAgICAgIGlmICh0aW1lbGluZUFnZW50KSB7CiAgICAgICAgICAgICAgICAgdjg6OlNjcmlw dE9yaWdpbiBvcmlnaW4gPSBmdW5jdGlvbi0+R2V0U2NyaXB0T3JpZ2luKCk7CiAgICAgICAgICAg ICAgICAgaWYgKCFvcmlnaW4uUmVzb3VyY2VOYW1lKCkuSXNFbXB0eSgpKQotICAgICAgICAgICAg ICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsQ2FsbEZ1bmN0aW9uKHY4VmFsdWVUb1dlYkNvcmVT dHJpbmcob3JpZ2luLlJlc291cmNlTmFtZSgpKSwgZnVuY3Rpb24tPkdldFNjcmlwdExpbmVOdW1i ZXIoKSArIDEpOworICAgICAgICAgICAgICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsQ2FsbEZ1 bmN0aW9uKHRvV2ViQ29yZVN0cmluZyhvcmlnaW4uUmVzb3VyY2VOYW1lKCkpLCBmdW5jdGlvbi0+ R2V0U2NyaXB0TGluZU51bWJlcigpICsgMSk7CiAgICAgICAgICAgICAgICAgZWxzZQotICAgICAg ICAgICAgICAgICAgICB0aW1lbGluZUFnZW50ID0gMDsKKyAgICAgICAgICAgICAgICAgICAgaW5z cGVjdGVkUGFnZSA9IDA7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICNlbmRpZiAvLyAhRU5B QkxFKElOU1BFQ1RPUikKQEAgLTQ5NCw4ICs0OTQsMTEgQEAgdjg6OkxvY2FsPHY4OjpWYWx1ZT4g VjhQcm94eTo6Y2FsbEZ1bmN0aW9uKHY4OjpIYW5kbGU8djg6OkZ1bmN0aW9uPiBmdW5jdGlvbiwg djgKICAgICAgICAgbV9yZWN1cnNpb24tLTsKIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAg ICAgIGlmICh0aW1lbGluZUFnZW50ICYmIG1fZnJhbWUtPnBhZ2UoKSAmJiB0aW1lbGluZUFnZW50 ID09IG1fZnJhbWUtPnBhZ2UoKS0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpKQotICAgICAgICAg ICAgdGltZWxpbmVBZ2VudC0+ZGlkQ2FsbEZ1bmN0aW9uKCk7CisgICAgICAgIGlmIChpbnNwZWN0 ZWRQYWdlKSB7CisgICAgICAgICAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFn ZW50ID0gaW5zcGVjdGVkUGFnZS0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpOworICAgICAgICAg ICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAgICAgICAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlk Q2FsbEZ1bmN0aW9uKCk7CisgICAgICAgIH0KICNlbmRpZiAvLyAhRU5BQkxFKElOU1BFQ1RPUikK IAogICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL05vZGUuY3BwIGIvV2ViQ29yZS9kb20v Tm9kZS5jcHAKaW5kZXggNTJhYWVlZC4uYjJjMGYwNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20v Tm9kZS5jcHAKKysrIGIvV2ViQ29yZS9kb20vTm9kZS5jcHAKQEAgLTI2MTAsMTAgKzI2MTAsMTUg QEAgYm9vbCBOb2RlOjpkaXNwYXRjaEdlbmVyaWNFdmVudChQYXNzUmVmUHRyPEV2ZW50PiBwcnBF dmVudCkKICAgICB9CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIEluc3BlY3RvclRpbWVs aW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBkb2N1bWVudCgpLT5pbnNwZWN0b3JUaW1lbGluZUFn ZW50KCk7Ci0gICAgYm9vbCB0aW1lbGluZUFnZW50SXNBY3RpdmUgPSB0aW1lbGluZUFnZW50ICYm IGV2ZW50SGFzTGlzdGVuZXJzKGV2ZW50LT50eXBlKCksIHRhcmdldEZvcldpbmRvd0V2ZW50cywg dGhpcywgYW5jZXN0b3JzKTsKLSAgICBpZiAodGltZWxpbmVBZ2VudElzQWN0aXZlKQotICAgICAg ICB0aW1lbGluZUFnZW50LT53aWxsRGlzcGF0Y2hFdmVudCgqZXZlbnQpOworICAgIFBhZ2UqIGlu c3BlY3RlZFBhZ2UgPSBkb2N1bWVudCgpLT5wYWdlKCk7CisgICAgaWYgKGluc3BlY3RlZFBhZ2Up IHsKKyAgICAgICAgSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IGluc3Bl Y3RlZFBhZ2UtPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKTsKKyAgICAgICAgYm9vbCB0aW1lbGlu ZUFnZW50SXNBY3RpdmUgPSB0aW1lbGluZUFnZW50ICYmIGV2ZW50SGFzTGlzdGVuZXJzKGV2ZW50 LT50eXBlKCksIHRhcmdldEZvcldpbmRvd0V2ZW50cywgdGhpcywgYW5jZXN0b3JzKTsKKyAgICAg ICAgaWYgKHRpbWVsaW5lQWdlbnRJc0FjdGl2ZSkKKyAgICAgICAgICAgIHRpbWVsaW5lQWdlbnQt PndpbGxEaXNwYXRjaEV2ZW50KCpldmVudCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGlu c3BlY3RlZFBhZ2UgPSAwOworICAgIH0KICNlbmRpZgogCiAgICAgLy8gR2l2ZSB0aGUgdGFyZ2V0 IG5vZGUgYSBjaGFuY2UgdG8gZG8gc29tZSB3b3JrIGJlZm9yZSBET00gZXZlbnQgaGFuZGxlcnMg Z2V0IGEgY3JhY2suCkBAIC0yNjk3LDggKzI3MDIsMTEgQEAgZG9uZURpc3BhdGNoaW5nOgogCiBk b25lV2l0aERlZmF1bHQ6CiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBpZiAodGltZWxpbmVB Z2VudElzQWN0aXZlICYmICh0aW1lbGluZUFnZW50ID0gZG9jdW1lbnQoKS0+aW5zcGVjdG9yVGlt ZWxpbmVBZ2VudCgpKSkKLSAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkRGlzcGF0Y2hFdmVudCgp OworICAgIGlmIChpbnNwZWN0ZWRQYWdlKSB7CisgICAgICAgIEluc3BlY3RvclRpbWVsaW5lQWdl bnQqIHRpbWVsaW5lQWdlbnQgPSBpbnNwZWN0ZWRQYWdlLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50 KCk7CisgICAgICAgIGlmICh0aW1lbGluZUFnZW50KQorICAgICAgICAgICAgdGltZWxpbmVBZ2Vu dC0+ZGlkRGlzcGF0Y2hFdmVudCgpOworICAgIH0KICNlbmRpZgogCiAgICAgRG9jdW1lbnQ6OnVw ZGF0ZVN0eWxlRm9yQWxsRG9jdW1lbnRzKCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRE9N V2luZG93LmNwcCBiL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCmluZGV4IDc1MGZmZDUuLmQ4 MjY3NTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCisrKyBiL1dlYkNv cmUvcGFnZS9ET01XaW5kb3cuY3BwCkBAIC0xNDMzLDE4ICsxNDMzLDIzIEBAIGJvb2wgRE9NV2lu ZG93OjpkaXNwYXRjaEV2ZW50KFBhc3NSZWZQdHI8RXZlbnQ+IHBycEV2ZW50LCBQYXNzUmVmUHRy PEV2ZW50VGFyZ2V0CiAgICAgZXZlbnQtPnNldEV2ZW50UGhhc2UoRXZlbnQ6OkFUX1RBUkdFVCk7 CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRp bWVsaW5lQWdlbnQgPSBpbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7Ci0gICAgYm9vbCB0aW1lbGlu ZUFnZW50SXNBY3RpdmUgPSB0aW1lbGluZUFnZW50ICYmIGhhc0V2ZW50TGlzdGVuZXJzKGV2ZW50 LT50eXBlKCkpOwotICAgIGlmICh0aW1lbGluZUFnZW50SXNBY3RpdmUpCi0gICAgICAgIHRpbWVs aW5lQWdlbnQtPndpbGxEaXNwYXRjaEV2ZW50KCpldmVudCk7CisgICAgUGFnZSogaW5zcGVjdGVk UGFnZSA9IGZyYW1lKCkgPyBmcmFtZSgpLT5wYWdlKCkgOiAwOworICAgIGlmIChpbnNwZWN0ZWRQ YWdlKSB7CisgICAgICAgIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBp bnNwZWN0ZWRQYWdlLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7CisgICAgICAgIGJvb2wgdGlt ZWxpbmVBZ2VudElzQWN0aXZlID0gdGltZWxpbmVBZ2VudCAmJiBoYXNFdmVudExpc3RlbmVycyhl dmVudC0+dHlwZSgpKTsKKyAgICAgICAgaWYgKHRpbWVsaW5lQWdlbnRJc0FjdGl2ZSkKKyAgICAg ICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxEaXNwYXRjaEV2ZW50KCpldmVudCk7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIGluc3BlY3RlZFBhZ2UgPSAwOworICAgIH0KICNlbmRpZgogCiAg ICAgYm9vbCByZXN1bHQgPSBmaXJlRXZlbnRMaXN0ZW5lcnMoZXZlbnQuZ2V0KCkpOwogCiAjaWYg RU5BQkxFKElOU1BFQ1RPUikKLSAgICBpZiAodGltZWxpbmVBZ2VudElzQWN0aXZlKSB7Ci0gICAg ICB0aW1lbGluZUFnZW50ID0gaW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpOwotICAgICAgaWYgKHRp bWVsaW5lQWdlbnQpCisgICAgaWYgKGluc3BlY3RlZFBhZ2UpIHsKKyAgICAgICAgSW5zcGVjdG9y VGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IGluc3BlY3RlZFBhZ2UtPmluc3BlY3RvclRp bWVsaW5lQWdlbnQoKTsKKyAgICAgICAgaWYgKHRpbWVsaW5lQWdlbnQpCiAgICAgICAgICAgICB0 aW1lbGluZUFnZW50LT5kaWREaXNwYXRjaEV2ZW50KCk7CiAgICAgfQogI2VuZGlmCg== 52307 2010-04-01 10:16:28 -0700 2010-04-01 12:58:41 -0700 [patch] Third iteration. patch.3 text/plain 5823 loislo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTFmMWNjYy4uMWJhOTA2MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wMy0zMSAgSWx5YSBUaWtob25v dnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU29tZXRpbWVzIGpzIGNvZGUgY2Fu IGRldGFjaCBwYWdlIGZyb20gaXQncyBmcmFtZSBhbmQgaW4gdGhhdCBjYXNlCisgICAgICAgIERp c3BhdGNoIEV2ZW50cyB3aWxsIHN0YXkgaW4gdGhlIFRpbWVsaW5lQWdlbnQncyBldmVudHMgc3Rh Y2suIE9ubHkgaW1tZWRpYXRlIGV2ZW50cyB3aWxsCisgICAgICAgIGFwcGVhciBhdCBmcm9udGVu ZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2ODkw CisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFByb3h5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlY4UHJveHk6OmNhbGxGdW5jdGlvbik6CisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Tm9kZTo6ZGlzcGF0Y2hHZW5lcmljRXZlbnQpOgorICAgICAgICAqIHBhZ2Uv RE9NV2luZG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVdpbmRvdzo6ZGlzcGF0Y2hFdmVu dCk6CisKIDIwMTAtMDMtMzEgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTmF0ZSBDaGFwaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4UHJveHkuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcApp bmRleCBmNmQ3NDNkLi40MTY5ZjEyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 UHJveHkuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAKQEAgLTQ3Niwx NyArNDc2LDE5IEBAIHY4OjpMb2NhbDx2ODo6VmFsdWU+IFY4UHJveHk6OmNhbGxGdW5jdGlvbih2 ODo6SGFuZGxlPHY4OjpGdW5jdGlvbj4gZnVuY3Rpb24sIHY4CiAgICAgICAgIG1fZnJhbWUtPmtl ZXBBbGl2ZSgpOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICAgICAgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IDA7Ci0gICAgICAgIGlmIChJbnNwZWN0b3JUaW1l bGluZUFnZW50OjppbnN0YW5jZUNvdW50KCkpIHsKLSAgICAgICAgICAgIHRpbWVsaW5lQWdlbnQg PSBtX2ZyYW1lLT5wYWdlKCkgPyBtX2ZyYW1lLT5wYWdlKCktPmluc3BlY3RvclRpbWVsaW5lQWdl bnQoKSA6IDA7Ci0gICAgICAgICAgICBpZiAodGltZWxpbmVBZ2VudCkgeworICAgICAgICBQYWdl KiBpbnNwZWN0ZWRQYWdlID0gSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6aW5zdGFuY2VDb3VudCgp ID8gbV9mcmFtZS0+cGFnZSgpOiAwOworICAgICAgICBpZiAoaW5zcGVjdGVkUGFnZSkKKyAgICAg ICAgICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5zcGVj dGVkUGFnZS0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpKSB7CiAgICAgICAgICAgICAgICAgdjg6 OlNjcmlwdE9yaWdpbiBvcmlnaW4gPSBmdW5jdGlvbi0+R2V0U2NyaXB0T3JpZ2luKCk7Ci0gICAg ICAgICAgICAgICAgaWYgKCFvcmlnaW4uUmVzb3VyY2VOYW1lKCkuSXNFbXB0eSgpKQotICAgICAg ICAgICAgICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsQ2FsbEZ1bmN0aW9uKHY4VmFsdWVUb1dl YkNvcmVTdHJpbmcob3JpZ2luLlJlc291cmNlTmFtZSgpKSwgZnVuY3Rpb24tPkdldFNjcmlwdExp bmVOdW1iZXIoKSArIDEpOwotICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAg ICAgdGltZWxpbmVBZ2VudCA9IDA7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KKyAgICAgICAg ICAgICAgICBTdHJpbmcgcmVzb3VyY2VOYW1lKCJ1bmRlZmluZWQiKTsKKyAgICAgICAgICAgICAg ICBpbnQgbGluZU51bWJlciA9IDE7CisgICAgICAgICAgICAgICAgaWYgKCFvcmlnaW4uUmVzb3Vy Y2VOYW1lKCkuSXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgICAgIHJlc291cmNlTmFtZSA9 IHRvV2ViQ29yZVN0cmluZyhvcmlnaW4uUmVzb3VyY2VOYW1lKCkpOworICAgICAgICAgICAgICAg ICAgICBsaW5lTnVtYmVyID0gZnVuY3Rpb24tPkdldFNjcmlwdExpbmVOdW1iZXIoKSArIDE7Cisg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxDYWxs RnVuY3Rpb24ocmVzb3VyY2VOYW1lLCBsaW5lTnVtYmVyKTsKKyAgICAgICAgICAgIH0gZWxzZQor ICAgICAgICAgICAgICAgIGluc3BlY3RlZFBhZ2UgPSAwOwogI2VuZGlmIC8vICFFTkFCTEUoSU5T UEVDVE9SKQogCiAgICAgICAgIG1fcmVjdXJzaW9uKys7CkBAIC00OTQsOCArNDk2LDkgQEAgdjg6 OkxvY2FsPHY4OjpWYWx1ZT4gVjhQcm94eTo6Y2FsbEZ1bmN0aW9uKHY4OjpIYW5kbGU8djg6OkZ1 bmN0aW9uPiBmdW5jdGlvbiwgdjgKICAgICAgICAgbV9yZWN1cnNpb24tLTsKIAogI2lmIEVOQUJM RShJTlNQRUNUT1IpCi0gICAgICAgIGlmICh0aW1lbGluZUFnZW50ICYmIG1fZnJhbWUtPnBhZ2Uo KSAmJiB0aW1lbGluZUFnZW50ID09IG1fZnJhbWUtPnBhZ2UoKS0+aW5zcGVjdG9yVGltZWxpbmVB Z2VudCgpKQotICAgICAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkQ2FsbEZ1bmN0aW9uKCk7Cisg ICAgICAgIGlmIChpbnNwZWN0ZWRQYWdlKQorICAgICAgICAgICAgaWYgKEluc3BlY3RvclRpbWVs aW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBpbnNwZWN0ZWRQYWdlLT5pbnNwZWN0b3JUaW1lbGlu ZUFnZW50KCkpCisgICAgICAgICAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkQ2FsbEZ1bmN0aW9u KCk7CiAjZW5kaWYgLy8gIUVOQUJMRShJTlNQRUNUT1IpCiAKICAgICB9CmRpZmYgLS1naXQgYS9X ZWJDb3JlL2RvbS9Ob2RlLmNwcCBiL1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IDUyYWFlZWQu LmE5NWZmMzkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL05vZGUuY3BwCisrKyBiL1dlYkNvcmUv ZG9tL05vZGUuY3BwCkBAIC0yNjEwLDEwICsyNjEwLDEyIEBAIGJvb2wgTm9kZTo6ZGlzcGF0Y2hH ZW5lcmljRXZlbnQoUGFzc1JlZlB0cjxFdmVudD4gcHJwRXZlbnQpCiAgICAgfQogCiAjaWYgRU5B QkxFKElOU1BFQ1RPUikKLSAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50 ID0gZG9jdW1lbnQoKS0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpOwotICAgIGJvb2wgdGltZWxp bmVBZ2VudElzQWN0aXZlID0gdGltZWxpbmVBZ2VudCAmJiBldmVudEhhc0xpc3RlbmVycyhldmVu dC0+dHlwZSgpLCB0YXJnZXRGb3JXaW5kb3dFdmVudHMsIHRoaXMsIGFuY2VzdG9ycyk7Ci0gICAg aWYgKHRpbWVsaW5lQWdlbnRJc0FjdGl2ZSkKLSAgICAgICAgdGltZWxpbmVBZ2VudC0+d2lsbERp c3BhdGNoRXZlbnQoKmV2ZW50KTsKKyAgICBQYWdlKiBpbnNwZWN0ZWRQYWdlID0gSW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6aW5zdGFuY2VDb3VudCgpID8gZG9jdW1lbnQoKS0+cGFnZSgpIDogMDsK KyAgICBpZiAoaW5zcGVjdGVkUGFnZSkKKyAgICAgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdl bnQqIHRpbWVsaW5lQWdlbnQgPSBldmVudEhhc0xpc3RlbmVycyhldmVudC0+dHlwZSgpLCB0YXJn ZXRGb3JXaW5kb3dFdmVudHMsIHRoaXMsIGFuY2VzdG9ycykgPyBpbnNwZWN0ZWRQYWdlLT5pbnNw ZWN0b3JUaW1lbGluZUFnZW50KCkgOiAwKQorICAgICAgICAgICAgdGltZWxpbmVBZ2VudC0+d2ls bERpc3BhdGNoRXZlbnQoKmV2ZW50KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgaW5zcGVj dGVkUGFnZSA9IDA7CiAjZW5kaWYKIAogICAgIC8vIEdpdmUgdGhlIHRhcmdldCBub2RlIGEgY2hh bmNlIHRvIGRvIHNvbWUgd29yayBiZWZvcmUgRE9NIGV2ZW50IGhhbmRsZXJzIGdldCBhIGNyYWNr LgpAQCAtMjY5Nyw4ICsyNjk5LDkgQEAgZG9uZURpc3BhdGNoaW5nOgogCiBkb25lV2l0aERlZmF1 bHQ6CiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBpZiAodGltZWxpbmVBZ2VudElzQWN0aXZl ICYmICh0aW1lbGluZUFnZW50ID0gZG9jdW1lbnQoKS0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgp KSkKLSAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkRGlzcGF0Y2hFdmVudCgpOworICAgIGlmIChp bnNwZWN0ZWRQYWdlKQorICAgICAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxp bmVBZ2VudCA9IGluc3BlY3RlZFBhZ2UtPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKKyAgICAg ICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZERpc3BhdGNoRXZlbnQoKTsKICNlbmRpZgogCiAgICAg RG9jdW1lbnQ6OnVwZGF0ZVN0eWxlRm9yQWxsRG9jdW1lbnRzKCk7CmRpZmYgLS1naXQgYS9XZWJD b3JlL3BhZ2UvRE9NV2luZG93LmNwcCBiL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCmluZGV4 IDc1MGZmZDUuLjdlZDNmMDggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3Bw CisrKyBiL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCkBAIC0xNDMzLDIwICsxNDMzLDIwIEBA IGJvb2wgRE9NV2luZG93OjpkaXNwYXRjaEV2ZW50KFBhc3NSZWZQdHI8RXZlbnQ+IHBycEV2ZW50 LCBQYXNzUmVmUHRyPEV2ZW50VGFyZ2V0CiAgICAgZXZlbnQtPnNldEV2ZW50UGhhc2UoRXZlbnQ6 OkFUX1RBUkdFVCk7CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIEluc3BlY3RvclRpbWVs aW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBpbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7Ci0gICAg Ym9vbCB0aW1lbGluZUFnZW50SXNBY3RpdmUgPSB0aW1lbGluZUFnZW50ICYmIGhhc0V2ZW50TGlz dGVuZXJzKGV2ZW50LT50eXBlKCkpOwotICAgIGlmICh0aW1lbGluZUFnZW50SXNBY3RpdmUpCi0g ICAgICAgIHRpbWVsaW5lQWdlbnQtPndpbGxEaXNwYXRjaEV2ZW50KCpldmVudCk7CisgICAgUGFn ZSogaW5zcGVjdGVkUGFnZSA9IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6Omluc3RhbmNlQ291bnQo KSAmJiBmcmFtZSgpID8gZnJhbWUoKS0+cGFnZSgpIDogMDsKKyAgICBpZiAoaW5zcGVjdGVkUGFn ZSkKKyAgICAgICAgaWYgKEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIHRpbWVsaW5lQWdlbnQgPSBo YXNFdmVudExpc3RlbmVycyhldmVudC0+dHlwZSgpKSA/IGluc3BlY3RlZFBhZ2UtPmluc3BlY3Rv clRpbWVsaW5lQWdlbnQoKSA6IDApCisgICAgICAgICAgICB0aW1lbGluZUFnZW50LT53aWxsRGlz cGF0Y2hFdmVudCgqZXZlbnQpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBpbnNwZWN0ZWRQ YWdlID0gMDsKICNlbmRpZgogCiAgICAgYm9vbCByZXN1bHQgPSBmaXJlRXZlbnRMaXN0ZW5lcnMo ZXZlbnQuZ2V0KCkpOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBpZiAodGltZWxpbmVB Z2VudElzQWN0aXZlKSB7Ci0gICAgICB0aW1lbGluZUFnZW50ID0gaW5zcGVjdG9yVGltZWxpbmVB Z2VudCgpOwotICAgICAgaWYgKHRpbWVsaW5lQWdlbnQpCisgICAgaWYgKGluc3BlY3RlZFBhZ2Up CisgICAgICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gaW5z cGVjdGVkUGFnZS0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpKQogICAgICAgICAgICAgdGltZWxp bmVBZ2VudC0+ZGlkRGlzcGF0Y2hFdmVudCgpOwotICAgIH0KICNlbmRpZgogCiAgICAgcmV0dXJu IHJlc3VsdDsK