summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore/wtf/android
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-11-23 16:44:44 +0000
committerSteve Block <steveblock@google.com>2009-11-23 16:53:02 +0000
commitaa8e16720c28ad5bf8ded122fe56a67a47c1b92a (patch)
tree1f7b31725887a44b0fb83f987ff2f22f299a41ed /JavaScriptCore/wtf/android
parentfb5979ac6e2238d5ae16f43cca16e6a0932a4279 (diff)
downloadexternal_webkit-aa8e16720c28ad5bf8ded122fe56a67a47c1b92a.zip
external_webkit-aa8e16720c28ad5bf8ded122fe56a67a47c1b92a.tar.gz
external_webkit-aa8e16720c28ad5bf8ded122fe56a67a47c1b92a.tar.bz2
Updates MainThreadAndroid.cpp to reflect version upstreamed to webkit.org.
See https://bugs.webkit.org/show_bug.cgi?id=31807 Change-Id: I46e116c933475699cba499e3c27921e00ebab666
Diffstat (limited to 'JavaScriptCore/wtf/android')
-rw-r--r--JavaScriptCore/wtf/android/MainThreadAndroid.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/JavaScriptCore/wtf/android/MainThreadAndroid.cpp b/JavaScriptCore/wtf/android/MainThreadAndroid.cpp
index 42176c5..c28f953 100644
--- a/JavaScriptCore/wtf/android/MainThreadAndroid.cpp
+++ b/JavaScriptCore/wtf/android/MainThreadAndroid.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2008, The Android Open Source Project
+ * Copyright 2009, The Android Open Source Project
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,14 +26,14 @@
#include "config.h"
#include "MainThread.h"
-#include "jni/JavaSharedClient.h"
+#include "JavaSharedClient.h"
using namespace android;
namespace WTF {
// Callback in the main thread.
-static void timeoutFired(void* )
+static void timeoutFired(void*)
{
dispatchFunctionsFromMainThread();
}
@@ -47,4 +47,4 @@ void scheduleDispatchFunctionsOnMainThread()
JavaSharedClient::EnqueueFunctionPtr(timeoutFired, 0);
}
-}
+} // namespace WTF