Title: [168148] trunk/Source/WebCore
Revision
168148
Author
mmaxfi...@apple.com
Date
2014-05-01 21:23:34 -0700 (Thu, 01 May 2014)

Log Message

Migrate all uses of DeviceMotionController and DeviceOrientationController to std::unique_ptr
https://bugs.webkit.org/show_bug.cgi?id=132461

Unreviewed build fix.

No new tests.

* dom/Document.cpp:
(WebCore::Document::Document):
* dom/Document.h:
* platform/ios/DeviceMotionClientIOS.h:
(WebCore::DeviceMotionClientIOS::create): Deleted.
* platform/ios/DeviceOrientationClientIOS.h:
(WebCore::DeviceOrientationClientIOS::create): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (168147 => 168148)


--- trunk/Source/WebCore/ChangeLog	2014-05-02 04:12:53 UTC (rev 168147)
+++ trunk/Source/WebCore/ChangeLog	2014-05-02 04:23:34 UTC (rev 168148)
@@ -1,3 +1,20 @@
+2014-05-01  Myles C. Maxfield  <mmaxfi...@apple.com>
+
+        Migrate all uses of DeviceMotionController and DeviceOrientationController to std::unique_ptr
+        https://bugs.webkit.org/show_bug.cgi?id=132461
+
+        Unreviewed build fix.
+
+        No new tests.
+
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        * dom/Document.h:
+        * platform/ios/DeviceMotionClientIOS.h:
+        (WebCore::DeviceMotionClientIOS::create): Deleted.
+        * platform/ios/DeviceOrientationClientIOS.h:
+        (WebCore::DeviceOrientationClientIOS::create): Deleted.
+
 2014-05-01  Gyuyoung Kim  <gyuyoung....@samsung.com>
 
         Convert OwnPtr and PassOwnPtr uses to std::unique_ptr in Supplement

Modified: trunk/Source/WebCore/dom/Document.cpp (168147 => 168148)


--- trunk/Source/WebCore/dom/Document.cpp	2014-05-02 04:12:53 UTC (rev 168147)
+++ trunk/Source/WebCore/dom/Document.cpp	2014-05-02 04:23:34 UTC (rev 168148)
@@ -488,10 +488,10 @@
     , m_lastHandledUserGestureTimestamp(0)
 #if PLATFORM(IOS)
 #if ENABLE(DEVICE_ORIENTATION)
-    , m_deviceMotionClient(DeviceMotionClientIOS::create())
-    , m_deviceMotionController(DeviceMotionController::create(m_deviceMotionClient.get()))
-    , m_deviceOrientationClient(DeviceOrientationClientIOS::create())
-    , m_deviceOrientationController(DeviceOrientationController::create(m_deviceOrientationClient.get()))
+    , m_deviceMotionClient(std::make_unique<DeviceMotionClientIOS>())
+    , m_deviceMotionController(std::make_unique<DeviceMotionController>(m_deviceMotionClient.get()))
+    , m_deviceOrientationClient(std::make_unique<DeviceOrientationClientIOS>())
+    , m_deviceOrientationController(std::make_unique<DeviceOrientationController>(m_deviceOrientationClient.get()))
 #endif
 #endif
 #if ENABLE(TELEPHONE_NUMBER_DETECTION)

Modified: trunk/Source/WebCore/dom/Document.h (168147 => 168148)


--- trunk/Source/WebCore/dom/Document.h	2014-05-02 04:12:53 UTC (rev 168147)
+++ trunk/Source/WebCore/dom/Document.h	2014-05-02 04:23:34 UTC (rev 168148)
@@ -1613,11 +1613,10 @@
 #endif
 
 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS)
-    // FIXME: Use std::unique_ptr instead of OwnPtr after we upstream DeviceMotionClientIOS.{h, mm}.
-    OwnPtr<DeviceMotionClient> m_deviceMotionClient;
-    OwnPtr<DeviceMotionController> m_deviceMotionController;
-    OwnPtr<DeviceOrientationClient> m_deviceOrientationClient;
-    OwnPtr<DeviceOrientationController> m_deviceOrientationController;
+    std::unique_ptr<DeviceMotionClient> m_deviceMotionClient;
+    std::unique_ptr<DeviceMotionController> m_deviceMotionController;
+    std::unique_ptr<DeviceOrientationClient> m_deviceOrientationClient;
+    std::unique_ptr<DeviceOrientationController> m_deviceOrientationController;
 #endif
 
 // FIXME: Find a better place for this functionality.

Modified: trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h (168147 => 168148)


--- trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h	2014-05-02 04:12:53 UTC (rev 168147)
+++ trunk/Source/WebCore/platform/ios/DeviceMotionClientIOS.h	2014-05-02 04:23:34 UTC (rev 168148)
@@ -42,10 +42,6 @@
 
 class DeviceMotionClientIOS : public DeviceMotionClient {
 public:
-    static PassOwnPtr<DeviceMotionClientIOS> create()
-    {
-        return adoptPtr(new DeviceMotionClientIOS());
-    }
     DeviceMotionClientIOS();
     virtual ~DeviceMotionClientIOS() override;
     virtual void setController(DeviceMotionController*) override;

Modified: trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h (168147 => 168148)


--- trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h	2014-05-02 04:12:53 UTC (rev 168147)
+++ trunk/Source/WebCore/platform/ios/DeviceOrientationClientIOS.h	2014-05-02 04:23:34 UTC (rev 168148)
@@ -42,10 +42,6 @@
 
 class DeviceOrientationClientIOS : public DeviceOrientationClient {
 public:
-    static PassOwnPtr<DeviceOrientationClientIOS> create()
-    {
-        return adoptPtr(new DeviceOrientationClientIOS());
-    }
     DeviceOrientationClientIOS();
     virtual ~DeviceOrientationClientIOS() override;
     virtual void setController(DeviceOrientationController*) override;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to