Changeset 132538 in webkit


Ignore:
Timestamp:
Oct 25, 2012 2:49:22 PM (12 years ago)
Author:
tony@chromium.org
Message:

Move default DOM Timer values into Settings
​https://bugs.webkit.org/show_bug.cgi?id=100405

Reviewed by Kenneth Russell.

Move the global values for defaultMinDOMTimerInterval and defaultDOMTimerAlignmentInterval into
the Settings object. This is more consistent with other global settings and allows us to remove
the setters on the DOMTimer object.

No new tests, this is a refactor.

  • page/DOMTimer.cpp: Remove globals.
  • page/DOMTimer.h:

(WebCore::DOMTimer::defaultMinTimerInterval): Call through to Settings
(WebCore::DOMTimer::defaultTimerAlignmentInterval): Call through to Settings.
(DOMTimer): Remove setters.

  • page/Settings.cpp:

(WebCore::Settings::setDefaultMinDOMTimerInterval): Use a global in Settings.
(WebCore::Settings::setDefaultDOMTimerAlignmentInterval): Use a global in Settings.

  • page/Settings.h:

(WebCore::Settings::defaultMinDOMTimerInterval): Inline the getter.
(WebCore::Settings::defaultDOMTimerAlignmentInterval): Inline the getter.
(Settings): Add globals.

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r132537 r132538  
     12012-10-25  Tony Chang  <tony@chromium.org>
     2
     3        Move default DOM Timer values into Settings
     4        https://bugs.webkit.org/show_bug.cgi?id=100405
     5
     6        Reviewed by Kenneth Russell.
     7
     8        Move the global values for defaultMinDOMTimerInterval and defaultDOMTimerAlignmentInterval into
     9        the Settings object. This is more consistent with other global settings and allows us to remove
     10        the setters on the DOMTimer object.
     11
     12        No new tests, this is a refactor.
     13
     14        * page/DOMTimer.cpp: Remove globals.
     15        * page/DOMTimer.h:
     16        (WebCore::DOMTimer::defaultMinTimerInterval): Call through to Settings
     17        (WebCore::DOMTimer::defaultTimerAlignmentInterval): Call through to Settings.
     18        (DOMTimer): Remove setters.
     19        * page/Settings.cpp:
     20        (WebCore::Settings::setDefaultMinDOMTimerInterval): Use a global in Settings.
     21        (WebCore::Settings::setDefaultDOMTimerAlignmentInterval): Use a global in Settings.
     22        * page/Settings.h:
     23        (WebCore::Settings::defaultMinDOMTimerInterval): Inline the getter.
     24        (WebCore::Settings::defaultDOMTimerAlignmentInterval): Inline the getter.
     25        (Settings): Add globals.
     26
    1272012-10-25  Simon Fraser  <simon.fraser@apple.com>
    228

  • trunk/Source/WebCore/page/DOMTimer.cpp

    r130720 r132538  
    4242static const int maxTimerNestingLevel = 5;
    4343static const double oneMillisecond = 0.001;
    44 double DOMTimer::s_minDefaultTimerInterval = 0.010; // 10 milliseconds
    45 double DOMTimer::s_defaultTimerAlignmentInterval = 0;
    4644
    4745static int timerNestingLevel = 0;

  • trunk/Source/WebCore/page/DOMTimer.h

    r130720 r132538  
    2828#define DOMTimer_h
    2929
     30#include "Settings.h"
    3031#include "SuspendableTimer.h"
    3132#include "UserGestureIndicator.h"
    … …  
    3637
    3738    class ScheduledAction;
    38     class Settings;
    3939
    4040    class DOMTimer : public SuspendableTimer {
    41         friend class Settings;
    4241    public:
    4342        virtual ~DOMTimer();
    … …  
    6362
    6463        // The default minimum allowable timer setting (in seconds, 0.001 == 1 ms).
    65         // These are only modified via static methods in Settings.
    66         static double defaultMinTimerInterval() { return s_minDefaultTimerInterval; }
    67         static void setDefaultMinTimerInterval(double value) { s_minDefaultTimerInterval = value; }
     64        static double defaultMinTimerInterval() { return Settings::defaultMinDOMTimerInterval(); }
    6865
    6966        // Retuns timer fire time rounded to the next multiple of timer alignment interval.
    … …  
    7269        // The default timer alignment interval (in seconds). If non zero, timer fire times
    7370        // will be rounded to a multiple of the alignment interval.
    74         // These are only modified via static methods in Settings.
    75         static double defaultTimerAlignmentInterval() { return s_defaultTimerAlignmentInterval; }
    76         static void setDefaultTimerAlignmentInterval(double value) { s_defaultTimerAlignmentInterval = value; }
     71        static double defaultTimerAlignmentInterval() { return Settings::defaultDOMTimerAlignmentInterval(); }
    7772
    7873        int m_timeoutId;
    … …  
    8176        int m_originalInterval;
    8277        RefPtr<UserGestureIndicator::Token> m_userGestureToken;
    83         static double s_minDefaultTimerInterval;
    84         static double s_defaultTimerAlignmentInterval;
    8578    };
    8679

  • trunk/Source/WebCore/page/Settings.cpp

    r132480 r132538  
    8282}
    8383
     84double Settings::gDefaultMinDOMTimerInterval = 0.010; // 10 milliseconds
     85double Settings::gDefaultDOMTimerAlignmentInterval = 0;
     86
    8487#if USE(SAFARI_THEME)
    8588bool Settings::gShouldPaintNativeControls = true;
    … …  
    8790
    8891#if USE(AVFOUNDATION)
    89 bool Settings::gAVFoundationEnabled(false);
     92bool Settings::gAVFoundationEnabled = false;
    9093#endif
    9194
    … …  
    698701void Settings::setDefaultMinDOMTimerInterval(double interval)
    699702{
    700     DOMTimer::setDefaultMinTimerInterval(interval);
    701 }
    702 
    703 double Settings::defaultMinDOMTimerInterval()
    704 {
    705     return DOMTimer::defaultMinTimerInterval();
     703    gDefaultMinDOMTimerInterval = interval;
    706704}
    707705
    … …  
    718716void Settings::setDefaultDOMTimerAlignmentInterval(double interval)
    719717{
    720     DOMTimer::setDefaultTimerAlignmentInterval(interval);
    721 }
    722 
    723 double Settings::defaultDOMTimerAlignmentInterval()
    724 {
    725     return DOMTimer::defaultTimerAlignmentInterval();
     718    gDefaultDOMTimerAlignmentInterval = interval;
    726719}
    727720

  • trunk/Source/WebCore/page/Settings.h

    r132480 r132538  
    258258       
    259259        static void setDefaultMinDOMTimerInterval(double); // Interval specified in seconds.
    260         static double defaultMinDOMTimerInterval();
     260        static double defaultMinDOMTimerInterval() { return gDefaultMinDOMTimerInterval; }
    261261       
    262262        void setMinDOMTimerInterval(double); // Per-page; initialized to default value.
    … …  
    264264
    265265        static void setDefaultDOMTimerAlignmentInterval(double);
    266         static double defaultDOMTimerAlignmentInterval();
     266        static double defaultDOMTimerAlignmentInterval() { return gDefaultDOMTimerAlignmentInterval; }
    267267
    268268        void setDOMTimerAlignmentInterval(double);
    … …  
    850850        double m_incrementalRenderingSuppressionTimeoutInSeconds;
    851851
     852        static double gDefaultMinDOMTimerInterval;
     853        static double gDefaultDOMTimerAlignmentInterval;
     854
    852855#if USE(AVFOUNDATION)
    853856        static bool gAVFoundationEnabled;
Note: See TracChangeset for help on using the changeset viewer.