90237 2012-06-28 19:10:10 -0700 [Chromium-Mac] Implement functions for localized time format information 2012-07-11 02:11:52 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 90248 90956 1 yosin yosin tkent oldest_to_newest 660057 0 yosin 2012-06-28 19:10:10 -0700 To implement input type "time" multiple fields UI, we need following functions for Windows: 1. localizedTimeFormatText() 2. localizedShortTimeFormatText() 3. timeAMPMLables() 665453 1 151392 yosin 2012-07-09 21:06:58 -0700 Created attachment 151392 Patch 1 665454 2 151393 yosin 2012-07-09 21:10:52 -0700 Created attachment 151393 Patch 2 665455 3 151393 yosin 2012-07-09 21:11:28 -0700 Comment on attachment 151393 Patch 2 Could you review this patch? Thanks in advance. 665460 4 151393 tkent 2012-07-09 21:25:38 -0700 Comment on attachment 151393 Patch 2 ok 665461 5 151393 yosin 2012-07-09 21:31:48 -0700 Comment on attachment 151393 Patch 2 Clearing flags on attachment: 151393 Committed r122190: <http://trac.webkit.org/changeset/122190> 665462 6 yosin 2012-07-09 21:31:54 -0700 All reviewed patches have been landed. Closing bug. 151392 2012-07-09 21:06:58 -0700 2012-07-09 21:10:47 -0700 Patch 1 bug-90237-20120710130657.patch text/plain 9202 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmYyZmQwMGZmMTgwY2Mw ZTdkYzFiZDFiNjEzMTMyZjFiYWJmMGE1NC4uZmFjYzlmMGZmYTY2MTE5MTczMDcxM2FjMTRjZGJm OGFkMzdlMWNiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA3LTA5ICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtLU1h Y10gSW1wbGVtZW50IGZ1bmN0aW9ucyBmb3IgbG9jYWxpemVkIHRpbWUgZm9ybWF0IGluZm9ybWF0 aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDIz NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg cGF0Y2ggaW50cm9kdWNlcyBmb2xsb3dpbmcgbG9jYWxpemVkIHRpbWUgZm9ybWF0IHJlbGF0ZWQK KyAgICAgICAgZnVuY3Rpb25zOgorICAgICAgICAgIC0gbG9jYWxpemVUaW1lRm9ybWF0VGV4dCgp CisgICAgICAgICAgLSBsb2NhbGl6ZVNob3J0VGltZUZvcm1hdFRleHQoKQorICAgICAgICAgIC0g dGltZUFNUE1MYWJlbHMKKyAgICAgICAgZm9yIE1hYyBPU1ggaW4gZmVhdHVyZSBmbGFnOiBFTkFC TEVfSU5QVVRfVFlQRV9USU1FX01VTFRJUExFX0ZJRUxEUy4KKworICAgICAgICBUaGVzZSBmdW5j dGlvbiB3aWxsIGJlIHVzZWQgYnkgaW5wdXQgdHlwZSAidGltZSIgd2l0aCBtdWx0aXBsZSBpbnB1 dAorICAgICAgICBmaWVsZHMgVUkuCisKKyAgICAgICAgVGVzdHM6IFdlYktpdC9jaHJvbWl1bS90 ZXN0cy9Mb2NhbGVNYWNUZXN0LmNwcAorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9tYWMvTG9j YWxlTWFjLmg6CisgICAgICAgIChMb2NhbGVNYWMpOiBBZGRlZCB0aW1lIGZvcm1hdCByZWxhdGVk IGZ1bmN0aW9ucyBhbmQgdmFyaWFibGVzLgorICAgICAgICAqIHBsYXRmb3JtL3RleHQvbWFjL0xv Y2FsZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZURhdGVUaW1lRm9ybWF0dGVyKTog QWRkZWQuIEEgaGVscGVyIGZ1bmN0aW9uIGZvciBjcmVhdGluZyBkYXRlIHRpbWUgZm9ybWF0dGVy LgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxlTWFjOjpjcmVhdGVTaG9ydERhdGVGb3JtYXR0ZXIp OiBDaGFuZ2VkIHRvIHVzZSBjcmVhdGVEYXRlVGltZUZvcm1hdHRlci4KKyAgICAgICAgKFdlYkNv cmU6OkxvY2FsZU1hYzo6Y3JlYXRlVGltZUZvcm1hdHRlcik6IEFkZGVkLgorICAgICAgICAoV2Vi Q29yZTo6TG9jYWxlTWFjOjpjcmVhdGVTaG9ydFRpbWVGb3JtYXR0ZXIpOiBBZGRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkxvY2FsZU1hYzo6dGltZUZvcm1hdFRleHQpOiBBZGRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkxvY2FsZU1hYzo6c2hvcnRUaW1lRm9ybWF0VGV4dCk6IEFkZGVkLgorICAgICAg ICAoV2ViQ29yZTo6TG9jYWxlTWFjOjp0aW1lQU1QTUxhYmVscyk6IEFkZGVkLgorCiAyMDEyLTA3 LTA5ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSRUdSRVNT SU9OKHIxMTQ4NjItcjExNDg4Nik6IEZpeCBhIGNyYXNoIGJ5IHN3aXRjaGluZyB0aGUgaW5wdXQg dHlwZSB0byBoaWRkZW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDg2ZTcwODU0Y2Jl OTY5NDQwMTNjMzZiN2U2ZmRjNjkxOWI1NTg1ODYuLjFlMmY0ZDkyN2EyMTdmZDkxMjA2OTdlZTk3 YTQzNWEwMzM2OWFiOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMDctMDkgIFlvc2hpZnVtaSBJbm91ZSAgPHlvc2luQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbQ2hyb21pdW0tTWFjXSBJbXBsZW1lbnQgZnVuY3Rpb25zIGZvciBsb2NhbGl6ZWQg dGltZSBmb3JtYXQgaW5mb3JtYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTkwMjM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiB0ZXN0cy9Mb2NhbGVNYWNUZXN0LmNwcDoKKyAgICAgICAgKExvY2Fs ZU1hY1Rlc3QpOgorICAgICAgICAoTG9jYWxlTWFjVGVzdDo6dGltZUZvcm1hdFRleHQpOgorICAg ICAgICAoTG9jYWxlTWFjVGVzdDo6c2hvcnRUaW1lRm9ybWF0VGV4dCk6CisgICAgICAgIChMb2Nh bGVNYWNUZXN0Ojp0aW1lQU1QTUxhYmVsKToKKyAgICAgICAgKFRFU1RfRik6CisKIDIwMTItMDct MDkgIEVyaWMgUGVubmVyICA8ZXBlbm5lckBnb29nbGUuY29tPgogCiAgICAgICAgIFtjaHJvbWl1 bV0gTWVyZ2UgdXBkYXRlcyBhbmQgaWRsZSB1cGRhdGVzIGludG8gb25lIHBhc3MKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvbWFjL0xvY2FsZU1hYy5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9tYWMvTG9jYWxlTWFjLmgKaW5kZXggNGMzNzFlZDdhODFk ZjM5Y2MyYTM3NWNhODIwOTUxMWM4NzczNGE0MS4uNmYxMzY1Zjc5NTMxOTdkODQxOWFjMzYzNDI1 ZTBlNTI1MTY1NmQ2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9t YWMvTG9jYWxlTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9tYWMvTG9j YWxlTWFjLmgKQEAgLTU4LDYgKzU4LDEyIEBAIHB1YmxpYzoKICAgICB1bnNpZ25lZCBmaXJzdERh eU9mV2VlaygpOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoSU5QVVRfVFlQRV9USU1FX01VTFRJUExF X0ZJRUxEUykKKyAgICBTdHJpbmcgdGltZUZvcm1hdFRleHQoKTsKKyAgICBTdHJpbmcgc2hvcnRU aW1lRm9ybWF0VGV4dCgpOworICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiB0aW1lQU1QTUxhYmVs cygpOworI2VuZGlmCisKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgTG9jYWxlTWFjKGNvbnN0IFN0 cmluZyYpOwogICAgIE5TRGF0ZUZvcm1hdHRlciAqY3JlYXRlU2hvcnREYXRlRm9ybWF0dGVyKCk7 CkBAIC02OCw2ICs3NCwxNCBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxTdHJpbmc+IG1fbW9udGhM YWJlbHM7CiAgICAgVmVjdG9yPFN0cmluZz4gbV93ZWVrRGF5U2hvcnRMYWJlbHM7CiAjZW5kaWYK KyNpZiBFTkFCTEUoSU5QVVRfVFlQRV9USU1FX01VTFRJUExFX0ZJRUxEUykKKyAgICBOU0RhdGVG b3JtYXR0ZXIgKmNyZWF0ZVRpbWVGb3JtYXR0ZXIoKTsKKyAgICBOU0RhdGVGb3JtYXR0ZXIgKmNy ZWF0ZVNob3J0VGltZUZvcm1hdHRlcigpOworCisgICAgU3RyaW5nIG1fbG9jYWxpemVkVGltZUZv cm1hdFRleHQ7CisgICAgU3RyaW5nIG1fbG9jYWxpemVkU2hvcnRUaW1lRm9ybWF0VGV4dDsKKyAg ICBWZWN0b3I8U3RyaW5nPiBtX3RpbWVBTVBNTGFiZWxzOworI2VuZGlmCiB9OwogCiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L21hYy9Mb2NhbGVNYWMubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L21hYy9Mb2NhbGVNYWMubW0KaW5kZXggYzcwOTdj ZWNlZmVjZmM1Y2VmNTU0NDI1MzUwNjA2ZTJiYmI4NmNmYy4uY2Q3ZjRmOTQ0ZmJiODM2YjNkMzdi ODFmYWNiZjM0ZTEzYjg3MzdmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v dGV4dC9tYWMvTG9jYWxlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQv bWFjL0xvY2FsZU1hYy5tbQpAQCAtNDQsNiArNDQsMTcgQEAgdXNpbmcgbmFtZXNwYWNlIHN0ZDsK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMgTlNEYXRlRm9ybWF0dGVyKiBjcmVhdGVE YXRlVGltZUZvcm1hdHRlcihOU0xvY2FsZSogbG9jYWxlLCBOU0RhdGVGb3JtYXR0ZXJTdHlsZSBk YXRlU3R5bGUsIE5TRGF0ZUZvcm1hdHRlclN0eWxlIHRpbWVTdHlsZSkKK3sKKyAgICBOU0RhdGVG b3JtYXR0ZXIgKmZvcm1hdHRlciA9IFtbTlNEYXRlRm9ybWF0dGVyIGFsbG9jXSBpbml0XTsKKyAg ICBbZm9ybWF0dGVyIHNldExvY2FsZTpsb2NhbGVdOworICAgIFtmb3JtYXR0ZXIgc2V0RGF0ZVN0 eWxlOmRhdGVTdHlsZV07CisgICAgW2Zvcm1hdHRlciBzZXRUaW1lU3R5bGU6dGltZVN0eWxlXTsK KyAgICBbZm9ybWF0dGVyIHNldFRpbWVab25lOltOU1RpbWVab25lIHRpbWVab25lV2l0aEFiYnJl dmlhdGlvbjpAIlVUQyJdXTsKKyAgICBbZm9ybWF0dGVyIHNldENhbGVuZGFyOltbTlNDYWxlbmRh ciBhbGxvY10gaW5pdFdpdGhDYWxlbmRhcklkZW50aWZpZXI6TlNHcmVnb3JpYW5DYWxlbmRhcl1d OworICAgIHJldHVybiBmb3JtYXR0ZXI7Cit9CisKIExvY2FsZU1hYzo6TG9jYWxlTWFjKGNvbnN0 IFN0cmluZyYgbG9jYWxlSWRlbnRpZmllcikKICAgICA6IG1fbG9jYWxlKFtbTlNMb2NhbGUgYWxs b2NdIGluaXRXaXRoTG9jYWxlSWRlbnRpZmllcjpsb2NhbGVJZGVudGlmaWVyXSkKIHsKQEAgLTY2 LDEzICs3Nyw3IEBAIExvY2FsZU1hYyogTG9jYWxlTWFjOjpjdXJyZW50TG9jYWxlKCkKIAogTlNE YXRlRm9ybWF0dGVyKiBMb2NhbGVNYWM6OmNyZWF0ZVNob3J0RGF0ZUZvcm1hdHRlcigpCiB7Ci0g ICAgTlNEYXRlRm9ybWF0dGVyICpmb3JtYXR0ZXIgPSBbW05TRGF0ZUZvcm1hdHRlciBhbGxvY10g aW5pdF07Ci0gICAgW2Zvcm1hdHRlciBzZXRMb2NhbGU6bV9sb2NhbGUuZ2V0KCldOwotICAgIFtm b3JtYXR0ZXIgc2V0RGF0ZVN0eWxlOk5TRGF0ZUZvcm1hdHRlclNob3J0U3R5bGVdOwotICAgIFtm b3JtYXR0ZXIgc2V0VGltZVN0eWxlOk5TRGF0ZUZvcm1hdHRlck5vU3R5bGVdOwotICAgIFtmb3Jt YXR0ZXIgc2V0VGltZVpvbmU6W05TVGltZVpvbmUgdGltZVpvbmVXaXRoQWJicmV2aWF0aW9uOkAi VVRDIl1dOwotICAgIFtmb3JtYXR0ZXIgc2V0Q2FsZW5kYXI6W1tOU0NhbGVuZGFyIGFsbG9jXSBp bml0V2l0aENhbGVuZGFySWRlbnRpZmllcjpOU0dyZWdvcmlhbkNhbGVuZGFyXV07Ci0gICAgcmV0 dXJuIGZvcm1hdHRlcjsKKyAgICByZXR1cm4gY3JlYXRlRGF0ZVRpbWVGb3JtYXR0ZXIobV9sb2Nh bGUuZ2V0KCksIE5TRGF0ZUZvcm1hdHRlclNob3J0U3R5bGUsIE5TRGF0ZUZvcm1hdHRlck5vU3R5 bGUpOwogfQogCiBkb3VibGUgTG9jYWxlTWFjOjpwYXJzZURhdGUoY29uc3QgU3RyaW5nJiBpbnB1 dCkKQEAgLTE5NCw0ICsxOTksNDUgQEAgdW5zaWduZWQgTG9jYWxlTWFjOjpmaXJzdERheU9mV2Vl aygpCiAgICAgcmV0dXJuIFtjYWxlbmRhci5nZXQoKSBmaXJzdFdlZWtkYXldIC0gMTsKIH0KICNl bmRpZgorCisjaWYgRU5BQkxFKElOUFVUX1RZUEVfVElNRV9NVUxUSVBMRV9GSUVMRFMpCitOU0Rh dGVGb3JtYXR0ZXIqIExvY2FsZU1hYzo6Y3JlYXRlVGltZUZvcm1hdHRlcigpCit7CisgICAgcmV0 dXJuIGNyZWF0ZURhdGVUaW1lRm9ybWF0dGVyKG1fbG9jYWxlLmdldCgpLCBOU0RhdGVGb3JtYXR0 ZXJOb1N0eWxlLCBOU0RhdGVGb3JtYXR0ZXJNZWRpdW1TdHlsZSk7Cit9CisKK05TRGF0ZUZvcm1h dHRlciogTG9jYWxlTWFjOjpjcmVhdGVTaG9ydFRpbWVGb3JtYXR0ZXIoKQoreworICAgIHJldHVy biBjcmVhdGVEYXRlVGltZUZvcm1hdHRlcihtX2xvY2FsZS5nZXQoKSwgTlNEYXRlRm9ybWF0dGVy Tm9TdHlsZSwgTlNEYXRlRm9ybWF0dGVyU2hvcnRTdHlsZSk7Cit9CisKK1N0cmluZyBMb2NhbGVN YWM6OnRpbWVGb3JtYXRUZXh0KCkKK3sKKyAgICBpZiAoIW1fbG9jYWxpemVkVGltZUZvcm1hdFRl eHQuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gbV9sb2NhbGl6ZWRUaW1lRm9ybWF0VGV4dDsK KyAgICBSZXRhaW5QdHI8TlNEYXRlRm9ybWF0dGVyPiBmb3JtYXR0ZXIoQWRvcHROUywgY3JlYXRl VGltZUZvcm1hdHRlcigpKTsKKyAgICBtX2xvY2FsaXplZFRpbWVGb3JtYXRUZXh0ID0gU3RyaW5n KFtmb3JtYXR0ZXIuZ2V0KCkgZGF0ZUZvcm1hdF0pOworICAgIHJldHVybiBtX2xvY2FsaXplZFRp bWVGb3JtYXRUZXh0OworfQorCitTdHJpbmcgTG9jYWxlTWFjOjpzaG9ydFRpbWVGb3JtYXRUZXh0 KCkKK3sKKyAgICBpZiAoIW1fbG9jYWxpemVkU2hvcnRUaW1lRm9ybWF0VGV4dC5pc0VtcHR5KCkp CisgICAgICAgIHJldHVybiBtX2xvY2FsaXplZFNob3J0VGltZUZvcm1hdFRleHQ7CisgICAgUmV0 YWluUHRyPE5TRGF0ZUZvcm1hdHRlcj4gZm9ybWF0dGVyKEFkb3B0TlMsIGNyZWF0ZVNob3J0VGlt ZUZvcm1hdHRlcigpKTsKKyAgICBtX2xvY2FsaXplZFNob3J0VGltZUZvcm1hdFRleHQgPSBTdHJp bmcoW2Zvcm1hdHRlci5nZXQoKSBkYXRlRm9ybWF0XSk7CisgICAgcmV0dXJuIG1fbG9jYWxpemVk U2hvcnRUaW1lRm9ybWF0VGV4dDsKK30KKworY29uc3QgVmVjdG9yPFN0cmluZz4mIExvY2FsZU1h Yzo6dGltZUFNUE1MYWJlbHMoKQoreworICAgIGlmICghbV90aW1lQU1QTUxhYmVscy5pc0VtcHR5 KCkpCisgICAgICAgIHJldHVybiBtX3RpbWVBTVBNTGFiZWxzOworICAgIG1fdGltZUFNUE1MYWJl bHMucmVzZXJ2ZUNhcGFjaXR5KDIpOworICAgIFJldGFpblB0cjxOU0RhdGVGb3JtYXR0ZXI+IGZv cm1hdHRlcihBZG9wdE5TLCBjcmVhdGVTaG9ydFRpbWVGb3JtYXR0ZXIoKSk7CisgICAgbV90aW1l QU1QTUxhYmVscy5hcHBlbmQoU3RyaW5nKFtmb3JtYXR0ZXIuZ2V0KCkgQU1TeW1ib2xdKSk7Cisg ICAgbV90aW1lQU1QTUxhYmVscy5hcHBlbmQoU3RyaW5nKFtmb3JtYXR0ZXIuZ2V0KCkgUE1TeW1i b2xdKSk7CisgICAgcmV0dXJuIG1fdGltZUFNUE1MYWJlbHM7Cit9CisjZW5kaWYKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTG9jYWxlTWFjVGVzdC5jcHAgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0xvY2FsZU1hY1Rlc3QuY3BwCmluZGV4IGQ1M2I4 M2M3YTkxOWE1N2M1NDg2Y2MyZDQwNmQxNWI5Zjg5OTcwNTYuLjExNTBhMzAxYWE4NzQzNmNlMjY2 ODc4NGRiYzYzNGQ0MGVkYTlhYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v dGVzdHMvTG9jYWxlTWFjVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0 cy9Mb2NhbGVNYWNUZXN0LmNwcApAQCAtOTksNiArOTksMjYgQEAgcHJvdGVjdGVkOgogICAgICAg ICByZXR1cm4gbG9jYWxlLT53ZWVrRGF5U2hvcnRMYWJlbHMoKVtpbmRleF07CiAgICAgfQogI2Vu ZGlmCisKKyNpZiBFTkFCTEUoSU5QVVRfVFlQRV9USU1FX01VTFRJUExFX0ZJRUxEUykKKyAgICBT dHJpbmcgdGltZUZvcm1hdFRleHQoY29uc3QgU3RyaW5nJiBsb2NhbGVTdHJpbmcpCisgICAgewor ICAgICAgICBPd25QdHI8TG9jYWxlTWFjPiBsb2NhbGUgPSBMb2NhbGVNYWM6OmNyZWF0ZShsb2Nh bGVTdHJpbmcpOworICAgICAgICByZXR1cm4gbG9jYWxlLT50aW1lRm9ybWF0VGV4dCgpOworICAg IH0KKworICAgIFN0cmluZyBzaG9ydFRpbWVGb3JtYXRUZXh0KGNvbnN0IFN0cmluZyYgbG9jYWxl U3RyaW5nKQorICAgIHsKKyAgICAgICAgT3duUHRyPExvY2FsZU1hYz4gbG9jYWxlID0gTG9jYWxl TWFjOjpjcmVhdGUobG9jYWxlU3RyaW5nKTsKKyAgICAgICAgcmV0dXJuIGxvY2FsZS0+c2hvcnRU aW1lRm9ybWF0VGV4dCgpOworICAgIH0KKworICAgIFN0cmluZyB0aW1lQU1QTUxhYmVsKGNvbnN0 IFN0cmluZyYgbG9jYWxlU3RyaW5nLCB1bnNpZ25lZCBpbmRleCkKKyAgICB7CisgICAgICAgIE93 blB0cjxMb2NhbGVNYWM+IGxvY2FsZSA9IExvY2FsZU1hYzo6Y3JlYXRlKGxvY2FsZVN0cmluZyk7 CisgICAgICAgIHJldHVybiBsb2NhbGUtPnRpbWVBTVBNTGFiZWxzKClbaW5kZXhdOworICAgIH0K KyNlbmRpZgogfTsKIAogVEVTVF9GKExvY2FsZU1hY1Rlc3QsIGZvcm1hdERhdGUpCkBAIC0xNjAs MyArMTgwLDMxIEBAIFRFU1RfRihMb2NhbGVNYWNUZXN0LCB3ZWVrRGF5U2hvcnRMYWJlbHMpCiAg ICAgRVhQRUNUX1NUUkVRKCJceEU1XHg5Q1x4OUYiLCB3ZWVrRGF5U2hvcnRMYWJlbCgiamFfSlAi LCBTYXR1cmRheSkudXRmOCgpLmRhdGEoKSk7CiB9CiAjZW5kaWYKKworI2lmIEVOQUJMRShJTlBV VF9UWVBFX1RJTUVfTVVMVElQTEVfRklFTERTKQorVEVTVF9GKExvY2FsZU1hY1Rlc3QsIHRpbWVG b3JtYXRUZXh0KQoreworICAgIEVYUEVDVF9TVFJFUSgiaDptbTpzcyBhIiwgdGltZUZvcm1hdFRl eHQoImVuX1VTIikudXRmOCgpLmRhdGEoKSk7CisgICAgRVhQRUNUX1NUUkVRKCJISDptbTpzcyIs IHRpbWVGb3JtYXRUZXh0KCJmcl9GUiIpLnV0ZjgoKS5kYXRhKCkpOworICAgIEVYUEVDVF9TVFJF USgiSDptbTpzcyIsIHRpbWVGb3JtYXRUZXh0KCJqYV9KUCIpLnV0ZjgoKS5kYXRhKCkpOworfQor CitURVNUX0YoTG9jYWxlTWFjVGVzdCwgc2hvcnRUaW1lRm9ybWF0VGV4dCkKK3sKKyAgICBFWFBF Q1RfU1RSRVEoImg6bW0gYSIsIHNob3J0VGltZUZvcm1hdFRleHQoImVuX1VTIikudXRmOCgpLmRh dGEoKSk7CisgICAgRVhQRUNUX1NUUkVRKCJISDptbSIsIHNob3J0VGltZUZvcm1hdFRleHQoImZy X0ZSIikudXRmOCgpLmRhdGEoKSk7CisgICAgRVhQRUNUX1NUUkVRKCJIOm1tIiwgc2hvcnRUaW1l Rm9ybWF0VGV4dCgiamFfSlAiKS51dGY4KCkuZGF0YSgpKTsKK30KKworVEVTVF9GKExvY2FsZU1h Y1Rlc3QsIHRpbWVBTVBNTGFiZWxzKQoreworICAgIEVYUEVDVF9TVFJFUSgiQU0iLCB0aW1lQU1Q TUxhYmVsKCJlbl9VUyIsIDApLnV0ZjgoKS5kYXRhKCkpOworICAgIEVYUEVDVF9TVFJFUSgiUE0i LCB0aW1lQU1QTUxhYmVsKCJlbl9VUyIsIDEpLnV0ZjgoKS5kYXRhKCkpOworCisgICAgRVhQRUNU X1NUUkVRKCJBTSIsIHRpbWVBTVBNTGFiZWwoImZyX0ZSIiwgMCkudXRmOCgpLmRhdGEoKSk7Cisg ICAgRVhQRUNUX1NUUkVRKCJQTSIsIHRpbWVBTVBNTGFiZWwoImZyX0ZSIiwgMSkudXRmOCgpLmRh dGEoKSk7CisKKyAgICBFWFBFQ1RfU1RSRVEoIlx4RTVceDhEXHg4OFx4RTVceDg5XHg4RCIsIHRp bWVBTVBNTGFiZWwoImphX0pQIiwgMCkudXRmOCgpLmRhdGEoKSk7CisgICAgRVhQRUNUX1NUUkVR KCJceEU1XHg4RFx4ODhceEU1XHhCRVx4OEMiLCB0aW1lQU1QTUxhYmVsKCJqYV9KUCIsIDEpLnV0 ZjgoKS5kYXRhKCkpOworfQorI2VuZGlmCg== 151393 2012-07-09 21:10:52 -0700 2012-07-09 21:31:48 -0700 Patch 2 bug-90237-20120710131050.patch text/plain 9340 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmYyZmQwMGZmMTgwY2Mw ZTdkYzFiZDFiNjEzMTMyZjFiYWJmMGE1NC4uMzA4NTc0ZjE3ZjUwMzJkYTJjYmUxNjNhZDhlZDlh MDJjYzNmOTZlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA3LTA5ICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtLU1h Y10gSW1wbGVtZW50IGZ1bmN0aW9ucyBmb3IgbG9jYWxpemVkIHRpbWUgZm9ybWF0IGluZm9ybWF0 aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDIz NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg cGF0Y2ggaW50cm9kdWNlcyBmb2xsb3dpbmcgbG9jYWxpemVkIHRpbWUgZm9ybWF0IHJlbGF0ZWQK KyAgICAgICAgZnVuY3Rpb25zOgorICAgICAgICAgIC0gbG9jYWxpemVUaW1lRm9ybWF0VGV4dCgp CisgICAgICAgICAgLSBsb2NhbGl6ZVNob3J0VGltZUZvcm1hdFRleHQoKQorICAgICAgICAgIC0g dGltZUFNUE1MYWJlbHMKKyAgICAgICAgZm9yIE1hYyBPU1ggaW4gZmVhdHVyZSBmbGFnOiBFTkFC TEVfSU5QVVRfVFlQRV9USU1FX01VTFRJUExFX0ZJRUxEUy4KKworICAgICAgICBUaGVzZSBmdW5j dGlvbiB3aWxsIGJlIHVzZWQgYnkgaW5wdXQgdHlwZSAidGltZSIgd2l0aCBtdWx0aXBsZSBpbnB1 dAorICAgICAgICBmaWVsZHMgVUkuCisKKyAgICAgICAgTm90ZTogSUNVIHZlcnNpb24gb2YgbG9j YWxpemVkIHRpbWUgZm9ybWF0IGZ1bmN0aW9ucyBhcmUgaW1wbGVtZW50ZWQKKyAgICAgICAgaW4g aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5OTY1CisKKyAgICAgICAg VGVzdHM6IFdlYktpdC9jaHJvbWl1bS90ZXN0cy9Mb2NhbGVNYWNUZXN0LmNwcAorCisgICAgICAg ICogcGxhdGZvcm0vdGV4dC9tYWMvTG9jYWxlTWFjLmg6CisgICAgICAgIChMb2NhbGVNYWMpOiBB ZGRlZCB0aW1lIGZvcm1hdCByZWxhdGVkIGZ1bmN0aW9ucyBhbmQgdmFyaWFibGVzLgorICAgICAg ICAqIHBsYXRmb3JtL3RleHQvbWFjL0xvY2FsZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmNy ZWF0ZURhdGVUaW1lRm9ybWF0dGVyKTogQWRkZWQuIEEgaGVscGVyIGZ1bmN0aW9uIGZvciBjcmVh dGluZyBkYXRlIHRpbWUgZm9ybWF0dGVyLgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxlTWFjOjpj cmVhdGVTaG9ydERhdGVGb3JtYXR0ZXIpOiBDaGFuZ2VkIHRvIHVzZSBjcmVhdGVEYXRlVGltZUZv cm1hdHRlci4KKyAgICAgICAgKFdlYkNvcmU6OkxvY2FsZU1hYzo6Y3JlYXRlVGltZUZvcm1hdHRl cik6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxlTWFjOjpjcmVhdGVTaG9ydFRpbWVG b3JtYXR0ZXIpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxvY2FsZU1hYzo6dGltZUZvcm1h dFRleHQpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxvY2FsZU1hYzo6c2hvcnRUaW1lRm9y bWF0VGV4dCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxlTWFjOjp0aW1lQU1QTUxh YmVscyk6IEFkZGVkLgorCiAyMDEyLTA3LTA5ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxMTQ4NjItcjExNDg4Nik6IEZpeCBhIGNyYXNo IGJ5IHN3aXRjaGluZyB0aGUgaW5wdXQgdHlwZSB0byBoaWRkZW4uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCmluZGV4IDg2ZTcwODU0Y2JlOTY5NDQwMTNjMzZiN2U2ZmRjNjkxOWI1NTg1ODYuLjFl MmY0ZDkyN2EyMTdmZDkxMjA2OTdlZTk3YTQzNWEwMzM2OWFiOWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDctMDkgIFlvc2hpZnVtaSBJbm91ZSAg PHlvc2luQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW0tTWFjXSBJbXBsZW1lbnQg ZnVuY3Rpb25zIGZvciBsb2NhbGl6ZWQgdGltZSBmb3JtYXQgaW5mb3JtYXRpb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwMjM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9Mb2NhbGVNYWNU ZXN0LmNwcDoKKyAgICAgICAgKExvY2FsZU1hY1Rlc3QpOgorICAgICAgICAoTG9jYWxlTWFjVGVz dDo6dGltZUZvcm1hdFRleHQpOgorICAgICAgICAoTG9jYWxlTWFjVGVzdDo6c2hvcnRUaW1lRm9y bWF0VGV4dCk6CisgICAgICAgIChMb2NhbGVNYWNUZXN0Ojp0aW1lQU1QTUxhYmVsKToKKyAgICAg ICAgKFRFU1RfRik6CisKIDIwMTItMDctMDkgIEVyaWMgUGVubmVyICA8ZXBlbm5lckBnb29nbGUu Y29tPgogCiAgICAgICAgIFtjaHJvbWl1bV0gTWVyZ2UgdXBkYXRlcyBhbmQgaWRsZSB1cGRhdGVz IGludG8gb25lIHBhc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQv bWFjL0xvY2FsZU1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9tYWMvTG9jYWxl TWFjLmgKaW5kZXggNGMzNzFlZDdhODFkZjM5Y2MyYTM3NWNhODIwOTUxMWM4NzczNGE0MS4uNmYx MzY1Zjc5NTMxOTdkODQxOWFjMzYzNDI1ZTBlNTI1MTY1NmQ2NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9tYWMvTG9jYWxlTWFjLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vdGV4dC9tYWMvTG9jYWxlTWFjLmgKQEAgLTU4LDYgKzU4LDEyIEBAIHB1Ymxp YzoKICAgICB1bnNpZ25lZCBmaXJzdERheU9mV2VlaygpOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUo SU5QVVRfVFlQRV9USU1FX01VTFRJUExFX0ZJRUxEUykKKyAgICBTdHJpbmcgdGltZUZvcm1hdFRl eHQoKTsKKyAgICBTdHJpbmcgc2hvcnRUaW1lRm9ybWF0VGV4dCgpOworICAgIGNvbnN0IFZlY3Rv cjxTdHJpbmc+JiB0aW1lQU1QTUxhYmVscygpOworI2VuZGlmCisKIHByaXZhdGU6CiAgICAgZXhw bGljaXQgTG9jYWxlTWFjKGNvbnN0IFN0cmluZyYpOwogICAgIE5TRGF0ZUZvcm1hdHRlciAqY3Jl YXRlU2hvcnREYXRlRm9ybWF0dGVyKCk7CkBAIC02OCw2ICs3NCwxNCBAQCBwcml2YXRlOgogICAg IFZlY3RvcjxTdHJpbmc+IG1fbW9udGhMYWJlbHM7CiAgICAgVmVjdG9yPFN0cmluZz4gbV93ZWVr RGF5U2hvcnRMYWJlbHM7CiAjZW5kaWYKKyNpZiBFTkFCTEUoSU5QVVRfVFlQRV9USU1FX01VTFRJ UExFX0ZJRUxEUykKKyAgICBOU0RhdGVGb3JtYXR0ZXIgKmNyZWF0ZVRpbWVGb3JtYXR0ZXIoKTsK KyAgICBOU0RhdGVGb3JtYXR0ZXIgKmNyZWF0ZVNob3J0VGltZUZvcm1hdHRlcigpOworCisgICAg U3RyaW5nIG1fbG9jYWxpemVkVGltZUZvcm1hdFRleHQ7CisgICAgU3RyaW5nIG1fbG9jYWxpemVk U2hvcnRUaW1lRm9ybWF0VGV4dDsKKyAgICBWZWN0b3I8U3RyaW5nPiBtX3RpbWVBTVBNTGFiZWxz OworI2VuZGlmCiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90 ZXh0L21hYy9Mb2NhbGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L21hYy9M b2NhbGVNYWMubW0KaW5kZXggYzcwOTdjZWNlZmVjZmM1Y2VmNTU0NDI1MzUwNjA2ZTJiYmI4NmNm Yy4uY2Q3ZjRmOTQ0ZmJiODM2YjNkMzdiODFmYWNiZjM0ZTEzYjg3MzdmMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9tYWMvTG9jYWxlTWFjLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvbWFjL0xvY2FsZU1hYy5tbQpAQCAtNDQsNiArNDQsMTcg QEAgdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMg TlNEYXRlRm9ybWF0dGVyKiBjcmVhdGVEYXRlVGltZUZvcm1hdHRlcihOU0xvY2FsZSogbG9jYWxl LCBOU0RhdGVGb3JtYXR0ZXJTdHlsZSBkYXRlU3R5bGUsIE5TRGF0ZUZvcm1hdHRlclN0eWxlIHRp bWVTdHlsZSkKK3sKKyAgICBOU0RhdGVGb3JtYXR0ZXIgKmZvcm1hdHRlciA9IFtbTlNEYXRlRm9y bWF0dGVyIGFsbG9jXSBpbml0XTsKKyAgICBbZm9ybWF0dGVyIHNldExvY2FsZTpsb2NhbGVdOwor ICAgIFtmb3JtYXR0ZXIgc2V0RGF0ZVN0eWxlOmRhdGVTdHlsZV07CisgICAgW2Zvcm1hdHRlciBz ZXRUaW1lU3R5bGU6dGltZVN0eWxlXTsKKyAgICBbZm9ybWF0dGVyIHNldFRpbWVab25lOltOU1Rp bWVab25lIHRpbWVab25lV2l0aEFiYnJldmlhdGlvbjpAIlVUQyJdXTsKKyAgICBbZm9ybWF0dGVy IHNldENhbGVuZGFyOltbTlNDYWxlbmRhciBhbGxvY10gaW5pdFdpdGhDYWxlbmRhcklkZW50aWZp ZXI6TlNHcmVnb3JpYW5DYWxlbmRhcl1dOworICAgIHJldHVybiBmb3JtYXR0ZXI7Cit9CisKIExv Y2FsZU1hYzo6TG9jYWxlTWFjKGNvbnN0IFN0cmluZyYgbG9jYWxlSWRlbnRpZmllcikKICAgICA6 IG1fbG9jYWxlKFtbTlNMb2NhbGUgYWxsb2NdIGluaXRXaXRoTG9jYWxlSWRlbnRpZmllcjpsb2Nh bGVJZGVudGlmaWVyXSkKIHsKQEAgLTY2LDEzICs3Nyw3IEBAIExvY2FsZU1hYyogTG9jYWxlTWFj OjpjdXJyZW50TG9jYWxlKCkKIAogTlNEYXRlRm9ybWF0dGVyKiBMb2NhbGVNYWM6OmNyZWF0ZVNo b3J0RGF0ZUZvcm1hdHRlcigpCiB7Ci0gICAgTlNEYXRlRm9ybWF0dGVyICpmb3JtYXR0ZXIgPSBb W05TRGF0ZUZvcm1hdHRlciBhbGxvY10gaW5pdF07Ci0gICAgW2Zvcm1hdHRlciBzZXRMb2NhbGU6 bV9sb2NhbGUuZ2V0KCldOwotICAgIFtmb3JtYXR0ZXIgc2V0RGF0ZVN0eWxlOk5TRGF0ZUZvcm1h dHRlclNob3J0U3R5bGVdOwotICAgIFtmb3JtYXR0ZXIgc2V0VGltZVN0eWxlOk5TRGF0ZUZvcm1h dHRlck5vU3R5bGVdOwotICAgIFtmb3JtYXR0ZXIgc2V0VGltZVpvbmU6W05TVGltZVpvbmUgdGlt ZVpvbmVXaXRoQWJicmV2aWF0aW9uOkAiVVRDIl1dOwotICAgIFtmb3JtYXR0ZXIgc2V0Q2FsZW5k YXI6W1tOU0NhbGVuZGFyIGFsbG9jXSBpbml0V2l0aENhbGVuZGFySWRlbnRpZmllcjpOU0dyZWdv cmlhbkNhbGVuZGFyXV07Ci0gICAgcmV0dXJuIGZvcm1hdHRlcjsKKyAgICByZXR1cm4gY3JlYXRl RGF0ZVRpbWVGb3JtYXR0ZXIobV9sb2NhbGUuZ2V0KCksIE5TRGF0ZUZvcm1hdHRlclNob3J0U3R5 bGUsIE5TRGF0ZUZvcm1hdHRlck5vU3R5bGUpOwogfQogCiBkb3VibGUgTG9jYWxlTWFjOjpwYXJz ZURhdGUoY29uc3QgU3RyaW5nJiBpbnB1dCkKQEAgLTE5NCw0ICsxOTksNDUgQEAgdW5zaWduZWQg TG9jYWxlTWFjOjpmaXJzdERheU9mV2VlaygpCiAgICAgcmV0dXJuIFtjYWxlbmRhci5nZXQoKSBm aXJzdFdlZWtkYXldIC0gMTsKIH0KICNlbmRpZgorCisjaWYgRU5BQkxFKElOUFVUX1RZUEVfVElN RV9NVUxUSVBMRV9GSUVMRFMpCitOU0RhdGVGb3JtYXR0ZXIqIExvY2FsZU1hYzo6Y3JlYXRlVGlt ZUZvcm1hdHRlcigpCit7CisgICAgcmV0dXJuIGNyZWF0ZURhdGVUaW1lRm9ybWF0dGVyKG1fbG9j YWxlLmdldCgpLCBOU0RhdGVGb3JtYXR0ZXJOb1N0eWxlLCBOU0RhdGVGb3JtYXR0ZXJNZWRpdW1T dHlsZSk7Cit9CisKK05TRGF0ZUZvcm1hdHRlciogTG9jYWxlTWFjOjpjcmVhdGVTaG9ydFRpbWVG b3JtYXR0ZXIoKQoreworICAgIHJldHVybiBjcmVhdGVEYXRlVGltZUZvcm1hdHRlcihtX2xvY2Fs ZS5nZXQoKSwgTlNEYXRlRm9ybWF0dGVyTm9TdHlsZSwgTlNEYXRlRm9ybWF0dGVyU2hvcnRTdHls ZSk7Cit9CisKK1N0cmluZyBMb2NhbGVNYWM6OnRpbWVGb3JtYXRUZXh0KCkKK3sKKyAgICBpZiAo IW1fbG9jYWxpemVkVGltZUZvcm1hdFRleHQuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gbV9s b2NhbGl6ZWRUaW1lRm9ybWF0VGV4dDsKKyAgICBSZXRhaW5QdHI8TlNEYXRlRm9ybWF0dGVyPiBm b3JtYXR0ZXIoQWRvcHROUywgY3JlYXRlVGltZUZvcm1hdHRlcigpKTsKKyAgICBtX2xvY2FsaXpl ZFRpbWVGb3JtYXRUZXh0ID0gU3RyaW5nKFtmb3JtYXR0ZXIuZ2V0KCkgZGF0ZUZvcm1hdF0pOwor ICAgIHJldHVybiBtX2xvY2FsaXplZFRpbWVGb3JtYXRUZXh0OworfQorCitTdHJpbmcgTG9jYWxl TWFjOjpzaG9ydFRpbWVGb3JtYXRUZXh0KCkKK3sKKyAgICBpZiAoIW1fbG9jYWxpemVkU2hvcnRU aW1lRm9ybWF0VGV4dC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBtX2xvY2FsaXplZFNob3J0 VGltZUZvcm1hdFRleHQ7CisgICAgUmV0YWluUHRyPE5TRGF0ZUZvcm1hdHRlcj4gZm9ybWF0dGVy KEFkb3B0TlMsIGNyZWF0ZVNob3J0VGltZUZvcm1hdHRlcigpKTsKKyAgICBtX2xvY2FsaXplZFNo b3J0VGltZUZvcm1hdFRleHQgPSBTdHJpbmcoW2Zvcm1hdHRlci5nZXQoKSBkYXRlRm9ybWF0XSk7 CisgICAgcmV0dXJuIG1fbG9jYWxpemVkU2hvcnRUaW1lRm9ybWF0VGV4dDsKK30KKworY29uc3Qg VmVjdG9yPFN0cmluZz4mIExvY2FsZU1hYzo6dGltZUFNUE1MYWJlbHMoKQoreworICAgIGlmICgh bV90aW1lQU1QTUxhYmVscy5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBtX3RpbWVBTVBNTGFi ZWxzOworICAgIG1fdGltZUFNUE1MYWJlbHMucmVzZXJ2ZUNhcGFjaXR5KDIpOworICAgIFJldGFp blB0cjxOU0RhdGVGb3JtYXR0ZXI+IGZvcm1hdHRlcihBZG9wdE5TLCBjcmVhdGVTaG9ydFRpbWVG b3JtYXR0ZXIoKSk7CisgICAgbV90aW1lQU1QTUxhYmVscy5hcHBlbmQoU3RyaW5nKFtmb3JtYXR0 ZXIuZ2V0KCkgQU1TeW1ib2xdKSk7CisgICAgbV90aW1lQU1QTUxhYmVscy5hcHBlbmQoU3RyaW5n KFtmb3JtYXR0ZXIuZ2V0KCkgUE1TeW1ib2xdKSk7CisgICAgcmV0dXJuIG1fdGltZUFNUE1MYWJl bHM7Cit9CisjZW5kaWYKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvTG9jYWxlTWFjVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0xvY2Fs ZU1hY1Rlc3QuY3BwCmluZGV4IGQ1M2I4M2M3YTkxOWE1N2M1NDg2Y2MyZDQwNmQxNWI5Zjg5OTcw NTYuLjExNTBhMzAxYWE4NzQzNmNlMjY2ODc4NGRiYzYzNGQ0MGVkYTlhYjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTG9jYWxlTWFjVGVzdC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9Mb2NhbGVNYWNUZXN0LmNwcApAQCAtOTksNiArOTks MjYgQEAgcHJvdGVjdGVkOgogICAgICAgICByZXR1cm4gbG9jYWxlLT53ZWVrRGF5U2hvcnRMYWJl bHMoKVtpbmRleF07CiAgICAgfQogI2VuZGlmCisKKyNpZiBFTkFCTEUoSU5QVVRfVFlQRV9USU1F X01VTFRJUExFX0ZJRUxEUykKKyAgICBTdHJpbmcgdGltZUZvcm1hdFRleHQoY29uc3QgU3RyaW5n JiBsb2NhbGVTdHJpbmcpCisgICAgeworICAgICAgICBPd25QdHI8TG9jYWxlTWFjPiBsb2NhbGUg PSBMb2NhbGVNYWM6OmNyZWF0ZShsb2NhbGVTdHJpbmcpOworICAgICAgICByZXR1cm4gbG9jYWxl LT50aW1lRm9ybWF0VGV4dCgpOworICAgIH0KKworICAgIFN0cmluZyBzaG9ydFRpbWVGb3JtYXRU ZXh0KGNvbnN0IFN0cmluZyYgbG9jYWxlU3RyaW5nKQorICAgIHsKKyAgICAgICAgT3duUHRyPExv Y2FsZU1hYz4gbG9jYWxlID0gTG9jYWxlTWFjOjpjcmVhdGUobG9jYWxlU3RyaW5nKTsKKyAgICAg ICAgcmV0dXJuIGxvY2FsZS0+c2hvcnRUaW1lRm9ybWF0VGV4dCgpOworICAgIH0KKworICAgIFN0 cmluZyB0aW1lQU1QTUxhYmVsKGNvbnN0IFN0cmluZyYgbG9jYWxlU3RyaW5nLCB1bnNpZ25lZCBp bmRleCkKKyAgICB7CisgICAgICAgIE93blB0cjxMb2NhbGVNYWM+IGxvY2FsZSA9IExvY2FsZU1h Yzo6Y3JlYXRlKGxvY2FsZVN0cmluZyk7CisgICAgICAgIHJldHVybiBsb2NhbGUtPnRpbWVBTVBN TGFiZWxzKClbaW5kZXhdOworICAgIH0KKyNlbmRpZgogfTsKIAogVEVTVF9GKExvY2FsZU1hY1Rl c3QsIGZvcm1hdERhdGUpCkBAIC0xNjAsMyArMTgwLDMxIEBAIFRFU1RfRihMb2NhbGVNYWNUZXN0 LCB3ZWVrRGF5U2hvcnRMYWJlbHMpCiAgICAgRVhQRUNUX1NUUkVRKCJceEU1XHg5Q1x4OUYiLCB3 ZWVrRGF5U2hvcnRMYWJlbCgiamFfSlAiLCBTYXR1cmRheSkudXRmOCgpLmRhdGEoKSk7CiB9CiAj ZW5kaWYKKworI2lmIEVOQUJMRShJTlBVVF9UWVBFX1RJTUVfTVVMVElQTEVfRklFTERTKQorVEVT VF9GKExvY2FsZU1hY1Rlc3QsIHRpbWVGb3JtYXRUZXh0KQoreworICAgIEVYUEVDVF9TVFJFUSgi aDptbTpzcyBhIiwgdGltZUZvcm1hdFRleHQoImVuX1VTIikudXRmOCgpLmRhdGEoKSk7CisgICAg RVhQRUNUX1NUUkVRKCJISDptbTpzcyIsIHRpbWVGb3JtYXRUZXh0KCJmcl9GUiIpLnV0ZjgoKS5k YXRhKCkpOworICAgIEVYUEVDVF9TVFJFUSgiSDptbTpzcyIsIHRpbWVGb3JtYXRUZXh0KCJqYV9K UCIpLnV0ZjgoKS5kYXRhKCkpOworfQorCitURVNUX0YoTG9jYWxlTWFjVGVzdCwgc2hvcnRUaW1l Rm9ybWF0VGV4dCkKK3sKKyAgICBFWFBFQ1RfU1RSRVEoImg6bW0gYSIsIHNob3J0VGltZUZvcm1h dFRleHQoImVuX1VTIikudXRmOCgpLmRhdGEoKSk7CisgICAgRVhQRUNUX1NUUkVRKCJISDptbSIs IHNob3J0VGltZUZvcm1hdFRleHQoImZyX0ZSIikudXRmOCgpLmRhdGEoKSk7CisgICAgRVhQRUNU X1NUUkVRKCJIOm1tIiwgc2hvcnRUaW1lRm9ybWF0VGV4dCgiamFfSlAiKS51dGY4KCkuZGF0YSgp KTsKK30KKworVEVTVF9GKExvY2FsZU1hY1Rlc3QsIHRpbWVBTVBNTGFiZWxzKQoreworICAgIEVY UEVDVF9TVFJFUSgiQU0iLCB0aW1lQU1QTUxhYmVsKCJlbl9VUyIsIDApLnV0ZjgoKS5kYXRhKCkp OworICAgIEVYUEVDVF9TVFJFUSgiUE0iLCB0aW1lQU1QTUxhYmVsKCJlbl9VUyIsIDEpLnV0Zjgo KS5kYXRhKCkpOworCisgICAgRVhQRUNUX1NUUkVRKCJBTSIsIHRpbWVBTVBNTGFiZWwoImZyX0ZS IiwgMCkudXRmOCgpLmRhdGEoKSk7CisgICAgRVhQRUNUX1NUUkVRKCJQTSIsIHRpbWVBTVBNTGFi ZWwoImZyX0ZSIiwgMSkudXRmOCgpLmRhdGEoKSk7CisKKyAgICBFWFBFQ1RfU1RSRVEoIlx4RTVc eDhEXHg4OFx4RTVceDg5XHg4RCIsIHRpbWVBTVBNTGFiZWwoImphX0pQIiwgMCkudXRmOCgpLmRh dGEoKSk7CisgICAgRVhQRUNUX1NUUkVRKCJceEU1XHg4RFx4ODhceEU1XHhCRVx4OEMiLCB0aW1l QU1QTUxhYmVsKCJqYV9KUCIsIDEpLnV0ZjgoKS5kYXRhKCkpOworfQorI2VuZGlmCg==