Title: [148618] trunk/Source/WebCore
Revision
148618
Author
[email protected]
Date
2013-04-17 11:16:52 -0700 (Wed, 17 Apr 2013)

Log Message

[refactor] Moved ScriptedAnimationController common code to inline function
https://bugs.webkit.org/show_bug.cgi?id=114681

Reviewed by Daniel Bates.

Avoided duplicated code by moving ScriptedAnimationController clearance
code to a common function used by both Document::dispose() and
Document::detach().

No new tests, no behavior changes.

* dom/Document.cpp:
(WebCore::Document::dispose):
(WebCore::Document::detach):
(WebCore::Document::clearScriptedAnimationController): Added.
* dom/Document.h:
(Document):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (148617 => 148618)


--- trunk/Source/WebCore/ChangeLog	2013-04-17 16:42:45 UTC (rev 148617)
+++ trunk/Source/WebCore/ChangeLog	2013-04-17 18:16:52 UTC (rev 148618)
@@ -1,3 +1,23 @@
+2013-04-17  Bruno de Oliveira Abinader  <[email protected]>
+
+        [refactor] Moved ScriptedAnimationController common code to inline function
+        https://bugs.webkit.org/show_bug.cgi?id=114681
+
+        Reviewed by Daniel Bates.
+
+        Avoided duplicated code by moving ScriptedAnimationController clearance
+        code to a common function used by both Document::dispose() and
+        Document::detach().
+
+        No new tests, no behavior changes.
+
+        * dom/Document.cpp:
+        (WebCore::Document::dispose):
+        (WebCore::Document::detach):
+        (WebCore::Document::clearScriptedAnimationController): Added.
+        * dom/Document.h:
+        (Document):
+
 2013-04-17  Chris Fleizach  <[email protected]>
 
         AX: When img@alt is undefined, WebKit should use @title as accessibility label if available

Modified: trunk/Source/WebCore/dom/Document.cpp (148617 => 148618)


--- trunk/Source/WebCore/dom/Document.cpp	2013-04-17 16:42:45 UTC (rev 148617)
+++ trunk/Source/WebCore/dom/Document.cpp	2013-04-17 18:16:52 UTC (rev 148618)
@@ -695,10 +695,7 @@
     m_cssCanvasElements.clear();
 
 #if ENABLE(REQUEST_ANIMATION_FRAME)
-    // FIXME: consider using ActiveDOMObject.
-    if (m_scriptedAnimationController)
-        m_scriptedAnimationController->clearDocumentPointer();
-    m_scriptedAnimationController.clear();
+    clearScriptedAnimationController();
 #endif
 }
 
@@ -2117,10 +2114,7 @@
 #endif
 
 #if ENABLE(REQUEST_ANIMATION_FRAME)
-    // FIXME: consider using ActiveDOMObject.
-    if (m_scriptedAnimationController)
-        m_scriptedAnimationController->clearDocumentPointer();
-    m_scriptedAnimationController.clear();
+    clearScriptedAnimationController();
 #endif
 
     RenderObject* render = renderer();
@@ -5627,6 +5621,14 @@
         return;
     m_scriptedAnimationController->serviceScriptedAnimations(monotonicAnimationStartTime);
 }
+
+void Document::clearScriptedAnimationController()
+{
+    // FIXME: consider using ActiveDOMObject.
+    if (m_scriptedAnimationController)
+        m_scriptedAnimationController->clearDocumentPointer();
+    m_scriptedAnimationController.clear();
+}
 #endif
 
 #if ENABLE(TOUCH_EVENTS)

Modified: trunk/Source/WebCore/dom/Document.h (148617 => 148618)


--- trunk/Source/WebCore/dom/Document.h	2013-04-17 16:42:45 UTC (rev 148617)
+++ trunk/Source/WebCore/dom/Document.h	2013-04-17 18:16:52 UTC (rev 148618)
@@ -1543,6 +1543,7 @@
     double m_lastHandledUserGestureTimestamp;
 
 #if ENABLE(REQUEST_ANIMATION_FRAME)
+    void clearScriptedAnimationController();
     RefPtr<ScriptedAnimationController> m_scriptedAnimationController;
 #endif
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to