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

Source/WebCore/dom/Document.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 130 matching lines @@
 struct DashboardRegionValue;
 #endif
 
 #if ENABLE(TOUCH_EVENTS)
 class Touch;
 class TouchList;
 #endif
 
 #if ENABLE(REQUEST_ANIMATION_FRAME)
 class RequestAnimationFrameCallback;
+class ScriptedAnimationController;
 #endif
 
 typedef int ExceptionCode;
 
 class FormElementKey {
 public:
     FormElementKey(AtomicStringImpl* = 0, AtomicStringImpl* = 0);
     ~FormElementKey();
     FormElementKey(const FormElementKey&);
     FormElementKey& operator=(const FormElementKey&);
@@ skipping 770 matching lines @@
     // Extension for manipulating canvas drawing contexts for use in CSS
     CanvasRenderingContext* getCSSCanvasContext(const String& type, const String& name, int width, int height);
     HTMLCanvasElement* getCSSCanvasElement(const String& name);
 
     bool isDNSPrefetchEnabled() const { return m_isDNSPrefetchEnabled; }
     void parseDNSPrefetchControlHeader(const String&);
 
     virtual void addMessage(MessageSource, MessageType, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL, PassRefPtr<ScriptCallStack>);
     virtual void postTask(PassOwnPtr<Task>); // Executes the task on context's thread asynchronously.
 
+    virtual void suspendScriptedAnimationControllerCallbacks();
+    virtual void resumeScriptedAnimationControllerCallbacks();
+
 #if USE(JSC)
     typedef JSC::WeakGCMap<WebCore::Node*, JSNode*> JSWrapperCache;
     typedef HashMap<DOMWrapperWorld*, JSWrapperCache*> JSWrapperCacheMap;
     JSWrapperCacheMap& wrapperCacheMap() { return m_wrapperCacheMap; }
     JSWrapperCache* getWrapperCache(DOMWrapperWorld* world);
     JSWrapperCache* createWrapperCache(DOMWrapperWorld*);
     void destroyWrapperCache(DOMWrapperWorld*);
     void destroyAllWrapperCaches();
 #endif
 
@@ skipping 447 matching lines @@
 
     ViewportArguments m_viewportArguments;
 
     bool m_directionSetOnDocumentElement;
     bool m_writingModeSetOnDocumentElement;
 
     DocumentTiming m_documentTiming;
     RefPtr<MediaQueryMatcher> m_mediaQueryMatcher;
 
 #if ENABLE(REQUEST_ANIMATION_FRAME)
-    typedef Vector<RefPtr<RequestAnimationFrameCallback> > RequestAnimationFrameCallbackList;
-    OwnPtr<RequestAnimationFrameCallbackList> m_requestAnimationFrameCallbacks;
-    int m_nextRequestAnimationFrameCallbackId;
+    OwnPtr<ScriptedAnimationController> m_scriptedAnimationController;
 #endif
 };
 
 inline bool Document::DocumentOrderedMap::contains(AtomicStringImpl* id) const
 {
     return m_map.contains(id) || m_duplicateCounts.contains(id);
 }
 
 inline bool Document::DocumentOrderedMap::containsMultiple(AtomicStringImpl* id) const
 {
@@ skipping 27 matching lines @@
     if (m_document)
         m_document->selfOnlyRef();
 #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)
     trackForDebugging();
 #endif
 }
 
 } // namespace WebCore
 
 #endif // Document_h