| Index: Source/core/clipboard/Clipboard.h
|
| diff --git a/Source/core/clipboard/Clipboard.h b/Source/core/clipboard/Clipboard.h
|
| index cca9fe837ad70727043cc9371b2094189da4ff0f..7ddd849e8840112a8aafd1fa0e055814b4b49315 100644
|
| --- a/Source/core/clipboard/Clipboard.h
|
| +++ b/Source/core/clipboard/Clipboard.h
|
| @@ -28,6 +28,7 @@
|
| #include "core/clipboard/ClipboardAccessPolicy.h"
|
| #include "core/fetch/ResourcePtr.h"
|
| #include "core/page/DragActions.h"
|
| +#include "heap/Handle.h"
|
| #include "platform/geometry/IntPoint.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/RefCounted.h"
|
| @@ -48,7 +49,8 @@ class Node;
|
| class Range;
|
|
|
| // State available during IE's events for drag and drop and copy/paste
|
| -class Clipboard : public RefCounted<Clipboard>, public ScriptWrappable {
|
| +class Clipboard : public RefCountedWillBeGarbageCollectedFinalized<Clipboard>, public ScriptWrappable {
|
| + DECLARE_GC_INFO;
|
| public:
|
| // Whether this clipboard is serving a drag-drop or copy-paste request.
|
| enum ClipboardType {
|
| @@ -56,7 +58,7 @@ public:
|
| DragAndDrop,
|
| };
|
|
|
| - static PassRefPtr<Clipboard> create(ClipboardType, ClipboardAccessPolicy, PassRefPtr<DataObject>);
|
| + static PassRefPtrWillBeRawPtr<Clipboard> create(ClipboardType, ClipboardAccessPolicy, PassRefPtrWillBeRawPtr<DataObject>);
|
| ~Clipboard();
|
|
|
| bool isForCopyAndPaste() const { return m_clipboardType == CopyAndPaste; }
|
| @@ -108,12 +110,14 @@ public:
|
|
|
| bool hasDropZoneType(const String&);
|
|
|
| - PassRefPtr<DataTransferItemList> items();
|
| + PassRefPtrWillBeRawPtr<DataTransferItemList> items();
|
|
|
| - PassRefPtr<DataObject> dataObject() const;
|
| + PassRefPtrWillBeRawPtr<DataObject> dataObject() const;
|
| +
|
| + void trace(Visitor*);
|
|
|
| private:
|
| - Clipboard(ClipboardType, ClipboardAccessPolicy, PassRefPtr<DataObject>);
|
| + Clipboard(ClipboardType, ClipboardAccessPolicy, PassRefPtrWillBeRawPtr<DataObject>);
|
|
|
| void setDragImage(ImageResource*, Node*, const IntPoint&);
|
|
|
| @@ -125,7 +129,7 @@ private:
|
| String m_dropEffect;
|
| String m_effectAllowed;
|
| ClipboardType m_clipboardType;
|
| - RefPtr<DataObject> m_dataObject;
|
| + RefPtrWillBeMember<DataObject> m_dataObject;
|
|
|
| IntPoint m_dragLoc;
|
| ResourcePtr<ImageResource> m_dragImage;
|
|
|