Merge 77355 - 2011-02-01 Mihai Parparita <mihaip@chromium.org>...

Source/WebCore/page/SuspendableTimer.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 18 matching lines @@
 
 #include "ScriptExecutionContext.h"
 
 namespace WebCore {
 
 SuspendableTimer::SuspendableTimer(ScriptExecutionContext* context)
     : ActiveDOMObject(context, this)
     , m_nextFireInterval(0)
     , m_repeatInterval(0)
 #if !ASSERT_DISABLED
+    , m_active(false)
     , m_suspended(false)
 #endif
 {
 }
 
 SuspendableTimer::~SuspendableTimer()
 {
 }
 
 bool SuspendableTimer::hasPendingActivity() const
 {
     return isActive();
 }
 
 void SuspendableTimer::stop()
 {
     TimerBase::stop();
 }
 
 void SuspendableTimer::suspend(ReasonForSuspension)
 {
 #if !ASSERT_DISABLED
     ASSERT(!m_suspended);
     m_suspended = true;
 #endif
-    m_nextFireInterval = nextFireInterval();
-    m_repeatInterval = repeatInterval();
-    TimerBase::stop();
+    m_active = isActive();
+    if (m_active) {
+        m_nextFireInterval = nextFireInterval();
+        m_repeatInterval = repeatInterval();
+        TimerBase::stop();
+    }
 }
 
 void SuspendableTimer::resume()
 {
 #if !ASSERT_DISABLED
     ASSERT(m_suspended);
     m_suspended = false;
 #endif
-    start(m_nextFireInterval, m_repeatInterval);
+    if (m_active)
+        start(m_nextFireInterval, m_repeatInterval);
 }
 
 bool SuspendableTimer::canSuspend() const
 {
     return true;
 }
 
 } // namespace WebCore