34405 2010-01-31 20:48:06 -0800 MediaControlTimeDisplayElement should defer time formatting to the theme 2010-02-03 23:48:54 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED HTML5 P2 Enhancement --- 0 nicholas.young webkit-unassigned commit-queue eric.carlson eric oldest_to_newest 186292 0 nicholas.young 2010-01-31 20:48:06 -0800 Currently, there exists two media control elements which display time related information: The current time display and the remaining time display. The inner text of these elements is defined in the MediaControlTimeDisplayElement (platform independent code). It should be possible for the theme to decide what times are shown in these elements, and how these times are formatted. 186293 1 47811 nicholas.young 2010-01-31 20:53:03 -0800 Created attachment 47811 Initial Patch This patch addresses the problem by introducing three new virtual methods to RenderTheme: virtual String formatMediaControlsTime(float time); virtual String formatMediaControlsCurrentTime(float currentTime, float duration); virtual String formatMediaControlsRemainingTime(float currentTime, float duration); The first method can be reimplemented by those only wishing to change how the times are formatted. The latter two methods can be reimplemented by those wishing to change what times are shown in each element. The motivating use case for this patch is to hide the time remaining element and augment the current time element - String RenderThemeXX::formatMediaCurrentTime(float currentTime, float duration) { return formatMediaTime(currentTime) + " / " + formatMediaTime(duration); } 186427 2 47811 eric.carlson 2010-02-01 08:00:22 -0800 Comment on attachment 47811 Initial Patch > + virtual String formatMediaControlsTime(float time); > + virtual String formatMediaControlsCurrentTime(float currentTime, float duration); > + virtual String formatMediaControlsRemainingTime(float currentTime, float duration); These should all be const. r=me with this change, thanks! 186749 3 47896 nicholas.young 2010-02-01 18:28:19 -0800 Created attachment 47896 Updated Patch Updated Patch. New RenderTheme methods are now const methods. Thanks for the review. 186766 4 47896 eric.carlson 2010-02-01 19:44:44 -0800 Comment on attachment 47896 Updated Patch r=me 186892 5 47896 commit-queue 2010-02-02 03:19:59 -0800 Comment on attachment 47896 Updated Patch Rejecting patch 47896 from commit-queue. Failed to run "['WebKitTools/Scripts/build-webkit', '--debug']" exit_code: 1 Last 500 characters of output: s/CommitQueue/WebCore/rendering/RenderButton.cpp -o /Users/eseidel/Projects/CommitQueue/WebKitBuild/WebCore.build/Debug/WebCore.build/Objects-normal/i386/RenderButton.o ** BUILD FAILED ** The following build commands failed: WebCore: Distributed-CompileC /Users/eseidel/Projects/CommitQueue/WebKitBuild/WebCore.build/Debug/WebCore.build/Objects-normal/i386/RenderTheme.o /Users/eseidel/Projects/CommitQueue/WebCore/rendering/RenderTheme.cpp normal i386 c++ com.apple.compilers.gcc.4_2 (1 failure) Full output: http://webkit-commit-queue.appspot.com/results/229431 187122 6 47896 eric 2010-02-02 13:54:45 -0800 Comment on attachment 47896 Updated Patch Looks like this patch does not compile on Leopard. Marking r- 187133 7 47811 eric 2010-02-02 14:08:04 -0800 Comment on attachment 47811 Initial Patch Clearing Eric Carlson's review on this obsolete patch. 187200 8 47982 nicholas.young 2010-02-02 16:18:54 -0800 Created attachment 47982 Update Patch - Fixes build on mac There's an unused parameter there. I've left it in (but commented it out) so that reimplementers don't have to guess what it is. 187543 9 eric 2010-02-03 16:25:23 -0800 Why is this one the RenderTheme (which is runtime switchable) instead of part of WebCore/platform? 187549 10 eric.carlson 2010-02-03 16:39:17 -0800 Because some platforms support more than one media controller theme? 187647 11 47982 commit-queue 2010-02-03 23:48:43 -0800 Comment on attachment 47982 Update Patch - Fixes build on mac Clearing flags on attachment: 47982 Committed r54326: <http://trac.webkit.org/changeset/54326> 187648 12 commit-queue 2010-02-03 23:48:54 -0800 All reviewed patches have been landed. Closing bug. 47811 2010-01-31 20:53:03 -0800 2010-02-02 14:08:04 -0800 Initial Patch webkit-format-time.txt text/plain 5711 nicholas.young SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDEyMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDEtMzEgIE5pY2hvbGFzIFlvdW5nICA8bmljaG9sYXMueW91 bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIERlZmVyIGZvcm1hdHRpbmcgb2YgdGltZXMgZGlzcGxheWVkIG9uIG1lZGlhIGNvbnRy b2xzIHRvIHRoZSBjdXJyZW50IHRoZW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MzQ0MDUKKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLiBS ZWZhY3RvcmluZyBPbmx5LgorCisgICAgICAgICogcmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1l bnRzLmNwcDogUmVtb3ZlZCBmb3JtYXRUaW1lKCkKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29u dHJvbFRpbWVEaXNwbGF5RWxlbWVudDo6c2V0Q3VycmVudFZhbHVlKTogTm8gbG9uZ2VyIHNldHMg aW5uZXIgdGV4dAorICAgICAgICAqIHJlbmRlcmluZy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZWRpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJNZWRpYTo6dXBkYXRlVGltZURpc3BsYXkpOiBBc2tzIHRoZSB0aGVtZSB0byBmb3JtYXQg dGhlIHRpbWUgZGlzcGxheSBlbGVtZW50cworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVt ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6Zm9ybWF0TWVkaWFDb250cm9s c1RpbWUpOiBuZXcgdmlydHVhbCBtZXRob2QKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l Ojpmb3JtYXRNZWRpYUNvbnRyb2xzQ3VycmVudFRpbWUpOiBuZXcgdmlydHVhbCBtZXRob2QKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjpmb3JtYXRNZWRpYUNvbnRyb2xzUmVtYWluaW5n VGltZSk6IG5ldyB2aXJ0dWFsIG1ldGhvZAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVt ZS5oOgorCiAyMDEwLTAxLTMxICBLd2FuZyBZdWwgU2VvICA8c2t5dWxAY29tcGFueTEwMC5uZXQ+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL3JlbmRl cmluZy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5k ZXJpbmcvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCShyZXZpc2lvbiA1NDEyMikKKysrIFdlYkNv cmUvcmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NzMxLDMwICs3MzEsOSBAQCB2b2lkIE1lZGlhQ29udHJvbFRpbWVEaXNwbGF5RWxlbWVudDo6c2V0 CiAgICAgcmVuZGVyZXIoKS0+c2V0U3R5bGUoc3R5bGUuZ2V0KCkpOwogfQogCi1TdHJpbmcgTWVk aWFDb250cm9sVGltZURpc3BsYXlFbGVtZW50Ojpmb3JtYXRUaW1lKGZsb2F0IHRpbWUpCi17Ci0g ICAgaWYgKCFpc2Zpbml0ZSh0aW1lKSkKLSAgICAgICAgdGltZSA9IDA7Ci0gICAgaW50IHNlY29u ZHMgPSAoaW50KWZhYnNmKHRpbWUpOwotICAgIGludCBob3VycyA9IHNlY29uZHMgLyAoNjAgKiA2 MCk7Ci0gICAgaW50IG1pbnV0ZXMgPSAoc2Vjb25kcyAvIDYwKSAlIDYwOwotICAgIHNlY29uZHMg JT0gNjA7Ci0gICAgaWYgKGhvdXJzKSB7Ci0gICAgICAgIGlmIChob3VycyA+IDkpCi0gICAgICAg ICAgICByZXR1cm4gU3RyaW5nOjpmb3JtYXQoIiVzJTAyZDolMDJkOiUwMmQiLCAodGltZSA8IDAg PyAiLSIgOiAiIiksIGhvdXJzLCBtaW51dGVzLCBzZWNvbmRzKTsKLQotICAgICAgICByZXR1cm4g U3RyaW5nOjpmb3JtYXQoIiVzJTAxZDolMDJkOiUwMmQiLCAodGltZSA8IDAgPyAiLSIgOiAiIiks IGhvdXJzLCBtaW51dGVzLCBzZWNvbmRzKTsKLSAgICB9Ci0KLSAgICByZXR1cm4gU3RyaW5nOjpm b3JtYXQoIiVzJTAyZDolMDJkIiwgKHRpbWUgPCAwID8gIi0iIDogIiIpLCBtaW51dGVzLCBzZWNv bmRzKTsKLX0KLQogdm9pZCBNZWRpYUNvbnRyb2xUaW1lRGlzcGxheUVsZW1lbnQ6OnNldEN1cnJl bnRWYWx1ZShmbG9hdCB0aW1lKQogewogICAgIG1fY3VycmVudFZhbHVlID0gdGltZTsKLQotICAg IEV4Y2VwdGlvbkNvZGUgZWM7Ci0gICAgc2V0SW5uZXJUZXh0KGZvcm1hdFRpbWUobV9jdXJyZW50 VmFsdWUpLCBlYyk7CiB9CiAKIApJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvTWVkaWFDb250cm9s RWxlbWVudHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9NZWRpYUNvbnRyb2xF bGVtZW50cy5oCShyZXZpc2lvbiA1NDEyMikKKysrIFdlYkNvcmUvcmVuZGVyaW5nL01lZGlhQ29u dHJvbEVsZW1lbnRzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2OCw4ICsyNjgsNiBAQCBwdWJsaWM6 CiAgICAgZmxvYXQgY3VycmVudFZhbHVlKCkgY29uc3QgeyByZXR1cm4gbV9jdXJyZW50VmFsdWU7 IH0KIAogcHJpdmF0ZToKLSAgICBTdHJpbmcgZm9ybWF0VGltZShmbG9hdCB0aW1lKTsKLQogICAg IGZsb2F0IG1fY3VycmVudFZhbHVlOwogICAgIGJvb2wgbV9pc1Zpc2libGU7CiB9OwpJbmRleDog V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck1lZGlhLmNwcAkocmV2aXNpb24gNTQxMjIpCisrKyBXZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJNZWRpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxMiwxMCArNDEyLDE1 IEBAIHZvaWQgUmVuZGVyTWVkaWE6OnVwZGF0ZVRpbWVEaXNwbGF5KCkKIHsKICAgICBpZiAoIW1f Y3VycmVudFRpbWVEaXNwbGF5IHx8ICFtX2N1cnJlbnRUaW1lRGlzcGxheS0+cmVuZGVyZXIoKSB8 fCBtX2N1cnJlbnRUaW1lRGlzcGxheS0+cmVuZGVyZXIoKS0+c3R5bGUoKS0+ZGlzcGxheSgpID09 IE5PTkUgfHwgc3R5bGUoKS0+dmlzaWJpbGl0eSgpICE9IFZJU0lCTEUpCiAgICAgICAgIHJldHVy bjsKKwogICAgIGZsb2F0IG5vdyA9IG1lZGlhRWxlbWVudCgpLT5jdXJyZW50VGltZSgpOwogICAg IGZsb2F0IGR1cmF0aW9uID0gbWVkaWFFbGVtZW50KCktPmR1cmF0aW9uKCk7CiAKKyAgICAvLyBB bGxvdyB0aGUgdGhlbWUgdG8gZm9ybWF0IHRoZSB0aW1lCisgICAgRXhjZXB0aW9uQ29kZSBlYzsK KyAgICBtX2N1cnJlbnRUaW1lRGlzcGxheS0+c2V0SW5uZXJUZXh0KHRoZW1lKCktPmZvcm1hdE1l ZGlhQ29udHJvbHNDdXJyZW50VGltZShub3csIGR1cmF0aW9uKSwgZWMpOwogICAgIG1fY3VycmVu dFRpbWVEaXNwbGF5LT5zZXRDdXJyZW50VmFsdWUobm93KTsKKyAgICBtX3RpbWVSZW1haW5pbmdE aXNwbGF5LT5zZXRJbm5lclRleHQodGhlbWUoKS0+Zm9ybWF0TWVkaWFDb250cm9sc1JlbWFpbmlu Z1RpbWUobm93LCBkdXJhdGlvbiksIGVjKTsKICAgICBtX3RpbWVSZW1haW5pbmdEaXNwbGF5LT5z ZXRDdXJyZW50VmFsdWUobm93IC0gZHVyYXRpb24pOwogfQogCkluZGV4OiBXZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWUuY3BwCShyZXZpc2lvbiA1NDEyMikKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDM2LDYgKzQzNiwzNSBAQCBib29sIFJlbmRl clRoZW1lOjpzaG91bGRSZW5kZXJNZWRpYUNvbnRyCiAgICAgICAgIHJldHVybiB0cnVlOwogICAg IH0KIH0KKworU3RyaW5nIFJlbmRlclRoZW1lOjpmb3JtYXRNZWRpYUNvbnRyb2xzVGltZShmbG9h dCB0aW1lKQoreworICAgIGlmICghaXNmaW5pdGUodGltZSkpCisgICAgICAgIHRpbWUgPSAwOwor ICAgIGludCBzZWNvbmRzID0gKGludClmYWJzZih0aW1lKTsKKyAgICBpbnQgaG91cnMgPSBzZWNv bmRzIC8gKDYwICogNjApOworICAgIGludCBtaW51dGVzID0gKHNlY29uZHMgLyA2MCkgJSA2MDsK KyAgICBzZWNvbmRzICU9IDYwOworICAgIGlmIChob3VycykgeworICAgICAgICBpZiAoaG91cnMg PiA5KQorICAgICAgICAgICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0KCIlcyUwMmQ6JTAyZDolMDJk IiwgKHRpbWUgPCAwID8gIi0iIDogIiIpLCBob3VycywgbWludXRlcywgc2Vjb25kcyk7CisKKyAg ICAgICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0KCIlcyUwMWQ6JTAyZDolMDJkIiwgKHRpbWUgPCAw ID8gIi0iIDogIiIpLCBob3VycywgbWludXRlcywgc2Vjb25kcyk7CisgICAgfQorCisgICAgcmV0 dXJuIFN0cmluZzo6Zm9ybWF0KCIlcyUwMmQ6JTAyZCIsICh0aW1lIDwgMCA/ICItIiA6ICIiKSwg bWludXRlcywgc2Vjb25kcyk7Cit9CisKK1N0cmluZyBSZW5kZXJUaGVtZTo6Zm9ybWF0TWVkaWFD b250cm9sc0N1cnJlbnRUaW1lKGZsb2F0IGN1cnJlbnRUaW1lLCBmbG9hdCBkdXJhdGlvbikKK3sK KyAgICByZXR1cm4gZm9ybWF0TWVkaWFDb250cm9sc1RpbWUoY3VycmVudFRpbWUpOworfQorCitT dHJpbmcgUmVuZGVyVGhlbWU6OmZvcm1hdE1lZGlhQ29udHJvbHNSZW1haW5pbmdUaW1lKGZsb2F0 IGN1cnJlbnRUaW1lLCBmbG9hdCBkdXJhdGlvbikKK3sKKyAgICByZXR1cm4gZm9ybWF0TWVkaWFD b250cm9sc1RpbWUoY3VycmVudFRpbWUgLSBkdXJhdGlvbik7Cit9CisKICNlbmRpZgogCiBDb2xv ciBSZW5kZXJUaGVtZTo6YWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKCkgY29uc3QKSW5k ZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaAkocmV2aXNpb24gNTQxMjIpCisrKyBXZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzUsNiArMTc1LDkgQEAg cHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRSZW5kZXJNZWRpYUNvbnRyb2xQYXJ0KENv bnRyb2xQYXJ0LCBFbGVtZW50Kik7CiAgICAgdmlydHVhbCBkb3VibGUgbWVkaWFDb250cm9sc0Zh ZGVJbkR1cmF0aW9uKCkgeyByZXR1cm4gMC4xOyB9CiAgICAgdmlydHVhbCBkb3VibGUgbWVkaWFD b250cm9sc0ZhZGVPdXREdXJhdGlvbigpIHsgcmV0dXJuIDAuMzsgfQorICAgIHZpcnR1YWwgU3Ry aW5nIGZvcm1hdE1lZGlhQ29udHJvbHNUaW1lKGZsb2F0IHRpbWUpOworICAgIHZpcnR1YWwgU3Ry aW5nIGZvcm1hdE1lZGlhQ29udHJvbHNDdXJyZW50VGltZShmbG9hdCBjdXJyZW50VGltZSwgZmxv YXQgZHVyYXRpb24pOworICAgIHZpcnR1YWwgU3RyaW5nIGZvcm1hdE1lZGlhQ29udHJvbHNSZW1h aW5pbmdUaW1lKGZsb2F0IGN1cnJlbnRUaW1lLCBmbG9hdCBkdXJhdGlvbik7CiAjZW5kaWYKIAog cHJvdGVjdGVkOgo= 47896 2010-02-01 18:28:19 -0800 2010-02-02 16:18:54 -0800 Updated Patch webkit-format-time.txt text/plain 5751 nicholas.young SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDE3OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDItMDEgIE5pY2hvbGFzIFlvdW5nICA8bmljaG9sYXMueW91 bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIERlZmVyIGZvcm1hdHRpbmcgb2YgdGltZXMgZGlzcGxheWVkIG9uIG1lZGlhIGNvbnRy b2xzIHRvIHRoZSBjdXJyZW50IHRoZW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MzQ0MDUKKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLiBS ZWZhY3RvcmluZyBPbmx5LgorCisgICAgICAgICogcmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1l bnRzLmNwcDogUmVtb3ZlZCBmb3JtYXRUaW1lKCkKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29u dHJvbFRpbWVEaXNwbGF5RWxlbWVudDo6c2V0Q3VycmVudFZhbHVlKTogTm8gbG9uZ2VyIHNldHMg aW5uZXIgdGV4dAorICAgICAgICAqIHJlbmRlcmluZy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZWRpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJNZWRpYTo6dXBkYXRlVGltZURpc3BsYXkpOiBBc2tzIHRoZSB0aGVtZSB0byBmb3JtYXQg dGhlIHRpbWUgZGlzcGxheSBlbGVtZW50cworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVt ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6Zm9ybWF0TWVkaWFDb250cm9s c1RpbWUpOiBuZXcgdmlydHVhbCBtZXRob2QKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l Ojpmb3JtYXRNZWRpYUNvbnRyb2xzQ3VycmVudFRpbWUpOiBuZXcgdmlydHVhbCBtZXRob2QKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjpmb3JtYXRNZWRpYUNvbnRyb2xzUmVtYWluaW5n VGltZSk6IG5ldyB2aXJ0dWFsIG1ldGhvZAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVt ZS5oOgorCiAyMDEwLTAyLTAxICBLYXZpdGEgS2FuZXRrYXIgIDxra2FuZXRrYXJAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5hdGUgQ2hhcGluLgpJbmRleDogV2ViQ29yZS9y ZW5kZXJpbmcvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAkocmV2aXNpb24gNTQxNzkpCisrKyBX ZWJDb3JlL3JlbmRlcmluZy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTczMSwzMCArNzMxLDkgQEAgdm9pZCBNZWRpYUNvbnRyb2xUaW1lRGlzcGxheUVsZW1lbnQ6 OnNldAogICAgIHJlbmRlcmVyKCktPnNldFN0eWxlKHN0eWxlLmdldCgpKTsKIH0KIAotU3RyaW5n IE1lZGlhQ29udHJvbFRpbWVEaXNwbGF5RWxlbWVudDo6Zm9ybWF0VGltZShmbG9hdCB0aW1lKQot ewotICAgIGlmICghaXNmaW5pdGUodGltZSkpCi0gICAgICAgIHRpbWUgPSAwOwotICAgIGludCBz ZWNvbmRzID0gKGludClmYWJzZih0aW1lKTsKLSAgICBpbnQgaG91cnMgPSBzZWNvbmRzIC8gKDYw ICogNjApOwotICAgIGludCBtaW51dGVzID0gKHNlY29uZHMgLyA2MCkgJSA2MDsKLSAgICBzZWNv bmRzICU9IDYwOwotICAgIGlmIChob3VycykgewotICAgICAgICBpZiAoaG91cnMgPiA5KQotICAg ICAgICAgICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0KCIlcyUwMmQ6JTAyZDolMDJkIiwgKHRpbWUg PCAwID8gIi0iIDogIiIpLCBob3VycywgbWludXRlcywgc2Vjb25kcyk7Ci0KLSAgICAgICAgcmV0 dXJuIFN0cmluZzo6Zm9ybWF0KCIlcyUwMWQ6JTAyZDolMDJkIiwgKHRpbWUgPCAwID8gIi0iIDog IiIpLCBob3VycywgbWludXRlcywgc2Vjb25kcyk7Ci0gICAgfQotCi0gICAgcmV0dXJuIFN0cmlu Zzo6Zm9ybWF0KCIlcyUwMmQ6JTAyZCIsICh0aW1lIDwgMCA/ICItIiA6ICIiKSwgbWludXRlcywg c2Vjb25kcyk7Ci19Ci0KIHZvaWQgTWVkaWFDb250cm9sVGltZURpc3BsYXlFbGVtZW50OjpzZXRD dXJyZW50VmFsdWUoZmxvYXQgdGltZSkKIHsKICAgICBtX2N1cnJlbnRWYWx1ZSA9IHRpbWU7Ci0K LSAgICBFeGNlcHRpb25Db2RlIGVjOwotICAgIHNldElubmVyVGV4dChmb3JtYXRUaW1lKG1fY3Vy cmVudFZhbHVlKSwgZWMpOwogfQogCiAKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL01lZGlhQ29u dHJvbEVsZW1lbnRzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvTWVkaWFDb250 cm9sRWxlbWVudHMuaAkocmV2aXNpb24gNTQxNzkpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9NZWRp YUNvbnRyb2xFbGVtZW50cy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNjgsOCArMjY4LDYgQEAgcHVi bGljOgogICAgIGZsb2F0IGN1cnJlbnRWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY3VycmVudFZh bHVlOyB9CiAKIHByaXZhdGU6Ci0gICAgU3RyaW5nIGZvcm1hdFRpbWUoZmxvYXQgdGltZSk7Ci0K ICAgICBmbG9hdCBtX2N1cnJlbnRWYWx1ZTsKICAgICBib29sIG1faXNWaXNpYmxlOwogfTsKSW5k ZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYS5jcHAJKHJldmlzaW9uIDU0MTc5KQorKysgV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MTIsMTAgKzQx MiwxNSBAQCB2b2lkIFJlbmRlck1lZGlhOjp1cGRhdGVUaW1lRGlzcGxheSgpCiB7CiAgICAgaWYg KCFtX2N1cnJlbnRUaW1lRGlzcGxheSB8fCAhbV9jdXJyZW50VGltZURpc3BsYXktPnJlbmRlcmVy KCkgfHwgbV9jdXJyZW50VGltZURpc3BsYXktPnJlbmRlcmVyKCktPnN0eWxlKCktPmRpc3BsYXko KSA9PSBOT05FIHx8IHN0eWxlKCktPnZpc2liaWxpdHkoKSAhPSBWSVNJQkxFKQogICAgICAgICBy ZXR1cm47CisKICAgICBmbG9hdCBub3cgPSBtZWRpYUVsZW1lbnQoKS0+Y3VycmVudFRpbWUoKTsK ICAgICBmbG9hdCBkdXJhdGlvbiA9IG1lZGlhRWxlbWVudCgpLT5kdXJhdGlvbigpOwogCisgICAg Ly8gQWxsb3cgdGhlIHRoZW1lIHRvIGZvcm1hdCB0aGUgdGltZQorICAgIEV4Y2VwdGlvbkNvZGUg ZWM7CisgICAgbV9jdXJyZW50VGltZURpc3BsYXktPnNldElubmVyVGV4dCh0aGVtZSgpLT5mb3Jt YXRNZWRpYUNvbnRyb2xzQ3VycmVudFRpbWUobm93LCBkdXJhdGlvbiksIGVjKTsKICAgICBtX2N1 cnJlbnRUaW1lRGlzcGxheS0+c2V0Q3VycmVudFZhbHVlKG5vdyk7CisgICAgbV90aW1lUmVtYWlu aW5nRGlzcGxheS0+c2V0SW5uZXJUZXh0KHRoZW1lKCktPmZvcm1hdE1lZGlhQ29udHJvbHNSZW1h aW5pbmdUaW1lKG5vdywgZHVyYXRpb24pLCBlYyk7CiAgICAgbV90aW1lUmVtYWluaW5nRGlzcGxh eS0+c2V0Q3VycmVudFZhbHVlKG5vdyAtIGR1cmF0aW9uKTsKIH0KIApJbmRleDogV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRoZW1lLmNwcAkocmV2aXNpb24gNTQxNzkpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzNiw2ICs0MzYsMzUgQEAgYm9vbCBS ZW5kZXJUaGVtZTo6c2hvdWxkUmVuZGVyTWVkaWFDb250cgogICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICB9CiB9CisKK1N0cmluZyBSZW5kZXJUaGVtZTo6Zm9ybWF0TWVkaWFDb250cm9sc1RpbWUo ZmxvYXQgdGltZSkgY29uc3QKK3sKKyAgICBpZiAoIWlzZmluaXRlKHRpbWUpKQorICAgICAgICB0 aW1lID0gMDsKKyAgICBpbnQgc2Vjb25kcyA9IChpbnQpZmFic2YodGltZSk7CisgICAgaW50IGhv dXJzID0gc2Vjb25kcyAvICg2MCAqIDYwKTsKKyAgICBpbnQgbWludXRlcyA9IChzZWNvbmRzIC8g NjApICUgNjA7CisgICAgc2Vjb25kcyAlPSA2MDsKKyAgICBpZiAoaG91cnMpIHsKKyAgICAgICAg aWYgKGhvdXJzID4gOSkKKyAgICAgICAgICAgIHJldHVybiBTdHJpbmc6OmZvcm1hdCgiJXMlMDJk OiUwMmQ6JTAyZCIsICh0aW1lIDwgMCA/ICItIiA6ICIiKSwgaG91cnMsIG1pbnV0ZXMsIHNlY29u ZHMpOworCisgICAgICAgIHJldHVybiBTdHJpbmc6OmZvcm1hdCgiJXMlMDFkOiUwMmQ6JTAyZCIs ICh0aW1lIDwgMCA/ICItIiA6ICIiKSwgaG91cnMsIG1pbnV0ZXMsIHNlY29uZHMpOworICAgIH0K KworICAgIHJldHVybiBTdHJpbmc6OmZvcm1hdCgiJXMlMDJkOiUwMmQiLCAodGltZSA8IDAgPyAi LSIgOiAiIiksIG1pbnV0ZXMsIHNlY29uZHMpOworfQorCitTdHJpbmcgUmVuZGVyVGhlbWU6OmZv cm1hdE1lZGlhQ29udHJvbHNDdXJyZW50VGltZShmbG9hdCBjdXJyZW50VGltZSwgZmxvYXQgZHVy YXRpb24pIGNvbnN0Cit7CisgICAgcmV0dXJuIGZvcm1hdE1lZGlhQ29udHJvbHNUaW1lKGN1cnJl bnRUaW1lKTsKK30KKworU3RyaW5nIFJlbmRlclRoZW1lOjpmb3JtYXRNZWRpYUNvbnRyb2xzUmVt YWluaW5nVGltZShmbG9hdCBjdXJyZW50VGltZSwgZmxvYXQgZHVyYXRpb24pIGNvbnN0Cit7Cisg ICAgcmV0dXJuIGZvcm1hdE1lZGlhQ29udHJvbHNUaW1lKGN1cnJlbnRUaW1lIC0gZHVyYXRpb24p OworfQorCiAjZW5kaWYKIAogQ29sb3IgUmVuZGVyVGhlbWU6OmFjdGl2ZVNlbGVjdGlvbkJhY2tn cm91bmRDb2xvcigpIGNvbnN0CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgJKHJldmlzaW9u IDU0MTc5KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaAkod29ya2luZyBjb3B5 KQpAQCAtMTc1LDYgKzE3NSw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkUmVu ZGVyTWVkaWFDb250cm9sUGFydChDb250cm9sUGFydCwgRWxlbWVudCopOwogICAgIHZpcnR1YWwg ZG91YmxlIG1lZGlhQ29udHJvbHNGYWRlSW5EdXJhdGlvbigpIHsgcmV0dXJuIDAuMTsgfQogICAg IHZpcnR1YWwgZG91YmxlIG1lZGlhQ29udHJvbHNGYWRlT3V0RHVyYXRpb24oKSB7IHJldHVybiAw LjM7IH0KKyAgICB2aXJ0dWFsIFN0cmluZyBmb3JtYXRNZWRpYUNvbnRyb2xzVGltZShmbG9hdCB0 aW1lKSBjb25zdDsKKyAgICB2aXJ0dWFsIFN0cmluZyBmb3JtYXRNZWRpYUNvbnRyb2xzQ3VycmVu dFRpbWUoZmxvYXQgY3VycmVudFRpbWUsIGZsb2F0IGR1cmF0aW9uKSBjb25zdDsKKyAgICB2aXJ0 dWFsIFN0cmluZyBmb3JtYXRNZWRpYUNvbnRyb2xzUmVtYWluaW5nVGltZShmbG9hdCBjdXJyZW50 VGltZSwgZmxvYXQgZHVyYXRpb24pIGNvbnN0OwogI2VuZGlmCiAKIHByb3RlY3RlZDoK 47982 2010-02-02 16:18:54 -0800 2010-02-03 23:48:43 -0800 Update Patch - Fixes build on mac webkit-format-time.txt text/plain 5760 nicholas.young SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDI2MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDItMDIgIE5pY2hvbGFzIFlvdW5nICA8bmljaG9sYXMueW91 bmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIERlZmVyIGZvcm1hdHRpbmcgb2YgdGltZXMgZGlzcGxheWVkIG9uIG1lZGlhIGNvbnRy b2xzIHRvIHRoZSBjdXJyZW50IHRoZW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MzQ0MDUKKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLiBS ZWZhY3RvcmluZyBPbmx5LgorCisgICAgICAgICogcmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1l bnRzLmNwcDogUmVtb3ZlZCBmb3JtYXRUaW1lKCkKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29u dHJvbFRpbWVEaXNwbGF5RWxlbWVudDo6c2V0Q3VycmVudFZhbHVlKTogTm8gbG9uZ2VyIHNldHMg aW5uZXIgdGV4dAorICAgICAgICAqIHJlbmRlcmluZy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZWRpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJNZWRpYTo6dXBkYXRlVGltZURpc3BsYXkpOiBBc2tzIHRoZSB0aGVtZSB0byBmb3JtYXQg dGhlIHRpbWUgZGlzcGxheSBlbGVtZW50cworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVt ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6Zm9ybWF0TWVkaWFDb250cm9s c1RpbWUpOiBuZXcgdmlydHVhbCBtZXRob2QKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l Ojpmb3JtYXRNZWRpYUNvbnRyb2xzQ3VycmVudFRpbWUpOiBuZXcgdmlydHVhbCBtZXRob2QKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjpmb3JtYXRNZWRpYUNvbnRyb2xzUmVtYWluaW5n VGltZSk6IG5ldyB2aXJ0dWFsIG1ldGhvZAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVt ZS5oOgorCiAyMDEwLTAyLTAyICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgTm8gcmV2aWV3LCByb2xsaW5nIG91dCByNTQyNTcuCkluZGV4OiBXZWJD b3JlL3JlbmRlcmluZy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9yZW5kZXJpbmcvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCShyZXZpc2lvbiA1NDI2MikK KysrIFdlYkNvcmUvcmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNzMxLDMwICs3MzEsOSBAQCB2b2lkIE1lZGlhQ29udHJvbFRpbWVEaXNwbGF5RWxl bWVudDo6c2V0CiAgICAgcmVuZGVyZXIoKS0+c2V0U3R5bGUoc3R5bGUuZ2V0KCkpOwogfQogCi1T dHJpbmcgTWVkaWFDb250cm9sVGltZURpc3BsYXlFbGVtZW50Ojpmb3JtYXRUaW1lKGZsb2F0IHRp bWUpCi17Ci0gICAgaWYgKCFpc2Zpbml0ZSh0aW1lKSkKLSAgICAgICAgdGltZSA9IDA7Ci0gICAg aW50IHNlY29uZHMgPSAoaW50KWZhYnNmKHRpbWUpOwotICAgIGludCBob3VycyA9IHNlY29uZHMg LyAoNjAgKiA2MCk7Ci0gICAgaW50IG1pbnV0ZXMgPSAoc2Vjb25kcyAvIDYwKSAlIDYwOwotICAg IHNlY29uZHMgJT0gNjA7Ci0gICAgaWYgKGhvdXJzKSB7Ci0gICAgICAgIGlmIChob3VycyA+IDkp Ci0gICAgICAgICAgICByZXR1cm4gU3RyaW5nOjpmb3JtYXQoIiVzJTAyZDolMDJkOiUwMmQiLCAo dGltZSA8IDAgPyAiLSIgOiAiIiksIGhvdXJzLCBtaW51dGVzLCBzZWNvbmRzKTsKLQotICAgICAg ICByZXR1cm4gU3RyaW5nOjpmb3JtYXQoIiVzJTAxZDolMDJkOiUwMmQiLCAodGltZSA8IDAgPyAi LSIgOiAiIiksIGhvdXJzLCBtaW51dGVzLCBzZWNvbmRzKTsKLSAgICB9Ci0KLSAgICByZXR1cm4g U3RyaW5nOjpmb3JtYXQoIiVzJTAyZDolMDJkIiwgKHRpbWUgPCAwID8gIi0iIDogIiIpLCBtaW51 dGVzLCBzZWNvbmRzKTsKLX0KLQogdm9pZCBNZWRpYUNvbnRyb2xUaW1lRGlzcGxheUVsZW1lbnQ6 OnNldEN1cnJlbnRWYWx1ZShmbG9hdCB0aW1lKQogewogICAgIG1fY3VycmVudFZhbHVlID0gdGlt ZTsKLQotICAgIEV4Y2VwdGlvbkNvZGUgZWM7Ci0gICAgc2V0SW5uZXJUZXh0KGZvcm1hdFRpbWUo bV9jdXJyZW50VmFsdWUpLCBlYyk7CiB9CiAKIApJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvTWVk aWFDb250cm9sRWxlbWVudHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9NZWRp YUNvbnRyb2xFbGVtZW50cy5oCShyZXZpc2lvbiA1NDI2MikKKysrIFdlYkNvcmUvcmVuZGVyaW5n L01lZGlhQ29udHJvbEVsZW1lbnRzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2OCw4ICsyNjgsNiBA QCBwdWJsaWM6CiAgICAgZmxvYXQgY3VycmVudFZhbHVlKCkgY29uc3QgeyByZXR1cm4gbV9jdXJy ZW50VmFsdWU7IH0KIAogcHJpdmF0ZToKLSAgICBTdHJpbmcgZm9ybWF0VGltZShmbG9hdCB0aW1l KTsKLQogICAgIGZsb2F0IG1fY3VycmVudFZhbHVlOwogICAgIGJvb2wgbV9pc1Zpc2libGU7CiB9 OwpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWEuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhLmNwcAkocmV2aXNpb24gNTQyNjIpCisrKyBX ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxMiwx MCArNDEyLDE1IEBAIHZvaWQgUmVuZGVyTWVkaWE6OnVwZGF0ZVRpbWVEaXNwbGF5KCkKIHsKICAg ICBpZiAoIW1fY3VycmVudFRpbWVEaXNwbGF5IHx8ICFtX2N1cnJlbnRUaW1lRGlzcGxheS0+cmVu ZGVyZXIoKSB8fCBtX2N1cnJlbnRUaW1lRGlzcGxheS0+cmVuZGVyZXIoKS0+c3R5bGUoKS0+ZGlz cGxheSgpID09IE5PTkUgfHwgc3R5bGUoKS0+dmlzaWJpbGl0eSgpICE9IFZJU0lCTEUpCiAgICAg ICAgIHJldHVybjsKKwogICAgIGZsb2F0IG5vdyA9IG1lZGlhRWxlbWVudCgpLT5jdXJyZW50VGlt ZSgpOwogICAgIGZsb2F0IGR1cmF0aW9uID0gbWVkaWFFbGVtZW50KCktPmR1cmF0aW9uKCk7CiAK KyAgICAvLyBBbGxvdyB0aGUgdGhlbWUgdG8gZm9ybWF0IHRoZSB0aW1lCisgICAgRXhjZXB0aW9u Q29kZSBlYzsKKyAgICBtX2N1cnJlbnRUaW1lRGlzcGxheS0+c2V0SW5uZXJUZXh0KHRoZW1lKCkt PmZvcm1hdE1lZGlhQ29udHJvbHNDdXJyZW50VGltZShub3csIGR1cmF0aW9uKSwgZWMpOwogICAg IG1fY3VycmVudFRpbWVEaXNwbGF5LT5zZXRDdXJyZW50VmFsdWUobm93KTsKKyAgICBtX3RpbWVS ZW1haW5pbmdEaXNwbGF5LT5zZXRJbm5lclRleHQodGhlbWUoKS0+Zm9ybWF0TWVkaWFDb250cm9s c1JlbWFpbmluZ1RpbWUobm93LCBkdXJhdGlvbiksIGVjKTsKICAgICBtX3RpbWVSZW1haW5pbmdE aXNwbGF5LT5zZXRDdXJyZW50VmFsdWUobm93IC0gZHVyYXRpb24pOwogfQogCkluZGV4OiBXZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWUuY3BwCShyZXZpc2lvbiA1NDI2MikKKysrIFdlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDM2LDYgKzQzNiwzNSBAQCBi b29sIFJlbmRlclRoZW1lOjpzaG91bGRSZW5kZXJNZWRpYUNvbnRyCiAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIH0KIH0KKworU3RyaW5nIFJlbmRlclRoZW1lOjpmb3JtYXRNZWRpYUNvbnRyb2xz VGltZShmbG9hdCB0aW1lKSBjb25zdAoreworICAgIGlmICghaXNmaW5pdGUodGltZSkpCisgICAg ICAgIHRpbWUgPSAwOworICAgIGludCBzZWNvbmRzID0gKGludClmYWJzZih0aW1lKTsKKyAgICBp bnQgaG91cnMgPSBzZWNvbmRzIC8gKDYwICogNjApOworICAgIGludCBtaW51dGVzID0gKHNlY29u ZHMgLyA2MCkgJSA2MDsKKyAgICBzZWNvbmRzICU9IDYwOworICAgIGlmIChob3VycykgeworICAg ICAgICBpZiAoaG91cnMgPiA5KQorICAgICAgICAgICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0KCIl cyUwMmQ6JTAyZDolMDJkIiwgKHRpbWUgPCAwID8gIi0iIDogIiIpLCBob3VycywgbWludXRlcywg c2Vjb25kcyk7CisKKyAgICAgICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0KCIlcyUwMWQ6JTAyZDol MDJkIiwgKHRpbWUgPCAwID8gIi0iIDogIiIpLCBob3VycywgbWludXRlcywgc2Vjb25kcyk7Cisg ICAgfQorCisgICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0KCIlcyUwMmQ6JTAyZCIsICh0aW1lIDwg MCA/ICItIiA6ICIiKSwgbWludXRlcywgc2Vjb25kcyk7Cit9CisKK1N0cmluZyBSZW5kZXJUaGVt ZTo6Zm9ybWF0TWVkaWFDb250cm9sc0N1cnJlbnRUaW1lKGZsb2F0IGN1cnJlbnRUaW1lLCBmbG9h dCAvKmR1cmF0aW9uKi8pIGNvbnN0Cit7CisgICAgcmV0dXJuIGZvcm1hdE1lZGlhQ29udHJvbHNU aW1lKGN1cnJlbnRUaW1lKTsKK30KKworU3RyaW5nIFJlbmRlclRoZW1lOjpmb3JtYXRNZWRpYUNv bnRyb2xzUmVtYWluaW5nVGltZShmbG9hdCBjdXJyZW50VGltZSwgZmxvYXQgZHVyYXRpb24pIGNv bnN0Cit7CisgICAgcmV0dXJuIGZvcm1hdE1lZGlhQ29udHJvbHNUaW1lKGN1cnJlbnRUaW1lIC0g ZHVyYXRpb24pOworfQorCiAjZW5kaWYKIAogQ29sb3IgUmVuZGVyVGhlbWU6OmFjdGl2ZVNlbGVj dGlvbkJhY2tncm91bmRDb2xvcigpIGNvbnN0CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUaGVtZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgJ KHJldmlzaW9uIDU0MjYyKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuaAkod29y a2luZyBjb3B5KQpAQCAtMTc1LDYgKzE3NSw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wg c2hvdWxkUmVuZGVyTWVkaWFDb250cm9sUGFydChDb250cm9sUGFydCwgRWxlbWVudCopOwogICAg IHZpcnR1YWwgZG91YmxlIG1lZGlhQ29udHJvbHNGYWRlSW5EdXJhdGlvbigpIHsgcmV0dXJuIDAu MTsgfQogICAgIHZpcnR1YWwgZG91YmxlIG1lZGlhQ29udHJvbHNGYWRlT3V0RHVyYXRpb24oKSB7 IHJldHVybiAwLjM7IH0KKyAgICB2aXJ0dWFsIFN0cmluZyBmb3JtYXRNZWRpYUNvbnRyb2xzVGlt ZShmbG9hdCB0aW1lKSBjb25zdDsKKyAgICB2aXJ0dWFsIFN0cmluZyBmb3JtYXRNZWRpYUNvbnRy b2xzQ3VycmVudFRpbWUoZmxvYXQgY3VycmVudFRpbWUsIGZsb2F0IGR1cmF0aW9uKSBjb25zdDsK KyAgICB2aXJ0dWFsIFN0cmluZyBmb3JtYXRNZWRpYUNvbnRyb2xzUmVtYWluaW5nVGltZShmbG9h dCBjdXJyZW50VGltZSwgZmxvYXQgZHVyYXRpb24pIGNvbnN0OwogI2VuZGlmCiAKIHByb3RlY3Rl ZDoK