75938 2012-01-09 22:39:57 -0800 [chromium] Reuse old timebase when activating CCDelayBasedTimeSource 2012-01-10 15:50:54 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 nduca nduca cc-bugs jamesr webkit.review.bot oldest_to_newest 532823 0 nduca 2012-01-09 22:39:57 -0800 [chromium] Reuse old timebase when activating CCDelayBasedTimeSource 532824 1 121797 nduca 2012-01-09 22:40:21 -0800 Created attachment 121797 Patch 532844 2 121797 jamesr 2012-01-09 23:40:35 -0800 Comment on attachment 121797 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121797&action=review R=me > Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.h:57 > + void postNextTickTask(double now); looks like this is millis, but since we've been talking about having untagged types be in seconds can we type-tag this value? 533407 3 121916 nduca 2012-01-10 15:11:58 -0800 Created attachment 121916 Patch for landing 533432 4 121916 webkit.review.bot 2012-01-10 15:50:50 -0800 Comment on attachment 121916 Patch for landing Clearing flags on attachment: 121916 Committed r104644: <http://trac.webkit.org/changeset/104644> 533434 5 webkit.review.bot 2012-01-10 15:50:54 -0800 All reviewed patches have been landed. Closing bug. 121797 2012-01-09 22:40:21 -0800 2012-01-10 15:11:54 -0800 Patch bug-75938-20120109224020.patch text/plain 9794 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWNhNDA3YThhOTg0NjY4 ZGU1MzczNTU3NGZhNDJkZDZhNjBmNTczYi4uOWU0YmQ1YWYxMTljNjI1MGZlNzM3YzI1YTYwODI5 Y2Q3ZjY4NjMyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAxLTA5ICBOYXQg RHVjYSAgPG5kdWNhQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFJldXNlIG9s ZCB0aW1lYmFzZSB3aGVuIGFjdGl2YXRpbmcgQ0NEZWxheUJhc2VkVGltZVNvdXJjZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU5MzgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q0NEZWxheUJhc2VkVGltZVNvdXJjZTo6Q0NEZWxheUJhc2VkVGltZVNvdXJjZSk6Cisg ICAgICAgIChXZWJDb3JlOjpDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjpzZXRBY3RpdmUpOgorICAg ICAgICAoV2ViQ29yZTo6Q0NEZWxheUJhc2VkVGltZVNvdXJjZTo6b25UaW1lckZpcmVkKToKKyAg ICAgICAgKFdlYkNvcmU6OkNDRGVsYXlCYXNlZFRpbWVTb3VyY2U6OnBvc3ROZXh0VGlja1Rhc2sp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRp bWVTb3VyY2UuaDoKKwogMjAxMi0wMS0wOSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3Jn PgogCiAgICAgICAgIFJlbW92ZSB1bnVzZWQgdmFyaWFibGUgZnJvbSBDb2RlR2VuZXJhdG9yVjgK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggYzFmNmIyMTY4ODgyM2Y0NjYyNDVlODM0YTkx YjkyZTg3YjkyYTNlOC4uZWJmYThiNzA2N2MzMzRmMDg1NDU0NmI5ZWU5MzVjMDRlOTM0ZmEwYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wMS0wOSAg TmF0IER1Y2EgIDxuZHVjYUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBSZXVz ZSBvbGQgdGltZWJhc2Ugd2hlbiBhY3RpdmF0aW5nIENDRGVsYXlCYXNlZFRpbWVTb3VyY2UKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1OTM4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9DQ0Rl bGF5QmFzZWRUaW1lU291cmNlVGVzdC5jcHA6CisgICAgICAgIChXZWJLaXRUZXN0czo6VEVTVCk6 CisKIDIwMTItMDEtMDkgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgW2Nocm9taXVtXSBDcmVhdGUgaXRlcmF0b3JzIGZvciB0aGUgUmVuZGVyU3VyZmFjZS1M YXllciB0cmVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2UuY3BwCmlu ZGV4IDM1NDc3MDY1ZTI2NDI4ZTQxOTMwMmU5OTM1YWRmNGM4YjRkOTY3NTIuLjI3Mjk5YTg0YTAz MWQzOTkyY2U1NjhjNWQ3MzcxY2M5YjgwNzA5OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVs YXlCYXNlZFRpbWVTb3VyY2UuY3BwCkBAIC00MCwxMCArNDAsMTEgQEAgUGFzc1JlZlB0cjxDQ0Rl bGF5QmFzZWRUaW1lU291cmNlPiBDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjpjcmVhdGUoZG91Ymxl IGludGVydmEKIAogQ0NEZWxheUJhc2VkVGltZVNvdXJjZTo6Q0NEZWxheUJhc2VkVGltZVNvdXJj ZShkb3VibGUgaW50ZXJ2YWxNcywgQ0NUaHJlYWQqIHRocmVhZCkKICAgICA6IG1fY2xpZW50KDAp CisgICAgLCBtX2hhc1RpY2tUYXJnZXQoZmFsc2UpCiAgICAgLCBtX2ludGVydmFsTXMoaW50ZXJ2 YWxNcykKICAgICAsIG1fdGlja1RhcmdldCgwKQogICAgICwgbV9zdGF0ZShTVEFURV9JTkFDVElW RSkKLSAgICAsIG1fdGhyZWFkKHRocmVhZCkKKyAgICAsIG1fdGltZXIodGhyZWFkLCB0aGlzKQog ewogfQogCkBAIC01MSwyOSArNTIsNDUgQEAgdm9pZCBDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjpz ZXRBY3RpdmUoYm9vbCBhY3RpdmUpCiB7CiAgICAgaWYgKCFhY3RpdmUpIHsKICAgICAgICAgbV9z dGF0ZSA9IFNUQVRFX0lOQUNUSVZFOworICAgICAgICBtX3RpbWVyLnN0b3AoKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAotICAgIC8vIEJlY29taW5nIGFjdGl2ZSBpcyBkZWZlcnJlZDogd2Ug cG9zdCBhIDAtZGVsYXkgdGFzay4gV2hlbiBpdCBydW5zLCB3ZSB1c2UKLSAgICAvLyB0aGF0IHRv IGVzdGFibGlzaCB0aGUgdGltZWJhc2UsIGJlY29tZSB0cnVseSBhY3RpdmUsIGFuZCBmaXJlIHRo ZSBmaXJzdAotICAgIC8vIHRpY2suCiAgICAgaWYgKG1fc3RhdGUgPT0gU1RBVEVfU1RBUlRJTkcg fHwgbV9zdGF0ZSA9PSBTVEFURV9BQ1RJVkUpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fc3Rh dGUgPSBTVEFURV9TVEFSVElORzsKLSAgICBwb3N0VGlja1Rhc2soMCk7Ci19CisgICAgaWYgKCFt X2hhc1RpY2tUYXJnZXQpIHsKKyAgICAgICAgLy8gQmVjb21pbmcgYWN0aXZlIHRoZSBmaXJzdCB0 aW1lIGlzIGRlZmVycmVkOiB3ZSBwb3N0IGEgMC1kZWxheSB0YXNrLiBXaGVuCisgICAgICAgIC8v IGl0IHJ1bnMsIHdlIHVzZSB0aGF0IHRvIGVzdGFibGlzaCB0aGUgdGltZWJhc2UsIGJlY29tZSB0 cnVseSBhY3RpdmUsIGFuZAorICAgICAgICAvLyBmaXJlIHRoZSBmaXJzdCB0aWNrLgorICAgICAg ICBtX3N0YXRlID0gU1RBVEVfU1RBUlRJTkc7CisgICAgICAgIG1fdGltZXIuc3RhcnRPbmVTaG90 KDApOworICAgICAgICByZXR1cm47CisgICAgfQogCi12b2lkIENDRGVsYXlCYXNlZFRpbWVTb3Vy Y2U6OnBvc3RUaWNrVGFzayhsb25nIGxvbmcgZGVsYXkpCi17Ci0gICAgdGhpcy0+cmVmKCk7Ci0g ICAgbV90aHJlYWQtPnBvc3REZWxheWVkVGFzayhjcmVhdGVDQ1RocmVhZFRhc2sodGhpcywgJkND RGVsYXlCYXNlZFRpbWVTb3VyY2U6Om9uVGljayksIGRlbGF5KTsKKyAgICBtX3N0YXRlID0gU1RB VEVfQUNUSVZFOworCisgICAgZG91YmxlIG5vdyA9IG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGlt ZU1zKCk7CisgICAgcG9zdE5leHRUaWNrVGFzayhub3cpOwogfQogCi12b2lkIENDRGVsYXlCYXNl ZFRpbWVTb3VyY2U6Om9uVGljaygpCit2b2lkIENDRGVsYXlCYXNlZFRpbWVTb3VyY2U6Om9uVGlt ZXJGaXJlZCgpCiB7Ci0gICAgdXBkYXRlU3RhdGUoKTsKLSAgICB0aGlzLT5kZXJlZigpOworICAg IEFTU0VSVChtX3N0YXRlICE9IFNUQVRFX0lOQUNUSVZFKTsKKworICAgIGRvdWJsZSBub3cgPSBt b25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWVNcygpOworCisgICAgaWYgKG1fc3RhdGUgPT0gU1RB VEVfU1RBUlRJTkcpIHsKKyAgICAgICAgbV9oYXNUaWNrVGFyZ2V0ID0gdHJ1ZTsKKyAgICAgICAg bV90aWNrVGFyZ2V0ID0gbm93OworICAgICAgICBtX3N0YXRlID0gU1RBVEVfQUNUSVZFOworICAg IH0KKworICAgIHBvc3ROZXh0VGlja1Rhc2sobm93KTsKKworICAgIC8vIEZpcmUgdGhlIHRpY2sK KyAgICBpZiAobV9jbGllbnQpCisgICAgICAgIG1fY2xpZW50LT5vblRpbWVyVGljaygpOwogfQog CiBkb3VibGUgQ0NEZWxheUJhc2VkVGltZVNvdXJjZTo6bW9ub3RvbmljYWxseUluY3JlYXNpbmdU aW1lTXMoKSBjb25zdApAQCAtMTI0LDE4ICsxNDEsOCBAQCBkb3VibGUgQ0NEZWxheUJhc2VkVGlt ZVNvdXJjZTo6bW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lTXMoKSBjb25zdAogLy8KIC8vIEZv ciB0aGUgcmVhbGx5IGxhdGUgZGVsYXksIHdlIHdlIG1vdmUgdG8gdGhlIG5leHQgbG9naWNhbCB0 aWNrLiBUaGUgdGltZWJhc2UgaXMgbm90IHJlc2V0LgogLy8gICAgICBub3c9MzcgICB0aWNrVGFy Z2V0PTE2LjY2NyAgbmV3VGFyZ2V0PTUwLjAwMCAgLS0+IHRpY2soKSwgcG9zdERlbGF5ZWRUYXNr KGZsb29yKDUwLjAwMC0zNykpIC0tPiBwb3N0RGVsYXllZFRhc2soMTMpCi12b2lkIENDRGVsYXlC YXNlZFRpbWVTb3VyY2U6OnVwZGF0ZVN0YXRlKCkKK3ZvaWQgQ0NEZWxheUJhc2VkVGltZVNvdXJj ZTo6cG9zdE5leHRUaWNrVGFzayhkb3VibGUgbm93KQogewotICAgIGlmIChtX3N0YXRlID09IFNU QVRFX0lOQUNUSVZFKQotICAgICAgICByZXR1cm47Ci0KLSAgICBkb3VibGUgbm93ID0gbW9ub3Rv bmljYWxseUluY3JlYXNpbmdUaW1lTXMoKTsKLQotICAgIGlmIChtX3N0YXRlID09IFNUQVRFX1NU QVJUSU5HKSB7Ci0gICAgICAgIG1fdGlja1RhcmdldCA9IG5vdzsKLSAgICAgICAgbV9zdGF0ZSA9 IFNUQVRFX0FDVElWRTsKLSAgICB9Ci0KICAgICBpbnQgbnVtSW50ZXJ2YWxzRWxhcHNlZCA9IHN0 YXRpY19jYXN0PGludD4oZmxvb3IoKG5vdyAtIG1fdGlja1RhcmdldCkgLyBtX2ludGVydmFsTXMp KTsKICAgICBkb3VibGUgbGFzdEVmZmVjdGl2ZVRpY2sgPSBtX3RpY2tUYXJnZXQgKyBtX2ludGVy dmFsTXMgKiBudW1JbnRlcnZhbHNFbGFwc2VkOwogICAgIGRvdWJsZSBuZXdUaWNrVGFyZ2V0ID0g bGFzdEVmZmVjdGl2ZVRpY2sgKyBtX2ludGVydmFsTXM7CkBAIC0xNDgsMTIgKzE1NSw4IEBAIHZv aWQgQ0NEZWxheUJhc2VkVGltZVNvdXJjZTo6dXBkYXRlU3RhdGUoKQogCiAgICAgLy8gUG9zdCBh bm90aGVyIHRhc2sgKmJlZm9yZSogdGhlIHRpY2sgYW5kIHVwZGF0ZSBzdGF0ZQogICAgIEFTU0VS VChuZXdUaWNrVGFyZ2V0ID4gbm93KTsKLSAgICBwb3N0VGlja1Rhc2soZGVsYXkpOworICAgIG1f dGltZXIuc3RhcnRPbmVTaG90KGRlbGF5KTsKICAgICBtX3RpY2tUYXJnZXQgPSBuZXdUaWNrVGFy Z2V0OwotCi0gICAgLy8gRmlyZSB0aGUgdGljawotICAgIGlmIChtX2NsaWVudCkKLSAgICAgICAg bV9jbGllbnQtPm9uVGltZXJUaWNrKCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2Uu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlC YXNlZFRpbWVTb3VyY2UuaAppbmRleCA2Y2M3MzM4ZDUzNjdhMDk4ZGViNDI0MDc4YzUzZmYxNTBk MTFhYTM0Li40YjE3MWI4OGQ4YWIzMmIyZDg1MDYxNGFjZWE1MjE4MTVmMzJiZTU5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0RlbGF5 QmFzZWRUaW1lU291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NEZWxheUJhc2VkVGltZVNvdXJjZS5oCkBAIC0yNiw2ICsyNiw3IEBACiAj ZGVmaW5lIENDRGVsYXlCYXNlZFRpbWVTb3VyY2VfaAogCiAjaW5jbHVkZSAiY2MvQ0NUaW1lU291 cmNlLmgiCisjaW5jbHVkZSAiY2MvQ0NUaW1lci5oIgogCiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQ dHIuaD4KIApAQCAtMzUsNyArMzYsNyBAQCBjbGFzcyBDQ1RocmVhZDsKIAogLy8gVGhpcyB0aW1l ciBpbXBsZW1lbnRzIGEgdGltZSBzb3VyY2UgdGhhdCBhY2hpZXZlcyB0aGUgc3BlY2lmaWVkIGlu dGVydmFsCiAvLyBpbiBmYWNlIG9mIG1pbGxpc2Vjb25kLXByZWNpc2lvbiBkZWxheWVkIGNhbGxi YWNrcyBhbmQgcmFuZG9tIHF1ZXVlaW5nIGRlbGF5cy4KLWNsYXNzIENDRGVsYXlCYXNlZFRpbWVT b3VyY2UgOiBwdWJsaWMgQ0NUaW1lU291cmNlIHsKK2NsYXNzIENDRGVsYXlCYXNlZFRpbWVTb3Vy Y2UgOiBwdWJsaWMgQ0NUaW1lU291cmNlLCBDQ1RpbWVyQ2xpZW50IHsKIHB1YmxpYzoKICAgICBz dGF0aWMgUGFzc1JlZlB0cjxDQ0RlbGF5QmFzZWRUaW1lU291cmNlPiBjcmVhdGUoZG91YmxlIGlu dGVydmFsTXMsIENDVGhyZWFkKik7CiAKQEAgLTQ1LDE0ICs0NiwxNSBAQCBwdWJsaWM6CiAKICAg ICB2aXJ0dWFsIHZvaWQgc2V0QWN0aXZlKGJvb2wpOwogCisgICAgLy8gQ0NUaW1lckNsaWVudCBp bXBsZW1lbnRhdGlvbgorICAgIHZpcnR1YWwgdm9pZCBvblRpbWVyRmlyZWQoKTsKKwogICAgIC8v IFZpcnR1YWwgZm9yIHRlc3RpbmcuCiAgICAgdmlydHVhbCBkb3VibGUgbW9ub3RvbmljYWxseUlu Y3JlYXNpbmdUaW1lTXMoKSBjb25zdDsKIAogcHJvdGVjdGVkOgogICAgIENDRGVsYXlCYXNlZFRp bWVTb3VyY2UoZG91YmxlIGludGVydmFsTXMsIENDVGhyZWFkKik7Ci0gICAgdm9pZCBvblRpY2so KTsKLSAgICB2b2lkIHVwZGF0ZVN0YXRlKCk7Ci0gICAgdm9pZCBwb3N0VGlja1Rhc2sobG9uZyBs b25nIGRlbGF5KTsKKyAgICB2b2lkIHBvc3ROZXh0VGlja1Rhc2soZG91YmxlIG5vdyk7CiAKICAg ICBlbnVtIFN0YXRlIHsKICAgICAgICAgU1RBVEVfSU5BQ1RJVkUsCkBAIC02MCwxMCArNjIsMTIg QEAgcHJvdGVjdGVkOgogICAgICAgICBTVEFURV9BQ1RJVkUsCiAgICAgfTsKICAgICBDQ1RpbWVT b3VyY2VDbGllbnQqIG1fY2xpZW50OworICAgIGJvb2wgbV9oYXNUaWNrVGFyZ2V0OwogICAgIGRv dWJsZSBtX2ludGVydmFsTXM7CiAgICAgZG91YmxlIG1fdGlja1RhcmdldDsKICAgICBTdGF0ZSBt X3N0YXRlOwogICAgIENDVGhyZWFkKiBtX3RocmVhZDsKKyAgICBDQ1RpbWVyIG1fdGltZXI7CiB9 OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDRGVsYXlC YXNlZFRpbWVTb3VyY2VUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NE ZWxheUJhc2VkVGltZVNvdXJjZVRlc3QuY3BwCmluZGV4IDA1YTc1M2JiOWNhZDNmY2IzMzIxMjBi Yjg5MGYwNDU2MjhlNGExMzAuLjQxYzlkMTE5ZWRlYWNjNzFmZGEyNjlhZDg2YmM2NTAwYTEzZTVi YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NEZWxheUJhc2Vk VGltZVNvdXJjZVRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NE ZWxheUJhc2VkVGltZVNvdXJjZVRlc3QuY3BwCkBAIC0yMjQsNyArMjI0LDcgQEAgVEVTVChDQ0Rl bGF5QmFzZWRUaW1lU291cmNlVGVzdCwgQWNoaWV2ZXNUYXJnZXRSYXRlV2l0aE5vTm9pc2UpCiAg ICAgRVhQRUNUX05FQVIoMTAwMC4wIC8gNjAuMCwgYXZlcmFnZUludGVydmFsLCAwLjEpOwogfQog Ci1URVNUKENDRGVsYXlCYXNlZFRpbWVTb3VyY2UsIFRlc3RVbnJlZldoaWxlUGVuZGluZykKK1RF U1QoQ0NEZWxheUJhc2VkVGltZVNvdXJjZSwgVGVzdERlYWN0aXZhdGVXaGlsZVBlbmRpbmcpCiB7 CiAgICAgRmFrZUNDVGhyZWFkIHRocmVhZDsKICAgICBGYWtlQ0NUaW1lU291cmNlQ2xpZW50IGNs aWVudDsKQEAgLTIzMyw3ICsyMzMsNTcgQEAgVEVTVChDQ0RlbGF5QmFzZWRUaW1lU291cmNlLCBU ZXN0VW5yZWZXaGlsZVBlbmRpbmcpCiAgICAgdGltZXItPnNldEFjdGl2ZSh0cnVlKTsgLy8gU2hv dWxkIHBvc3QgYSB0YXNrLgogICAgIHRpbWVyLT5zZXRBY3RpdmUoZmFsc2UpOwogICAgIHRpbWVy LmNsZWFyKCk7Ci0gICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7IC8vIFNob3VsZCBydW4gdGhl IHBvc3RlZCB0YXNrLCBhbmQgZGVsZXRlIHRoZSB0aW1lciBvYmplY3QuCisgICAgdGhyZWFkLnJ1 blBlbmRpbmdUYXNrKCk7IC8vIFNob3VsZCBydW4gdGhlIHBvc3RlZCB0YXNrIHdpdGhvdXQgY3Jh c2hpbmcuCit9CisKK1RFU1QoQ0NEZWxheUJhc2VkVGltZVNvdXJjZSwgVGVzdERlYWN0aXZhdGVB bmRSZWFjdGl2YXRlQmVmb3JlTmV4dFRpY2tUaW1lKQoreworICAgIEZha2VDQ1RocmVhZCB0aHJl YWQ7CisgICAgRmFrZUNDVGltZVNvdXJjZUNsaWVudCBjbGllbnQ7CisgICAgUmVmUHRyPEZha2VD Q0RlbGF5QmFzZWRUaW1lU291cmNlPiB0aW1lciA9IEZha2VDQ0RlbGF5QmFzZWRUaW1lU291cmNl OjpjcmVhdGUoMTAwMC4wIC8gNjAuMCwgJnRocmVhZCk7CisgICAgdGltZXItPnNldENsaWVudCgm Y2xpZW50KTsKKworICAgIC8vIFNob3VsZCBydW4gdGhlIGFjdGl2YXRlIHRhc2ssIGFuZCBwaWNr IHVwIGEgbmV3IHRpbWViYXNlLgorICAgIHRpbWVyLT5zZXRBY3RpdmUodHJ1ZSk7CisgICAgdGlt ZXItPnNldE1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZU1zKDApOworICAgIHRocmVhZC5ydW5Q ZW5kaW5nVGFzaygpOworCisgICAgLy8gU3RvcCB0aGUgdGltZXIKKyAgICB0aW1lci0+c2V0QWN0 aXZlKGZhbHNlKTsKKworICAgIC8vIFRhc2sgd2lsbCBiZSBwZW5kaW5nIGFueXdheSwgcnVuIGl0 CisgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7CisKKyAgICAvLyBTdGFydCB0aGUgdGltZXIg YWdhaW4sIGJ1dCBiZWZvcmUgdGhlIG5leHQgdGljayB0aW1lIHRoZSB0aW1lciBwcmV2aW91c2x5 CisgICAgLy8gcGxhbm5lZCBvbiB1c2luZy4gVGhhdCBzYW1lIHRpY2sgdGltZSBzaG91bGQgc3Rp bGwgYmUgdGFyZ2V0ZWQuCisgICAgdGltZXItPnNldE1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGlt ZU1zKDQpOworICAgIHRpbWVyLT5zZXRBY3RpdmUodHJ1ZSk7CisgICAgRVhQRUNUX0VRKDEyLCB0 aHJlYWQucGVuZGluZ0RlbGF5KCkpOworfQorCitURVNUKENDRGVsYXlCYXNlZFRpbWVTb3VyY2Us IFRlc3REZWFjdGl2YXRlQW5kUmVhY3RpdmF0ZUFmdGVyTmV4dFRpY2tUaW1lKQoreworICAgIEZh a2VDQ1RocmVhZCB0aHJlYWQ7CisgICAgRmFrZUNDVGltZVNvdXJjZUNsaWVudCBjbGllbnQ7Cisg ICAgUmVmUHRyPEZha2VDQ0RlbGF5QmFzZWRUaW1lU291cmNlPiB0aW1lciA9IEZha2VDQ0RlbGF5 QmFzZWRUaW1lU291cmNlOjpjcmVhdGUoMTAwMC4wIC8gNjAuMCwgJnRocmVhZCk7CisgICAgdGlt ZXItPnNldENsaWVudCgmY2xpZW50KTsKKworICAgIC8vIFNob3VsZCBydW4gdGhlIGFjdGl2YXRl IHRhc2ssIGFuZCBwaWNrIHVwIGEgbmV3IHRpbWViYXNlLgorICAgIHRpbWVyLT5zZXRBY3RpdmUo dHJ1ZSk7CisgICAgdGltZXItPnNldE1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZU1zKDApOwor ICAgIHRocmVhZC5ydW5QZW5kaW5nVGFzaygpOworCisgICAgLy8gU3RvcCB0aGUgdGltZXIKKyAg ICB0aW1lci0+c2V0QWN0aXZlKGZhbHNlKTsKKworICAgIC8vIFRhc2sgd2lsbCBiZSBwZW5kaW5n IGFueXdheSwgcnVuIGl0CisgICAgdGhyZWFkLnJ1blBlbmRpbmdUYXNrKCk7CisKKyAgICAvLyBT dGFydCB0aGUgdGltZXIgYWdhaW4sIGJ1dCBiZWZvcmUgdGhlIG5leHQgdGljayB0aW1lIHRoZSB0 aW1lciBwcmV2aW91c2x5CisgICAgLy8gcGxhbm5lZCBvbiB1c2luZy4gVGhhdCBzYW1lIHRpY2sg dGltZSBzaG91bGQgc3RpbGwgYmUgdGFyZ2V0ZWQuCisgICAgdGltZXItPnNldE1vbm90b25pY2Fs bHlJbmNyZWFzaW5nVGltZU1zKDIwKTsKKyAgICB0aW1lci0+c2V0QWN0aXZlKHRydWUpOworICAg IEVYUEVDVF9FUSgxMywgdGhyZWFkLnBlbmRpbmdEZWxheSgpKTsKIH0KIAogfQo= 121916 2012-01-10 15:11:58 -0800 2012-01-10 15:50:50 -0800 Patch for landing bug-75938-20120110151158.patch text/plain 10224 nduca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWNhNDA3YThhOTg0NjY4 ZGU1MzczNTU3NGZhNDJkZDZhNjBmNTczYi4uNDcwM2I5NTVkNGRjNzljYjJkYTFhM2NkODIzNzRh ZWRlZWQ3OWE2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAxLTA5ICBOYXQg RHVjYSAgPG5kdWNhQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFJldXNlIG9s ZCB0aW1lYmFzZSB3aGVuIGFjdGl2YXRpbmcgQ0NEZWxheUJhc2VkVGltZVNvdXJjZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU5MzgKKworICAgICAg ICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q0NEZWxheUJhc2VkVGltZVNvdXJjZTo6Q0NEZWxheUJhc2VkVGltZVNvdXJjZSk6Cisg ICAgICAgIChXZWJDb3JlOjpDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjpzZXRBY3RpdmUpOgorICAg ICAgICAoV2ViQ29yZTo6Q0NEZWxheUJhc2VkVGltZVNvdXJjZTo6b25UaW1lckZpcmVkKToKKyAg ICAgICAgKFdlYkNvcmU6OkNDRGVsYXlCYXNlZFRpbWVTb3VyY2U6OnBvc3ROZXh0VGlja1Rhc2sp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRp bWVTb3VyY2UuaDoKKwogMjAxMi0wMS0wOSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3Jn PgogCiAgICAgICAgIFJlbW92ZSB1bnVzZWQgdmFyaWFibGUgZnJvbSBDb2RlR2VuZXJhdG9yVjgK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggYzFmNmIyMTY4ODgyM2Y0NjYyNDVlODM0YTkx YjkyZTg3YjkyYTNlOC4uMWNkNDlhOWJhZmQ2NGQyZDBiZGE2MzJiMmFiYTBiNThiYmQ4MmM5NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wMS0wOSAg TmF0IER1Y2EgIDxuZHVjYUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBSZXVz ZSBvbGQgdGltZWJhc2Ugd2hlbiBhY3RpdmF0aW5nIENDRGVsYXlCYXNlZFRpbWVTb3VyY2UKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1OTM4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMgUm9iaW5zb24uCisKKyAgICAgICAgKiB0ZXN0cy9DQ0Rl bGF5QmFzZWRUaW1lU291cmNlVGVzdC5jcHA6CisgICAgICAgIChXZWJLaXRUZXN0czo6VEVTVCk6 CisKIDIwMTItMDEtMDkgIERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgW2Nocm9taXVtXSBDcmVhdGUgaXRlcmF0b3JzIGZvciB0aGUgUmVuZGVyU3VyZmFjZS1M YXllciB0cmVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2UuY3BwCmlu ZGV4IDM1NDc3MDY1ZTI2NDI4ZTQxOTMwMmU5OTM1YWRmNGM4YjRkOTY3NTIuLmU3YjE5YTc2MDUw NGVmNzRjODQzNDA2MDUzYWY0MGM5MzMzNDAzNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVs YXlCYXNlZFRpbWVTb3VyY2UuY3BwCkBAIC00MCwxMCArNDAsMTEgQEAgUGFzc1JlZlB0cjxDQ0Rl bGF5QmFzZWRUaW1lU291cmNlPiBDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjpjcmVhdGUoZG91Ymxl IGludGVydmEKIAogQ0NEZWxheUJhc2VkVGltZVNvdXJjZTo6Q0NEZWxheUJhc2VkVGltZVNvdXJj ZShkb3VibGUgaW50ZXJ2YWxNcywgQ0NUaHJlYWQqIHRocmVhZCkKICAgICA6IG1fY2xpZW50KDAp CisgICAgLCBtX2hhc1RpY2tUYXJnZXQoZmFsc2UpCiAgICAgLCBtX2ludGVydmFsTXMoaW50ZXJ2 YWxNcykKICAgICAsIG1fdGlja1RhcmdldCgwKQogICAgICwgbV9zdGF0ZShTVEFURV9JTkFDVElW RSkKLSAgICAsIG1fdGhyZWFkKHRocmVhZCkKKyAgICAsIG1fdGltZXIodGhyZWFkLCB0aGlzKQog ewogfQogCkBAIC01MSwyOSArNTIsNDUgQEAgdm9pZCBDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjpz ZXRBY3RpdmUoYm9vbCBhY3RpdmUpCiB7CiAgICAgaWYgKCFhY3RpdmUpIHsKICAgICAgICAgbV9z dGF0ZSA9IFNUQVRFX0lOQUNUSVZFOworICAgICAgICBtX3RpbWVyLnN0b3AoKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAotICAgIC8vIEJlY29taW5nIGFjdGl2ZSBpcyBkZWZlcnJlZDogd2Ug cG9zdCBhIDAtZGVsYXkgdGFzay4gV2hlbiBpdCBydW5zLCB3ZSB1c2UKLSAgICAvLyB0aGF0IHRv IGVzdGFibGlzaCB0aGUgdGltZWJhc2UsIGJlY29tZSB0cnVseSBhY3RpdmUsIGFuZCBmaXJlIHRo ZSBmaXJzdAotICAgIC8vIHRpY2suCiAgICAgaWYgKG1fc3RhdGUgPT0gU1RBVEVfU1RBUlRJTkcg fHwgbV9zdGF0ZSA9PSBTVEFURV9BQ1RJVkUpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fc3Rh dGUgPSBTVEFURV9TVEFSVElORzsKLSAgICBwb3N0VGlja1Rhc2soMCk7Ci19CisgICAgaWYgKCFt X2hhc1RpY2tUYXJnZXQpIHsKKyAgICAgICAgLy8gQmVjb21pbmcgYWN0aXZlIHRoZSBmaXJzdCB0 aW1lIGlzIGRlZmVycmVkOiB3ZSBwb3N0IGEgMC1kZWxheSB0YXNrLiBXaGVuCisgICAgICAgIC8v IGl0IHJ1bnMsIHdlIHVzZSB0aGF0IHRvIGVzdGFibGlzaCB0aGUgdGltZWJhc2UsIGJlY29tZSB0 cnVseSBhY3RpdmUsIGFuZAorICAgICAgICAvLyBmaXJlIHRoZSBmaXJzdCB0aWNrLgorICAgICAg ICBtX3N0YXRlID0gU1RBVEVfU1RBUlRJTkc7CisgICAgICAgIG1fdGltZXIuc3RhcnRPbmVTaG90 KDApOworICAgICAgICByZXR1cm47CisgICAgfQogCi12b2lkIENDRGVsYXlCYXNlZFRpbWVTb3Vy Y2U6OnBvc3RUaWNrVGFzayhsb25nIGxvbmcgZGVsYXkpCi17Ci0gICAgdGhpcy0+cmVmKCk7Ci0g ICAgbV90aHJlYWQtPnBvc3REZWxheWVkVGFzayhjcmVhdGVDQ1RocmVhZFRhc2sodGhpcywgJkND RGVsYXlCYXNlZFRpbWVTb3VyY2U6Om9uVGljayksIGRlbGF5KTsKKyAgICBtX3N0YXRlID0gU1RB VEVfQUNUSVZFOworCisgICAgZG91YmxlIG5vd01zID0gbW9ub3RvbmljYWxseUluY3JlYXNpbmdU aW1lTXMoKTsKKyAgICBwb3N0TmV4dFRpY2tUYXNrKG5vd01zKTsKIH0KIAotdm9pZCBDQ0RlbGF5 QmFzZWRUaW1lU291cmNlOjpvblRpY2soKQordm9pZCBDQ0RlbGF5QmFzZWRUaW1lU291cmNlOjpv blRpbWVyRmlyZWQoKQogewotICAgIHVwZGF0ZVN0YXRlKCk7Ci0gICAgdGhpcy0+ZGVyZWYoKTsK KyAgICBBU1NFUlQobV9zdGF0ZSAhPSBTVEFURV9JTkFDVElWRSk7CisKKyAgICBkb3VibGUgbm93 TXMgPSBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWVNcygpOworCisgICAgaWYgKG1fc3RhdGUg PT0gU1RBVEVfU1RBUlRJTkcpIHsKKyAgICAgICAgbV9oYXNUaWNrVGFyZ2V0ID0gdHJ1ZTsKKyAg ICAgICAgbV90aWNrVGFyZ2V0ID0gbm93TXM7CisgICAgICAgIG1fc3RhdGUgPSBTVEFURV9BQ1RJ VkU7CisgICAgfQorCisgICAgcG9zdE5leHRUaWNrVGFzayhub3dNcyk7CisKKyAgICAvLyBGaXJl IHRoZSB0aWNrCisgICAgaWYgKG1fY2xpZW50KQorICAgICAgICBtX2NsaWVudC0+b25UaW1lclRp Y2soKTsKIH0KIAogZG91YmxlIENDRGVsYXlCYXNlZFRpbWVTb3VyY2U6Om1vbm90b25pY2FsbHlJ bmNyZWFzaW5nVGltZU1zKCkgY29uc3QKQEAgLTEyNCwzNiArMTQxLDIyIEBAIGRvdWJsZSBDQ0Rl bGF5QmFzZWRUaW1lU291cmNlOjptb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWVNcygpIGNvbnN0 CiAvLwogLy8gRm9yIHRoZSByZWFsbHkgbGF0ZSBkZWxheSwgd2Ugd2UgbW92ZSB0byB0aGUgbmV4 dCBsb2dpY2FsIHRpY2suIFRoZSB0aW1lYmFzZSBpcyBub3QgcmVzZXQuCiAvLyAgICAgIG5vdz0z NyAgIHRpY2tUYXJnZXQ9MTYuNjY3ICBuZXdUYXJnZXQ9NTAuMDAwICAtLT4gdGljaygpLCBwb3N0 RGVsYXllZFRhc2soZmxvb3IoNTAuMDAwLTM3KSkgLS0+IHBvc3REZWxheWVkVGFzaygxMykKLXZv aWQgQ0NEZWxheUJhc2VkVGltZVNvdXJjZTo6dXBkYXRlU3RhdGUoKQordm9pZCBDQ0RlbGF5QmFz ZWRUaW1lU291cmNlOjpwb3N0TmV4dFRpY2tUYXNrKGRvdWJsZSBub3dNcykKIHsKLSAgICBpZiAo bV9zdGF0ZSA9PSBTVEFURV9JTkFDVElWRSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgZG91Ymxl IG5vdyA9IG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZU1zKCk7Ci0KLSAgICBpZiAobV9zdGF0 ZSA9PSBTVEFURV9TVEFSVElORykgewotICAgICAgICBtX3RpY2tUYXJnZXQgPSBub3c7Ci0gICAg ICAgIG1fc3RhdGUgPSBTVEFURV9BQ1RJVkU7Ci0gICAgfQotCi0gICAgaW50IG51bUludGVydmFs c0VsYXBzZWQgPSBzdGF0aWNfY2FzdDxpbnQ+KGZsb29yKChub3cgLSBtX3RpY2tUYXJnZXQpIC8g bV9pbnRlcnZhbE1zKSk7CisgICAgaW50IG51bUludGVydmFsc0VsYXBzZWQgPSBzdGF0aWNfY2Fz dDxpbnQ+KGZsb29yKChub3dNcyAtIG1fdGlja1RhcmdldCkgLyBtX2ludGVydmFsTXMpKTsKICAg ICBkb3VibGUgbGFzdEVmZmVjdGl2ZVRpY2sgPSBtX3RpY2tUYXJnZXQgKyBtX2ludGVydmFsTXMg KiBudW1JbnRlcnZhbHNFbGFwc2VkOwogICAgIGRvdWJsZSBuZXdUaWNrVGFyZ2V0ID0gbGFzdEVm ZmVjdGl2ZVRpY2sgKyBtX2ludGVydmFsTXM7CiAKLSAgICBsb25nIGxvbmcgZGVsYXkgPSBzdGF0 aWNfY2FzdDxsb25nIGxvbmc+KG5ld1RpY2tUYXJnZXQgLSBub3cpOworICAgIGxvbmcgbG9uZyBk ZWxheSA9IHN0YXRpY19jYXN0PGxvbmcgbG9uZz4obmV3VGlja1RhcmdldCAtIG5vd01zKTsKICAg ICBpZiAoIWRlbGF5KSB7CiAgICAgICAgIG5ld1RpY2tUYXJnZXQgPSBuZXdUaWNrVGFyZ2V0ICsg bV9pbnRlcnZhbE1zOwotICAgICAgICBkZWxheSA9IHN0YXRpY19jYXN0PGxvbmcgbG9uZz4obmV3 VGlja1RhcmdldCAtIG5vdyk7CisgICAgICAgIGRlbGF5ID0gc3RhdGljX2Nhc3Q8bG9uZyBsb25n PihuZXdUaWNrVGFyZ2V0IC0gbm93TXMpOwogICAgIH0KIAogICAgIC8vIFBvc3QgYW5vdGhlciB0 YXNrICpiZWZvcmUqIHRoZSB0aWNrIGFuZCB1cGRhdGUgc3RhdGUKLSAgICBBU1NFUlQobmV3VGlj a1RhcmdldCA+IG5vdyk7Ci0gICAgcG9zdFRpY2tUYXNrKGRlbGF5KTsKKyAgICBBU1NFUlQobmV3 VGlja1RhcmdldCA+IG5vd01zKTsKKyAgICBtX3RpbWVyLnN0YXJ0T25lU2hvdChkZWxheSk7CiAg ICAgbV90aWNrVGFyZ2V0ID0gbmV3VGlja1RhcmdldDsKLQotICAgIC8vIEZpcmUgdGhlIHRpY2sK LSAgICBpZiAobV9jbGllbnQpCi0gICAgICAgIG1fY2xpZW50LT5vblRpbWVyVGljaygpOwogfQog CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlLmgKaW5kZXggNmNjNzMz OGQ1MzY3YTA5OGRlYjQyNDA3OGM1M2ZmMTUwZDExYWEzNC4uNjMzNmI4ODQ5NTQ1ZmM4M2YyMzQy NGQ5ZWEzOGRlZDM2YmZiNzVjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NEZWxheUJhc2VkVGltZVNvdXJjZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDRGVsYXlCYXNlZFRpbWVT b3VyY2UuaApAQCAtMjYsNiArMjYsNyBAQAogI2RlZmluZSBDQ0RlbGF5QmFzZWRUaW1lU291cmNl X2gKIAogI2luY2x1ZGUgImNjL0NDVGltZVNvdXJjZS5oIgorI2luY2x1ZGUgImNjL0NDVGltZXIu aCIKIAogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAKQEAgLTM1LDcgKzM2LDcgQEAgY2xh c3MgQ0NUaHJlYWQ7CiAKIC8vIFRoaXMgdGltZXIgaW1wbGVtZW50cyBhIHRpbWUgc291cmNlIHRo YXQgYWNoaWV2ZXMgdGhlIHNwZWNpZmllZCBpbnRlcnZhbAogLy8gaW4gZmFjZSBvZiBtaWxsaXNl Y29uZC1wcmVjaXNpb24gZGVsYXllZCBjYWxsYmFja3MgYW5kIHJhbmRvbSBxdWV1ZWluZyBkZWxh eXMuCi1jbGFzcyBDQ0RlbGF5QmFzZWRUaW1lU291cmNlIDogcHVibGljIENDVGltZVNvdXJjZSB7 CitjbGFzcyBDQ0RlbGF5QmFzZWRUaW1lU291cmNlIDogcHVibGljIENDVGltZVNvdXJjZSwgQ0NU aW1lckNsaWVudCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q0NEZWxheUJhc2Vk VGltZVNvdXJjZT4gY3JlYXRlKGRvdWJsZSBpbnRlcnZhbE1zLCBDQ1RocmVhZCopOwogCkBAIC00 NSwxNCArNDYsMTUgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIHNldEFjdGl2ZShib29s KTsKIAorICAgIC8vIENDVGltZXJDbGllbnQgaW1wbGVtZW50YXRpb24uCisgICAgdmlydHVhbCB2 b2lkIG9uVGltZXJGaXJlZCgpOworCiAgICAgLy8gVmlydHVhbCBmb3IgdGVzdGluZy4KICAgICB2 aXJ0dWFsIGRvdWJsZSBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWVNcygpIGNvbnN0OwogCiBw cm90ZWN0ZWQ6CiAgICAgQ0NEZWxheUJhc2VkVGltZVNvdXJjZShkb3VibGUgaW50ZXJ2YWxNcywg Q0NUaHJlYWQqKTsKLSAgICB2b2lkIG9uVGljaygpOwotICAgIHZvaWQgdXBkYXRlU3RhdGUoKTsK LSAgICB2b2lkIHBvc3RUaWNrVGFzayhsb25nIGxvbmcgZGVsYXkpOworICAgIHZvaWQgcG9zdE5l eHRUaWNrVGFzayhkb3VibGUgbm93TXMpOwogCiAgICAgZW51bSBTdGF0ZSB7CiAgICAgICAgIFNU QVRFX0lOQUNUSVZFLApAQCAtNjAsMTAgKzYyLDEyIEBAIHByb3RlY3RlZDoKICAgICAgICAgU1RB VEVfQUNUSVZFLAogICAgIH07CiAgICAgQ0NUaW1lU291cmNlQ2xpZW50KiBtX2NsaWVudDsKKyAg ICBib29sIG1faGFzVGlja1RhcmdldDsKICAgICBkb3VibGUgbV9pbnRlcnZhbE1zOwogICAgIGRv dWJsZSBtX3RpY2tUYXJnZXQ7CiAgICAgU3RhdGUgbV9zdGF0ZTsKICAgICBDQ1RocmVhZCogbV90 aHJlYWQ7CisgICAgQ0NUaW1lciBtX3RpbWVyOwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0RlbGF5QmFzZWRUaW1lU291cmNlVGVzdC5jcHAgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2VUZXN0LmNw cAppbmRleCAwNWE3NTNiYjljYWQzZmNiMzMyMTIwYmI4OTBmMDQ1NjI4ZTRhMTMwLi40MWM5ZDEx OWVkZWFjYzcxZmRhMjY5YWQ4NmJjNjUwMGExM2U1YmMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2VUZXN0LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDRGVsYXlCYXNlZFRpbWVTb3VyY2VUZXN0LmNw cApAQCAtMjI0LDcgKzIyNCw3IEBAIFRFU1QoQ0NEZWxheUJhc2VkVGltZVNvdXJjZVRlc3QsIEFj aGlldmVzVGFyZ2V0UmF0ZVdpdGhOb05vaXNlKQogICAgIEVYUEVDVF9ORUFSKDEwMDAuMCAvIDYw LjAsIGF2ZXJhZ2VJbnRlcnZhbCwgMC4xKTsKIH0KIAotVEVTVChDQ0RlbGF5QmFzZWRUaW1lU291 cmNlLCBUZXN0VW5yZWZXaGlsZVBlbmRpbmcpCitURVNUKENDRGVsYXlCYXNlZFRpbWVTb3VyY2Us IFRlc3REZWFjdGl2YXRlV2hpbGVQZW5kaW5nKQogewogICAgIEZha2VDQ1RocmVhZCB0aHJlYWQ7 CiAgICAgRmFrZUNDVGltZVNvdXJjZUNsaWVudCBjbGllbnQ7CkBAIC0yMzMsNyArMjMzLDU3IEBA IFRFU1QoQ0NEZWxheUJhc2VkVGltZVNvdXJjZSwgVGVzdFVucmVmV2hpbGVQZW5kaW5nKQogICAg IHRpbWVyLT5zZXRBY3RpdmUodHJ1ZSk7IC8vIFNob3VsZCBwb3N0IGEgdGFzay4KICAgICB0aW1l ci0+c2V0QWN0aXZlKGZhbHNlKTsKICAgICB0aW1lci5jbGVhcigpOwotICAgIHRocmVhZC5ydW5Q ZW5kaW5nVGFzaygpOyAvLyBTaG91bGQgcnVuIHRoZSBwb3N0ZWQgdGFzaywgYW5kIGRlbGV0ZSB0 aGUgdGltZXIgb2JqZWN0LgorICAgIHRocmVhZC5ydW5QZW5kaW5nVGFzaygpOyAvLyBTaG91bGQg cnVuIHRoZSBwb3N0ZWQgdGFzayB3aXRob3V0IGNyYXNoaW5nLgorfQorCitURVNUKENDRGVsYXlC YXNlZFRpbWVTb3VyY2UsIFRlc3REZWFjdGl2YXRlQW5kUmVhY3RpdmF0ZUJlZm9yZU5leHRUaWNr VGltZSkKK3sKKyAgICBGYWtlQ0NUaHJlYWQgdGhyZWFkOworICAgIEZha2VDQ1RpbWVTb3VyY2VD bGllbnQgY2xpZW50OworICAgIFJlZlB0cjxGYWtlQ0NEZWxheUJhc2VkVGltZVNvdXJjZT4gdGlt ZXIgPSBGYWtlQ0NEZWxheUJhc2VkVGltZVNvdXJjZTo6Y3JlYXRlKDEwMDAuMCAvIDYwLjAsICZ0 aHJlYWQpOworICAgIHRpbWVyLT5zZXRDbGllbnQoJmNsaWVudCk7CisKKyAgICAvLyBTaG91bGQg cnVuIHRoZSBhY3RpdmF0ZSB0YXNrLCBhbmQgcGljayB1cCBhIG5ldyB0aW1lYmFzZS4KKyAgICB0 aW1lci0+c2V0QWN0aXZlKHRydWUpOworICAgIHRpbWVyLT5zZXRNb25vdG9uaWNhbGx5SW5jcmVh c2luZ1RpbWVNcygwKTsKKyAgICB0aHJlYWQucnVuUGVuZGluZ1Rhc2soKTsKKworICAgIC8vIFN0 b3AgdGhlIHRpbWVyCisgICAgdGltZXItPnNldEFjdGl2ZShmYWxzZSk7CisKKyAgICAvLyBUYXNr IHdpbGwgYmUgcGVuZGluZyBhbnl3YXksIHJ1biBpdAorICAgIHRocmVhZC5ydW5QZW5kaW5nVGFz aygpOworCisgICAgLy8gU3RhcnQgdGhlIHRpbWVyIGFnYWluLCBidXQgYmVmb3JlIHRoZSBuZXh0 IHRpY2sgdGltZSB0aGUgdGltZXIgcHJldmlvdXNseQorICAgIC8vIHBsYW5uZWQgb24gdXNpbmcu IFRoYXQgc2FtZSB0aWNrIHRpbWUgc2hvdWxkIHN0aWxsIGJlIHRhcmdldGVkLgorICAgIHRpbWVy LT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWVNcyg0KTsKKyAgICB0aW1lci0+c2V0QWN0 aXZlKHRydWUpOworICAgIEVYUEVDVF9FUSgxMiwgdGhyZWFkLnBlbmRpbmdEZWxheSgpKTsKK30K KworVEVTVChDQ0RlbGF5QmFzZWRUaW1lU291cmNlLCBUZXN0RGVhY3RpdmF0ZUFuZFJlYWN0aXZh dGVBZnRlck5leHRUaWNrVGltZSkKK3sKKyAgICBGYWtlQ0NUaHJlYWQgdGhyZWFkOworICAgIEZh a2VDQ1RpbWVTb3VyY2VDbGllbnQgY2xpZW50OworICAgIFJlZlB0cjxGYWtlQ0NEZWxheUJhc2Vk VGltZVNvdXJjZT4gdGltZXIgPSBGYWtlQ0NEZWxheUJhc2VkVGltZVNvdXJjZTo6Y3JlYXRlKDEw MDAuMCAvIDYwLjAsICZ0aHJlYWQpOworICAgIHRpbWVyLT5zZXRDbGllbnQoJmNsaWVudCk7CisK KyAgICAvLyBTaG91bGQgcnVuIHRoZSBhY3RpdmF0ZSB0YXNrLCBhbmQgcGljayB1cCBhIG5ldyB0 aW1lYmFzZS4KKyAgICB0aW1lci0+c2V0QWN0aXZlKHRydWUpOworICAgIHRpbWVyLT5zZXRNb25v dG9uaWNhbGx5SW5jcmVhc2luZ1RpbWVNcygwKTsKKyAgICB0aHJlYWQucnVuUGVuZGluZ1Rhc2so KTsKKworICAgIC8vIFN0b3AgdGhlIHRpbWVyCisgICAgdGltZXItPnNldEFjdGl2ZShmYWxzZSk7 CisKKyAgICAvLyBUYXNrIHdpbGwgYmUgcGVuZGluZyBhbnl3YXksIHJ1biBpdAorICAgIHRocmVh ZC5ydW5QZW5kaW5nVGFzaygpOworCisgICAgLy8gU3RhcnQgdGhlIHRpbWVyIGFnYWluLCBidXQg YmVmb3JlIHRoZSBuZXh0IHRpY2sgdGltZSB0aGUgdGltZXIgcHJldmlvdXNseQorICAgIC8vIHBs YW5uZWQgb24gdXNpbmcuIFRoYXQgc2FtZSB0aWNrIHRpbWUgc2hvdWxkIHN0aWxsIGJlIHRhcmdl dGVkLgorICAgIHRpbWVyLT5zZXRNb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWVNcygyMCk7Cisg ICAgdGltZXItPnNldEFjdGl2ZSh0cnVlKTsKKyAgICBFWFBFQ1RfRVEoMTMsIHRocmVhZC5wZW5k aW5nRGVsYXkoKSk7CiB9CiAKIH0K