Merge in WebKit r47029.

1 files changed, 30 insertions, 30 deletions

diff --git a/WebCore/page/DOMTimer.h b/WebCore/page/DOMTimer.h
index f6343fc..6d6271f 100644
--- a/WebCore/page/DOMTimer.h
+++ b/WebCore/page/DOMTimer.h
@@ -33,41 +33,41 @@
 
 namespace WebCore {
 
-class ScheduledAction;
+    class ScheduledAction;
 
-class DOMTimer : public TimerBase, public ActiveDOMObject {
-public:
-    virtual ~DOMTimer();
-    // Creates a new timer owned by specified ScriptExecutionContext, starts it
-    // and returns its Id.
-    static int install(ScriptExecutionContext*, ScheduledAction*, int timeout, bool singleShot);
-    static void removeById(ScriptExecutionContext*, int timeoutId);
+    class DOMTimer : public TimerBase, public ActiveDOMObject {
+    public:
+        virtual ~DOMTimer();
+        // Creates a new timer owned by specified ScriptExecutionContext, starts it
+        // and returns its Id.
+        static int install(ScriptExecutionContext*, ScheduledAction*, int timeout, bool singleShot);
+        static void removeById(ScriptExecutionContext*, int timeoutId);
 
-    // ActiveDOMObject
-    virtual bool hasPendingActivity() const;
-    virtual void contextDestroyed();
-    virtual void stop();
-    virtual bool canSuspend() const;
-    virtual void suspend();
-    virtual void resume();
+        // ActiveDOMObject
+        virtual bool hasPendingActivity() const;
+        virtual void contextDestroyed();
+        virtual void stop();
+        virtual bool canSuspend() const;
+        virtual void suspend();
+        virtual void resume();
 
-    // The lowest allowable timer setting (in seconds, 0.001 == 1 ms).
-    // Default is 10ms.
-    // Chromium uses a non-default timeout.
-    static double minTimerInterval() { return s_minTimerInterval; }
-    static void setMinTimerInterval(double value) { s_minTimerInterval = value; }
+        // The lowest allowable timer setting (in seconds, 0.001 == 1 ms).
+        // Default is 10ms.
+        // Chromium uses a non-default timeout.
+        static double minTimerInterval() { return s_minTimerInterval; }
+        static void setMinTimerInterval(double value) { s_minTimerInterval = value; }
 
-private:
-    DOMTimer(ScriptExecutionContext*, ScheduledAction*, int timeout, bool singleShot);
-    virtual void fired();
+    private:
+        DOMTimer(ScriptExecutionContext*, ScheduledAction*, int timeout, bool singleShot);
+        virtual void fired();
 
-    int m_timeoutId;
-    int m_nestingLevel;
-    OwnPtr<ScheduledAction> m_action;
-    double m_nextFireInterval;
-    double m_repeatInterval;
-    static double s_minTimerInterval;
-};
+        int m_timeoutId;
+        int m_nestingLevel;
+        OwnPtr<ScheduledAction> m_action;
+        double m_nextFireInterval;
+        double m_repeatInterval;
+        static double s_minTimerInterval;
+    };
 
 } // namespace WebCore