Changeset 180873 in webkit

Timestamp:

Mar 1, 2015, 5:48:54 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Use std::unique_ptr instead of PassOwnPtr|OwnPtr for ScrollAnimator
​https://bugs.webkit.org/show_bug.cgi?id=142143

Patch by Joonghun Park <​jh718.park@samsung.com> on 2015-03-01
Reviewed by Darin Adler.

No new tests, no behavior changes.

• platform/ScrollAnimator.cpp:

(WebCore::ScrollAnimator::create):

• platform/ScrollAnimator.h:
• platform/ScrollAnimatorNone.cpp:

(WebCore::ScrollAnimator::create):

• platform/ScrollableArea.h:
• platform/ios/ScrollAnimatorIOS.mm:

(WebCore::ScrollAnimator::create):

• platform/mac/ScrollAnimatorMac.mm:

(WebCore::ScrollAnimator::create):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ScrollAnimator.cpp (modified) (1 diff)
• platform/ScrollAnimator.h (modified) (2 diffs)
• platform/ScrollAnimatorNone.cpp (modified) (1 diff)
• platform/ScrollableArea.h (modified) (1 diff)
• platform/ios/ScrollAnimatorIOS.mm (modified) (1 diff)
• platform/mac/ScrollAnimatorMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-01  Joonghun Park  <jh718.park@samsung.com>
+
+        Use std::unique_ptr instead of PassOwnPtr|OwnPtr for ScrollAnimator
+        https://bugs.webkit.org/show_bug.cgi?id=142143
+
+        Reviewed by Darin Adler.
+
+        No new tests, no behavior changes.
+
+        * platform/ScrollAnimator.cpp:
+        (WebCore::ScrollAnimator::create):
+        * platform/ScrollAnimator.h:
+        * platform/ScrollAnimatorNone.cpp:
+        (WebCore::ScrollAnimator::create):
+        * platform/ScrollableArea.h:
+        * platform/ios/ScrollAnimatorIOS.mm:
+        (WebCore::ScrollAnimator::create):
+        * platform/mac/ScrollAnimatorMac.mm:
+        (WebCore::ScrollAnimator::create):
+
 2015-02-26  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/platform/ScrollAnimator.cpp

@@ -42 +42 @@
 
 #if !ENABLE(SMOOTH_SCROLLING) && !PLATFORM(IOS)
-PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea& scrollableArea)
-{
-    return adoptPtr(new ScrollAnimator(scrollableArea));
+std::unique_ptr<ScrollAnimator> ScrollAnimator::create(ScrollableArea& scrollableArea)
+{
+    return std::make_unique<ScrollAnimator>(scrollableArea);
 }
 #endif

trunk/Source/WebCore/platform/ScrollAnimator.h

@@ -58 +58 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassOwnPtr<ScrollAnimator> create(ScrollableArea&);
+    static std::unique_ptr<ScrollAnimator> create(ScrollableArea&);
 
+    explicit ScrollAnimator(ScrollableArea&);
     virtual ~ScrollAnimator();
 
@@ -127 +128 @@
 
 protected:
-    explicit ScrollAnimator(ScrollableArea&);
-
     virtual void notifyPositionChanged(const FloatSize& delta);
 

trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp

@@ -53 +53 @@
 const double kZoomTicks = 11;
 
-PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea& scrollableArea)
+std::unique_ptr<ScrollAnimator> ScrollAnimator::create(ScrollableArea& scrollableArea)
 {
     if (scrollableArea.scrollAnimatorEnabled())
-        return adoptPtr(new ScrollAnimatorNone(scrollableArea));
-    return adoptPtr(new ScrollAnimator(scrollableArea));
+        return std::make_unique<ScrollAnimatorNone>(scrollableArea);
+    return std::make_unique<ScrollAnimator>(scrollableArea);
 }
 

trunk/Source/WebCore/platform/ScrollableArea.h

@@ -297 +297 @@
     virtual void setScrollOffset(const IntPoint&) = 0;
 
-    mutable OwnPtr<ScrollAnimator> m_scrollAnimator;
+    mutable std::unique_ptr<ScrollAnimator> m_scrollAnimator;
 
 #if ENABLE(CSS_SCROLL_SNAP)

trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm

@@ -41 +41 @@
 namespace WebCore {
 
-PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea& scrollableArea)
+std::unique_ptr<ScrollAnimator> ScrollAnimator::create(ScrollableArea& scrollableArea)
 {
-    return adoptPtr(new ScrollAnimatorIOS(scrollableArea));
+    return std::make_unique<ScrollAnimatorIOS>(scrollableArea);
 }
 

trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm

@@ -635 +635 @@
 namespace WebCore {
 
-PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea& scrollableArea)
-{
-    return adoptPtr(new ScrollAnimatorMac(scrollableArea));
+std::unique_ptr<ScrollAnimator> ScrollAnimator::create(ScrollableArea& scrollableArea)
+{
+    return std::make_unique<ScrollAnimatorMac>(scrollableArea);
 }