Merge 78648 - 2011-02-15 James Robinson <jamesr@chromium.org>...

Source/WebCore/dom/ScriptExecutionContext.h

 /*
  * 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 89 matching lines @@
         // Active objects can be asked to suspend even if canSuspendActiveDOMObjects() returns 'false' -
         // step-by-step JS debugging is one example.
         void suspendActiveDOMObjects(ActiveDOMObject::ReasonForSuspension);
         void resumeActiveDOMObjects();
         void stopActiveDOMObjects();
         void createdActiveDOMObject(ActiveDOMObject*, void* upcastPointer);
         void destroyedActiveDOMObject(ActiveDOMObject*);
         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();
         void createdMessagePort(MessagePort*);
         void destroyedMessagePort(MessagePort*);
         const HashSet<MessagePort*>& messagePorts() const { return m_messagePorts; }
 
 #if ENABLE(BLOB)
         void createdDomUrl(DOMURL*);
         void destroyedDomUrl(DOMURL*);
@@ skipping 75 matching lines @@
 
 #if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
         RefPtr<FileThread> m_fileThread;
 #endif
     };
 
 } // namespace WebCore
 
 
 #endif // ScriptExecutionContext_h