Attachment #239858 for bug #137736

View Details Raw Unified Return to Bug 137736

| Differences between



2014-10-15  Gyuyoung Kim  <gyuyoung.kim@samsung.com>

        Use std::unique_ptr for CachedResource
        https://bugs.webkit.org/show_bug.cgi?id=137736

        Reviewed by NOBODY (OOPS!).

        No new tests, no behavior change.

        * loader/cache/CachedResource.cpp: Use std::unique_ptr instead of PassOwnPtr|OwnPtr.
        (WebCore::CachedResource::removeClient):
        * loader/cache/CachedResource.h:
        (WebCore::CachedResource::CachedResourceCallback::schedule):

2014-10-14  Gyuyoung Kim  <gyuyoung.kim@samsung.com>

        Clean up unnecessary PassOwnPtr.h inclusion




void CachedResource::removeClient(CachedResourceClient* client)
{
    std::unique_ptr<CachedResourceCallback> callback = m_clientsAwaitingCallback.take(client);
    if (callback) {
        ASSERT(!m_clients.contains(client));
        callback->cancel();
        callback = nullptr;
    } else {
        ASSERT(m_clients.contains(client));
        m_clients.remove(client);



#include <time.h>
#include <wtf/HashCountedSet.h>
#include <wtf/HashSet.h>
#include <wtf/OwnPtr.h>
#include <wtf/TypeCasts.h>
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>


    class CachedResourceCallback {
    public:
        static std::unique_ptr<CachedResourceCallback> schedule(CachedResource* resource, CachedResourceClient* client) { return std::unique_ptr<CachedResourceCallback>(new CachedResourceCallback(resource, client)); }
        void cancel();
    private:
        CachedResourceCallback(CachedResource*, CachedResourceClient*);

        CachedResourceClient* m_client;
        Timer<CachedResourceCallback> m_callbackTimer;
    };
    HashMap<CachedResourceClient*, std::unique_ptr<CachedResourceCallback>> m_clientsAwaitingCallback;

    ResourceRequest m_resourceRequest;
    SessionID m_sessionID;

Return to Bug 137736

Lines 514-524 bool CachedResource::addClientToSet(CachedResourceClient* client) a/Source/WebCore/loader/cache/CachedResource.cpp_sec1
- a/Source/WebCore/loader/cache/CachedResource.cpp -2 / +2 lines
514		514
515	void CachedResource::removeClient(CachedResourceClient* client)	515	void CachedResource::removeClient(CachedResourceClient* client)
516	{	516	{
517	OwnPtr<CachedResourceCallback> callback = m_clientsAwaitingCallback.take(client);	517	std::unique_ptr<CachedResourceCallback> callback = m_clientsAwaitingCallback.take(client);
518	if (callback) {	518	if (callback) {
519	ASSERT(!m_clients.contains(client));	519	ASSERT(!m_clients.contains(client));
520	callback->cancel();	520	callback->cancel();
521	callback.clear();	521	callback = nullptr;
522	} else {	522	} else {
523	ASSERT(m_clients.contains(client));	523	ASSERT(m_clients.contains(client));
524	m_clients.remove(client);	524	m_clients.remove(client);

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +14 lines
		1	2014-10-15 Gyuyoung Kim <gyuyoung.kim@samsung.com>
		2
		3	Use std::unique_ptr for CachedResource
		4	https://bugs.webkit.org/show_bug.cgi?id=137736
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	No new tests, no behavior change.
		9
		10	* loader/cache/CachedResource.cpp: Use std::unique_ptr instead of PassOwnPtr\|OwnPtr.
		11	(WebCore::CachedResource::removeClient):
		12	* loader/cache/CachedResource.h:
		13	(WebCore::CachedResource::CachedResourceCallback::schedule):
		14
1	2014-10-14 Gyuyoung Kim <gyuyoung.kim@samsung.com>	15	2014-10-14 Gyuyoung Kim <gyuyoung.kim@samsung.com>
2		16
3	Clean up unnecessary PassOwnPtr.h inclusion	17	Clean up unnecessary PassOwnPtr.h inclusion

Lines 35-41 a/Source/WebCore/loader/cache/CachedResource.h_sec1
- a/Source/WebCore/loader/cache/CachedResource.h -3 / +2 lines
35	#include <time.h>	35	#include <time.h>
36	#include <wtf/HashCountedSet.h>	36	#include <wtf/HashCountedSet.h>
37	#include <wtf/HashSet.h>	37	#include <wtf/HashSet.h>
38	#include <wtf/OwnPtr.h>
39	#include <wtf/TypeCasts.h>	38	#include <wtf/TypeCasts.h>
40	#include <wtf/Vector.h>	39	#include <wtf/Vector.h>
41	#include <wtf/text/WTFString.h>	40	#include <wtf/text/WTFString.h>
Lines 269-275 protected: a/Source/WebCore/loader/cache/CachedResource.h_sec2
269		268
270	class CachedResourceCallback {	269	class CachedResourceCallback {
271	public:	270	public:
272	static PassOwnPtr<CachedResourceCallback> schedule(CachedResource* resource, CachedResourceClient* client) { return adoptPtr(new CachedResourceCallback(resource, client)); }	271	static std::unique_ptr<CachedResourceCallback> schedule(CachedResource* resource, CachedResourceClient* client) { return std::unique_ptr<CachedResourceCallback>(new CachedResourceCallback(resource, client)); }
273	void cancel();	272	void cancel();
274	private:	273	private:
275	CachedResourceCallback(CachedResource, CachedResourceClient);	274	CachedResourceCallback(CachedResource, CachedResourceClient);
Lines 279-285 protected: a/Source/WebCore/loader/cache/CachedResource.h_sec3
279	CachedResourceClient* m_client;	278	CachedResourceClient* m_client;
280	Timer<CachedResourceCallback> m_callbackTimer;	279	Timer<CachedResourceCallback> m_callbackTimer;
281	};	280	};
282	HashMap<CachedResourceClient*, OwnPtr<CachedResourceCallback>> m_clientsAwaitingCallback;	281	HashMap<CachedResourceClient*, std::unique_ptr<CachedResourceCallback>> m_clientsAwaitingCallback;
283		282
284	ResourceRequest m_resourceRequest;	283	ResourceRequest m_resourceRequest;
285	SessionID m_sessionID;	284	SessionID m_sessionID;