diff options
| author | John Reck <jreck@google.com> | 2012-05-21 14:32:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-21 14:32:35 -0700 |
| commit | 937f02eed327b38392b69ef4db158dc7a152ed93 (patch) | |
| tree | 59cd971cf32a40ebc151beef1bfe14ad8593f79c /Source/WebCore/platform/android | |
| parent | d79c461a709fb422b8bf694bd665ca144689bfe6 (diff) | |
| parent | 655f75feeee4c396740a8e768888c7c8f0602cb8 (diff) | |
| download | external_webkit-937f02eed327b38392b69ef4db158dc7a152ed93.zip external_webkit-937f02eed327b38392b69ef4db158dc7a152ed93.tar.gz external_webkit-937f02eed327b38392b69ef4db158dc7a152ed93.tar.bz2 | |
am 655f75fe: am 2c52cc31: Merge "Switch to a 4ms/1s timer" into jb-dev
* commit '655f75feeee4c396740a8e768888c7c8f0602cb8':
Switch to a 4ms/1s timer
Diffstat (limited to 'Source/WebCore/platform/android')
| -rw-r--r-- | Source/WebCore/platform/android/SharedTimerAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/android/SharedTimerAndroid.cpp b/Source/WebCore/platform/android/SharedTimerAndroid.cpp index a3f3db5..92223d5 100644 --- a/Source/WebCore/platform/android/SharedTimerAndroid.cpp +++ b/Source/WebCore/platform/android/SharedTimerAndroid.cpp @@ -51,7 +51,7 @@ void setSharedTimerFireTime(double fireTime) { long long timeInMs = static_cast<long long>((fireTime - WTF::currentTime()) * 1000); - ALOGV("setSharedTimerFireTime: in %ld millisec", timeInMs); + ALOGV("setSharedTimerFireTime: in %d millisec", (int)timeInMs); if (JavaSharedClient::GetTimerClient()) JavaSharedClient::GetTimerClient()->setSharedTimer(timeInMs); } |