Chromium Code Reviews| Index: public/platform/WebDragData.h |
| diff --git a/public/platform/WebDragData.h b/public/platform/WebDragData.h |
| index 4a63bb0e6c49e448a0b0952f34afebec7d46bcad..32c53ce35d7ddc5a23c138afada4c08a309c5c47 100644 |
| --- a/public/platform/WebDragData.h |
| +++ b/public/platform/WebDragData.h |
| @@ -91,7 +91,14 @@ public: |
| assign(object); |
| return *this; |
| } |
| - ~WebDragData() { reset(); } |
| + ~WebDragData() |
| + { |
| +#if BLINK_IMPLEMENTATION |
| + m_private.reset(); |
| +#else |
| + reset(); |
| +#endif |
| + } |
| bool isNull() const { return m_private.isNull(); } |
| @@ -107,9 +114,22 @@ public: |
| BLINK_EXPORT void setFilesystemId(const WebString&); |
| #if BLINK_IMPLEMENTATION |
| - explicit WebDragData(const PassRefPtrWillBeRawPtr<DataObject>&); |
| - WebDragData& operator=(const PassRefPtrWillBeRawPtr<DataObject>&); |
| - DataObject* getValue() const; |
| + // FIXME: to avoid "core depends on web", use inline here. |
|
tkent
2015/02/18 02:17:57
The problem is "platform depends on core", not "co
tasak
2015/02/23 09:20:33
Done.
|
| + // After merging blink repository with content repository, redesign |
| + // how core works with web and content. |
| + explicit WebDragData(const PassRefPtrWillBeRawPtr<DataObject>& object) |
| + { |
| + m_private = object; |
| + } |
| + WebDragData& operator=(const PassRefPtrWillBeRawPtr<DataObject>& object) |
| + { |
| + m_private = object; |
| + return *this; |
| + } |
| + DataObject* getValue() const |
| + { |
| + return m_private.get(); |
| + } |
| #endif |
| private: |