Attachment #230787 for bug #132544

View Details Raw Unified Return to Bug 132544



2014-05-04  Gyuyoung Kim  <gyuyoung.kim@samsung.com>

        Use std::unique_ptr in m_taskTimer of Notification class
        https://bugs.webkit.org/show_bug.cgi?id=132544

        Reviewed by NOBODY (OOPS!).

        No new tests, no behavior change.

        * Modules/notifications/Notification.cpp:
        (WebCore::Notification::Notification):
        * Modules/notifications/Notification.h: Use std::unique_ptr instead of OwnPtr.

2014-05-03  Commit Queue  <commit-queue@webkit.org>

        Unreviewed, rolling out r168232.

Lines 84-90 Notification::Notification(ScriptExecutionContext& context, const String& title) a/Source/WebCore/Modules/notifications/Notification.cpp_sec1
- a/Source/WebCore/Modules/notifications/Notification.cpp -1 / +1 lines
84	: ActiveDOMObject(&context)	84	: ActiveDOMObject(&context)
85	, m_title(title)	85	, m_title(title)
86	, m_state(Idle)	86	, m_state(Idle)
87	, m_taskTimer(adoptPtr(new Timer<Notification>(this, &Notification::taskTimerFired)))	87	, m_taskTimer(std::make_unique<Timer<Notification>>(this, &Notification::taskTimerFired))
88	{	88	{
89	m_notificationCenter = DOMWindowNotifications::webkitNotifications(toDocument(context).domWindow());	89	m_notificationCenter = DOMWindowNotifications::webkitNotifications(toDocument(context).domWindow());
90		90



#include "SharedBuffer.h"
#include "TextDirection.h"
#include "ThreadableLoaderClient.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>

    RefPtr<NotificationCenter> m_notificationCenter;

#if ENABLE(NOTIFICATIONS)
    std::unique_ptr<Timer<Notification>> m_taskTimer;
#endif
};


Return to Bug 132544

Lines 40-46 a/Source/WebCore/Modules/notifications/Notification.h_sec1
- a/Source/WebCore/Modules/notifications/Notification.h -2 / +1 lines
40	#include "SharedBuffer.h"	40	#include "SharedBuffer.h"
41	#include "TextDirection.h"	41	#include "TextDirection.h"
42	#include "ThreadableLoaderClient.h"	42	#include "ThreadableLoaderClient.h"
43	#include <wtf/OwnPtr.h>
44	#include <wtf/PassRefPtr.h>	43	#include <wtf/PassRefPtr.h>
45	#include <wtf/RefCounted.h>	44	#include <wtf/RefCounted.h>
46	#include <wtf/RefPtr.h>	45	#include <wtf/RefPtr.h>
Lines 181-187 private: a/Source/WebCore/Modules/notifications/Notification.h_sec2
181	RefPtr<NotificationCenter> m_notificationCenter;	180	RefPtr<NotificationCenter> m_notificationCenter;
182		181
183	#if ENABLE(NOTIFICATIONS)	182	#if ENABLE(NOTIFICATIONS)
184	OwnPtr<Timer<Notification>> m_taskTimer;	183	std::unique_ptr<Timer<Notification>> m_taskTimer;
185	#endif	184	#endif
186	};	185	};
187		186

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +13 lines
		1	2014-05-04 Gyuyoung Kim <gyuyoung.kim@samsung.com>
		2
		3	Use std::unique_ptr in m_taskTimer of Notification class
		4	https://bugs.webkit.org/show_bug.cgi?id=132544
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	No new tests, no behavior change.
		9
		10	* Modules/notifications/Notification.cpp:
		11	(WebCore::Notification::Notification):
		12	* Modules/notifications/Notification.h: Use std::unique_ptr instead of OwnPtr.
		13
1	2014-05-03 Commit Queue <commit-queue@webkit.org>	14	2014-05-03 Commit Queue <commit-queue@webkit.org>
2		15
3	Unreviewed, rolling out r168232.	16	Unreviewed, rolling out r168232.