diff options
author | Andrei Popescu <andreip@google.com> | 2009-11-25 16:20:53 +0000 |
---|---|---|
committer | Andrei Popescu <andreip@google.com> | 2009-11-25 16:27:56 +0000 |
commit | fada8e51ba8b044a116f6ed4d046a9778a0d27a1 (patch) | |
tree | 33f865e7e9e5811fb3ddd898f0b8e9a845925406 /WebCore/platform/android | |
parent | 6e752dd8042aae87f4827210909b1bfdaa58fbb7 (diff) | |
download | external_webkit-fada8e51ba8b044a116f6ed4d046a9778a0d27a1.zip external_webkit-fada8e51ba8b044a116f6ed4d046a9778a0d27a1.tar.gz external_webkit-fada8e51ba8b044a116f6ed4d046a9778a0d27a1.tar.bz2 |
Bring Android files in line with what landed at webkit.org.
Picks up changes made by Apple in
http://trac.webkit.org/changeset/51191/trunk/WebCore/platform/android/LocalizedStringsAndroid.cpp
Diffstat (limited to 'WebCore/platform/android')
-rw-r--r-- | WebCore/platform/android/LocalizedStringsAndroid.cpp | 60 | ||||
-rw-r--r-- | WebCore/platform/android/SharedTimerAndroid.cpp | 14 |
2 files changed, 67 insertions, 7 deletions
diff --git a/WebCore/platform/android/LocalizedStringsAndroid.cpp b/WebCore/platform/android/LocalizedStringsAndroid.cpp index fc3b63c..2fc880b 100644 --- a/WebCore/platform/android/LocalizedStringsAndroid.cpp +++ b/WebCore/platform/android/LocalizedStringsAndroid.cpp @@ -279,6 +279,24 @@ String mediaElementLiveBroadcastStateText() return String(); } +String localizedMediaControlElementString(const String& controlName) +{ + notImplemented(); + return String(); +} + +String localizedMediaControlElementHelpText(const String& controlName) +{ + notImplemented(); + return String(); +} + +String localizedMediaTimeDescription(const String& controlName) +{ + notImplemented(); + return String(); +} + String searchableIndexIntroduction() { notImplemented(); @@ -301,4 +319,46 @@ String inputElementAltText() return String(); } +String validationMessageValueMissingText() +{ + notImplemented(); + return String(); +} + +String validationMessageTypeMismatchText() +{ + notImplemented(); + return String(); +} + +String validationMessagePatternMismatchText() +{ + notImplemented(); + return String(); +} + +String validationMessageTooLongText() +{ + notImplemented(); + return String(); +} + +String validationMessageRangeUnderflowText() +{ + notImplemented(); + return String(); +} + +String validationMessageRangeOverflowText() +{ + notImplemented(); + return String(); +} + +String validationMessageStepMismatchText() +{ + notImplemented(); + return String(); +} + } // namespace WebCore diff --git a/WebCore/platform/android/SharedTimerAndroid.cpp b/WebCore/platform/android/SharedTimerAndroid.cpp index 36b9a0f..e4f3b36 100644 --- a/WebCore/platform/android/SharedTimerAndroid.cpp +++ b/WebCore/platform/android/SharedTimerAndroid.cpp @@ -23,13 +23,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define LOG_TAG "Timers" - #include "config.h" #include "SharedTimer.h" -#include "JavaSharedClient.h" -#include "TimerClient.h" +#define LOG_TAG "Timers" + +#include <TimerClient.h> +#include <JavaSharedClient.h> #include <utils/Log.h> #include <wtf/CurrentTime.h> @@ -49,11 +49,11 @@ void setSharedTimerFiredFunction(void (*f)()) // as the result of currentTime() is. void setSharedTimerFireTime(double fireTime) { - long long timeInMS = (long long)((fireTime - WTF::currentTime()) * 1000); + long long timeInMs = static_cast<long long>((fireTime - WTF::currentTime()) * 1000); - LOGV("setSharedTimerFireTime: in %ld millisec", timeInMS); + LOGV("setSharedTimerFireTime: in %ld millisec", timeInMs); if (JavaSharedClient::GetTimerClient()) - JavaSharedClient::GetTimerClient()->setSharedTimer(timeInMS); + JavaSharedClient::GetTimerClient()->setSharedTimer(timeInMs); } void stopSharedTimer() |