33317 2010-01-07 03:34:21 -0800 Document::minimumLayoutDelay() should return unsigned, rather than int 2010-06-10 20:36:53 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All ASSIGNED P2 Normal --- 1 steveblock steveblock darin ddkilzer steveblock webkit.review.bot oldest_to_newest 178119 0 steveblock 2010-01-07 03:34:21 -0800 Document::minimumLayoutDelay() should return unsigned, rather than int. Correspondingly, the variables and helper functions used in this method should be updated to use unsigned. See Bug 32875. 178243 1 46061 steveblock 2010-01-07 10:10:03 -0800 Created attachment 46061 Patch 1 for Bug 33317 178245 2 webkit.review.bot 2010-01-07 10:12:18 -0800 style-queue ran check-webkit-style on attachment 46061 without any errors. 178247 3 46061 darin 2010-01-07 10:14:07 -0800 Comment on attachment 46061 Patch 1 for Bug 33317 The other changes seem ideal, but I am slightly worried about elapsedTime. Are you sure we won't change behavior here by turning "moving backward in time" cases that might occur due to time changes into "move forward by MAX_UINT" cases? 178252 4 steveblock 2010-01-07 10:31:52 -0800 (In reply to comment #3) > (From update of attachment 46061 [details]) > The other changes seem ideal, but I am slightly worried about elapsedTime. Are > you sure we won't change behavior here by turning "moving backward in time" > cases that might occur due to time changes into "move forward by MAX_UINT" > cases? Good point. Since the result of elapsedTime is always intended to be non-negative, presumably the right thing to do is to have it return the following? currentTime() > m_startTime ? currentTime() - m_startTime : 0 This is a behavior change from "moving backward in time" to "no movement in time", but makes it more explicit. 179250 5 darin 2010-01-10 20:52:24 -0800 (In reply to comment #4) > (In reply to comment #3) > Good point. Since the result of elapsedTime is always intended to be > non-negative, presumably the right thing to do is to have it return the > following? > > currentTime() > m_startTime ? currentTime() - m_startTime : 0 > > This is a behavior change from "moving backward in time" to "no movement in > time", but makes it more explicit. Sure, seems good. The key is probably to find a way to test it. 183494 6 46061 levin 2010-01-21 22:48:24 -0800 Comment on attachment 46061 Patch 1 for Bug 33317 r- for two reasons: 1. This patch/changelog doesn't mention why this needs to be done only what (and I personally hate unsigned -- been burned in the past by subtle bugs of the nature that Darin mentioned). If there was a "why", perhaps we could discuss alternatives :) 2. Is there a way to address Darin Adler's last comment? 183561 7 steveblock 2010-01-22 02:11:38 -0800 > 1. This patch/changelog doesn't mention why this needs to be done only what The only motivation was Eric's comment on the bug in which I added minimumLayoutDelay. See https://bugs.webkit.org/show_bug.cgi?id=32875#c14 and later comments in that bug. > 2. Is there a way to address Darin Adler's last comment? I haven't yet looked into testing. 46061 2010-01-07 10:10:03 -0800 2010-06-10 20:36:53 -0700 Patch 1 for Bug 33317 unsignedTimeout.txt text/plain 14023 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MjkyOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzcgQEAKKzIwMTAtMDEtMDcgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IERvY3VtZW50OjptaW5pbXVtTGF5b3V0RGVsYXkoKSBzaG91bGQgcmV0dXJuIHVuc2lnbmVkLCBy YXRoZXIgdGhhbiBpbnQgKGVkaXQpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zMzMxNworCisgICAgICAgIE5vIG5ldyB0ZXN0cyBwb3NzaWJsZS4KKwor ICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6IE1vZGlmaWVkLgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnQ6OmltcGxpY2l0Q2xvc2UpOiBNb2RpZmllZC4gVXNlcyB1bnNpZ25lZCB0eXBlIGZv ciBwcmludGYuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c2V0UGFyc2luZyk6IE1vZGlm aWVkLiBVc2VzIHVuc2lnbmVkIHR5cGUgZm9yIHByaW50Zi4KKyAgICAgICAgKFdlYkNvcmU6OkRv Y3VtZW50OjptaW5pbXVtTGF5b3V0RGVsYXkpOiBNb2RpZmllZC4gTm93IHJldHVybnMgdW5zaWdu ZWQuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6ZWxhcHNlZFRpbWUpOiBNb2RpZmllZC4g Tm93IHJldHVybnMgdW5zaWduZWQuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6d3JpdGUp OiBNb2RpZmllZC4gVXNlcyB1bnNpZ25lZCB0eXBlIGZvciBwcmludGYuCisgICAgICAgIChXZWJD b3JlOjpEb2N1bWVudDo6ZmluaXNoUGFyc2luZyk6IE1vZGlmaWVkLiBVc2VzIHVuc2lnbmVkIHR5 cGUgZm9yIHByaW50Zi4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpyZW1vdmVQZW5kaW5n U2hlZXQpOiBNb2RpZmllZC4gVXNlcyB1bnNpZ25lZCB0eXBlIGZvciBwcmludGYuCisgICAgICAg IChXZWJDb3JlOjpEb2N1bWVudDo6dXBkYXRlU3R5bGVTZWxlY3Rvcik6IE1vZGlmaWVkLiBVc2Vz IHVuc2lnbmVkIHR5cGUgZm9yIHByaW50Zi4KKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDogTW9k aWZpZWQuCisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c2V0RXh0cmFMYXlvdXREZWxheSk6 IE1vZGlmaWVkLiBOb3cgcmV0dXJucyB1bnNpZ25lZC4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3Vt ZW50OjplbGFwc2VkVGltZSk6IE1vZGlmaWVkLiBOb3cgcmV0dXJucyB1bnNpZ25lZC4KKyAgICAg ICAgKiBodG1sL0hUTUxUb2tlbml6ZXIuY3BwOiBNb2RpZmllZC4KKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxUb2tlbml6ZXI6OnNjcmlwdEhhbmRsZXIpOiBNb2RpZmllZC4gVXNlcyB1bnNpZ25lZCB0 eXBlIGZvciBwcmludGYuCisgICAgICAgIChXZWJDb3JlOjpIVE1MVG9rZW5pemVyOjpzY3JpcHRF eGVjdXRpb24pOiBNb2RpZmllZC4gVXNlcyB1bnNpZ25lZCB0eXBlIGZvciBwcmludGYuCisgICAg ICAgIChXZWJDb3JlOjpIVE1MVG9rZW5pemVyOjp3cml0ZSk6IE1vZGlmaWVkLiBVc2VzIHVuc2ln bmVkIHR5cGUgZm9yIHByaW50Zi4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUb2tlbml6ZXI6OnRp bWVyRmlyZWQpOiBNb2RpZmllZC4gVXNlcyB1bnNpZ25lZCB0eXBlIGZvciBwcmludGYuCisgICAg ICAgIChXZWJDb3JlOjpIVE1MVG9rZW5pemVyOjpleGVjdXRlRXh0ZXJuYWxTY3JpcHRzSWZSZWFk eSk6IE1vZGlmaWVkLiBVc2VzIHVuc2lnbmVkIHR5cGUgZm9yIHByaW50Zi4KKyAgICAgICAgKiBw YWdlL0ZyYW1lVmlldy5jcHA6IE1vZGlmaWVkLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3 OjpsYXlvdXQpOiBNb2RpZmllZC4gVXNlcyB1bnNpZ25lZCB0eXBlIGZvciBwcmludGYuCisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmxheW91dFRpbWVyRmlyZWQpOiBNb2RpZmllZC4gVXNl cyB1bnNpZ25lZCB0eXBlIGZvciBwcmludGYuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6 OnNjaGVkdWxlUmVsYXlvdXQpOiBNb2RpZmllZC4gVXNlIHVuc2lnbmVkIGZvciByZXR1cm4gdmFs dWUgb2YgbWluaW11bUxheW91dERlbGF5LgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojpz Y2hlZHVsZVJlbGF5b3V0T2ZTdWJ0cmVlKTogTW9kaWZpZWQuIFVzZSB1bnNpZ25lZCBmb3IgcmV0 dXJuIHZhbHVlIG9mIG1pbmltdW1MYXlvdXREZWxheS4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l Vmlldzo6dW5zY2hlZHVsZVJlbGF5b3V0KTogTW9kaWZpZWQuIFVzZXMgdW5zaWduZWQgdHlwZSBm b3IgcHJpbnRmLgorCiAyMDEwLTAxLTA3ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5u QG5va2lhLmNvbT4KIAogICAgICAgICBSdWJiZXItc3RhbXBlZCBieSBLZW5uZXRoIFJvaGRlIENo cmlzdGlhbnNlbi4KSW5kZXg6IFdlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHJldmlzaW9uIDUyOTE5KQorKysgV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDIsNyArMjAyLDcgQEAgdXNpbmcg bmFtZXNwYWNlIEhUTUxOYW1lczsKIC8vIFRoaXMgYW1vdW50IG9mIHRpbWUgbXVzdCBoYXZlIGVs YXBzZWQgYmVmb3JlIHdlIHdpbGwgZXZlbiBjb25zaWRlciBzY2hlZHVsaW5nIGEgbGF5b3V0IHdp dGhvdXQgYSBkZWxheS4KIC8vIEZJWE1FOiBGb3IgZmFzdGVyIG1hY2hpbmVzIHRoaXMgdmFsdWUg Y2FuIHJlYWxseSBiZSBsb3dlcmVkIHRvIDIwMC4gIDI1MCBpcyBhZGVxdWF0ZSwgYnV0IGEgbGl0 dGxlIGhpZ2gKIC8vIGZvciBkdWFsIEc1cy4gOikKLXN0YXRpYyBjb25zdCBpbnQgY0xheW91dFNj aGVkdWxlVGhyZXNob2xkID0gMjUwOworc3RhdGljIGNvbnN0IHVuc2lnbmVkIGNMYXlvdXRTY2hl ZHVsZVRocmVzaG9sZCA9IDI1MDsKIAogLy8gVXNlIDEgdG8gcmVwcmVzZW50IHRoZSBkb2N1bWVu dCdzIGRlZmF1bHQgZm9ybS4KIHN0YXRpYyBIVE1MRm9ybUVsZW1lbnQqIGNvbnN0IGRlZmF1bHRG b3JtID0gcmVpbnRlcnByZXRfY2FzdDxIVE1MRm9ybUVsZW1lbnQqPigxKTsKQEAgLTE3MzcsNyAr MTczNyw3IEBAIHZvaWQgRG9jdW1lbnQ6OmltcGxpY2l0Q2xvc2UoKQogICAgICAgICBmLT5sb2Fk ZXIoKS0+aGFuZGxlZE9ubG9hZEV2ZW50cygpOwogI2lmZGVmIElOU1RSVU1FTlRfTEFZT1VUX1ND SEVEVUxJTkcKICAgICBpZiAoIW93bmVyRWxlbWVudCgpKQotICAgICAgICBwcmludGYoIm9ubG9h ZCBmaXJlZCBhdCAlZFxuIiwgZWxhcHNlZFRpbWUoKSk7CisgICAgICAgIHByaW50Zigib25sb2Fk IGZpcmVkIGF0ICV1XG4iLCBlbGFwc2VkVGltZSgpKTsKICNlbmRpZgogCiAgICAgbV9wcm9jZXNz aW5nTG9hZEV2ZW50ID0gZmFsc2U7CkBAIC0xODAwLDcgKzE4MDAsNyBAQCB2b2lkIERvY3VtZW50 OjpzZXRQYXJzaW5nKGJvb2wgYikKIAogI2lmZGVmIElOU1RSVU1FTlRfTEFZT1VUX1NDSEVEVUxJ TkcKICAgICBpZiAoIW93bmVyRWxlbWVudCgpICYmICFtX2JQYXJzaW5nKQotICAgICAgICBwcmlu dGYoIlBhcnNpbmcgZmluaXNoZWQgYXQgJWRcbiIsIGVsYXBzZWRUaW1lKCkpOworICAgICAgICBw cmludGYoIlBhcnNpbmcgZmluaXNoZWQgYXQgJXVcbiIsIGVsYXBzZWRUaW1lKCkpOwogI2VuZGlm CiB9CiAKQEAgLTE4MTYsMjggKzE4MTYsMzAgQEAgYm9vbCBEb2N1bWVudDo6c2hvdWxkU2NoZWR1 bGVMYXlvdXQoKQogICAgICAgICAoZG9jdW1lbnRFbGVtZW50KCkgJiYgIWRvY3VtZW50RWxlbWVu dCgpLT5oYXNUYWdOYW1lKGh0bWxUYWcpKTsKIH0KIAotaW50IERvY3VtZW50OjptaW5pbXVtTGF5 b3V0RGVsYXkoKQordW5zaWduZWQgRG9jdW1lbnQ6Om1pbmltdW1MYXlvdXREZWxheSgpCiB7CiAg ICAgaWYgKG1fb3Zlck1pbmltdW1MYXlvdXRUaHJlc2hvbGQpCiAgICAgICAgIHJldHVybiBtX2V4 dHJhTGF5b3V0RGVsYXk7CiAgICAgCi0gICAgaW50IGVsYXBzZWQgPSBlbGFwc2VkVGltZSgpOwor ICAgIHVuc2lnbmVkIGVsYXBzZWQgPSBlbGFwc2VkVGltZSgpOwogICAgIG1fb3Zlck1pbmltdW1M YXlvdXRUaHJlc2hvbGQgPSBlbGFwc2VkID4gY0xheW91dFNjaGVkdWxlVGhyZXNob2xkOworICAg IGlmIChtX292ZXJNaW5pbXVtTGF5b3V0VGhyZXNob2xkKQorICAgICAgICByZXR1cm4gbV9leHRy YUxheW91dERlbGF5OwogICAgIAogICAgIC8vIFdlJ2xsIHdhbnQgdG8gc2NoZWR1bGUgdGhlIHRp bWVyIHRvIGZpcmUgYXQgdGhlIG1pbmltdW0gbGF5b3V0IHRocmVzaG9sZC4KLSAgICByZXR1cm4g bWF4KDAsIGNMYXlvdXRTY2hlZHVsZVRocmVzaG9sZCAtIGVsYXBzZWQpICsgbV9leHRyYUxheW91 dERlbGF5OworICAgIHJldHVybiBjTGF5b3V0U2NoZWR1bGVUaHJlc2hvbGQgLSBlbGFwc2VkICsg bV9leHRyYUxheW91dERlbGF5OwogfQogCi1pbnQgRG9jdW1lbnQ6OmVsYXBzZWRUaW1lKCkgY29u c3QKK3Vuc2lnbmVkIERvY3VtZW50OjplbGFwc2VkVGltZSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJu IHN0YXRpY19jYXN0PGludD4oKGN1cnJlbnRUaW1lKCkgLSBtX3N0YXJ0VGltZSkgKiAxMDAwKTsK KyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KChjdXJyZW50VGltZSgpIC0gbV9zdGFy dFRpbWUpICogMTAwMCk7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OndyaXRlKGNvbnN0IFNlZ21lbnRl ZFN0cmluZyYgdGV4dCwgRG9jdW1lbnQqIG93bmVyRG9jdW1lbnQpCiB7CiAjaWZkZWYgSU5TVFJV TUVOVF9MQVlPVVRfU0NIRURVTElORwogICAgIGlmICghb3duZXJFbGVtZW50KCkpCi0gICAgICAg IHByaW50ZigiQmVnaW5uaW5nIGEgZG9jdW1lbnQud3JpdGUgYXQgJWRcbiIsIGVsYXBzZWRUaW1l KCkpOworICAgICAgICBwcmludGYoIkJlZ2lubmluZyBhIGRvY3VtZW50LndyaXRlIGF0ICV1XG4i LCBlbGFwc2VkVGltZSgpKTsKICNlbmRpZgogCiAgICAgaWYgKCFtX3Rva2VuaXplcikKQEAgLTE4 NDgsNyArMTg1MCw3IEBAIHZvaWQgRG9jdW1lbnQ6OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0cmkK IAogI2lmZGVmIElOU1RSVU1FTlRfTEFZT1VUX1NDSEVEVUxJTkcKICAgICBpZiAoIW93bmVyRWxl bWVudCgpKQotICAgICAgICBwcmludGYoIkVuZGluZyBhIGRvY3VtZW50LndyaXRlIGF0ICVkXG4i LCBlbGFwc2VkVGltZSgpKTsKKyAgICAgICAgcHJpbnRmKCJFbmRpbmcgYSBkb2N1bWVudC53cml0 ZSBhdCAldVxuIiwgZWxhcHNlZFRpbWUoKSk7CiAjZW5kaWYgICAgCiB9CiAKQEAgLTE4NjcsNyAr MTg2OSw3IEBAIHZvaWQgRG9jdW1lbnQ6OmZpbmlzaFBhcnNpbmcoKQogewogI2lmZGVmIElOU1RS VU1FTlRfTEFZT1VUX1NDSEVEVUxJTkcKICAgICBpZiAoIW93bmVyRWxlbWVudCgpKQotICAgICAg ICBwcmludGYoIlJlY2VpdmVkIGFsbCBkYXRhIGF0ICVkXG4iLCBlbGFwc2VkVGltZSgpKTsKKyAg ICAgICAgcHJpbnRmKCJSZWNlaXZlZCBhbGwgZGF0YSBhdCAldVxuIiwgZWxhcHNlZFRpbWUoKSk7 CiAjZW5kaWYKICAgICAKICAgICAvLyBMZXQgdGhlIHRva2VuaXplciBnbyB0aHJvdWdoIGFzIG11 Y2ggZGF0YSBhcyBpdCBjYW4uICBUaGVyZSB3aWxsIGJlIHRocmVlIHBvc3NpYmxlIG91dGNvbWVz IGFmdGVyCkBAIC0yMzYwLDcgKzIzNjIsNyBAQCB2b2lkIERvY3VtZW50OjpyZW1vdmVQZW5kaW5n U2hlZXQoKQogICAgIAogI2lmZGVmIElOU1RSVU1FTlRfTEFZT1VUX1NDSEVEVUxJTkcKICAgICBp ZiAoIW93bmVyRWxlbWVudCgpKQotICAgICAgICBwcmludGYoIlN0eWxlc2hlZXQgbG9hZGVkIGF0 IHRpbWUgJWQuICVkIHN0eWxlc2hlZXRzIHN0aWxsIHJlbWFpbi5cbiIsIGVsYXBzZWRUaW1lKCks IG1fcGVuZGluZ1N0eWxlc2hlZXRzKTsKKyAgICAgICAgcHJpbnRmKCJTdHlsZXNoZWV0IGxvYWRl ZCBhdCB0aW1lICV1LiAlZCBzdHlsZXNoZWV0cyBzdGlsbCByZW1haW4uXG4iLCBlbGFwc2VkVGlt ZSgpLCBtX3BlbmRpbmdTdHlsZXNoZWV0cyk7CiAjZW5kaWYKIAogICAgIHVwZGF0ZVN0eWxlU2Vs ZWN0b3IoKTsKQEAgLTIzODcsNyArMjM4OSw3IEBAIHZvaWQgRG9jdW1lbnQ6OnVwZGF0ZVN0eWxl U2VsZWN0b3IoKQogCiAjaWZkZWYgSU5TVFJVTUVOVF9MQVlPVVRfU0NIRURVTElORwogICAgIGlm ICghb3duZXJFbGVtZW50KCkpCi0gICAgICAgIHByaW50ZigiQmVnaW5uaW5nIHVwZGF0ZSBvZiBz dHlsZSBzZWxlY3RvciBhdCB0aW1lICVkLlxuIiwgZWxhcHNlZFRpbWUoKSk7CisgICAgICAgIHBy aW50ZigiQmVnaW5uaW5nIHVwZGF0ZSBvZiBzdHlsZSBzZWxlY3RvciBhdCB0aW1lICV1LlxuIiwg ZWxhcHNlZFRpbWUoKSk7CiAjZW5kaWYKIAogICAgIHJlY2FsY1N0eWxlU2VsZWN0b3IoKTsKQEAg LTIzOTUsNyArMjM5Nyw3IEBAIHZvaWQgRG9jdW1lbnQ6OnVwZGF0ZVN0eWxlU2VsZWN0b3IoKQog CiAjaWZkZWYgSU5TVFJVTUVOVF9MQVlPVVRfU0NIRURVTElORwogICAgIGlmICghb3duZXJFbGVt ZW50KCkpCi0gICAgICAgIHByaW50ZigiRmluaXNoZWQgdXBkYXRlIG9mIHN0eWxlIHNlbGVjdG9y IGF0IHRpbWUgJWRcbiIsIGVsYXBzZWRUaW1lKCkpOworICAgICAgICBwcmludGYoIkZpbmlzaGVk IHVwZGF0ZSBvZiBzdHlsZSBzZWxlY3RvciBhdCB0aW1lICV1XG4iLCBlbGFwc2VkVGltZSgpKTsK ICNlbmRpZgogCiAgICAgaWYgKHJlbmRlcmVyKCkpIHsKSW5kZXg6IFdlYkNvcmUvZG9tL0RvY3Vt ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vRG9jdW1lbnQuaAkocmV2aXNpb24gNTI5 MTkpCisrKyBXZWJDb3JlL2RvbS9Eb2N1bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC01MzAsMTMg KzUzMCwxMyBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBzZXRQYXJzaW5nKGJvb2wpOwogICAg IGJvb2wgcGFyc2luZygpIGNvbnN0IHsgcmV0dXJuIG1fYlBhcnNpbmc7IH0KLSAgICBpbnQgbWlu aW11bUxheW91dERlbGF5KCk7CisgICAgdW5zaWduZWQgbWluaW11bUxheW91dERlbGF5KCk7CiAK ICAgICAvLyBUaGlzIG1ldGhvZCBpcyB1c2VkIGJ5IEFuZHJvaWQuCi0gICAgdm9pZCBzZXRFeHRy YUxheW91dERlbGF5KGludCBkZWxheSkgeyBtX2V4dHJhTGF5b3V0RGVsYXkgPSBkZWxheTsgfQor ICAgIHZvaWQgc2V0RXh0cmFMYXlvdXREZWxheSh1bnNpZ25lZCBkZWxheSkgeyBtX2V4dHJhTGF5 b3V0RGVsYXkgPSBkZWxheTsgfQogCiAgICAgYm9vbCBzaG91bGRTY2hlZHVsZUxheW91dCgpOwot ICAgIGludCBlbGFwc2VkVGltZSgpIGNvbnN0OworICAgIHVuc2lnbmVkIGVsYXBzZWRUaW1lKCkg Y29uc3Q7CiAgICAgCiAgICAgdm9pZCBzZXRUZXh0Q29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKSB7 IG1fdGV4dENvbG9yID0gY29sb3I7IH0KICAgICBDb2xvciB0ZXh0Q29sb3IoKSBjb25zdCB7IHJl dHVybiBtX3RleHRDb2xvcjsgfQpAQCAtMTA5Niw3ICsxMDk2LDcgQEAgcHJpdmF0ZToKICAgICAv LyBUaGlzIGlzIHVzZWQgdG8gaW5jcmVhc2UgdGhlIG1pbmltdW0gZGVsYXkgYmV0d2VlbiByZS1s YXlvdXRzLiBJdCBpcyBzZXQKICAgICAvLyB1c2luZyBzZXRFeHRyYUxheW91dERlbGF5IHRvIG1v ZGlmeSB0aGUgbWluaW11bSBkZWxheSB1c2VkIGF0IGRpZmZlcmVudAogICAgIC8vIHBvaW50cyBk dXJpbmcgdGhlIGxpZmV0aW1lIG9mIHRoZSBEb2N1bWVudC4KLSAgICBpbnQgbV9leHRyYUxheW91 dERlbGF5OworICAgIHVuc2lnbmVkIG1fZXh0cmFMYXlvdXREZWxheTsKIAogICAgIFZlY3Rvcjxz dGQ6OnBhaXI8U2NyaXB0RWxlbWVudERhdGEqLCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRT Y3JpcHQ+ID4gPiBtX3NjcmlwdHNUb0V4ZWN1dGVTb29uOwogICAgIFRpbWVyPERvY3VtZW50PiBt X2V4ZWN1dGVTY3JpcHRTb29uVGltZXI7CkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTFRva2VuaXpl ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxUb2tlbml6ZXIuY3BwCShyZXZp c2lvbiA1MjkxNykKKysrIFdlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDQzLDcgKzQ0Myw3IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6 ZXI6OnNjcmkKICAgICAgICAgICAgIGlmICghbV9wYXJzZXItPnNraXBNb2RlKCkgJiYgIWZvbGxv d2luZ0ZyYW1lc2V0KSB7CiAjaWZkZWYgSU5TVFJVTUVOVF9MQVlPVVRfU0NIRURVTElORwogICAg ICAgICAgICAgICAgIGlmICghbV9kb2MtPm93bmVyRWxlbWVudCgpKQotICAgICAgICAgICAgICAg ICAgICBwcmludGYoIlJlcXVlc3Rpbmcgc2NyaXB0IGF0IHRpbWUgJWRcbiIsIG1fZG9jLT5lbGFw c2VkVGltZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgcHJpbnRmKCJSZXF1ZXN0aW5nIHNjcmlw dCBhdCB0aW1lICV1XG4iLCBtX2RvYy0+ZWxhcHNlZFRpbWUoKSk7CiAjZW5kaWYKICAgICAgICAg ICAgICAgICAvLyBUaGUgcGFyc2VyIG1pZ2h0IGhhdmUgYmVlbiBzdG9wcGVkIGJ5IGZvciBleGFt cGxlIGEgd2luZG93LmNsb3NlIGNhbGwgaW4gYW4gZWFybGllciBzY3JpcHQuCiAgICAgICAgICAg ICAgICAgLy8gSWYgc28sIHdlIGRvbid0IHdhbnQgdG8gbG9hZCBzY3JpcHRzLgpAQCAtNTYzLDcg KzU2Myw3IEBAIEhUTUxUb2tlbml6ZXI6OlN0YXRlIEhUTUxUb2tlbml6ZXI6OnNjcmkKIAogI2lm ZGVmIElOU1RSVU1FTlRfTEFZT1VUX1NDSEVEVUxJTkcKICAgICBpZiAoIW1fZG9jLT5vd25lckVs ZW1lbnQoKSkKLSAgICAgICAgcHJpbnRmKCJiZWdpbm5pbmcgc2NyaXB0IGV4ZWN1dGlvbiBhdCAl ZFxuIiwgbV9kb2MtPmVsYXBzZWRUaW1lKCkpOworICAgICAgICBwcmludGYoImJlZ2lubmluZyBz Y3JpcHQgZXhlY3V0aW9uIGF0ICV1XG4iLCBtX2RvYy0+ZWxhcHNlZFRpbWUoKSk7CiAjZW5kaWYK IAogICAgIG1fc3RhdGUgPSBzdGF0ZTsKQEAgLTU3NCw3ICs1NzQsNyBAQCBIVE1MVG9rZW5pemVy OjpTdGF0ZSBIVE1MVG9rZW5pemVyOjpzY3JpCiAKICNpZmRlZiBJTlNUUlVNRU5UX0xBWU9VVF9T Q0hFRFVMSU5HCiAgICAgaWYgKCFtX2RvYy0+b3duZXJFbGVtZW50KCkpCi0gICAgICAgIHByaW50 ZigiZW5kaW5nIHNjcmlwdCBleGVjdXRpb24gYXQgJWRcbiIsIG1fZG9jLT5lbGFwc2VkVGltZSgp KTsKKyAgICAgICAgcHJpbnRmKCJlbmRpbmcgc2NyaXB0IGV4ZWN1dGlvbiBhdCAldVxuIiwgbV9k b2MtPmVsYXBzZWRUaW1lKCkpOwogI2VuZGlmCiAgICAgCiAgICAgbV9leGVjdXRpbmdTY3JpcHQt LTsKQEAgLTE2NjQsNyArMTY2NCw3IEBAIHZvaWQgSFRNTFRva2VuaXplcjo6d3JpdGUoY29uc3Qg U2VnbWVudGUKICAgICAKICNpZmRlZiBJTlNUUlVNRU5UX0xBWU9VVF9TQ0hFRFVMSU5HCiAgICAg aWYgKCFtX2RvYy0+b3duZXJFbGVtZW50KCkpCi0gICAgICAgIHByaW50ZigiQmVnaW5uaW5nIHdy aXRlIGF0IHRpbWUgJWRcbiIsIG1fZG9jLT5lbGFwc2VkVGltZSgpKTsKKyAgICAgICAgcHJpbnRm KCJCZWdpbm5pbmcgd3JpdGUgYXQgdGltZSAldVxuIiwgbV9kb2MtPmVsYXBzZWRUaW1lKCkpOwog I2VuZGlmCiAKICAgICBpbnQgcHJvY2Vzc2VkQ291bnQgPSAwOwpAQCAtMTc5Myw3ICsxNzkzLDcg QEAgdm9pZCBIVE1MVG9rZW5pemVyOjp3cml0ZShjb25zdCBTZWdtZW50ZQogICAgIAogI2lmZGVm IElOU1RSVU1FTlRfTEFZT1VUX1NDSEVEVUxJTkcKICAgICBpZiAoIW1fZG9jLT5vd25lckVsZW1l bnQoKSkKLSAgICAgICAgcHJpbnRmKCJFbmRpbmcgd3JpdGUgYXQgdGltZSAlZFxuIiwgbV9kb2Mt PmVsYXBzZWRUaW1lKCkpOworICAgICAgICBwcmludGYoIkVuZGluZyB3cml0ZSBhdCB0aW1lICV1 XG4iLCBtX2RvYy0+ZWxhcHNlZFRpbWUoKSk7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShJTlNQRUNU T1IpCkBAIC0xODMyLDcgKzE4MzIsNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OnRpbWVyRmlyZWQo VGltZXI8SFRNCiB7CiAjaWZkZWYgSU5TVFJVTUVOVF9MQVlPVVRfU0NIRURVTElORwogICAgIGlm ICghbV9kb2MtPm93bmVyRWxlbWVudCgpKQotICAgICAgICBwcmludGYoIkJlZ2lubmluZyB0aW1l ciB3cml0ZSBhdCB0aW1lICVkXG4iLCBtX2RvYy0+ZWxhcHNlZFRpbWUoKSk7CisgICAgICAgIHBy aW50ZigiQmVnaW5uaW5nIHRpbWVyIHdyaXRlIGF0IHRpbWUgJXVcbiIsIG1fZG9jLT5lbGFwc2Vk VGltZSgpKTsKICNlbmRpZgogCiAgICAgaWYgKG1fZG9jLT52aWV3KCkgJiYgbV9kb2MtPnZpZXco KS0+bGF5b3V0UGVuZGluZygpICYmICFtX2RvYy0+bWluaW11bUxheW91dERlbGF5KCkpIHsKQEAg LTIwMTksNyArMjAxOSw3IEBAIHZvaWQgSFRNTFRva2VuaXplcjo6ZXhlY3V0ZUV4dGVybmFsU2Ny aXAKIHsKICNpZmRlZiBJTlNUUlVNRU5UX0xBWU9VVF9TQ0hFRFVMSU5HCiAgICAgaWYgKCFtX2Rv Yy0+b3duZXJFbGVtZW50KCkpCi0gICAgICAgIHByaW50Zigic2NyaXB0IGxvYWRlZCBhdCAlZFxu IiwgbV9kb2MtPmVsYXBzZWRUaW1lKCkpOworICAgICAgICBwcmludGYoInNjcmlwdCBsb2FkZWQg YXQgJXVcbiIsIG1fZG9jLT5lbGFwc2VkVGltZSgpKTsKICNlbmRpZgogCiAgICAgQVNTRVJUKCFt X3BlbmRpbmdTY3JpcHRzLmlzRW1wdHkoKSk7CkBAIC0yMDUzLDcgKzIwNTMsNyBAQCB2b2lkIEhU TUxUb2tlbml6ZXI6OmV4ZWN1dGVFeHRlcm5hbFNjcmlwCiAKICNpZmRlZiBJTlNUUlVNRU5UX0xB WU9VVF9TQ0hFRFVMSU5HCiAgICAgICAgIGlmICghbV9kb2MtPm93bmVyRWxlbWVudCgpKQotICAg ICAgICAgICAgcHJpbnRmKCJleHRlcm5hbCBzY3JpcHQgYmVnaW5uaW5nIGV4ZWN1dGlvbiBhdCAl ZFxuIiwgbV9kb2MtPmVsYXBzZWRUaW1lKCkpOworICAgICAgICAgICAgcHJpbnRmKCJleHRlcm5h bCBzY3JpcHQgYmVnaW5uaW5nIGV4ZWN1dGlvbiBhdCAldVxuIiwgbV9kb2MtPmVsYXBzZWRUaW1l KCkpOwogI2VuZGlmCiAKICAgICAgICAgaWYgKGVycm9yT2NjdXJyZWQpCkBAIC0yMDc2LDcgKzIw NzYsNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OmV4ZWN1dGVFeHRlcm5hbFNjcmlwCiAgICAgICAg ICAgICBtX3N0YXRlLnNldExvYWRpbmdFeHRTY3JpcHQoZmFsc2UpOwogI2lmZGVmIElOU1RSVU1F TlRfTEFZT1VUX1NDSEVEVUxJTkcKICAgICAgICAgICAgIGlmICghbV9kb2MtPm93bmVyRWxlbWVu dCgpKQotICAgICAgICAgICAgICAgIHByaW50ZigiZXh0ZXJuYWwgc2NyaXB0IGZpbmlzaGVkIGV4 ZWN1dGlvbiBhdCAlZFxuIiwgbV9kb2MtPmVsYXBzZWRUaW1lKCkpOworICAgICAgICAgICAgICAg IHByaW50ZigiZXh0ZXJuYWwgc2NyaXB0IGZpbmlzaGVkIGV4ZWN1dGlvbiBhdCAldVxuIiwgbV9k b2MtPmVsYXBzZWRUaW1lKCkpOwogI2VuZGlmCiAgICAgICAgIH0gZWxzZSBpZiAobV9oYXNTY3Jp cHRzV2FpdGluZ0ZvclN0eWxlc2hlZXRzKSB7CiAgICAgICAgICAgICAvLyBtX2hhc1NjcmlwdHNX YWl0aW5nRm9yU3R5bGVzaGVldHMgZmxhZyBtaWdodCBoYXZlIGNoYW5nZWQgZHVyaW5nIHRoZSBz Y3JpcHQgZXhlY3V0aW9uLgpJbmRleDogV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHJldmlzaW9uIDUyOTE3KQorKysg V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYyNCw3ICs2MjQs NyBAQCB2b2lkIEZyYW1lVmlldzo6bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVlCiAgICAgICAgIH0K ICNpZmRlZiBJTlNUUlVNRU5UX0xBWU9VVF9TQ0hFRFVMSU5HCiAgICAgICAgIGlmIChtX2ZpcnN0 TGF5b3V0ICYmICFkb2N1bWVudC0+b3duZXJFbGVtZW50KCkpCi0gICAgICAgICAgICBwcmludGYo IkVsYXBzZWQgdGltZSBiZWZvcmUgZmlyc3QgbGF5b3V0OiAlZFxuIiwgZG9jdW1lbnQtPmVsYXBz ZWRUaW1lKCkpOworICAgICAgICAgICAgcHJpbnRmKCJFbGFwc2VkIHRpbWUgYmVmb3JlIGZpcnN0 IGxheW91dDogJXVcbiIsIGRvY3VtZW50LT5lbGFwc2VkVGltZSgpKTsKICNlbmRpZgogICAgIH0K IApAQCAtMTExNCw3ICsxMTE0LDcgQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dFRpbWVyRmlyZWQo VGltZXI8RgogewogI2lmZGVmIElOU1RSVU1FTlRfTEFZT1VUX1NDSEVEVUxJTkcKICAgICBpZiAo IW1fZnJhbWUtPmRvY3VtZW50KCktPm93bmVyRWxlbWVudCgpKQotICAgICAgICBwcmludGYoIkxh eW91dCB0aW1lciBmaXJlZCBhdCAlZFxuIiwgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+ZWxhcHNlZFRp bWUoKSk7CisgICAgICAgIHByaW50ZigiTGF5b3V0IHRpbWVyIGZpcmVkIGF0ICV1XG4iLCBtX2Zy YW1lLT5kb2N1bWVudCgpLT5lbGFwc2VkVGltZSgpKTsKICNlbmRpZgogICAgIGxheW91dCgpOwog fQpAQCAtMTEzNiw3ICsxMTM2LDcgQEAgdm9pZCBGcmFtZVZpZXc6OnNjaGVkdWxlUmVsYXlvdXQo KQogICAgIGlmICghbV9mcmFtZS0+ZG9jdW1lbnQoKS0+c2hvdWxkU2NoZWR1bGVMYXlvdXQoKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgaW50IGRlbGF5ID0gbV9mcmFtZS0+ZG9jdW1lbnQoKS0+ bWluaW11bUxheW91dERlbGF5KCk7CisgICAgdW5zaWduZWQgZGVsYXkgPSBtX2ZyYW1lLT5kb2N1 bWVudCgpLT5taW5pbXVtTGF5b3V0RGVsYXkoKTsKICAgICBpZiAobV9sYXlvdXRUaW1lci5pc0Fj dGl2ZSgpICYmIG1fZGVsYXllZExheW91dCAmJiAhZGVsYXkpCiAgICAgICAgIHVuc2NoZWR1bGVS ZWxheW91dCgpOwogICAgIGlmIChtX2xheW91dFRpbWVyLmlzQWN0aXZlKCkpCkBAIC0xMTQ2LDcg KzExNDYsNyBAQCB2b2lkIEZyYW1lVmlldzo6c2NoZWR1bGVSZWxheW91dCgpCiAKICNpZmRlZiBJ TlNUUlVNRU5UX0xBWU9VVF9TQ0hFRFVMSU5HCiAgICAgaWYgKCFtX2ZyYW1lLT5kb2N1bWVudCgp LT5vd25lckVsZW1lbnQoKSkKLSAgICAgICAgcHJpbnRmKCJTY2hlZHVsaW5nIGxheW91dCBmb3Ig JWRcbiIsIGRlbGF5KTsKKyAgICAgICAgcHJpbnRmKCJTY2hlZHVsaW5nIGxheW91dCBmb3IgJXVc biIsIGRlbGF5KTsKICNlbmRpZgogCiAgICAgbV9sYXlvdXRUaW1lci5zdGFydE9uZVNob3QoZGVs YXkgKiAwLjAwMSk7CkBAIC0xMTkwLDcgKzExOTAsNyBAQCB2b2lkIEZyYW1lVmlldzo6c2NoZWR1 bGVSZWxheW91dE9mU3VidHJlCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVsc2Ug ewotICAgICAgICBpbnQgZGVsYXkgPSBtX2ZyYW1lLT5kb2N1bWVudCgpLT5taW5pbXVtTGF5b3V0 RGVsYXkoKTsKKyAgICAgICAgdW5zaWduZWQgZGVsYXkgPSBtX2ZyYW1lLT5kb2N1bWVudCgpLT5t aW5pbXVtTGF5b3V0RGVsYXkoKTsKICAgICAgICAgbV9sYXlvdXRSb290ID0gcmVsYXlvdXRSb290 OwogICAgICAgICBtX2RlbGF5ZWRMYXlvdXQgPSBkZWxheSAhPSAwOwogICAgICAgICBtX2xheW91 dFRpbWVyLnN0YXJ0T25lU2hvdChkZWxheSAqIDAuMDAxKTsKQEAgLTEyMzgsNyArMTIzOCw3IEBA IHZvaWQgRnJhbWVWaWV3Ojp1bnNjaGVkdWxlUmVsYXlvdXQoKQogCiAjaWZkZWYgSU5TVFJVTUVO VF9MQVlPVVRfU0NIRURVTElORwogICAgIGlmICghbV9mcmFtZS0+ZG9jdW1lbnQoKS0+b3duZXJF bGVtZW50KCkpCi0gICAgICAgIHByaW50ZigiTGF5b3V0IHRpbWVyIHVuc2NoZWR1bGVkIGF0ICVk XG4iLCBtX2ZyYW1lLT5kb2N1bWVudCgpLT5lbGFwc2VkVGltZSgpKTsKKyAgICAgICAgcHJpbnRm KCJMYXlvdXQgdGltZXIgdW5zY2hlZHVsZWQgYXQgJXVcbiIsIG1fZnJhbWUtPmRvY3VtZW50KCkt PmVsYXBzZWRUaW1lKCkpOwogI2VuZGlmCiAgICAgCiAgICAgbV9sYXlvdXRUaW1lci5zdG9wKCk7 Cg==