Changeset 155421 in webkit

Timestamp:

Sep 9, 2013, 11:10:17 PM (13 years ago)

Author:

akling@apple.com

Message:

Remove unreviewed gunk I just accidentally committed :|

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Frame.cpp (modified) (1 diff)
• page/animation/AnimationController.cpp (modified) (8 diffs)
• page/animation/AnimationController.h (modified) (2 diffs)
• page/animation/AnimationControllerPrivate.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-09  Andreas Kling  <akling@apple.com>
+
+        Remove unreviewed gunk I just accidentally committed :|
+
 2013-09-09  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/page/Frame.cpp

@@ -162 +162 @@
     , m_selection(adoptPtr(new FrameSelection(this)))
     , m_eventHandler(adoptPtr(new EventHandler(*this)))
-    , m_animationController(createOwned<AnimationController>(*this)))
+    , m_animationController(adoptPtr(new AnimationController(this)))
     , m_pageZoomFactor(parentPageZoomFactor(this))
     , m_textZoomFactor(parentTextZoomFactor(this))

trunk/Source/WebCore/page/animation/AnimationController.cpp

@@ -51 +51 @@
 static const double cBeginAnimationUpdateTimeNotSet = -1;
 
-AnimationControllerPrivate::AnimationControllerPrivate(Frame& frame)
+AnimationControllerPrivate::AnimationControllerPrivate(Frame* frame)
     : m_animationTimer(this, &AnimationControllerPrivate::animationTimerFired)
     , m_updateStyleIfNeededDispatcher(this, &AnimationControllerPrivate::updateStyleIfNeededDispatcherFired)
@@ -113 +113 @@
 
     if (calledSetChanged)
-        m_frame.document()->updateStyleIfNeeded();
+        m_frame->document()->updateStyleIfNeeded();
 
     return timeToNextService;
@@ -164 +164 @@
 {
     // Protect the frame from getting destroyed in the event handler
-    Ref<Frame> protector(m_frame);
+    RefPtr<Frame> protector = m_frame;
 
     bool updateStyle = !m_eventsToDispatch.isEmpty() || !m_nodeChangesToDispatch.isEmpty();
@@ -187 +187 @@
     m_nodeChangesToDispatch.clear();
 
-    if (updateStyle)
-        m_frame.document()->updateStyleIfNeeded();
+    if (updateStyle && m_frame)
+        m_frame->document()->updateStyleIfNeeded();
 }
 
@@ -225 +225 @@
 
     if (timeToNextService >= 0)
-        m_frame.document()->view()->scheduleAnimation();
+        m_frame->document()->view()->scheduleAnimation();
 }
 #endif
@@ -267 +267 @@
         return;
 
-    suspendAnimationsForDocument(m_frame.document());
+    suspendAnimationsForDocument(m_frame->document());
 
     // Traverse subframes
-    for (Frame* child = m_frame.tree().firstChild(); child; child = child->tree().nextSibling())
+    for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree().nextSibling())
         child->animation().suspendAnimations();
 
@@ -281 +281 @@
         return;
 
-    resumeAnimationsForDocument(m_frame.document());
+    resumeAnimationsForDocument(m_frame->document());
 
     // Traverse subframes
-    for (Frame* child = m_frame.tree().firstChild(); child; child = child->tree().nextSibling())
+    for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree().nextSibling())
         child->animation().resumeAnimations();
 
@@ -491 +491 @@
 }
 
-AnimationController::AnimationController(Frame& frame)
-    : m_data(createOwned<AnimationControllerPrivate>(frame)))
+AnimationController::AnimationController(Frame* frame)
+    : m_data(adoptPtr(new AnimationControllerPrivate(frame)))
     , m_beginAnimationUpdateCount(0)
 {

trunk/Source/WebCore/page/animation/AnimationController.h

@@ -47 +47 @@
 class AnimationController {
 public:
-    explicit AnimationController(Frame&);
+    AnimationController(Frame*);
     ~AnimationController();
 
@@ -84 +84 @@
 
 private:
-    const OwnPtr<AnimationControllerPrivate> m_data;
+    OwnPtr<AnimationControllerPrivate> m_data;
     int m_beginAnimationUpdateCount;
 };

trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h

@@ -59 +59 @@
     WTF_MAKE_NONCOPYABLE(AnimationControllerPrivate); WTF_MAKE_FAST_ALLOCATED;
 public:
-    explicit AnimationControllerPrivate(Frame&);
+    AnimationControllerPrivate(Frame*);
     ~AnimationControllerPrivate();
 
@@ -126 +126 @@
     Timer<AnimationControllerPrivate> m_animationTimer;
     Timer<AnimationControllerPrivate> m_updateStyleIfNeededDispatcher;
-    Frame& m_frame;
+    Frame* m_frame;
     
     class EventToDispatch {