Attachment #224816 for bug #129078

View Details Raw Unified Return to Bug 129078

| Differences between



2014-02-20  Gyuyoung Kim  <gyuyoung.kim@samsung.com>

        Start to use std::unique_ptr for DragImageLoader
        https://bugs.webkit.org/show_bug.cgi?id=129078

        Reviewed by Ryosuke Niwa.

        As a step to use std::unique_ptr, this patch replace uses of OwnPtr and PassOwnPtr
        in the DragImageLoader class with std::unique_ptr.

        * dom/Clipboard.cpp:
        (WebCore::Clipboard::setDragImage):
        * dom/Clipboard.h:

2014-02-20  Brady Eidson  <beidson@apple.com>

        Move the image controls setting to Settings.in



#if ENABLE(DRAG_SUPPORT)

class DragImageLoader final : private CachedImageClient {
    WTF_MAKE_NONCOPYABLE(DragImageLoader); WTF_MAKE_FAST_ALLOCATED;
public:
    explicit DragImageLoader(Clipboard*);
    void startLoading(CachedResourceHandle<CachedImage>&);
    void stopLoading(CachedResourceHandle<CachedImage>&);

private:
    DragImageLoader(Clipboard*);
    virtual void imageChanged(CachedImage*, const IntRect*) override;
    Clipboard* m_clipboard;
};

    m_dragImage = image;
    if (m_dragImage) {
        if (!m_dragImageLoader)
            m_dragImageLoader = std::make_unique<DragImageLoader>(this);
        m_dragImageLoader->startLoading(m_dragImage);
    }



#endif

PassOwnPtr<DragImageLoader> DragImageLoader::create(Clipboard* clipboard)
{
    return adoptPtr(new DragImageLoader(clipboard));
}

DragImageLoader::DragImageLoader(Clipboard* clipboard)
    : m_clipboard(clipboard)
{

Lines 114-120 namespace WebCore { a/Source/WebCore/dom/Clipboard.h_sec1
- a/Source/WebCore/dom/Clipboard.h -1 / +1 lines
114	IntPoint m_dragLocation;	114	IntPoint m_dragLocation;
115	CachedResourceHandle<CachedImage> m_dragImage;	115	CachedResourceHandle<CachedImage> m_dragImage;
116	RefPtr<Element> m_dragImageElement;	116	RefPtr<Element> m_dragImageElement;
117	OwnPtr<DragImageLoader> m_dragImageLoader;	117	std::unique_ptr<DragImageLoader> m_dragImageLoader;
118	#endif	118	#endif
119	};	119	};
120		120

Return to Bug 129078

Lines 42-55 namespace WebCore { a/Source/WebCore/dom/Clipboard.cpp_sec1
- a/Source/WebCore/dom/Clipboard.cpp -9 / +3 lines
42	#if ENABLE(DRAG_SUPPORT)	42	#if ENABLE(DRAG_SUPPORT)
43		43
44	class DragImageLoader final : private CachedImageClient {	44	class DragImageLoader final : private CachedImageClient {
45	WTF_MAKE_FAST_ALLOCATED;	45	WTF_MAKE_NONCOPYABLE(DragImageLoader); WTF_MAKE_FAST_ALLOCATED;
46	public:	46	public:
47	static PassOwnPtr<DragImageLoader> create(Clipboard*);	47	explicit DragImageLoader(Clipboard*);
48	void startLoading(CachedResourceHandle<CachedImage>&);	48	void startLoading(CachedResourceHandle<CachedImage>&);
49	void stopLoading(CachedResourceHandle<CachedImage>&);	49	void stopLoading(CachedResourceHandle<CachedImage>&);
50		50
51	private:	51	private:
52	DragImageLoader(Clipboard*);
53	virtual void imageChanged(CachedImage, const IntRect) override;	52	virtual void imageChanged(CachedImage, const IntRect) override;
54	Clipboard* m_clipboard;	53	Clipboard* m_clipboard;
55	};	54	};
Lines 242-248 void Clipboard::setDragImage(Element* element, int x, int y) a/Source/WebCore/dom/Clipboard.cpp_sec2
242	m_dragImage = image;	241	m_dragImage = image;
243	if (m_dragImage) {	242	if (m_dragImage) {
244	if (!m_dragImageLoader)	243	if (!m_dragImageLoader)
245	m_dragImageLoader = DragImageLoader::create(this);	244	m_dragImageLoader = std::make_unique<DragImageLoader>(this);
246	m_dragImageLoader->startLoading(m_dragImage);	245	m_dragImageLoader->startLoading(m_dragImage);
247	}	246	}
248		247
Lines 286-296 DragImageRef Clipboard::createDragImage(IntPoint& location) const a/Source/WebCore/dom/Clipboard.cpp_sec3
286		285
287	#endif	286	#endif
288		287
289	PassOwnPtr<DragImageLoader> DragImageLoader::create(Clipboard* clipboard)
290	{
291	return adoptPtr(new DragImageLoader(clipboard));
292	}
293
294	DragImageLoader::DragImageLoader(Clipboard* clipboard)	288	DragImageLoader::DragImageLoader(Clipboard* clipboard)
295	: m_clipboard(clipboard)	289	: m_clipboard(clipboard)
296	{	290	{

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +14 lines
		1	2014-02-20 Gyuyoung Kim <gyuyoung.kim@samsung.com>
		2
		3	Start to use std::unique_ptr for DragImageLoader
		4	https://bugs.webkit.org/show_bug.cgi?id=129078
		5
		6	Reviewed by Ryosuke Niwa.
		7
		8	As a step to use std::unique_ptr, this patch replace uses of OwnPtr and PassOwnPtr
		9	in the DragImageLoader class with std::unique_ptr.
		10
		11	* dom/Clipboard.cpp:
		12	(WebCore::Clipboard::setDragImage):
		13	* dom/Clipboard.h:
		14
1	2014-02-20 Brady Eidson <beidson@apple.com>	15	2014-02-20 Brady Eidson <beidson@apple.com>
2		16
3	Move the image controls setting to Settings.in	17	Move the image controls setting to Settings.in