Attachment 224816 Details for Bug 129078 – Patch for landing

[patch] Patch for landing

bug-129078-20140221110950.patch (text/plain), 2.88 KB, created by Gyuyoung Kim on 2014-02-20 18:09:52 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Gyuyoung Kim

Created: 2014-02-20 18:09:52 PST

Size: 2.88 KB

patch

obsolete

>Subversion Revision: 164458
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e9e179d4a4cc7f392e4e5b3301e75b73876893ef..c13a510786a2677329bf39c45df988277e49f623 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+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
>diff --git a/Source/WebCore/dom/Clipboard.cpp b/Source/WebCore/dom/Clipboard.cpp
>index 30d13dd19813f7f3b2212179c34d510b9615af68..73eba7d2c8da4d4efaeec1e8c7df351dadb898bd 100644
>--- a/Source/WebCore/dom/Clipboard.cpp
>+++ b/Source/WebCore/dom/Clipboard.cpp
>@@ -42,14 +42,13 @@ namespace WebCore {
> #if ENABLE(DRAG_SUPPORT)
> 
> class DragImageLoader final : private CachedImageClient {
>-    WTF_MAKE_FAST_ALLOCATED;
>+    WTF_MAKE_NONCOPYABLE(DragImageLoader); WTF_MAKE_FAST_ALLOCATED;
> public:
>-    static PassOwnPtr<DragImageLoader> create(Clipboard*);
>+    explicit DragImageLoader(Clipboard*);
>     void startLoading(CachedResourceHandle<CachedImage>&);
>     void stopLoading(CachedResourceHandle<CachedImage>&);
> 
> private:
>-    DragImageLoader(Clipboard*);
>     virtual void imageChanged(CachedImage*, const IntRect*) override;
>     Clipboard* m_clipboard;
> };
>@@ -242,7 +241,7 @@ void Clipboard::setDragImage(Element* element, int x, int y)
>     m_dragImage = image;
>     if (m_dragImage) {
>         if (!m_dragImageLoader)
>-            m_dragImageLoader = DragImageLoader::create(this);
>+            m_dragImageLoader = std::make_unique<DragImageLoader>(this);
>         m_dragImageLoader->startLoading(m_dragImage);
>     }
> 
>@@ -286,11 +285,6 @@ DragImageRef Clipboard::createDragImage(IntPoint& location) const
> 
> #endif
> 
>-PassOwnPtr<DragImageLoader> DragImageLoader::create(Clipboard* clipboard)
>-{
>-    return adoptPtr(new DragImageLoader(clipboard));
>-}
>-
> DragImageLoader::DragImageLoader(Clipboard* clipboard)
>     : m_clipboard(clipboard)
> {
>diff --git a/Source/WebCore/dom/Clipboard.h b/Source/WebCore/dom/Clipboard.h
>index 5ca2700b6bff595eb0b68d7b4c7ea6d6d89c8e15..6eb34b55e3e70e62b649f5c766d1e9d187a5b440 100644
>--- a/Source/WebCore/dom/Clipboard.h
>+++ b/Source/WebCore/dom/Clipboard.h
>@@ -114,7 +114,7 @@ namespace WebCore {
>         IntPoint m_dragLocation;
>         CachedResourceHandle<CachedImage> m_dragImage;
>         RefPtr<Element> m_dragImageElement;
>-        OwnPtr<DragImageLoader> m_dragImageLoader;
>+        std::unique_ptr<DragImageLoader> m_dragImageLoader;
> #endif
>     };
>

Actions: View | Formatted Diff | Diff

Attachments on bug 129078: 224699 | 224816 | 224817