Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 9 insertions, 1 deletions

diff --git a/Source/WebCore/dom/ScriptExecutionContext.h b/Source/WebCore/dom/ScriptExecutionContext.h
index 642906c..3b37f0c 100644
--- a/Source/WebCore/dom/ScriptExecutionContext.h
+++ b/Source/WebCore/dom/ScriptExecutionContext.h
@@ -107,6 +107,9 @@ namespace WebCore {
         typedef const HashMap<ActiveDOMObject*, void*> ActiveDOMObjectsMap;
         ActiveDOMObjectsMap& activeDOMObjects() const { return m_activeDOMObjects; }
 
+        virtual void suspendScriptedAnimationControllerCallbacks() { }
+        virtual void resumeScriptedAnimationControllerCallbacks() { }
+
         // MessagePort is conceptually a kind of ActiveDOMObject, but it needs to be tracked separately for message dispatch.
         void processMessagePortMessagesSoon();
         void dispatchMessagePortEvents();
@@ -152,6 +155,10 @@ namespace WebCore {
         void stopFileThread();
 #endif
 
+        // Interval is in seconds.
+        void adjustMinimumTimerInterval(double oldMinimumTimerInterval);
+        virtual double minimumTimerInterval() const;
+
     protected:
         // Explicitly override the security origin for this script context.
         // Note: It is dangerous to change the security origin of a script context
@@ -176,7 +183,8 @@ namespace WebCore {
         bool m_iteratingActiveDOMObjects;
         bool m_inDestructor;
 
-        HashMap<int, DOMTimer*> m_timeouts;
+        typedef HashMap<int, DOMTimer*> TimeoutMap;
+        TimeoutMap m_timeouts;
 
 #if ENABLE(BLOB)
         HashSet<String> m_publicBlobURLs;