summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkitclient_impl.cc
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-04 07:03:07 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-04 07:03:07 +0000
commita1ff0ea6957a8c66b171fb7748db9f8efa0f6924 (patch)
tree713bc6819fc3b6bc2b9157669681ddf3c1f68f31 /webkit/glue/webkitclient_impl.cc
parent22529d4b1b075cfb1d2747ca2ed9f24dbbfadc39 (diff)
downloadchromium_src-a1ff0ea6957a8c66b171fb7748db9f8efa0f6924.zip
chromium_src-a1ff0ea6957a8c66b171fb7748db9f8efa0f6924.tar.gz
chromium_src-a1ff0ea6957a8c66b171fb7748db9f8efa0f6924.tar.bz2
revert r10874 since it had no impact on intl1 page cycler
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10879 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkitclient_impl.cc')
-rw-r--r--webkit/glue/webkitclient_impl.cc62
1 files changed, 0 insertions, 62 deletions
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 12a4d14..e726a6c 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -21,66 +21,6 @@ double WebKitClientImpl::currentTime() {
return base::Time::Now().ToDoubleT();
}
-// HACK to see if this code impacts the intl1 page cycler
-#if defined(OS_WIN)
-class SharedTimerTask;
-
-// We maintain a single active timer and a single active task for
-// setting timers directly on the platform.
-static SharedTimerTask* shared_timer_task;
-static void (*shared_timer_function)();
-
-// Timer task to run in the chrome message loop.
-class SharedTimerTask : public Task {
- public:
- SharedTimerTask(void (*callback)()) : callback_(callback) {}
-
- virtual void Run() {
- if (!callback_)
- return;
- // Since we only have one task running at a time, verify 'this' is it
- DCHECK(shared_timer_task == this);
- shared_timer_task = NULL;
- callback_();
- }
-
- void Cancel() {
- callback_ = NULL;
- }
-
- private:
- void (*callback_)();
- DISALLOW_COPY_AND_ASSIGN(SharedTimerTask);
-};
-
-void WebKitClientImpl::setSharedTimerFiredFunction(void (*func)()) {
- shared_timer_function = func;
-}
-
-void WebKitClientImpl::setSharedTimerFireTime(double fire_time) {
- DCHECK(shared_timer_function);
- int interval = static_cast<int>((fire_time - currentTime()) * 1000);
- if (interval < 0)
- interval = 0;
-
- stopSharedTimer();
-
- // Verify that we didn't leak the task or timer objects.
- DCHECK(shared_timer_task == NULL);
- shared_timer_task = new SharedTimerTask(shared_timer_function);
- MessageLoop::current()->PostDelayedTask(FROM_HERE, shared_timer_task,
- interval);
-}
-
-void WebKitClientImpl::stopSharedTimer() {
- if (!shared_timer_task)
- return;
- shared_timer_task->Cancel();
- shared_timer_task = NULL;
-}
-
-#else
-
void WebKitClientImpl::setSharedTimerFiredFunction(void (*func)()) {
shared_timer_func_ = func;
}
@@ -99,8 +39,6 @@ void WebKitClientImpl::stopSharedTimer() {
shared_timer_.Stop();
}
-#endif
-
void WebKitClientImpl::callOnMainThread(void (*func)()) {
main_loop_->PostTask(FROM_HERE, NewRunnableFunction(func));
}