diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
| commit | de56f378336660dcc848763c80267a5e063ae47d (patch) | |
| tree | 7f551b88923b35bc4022ce6ab3a3f602fb60d91c /webkit/port/platform/DragDataWin.cpp | |
| parent | dc4f63c80cb90efe594131030aad6776e5945fcc (diff) | |
| download | chromium_src-de56f378336660dcc848763c80267a5e063ae47d.zip chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.gz chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.bz2 | |
Merge the chrome_webkit_merge_branch back on to trunk. This brings us
up to webkit@36102.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port/platform/DragDataWin.cpp')
| -rw-r--r-- | webkit/port/platform/DragDataWin.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/port/platform/DragDataWin.cpp b/webkit/port/platform/DragDataWin.cpp index 6a374b8..8deca48 100644 --- a/webkit/port/platform/DragDataWin.cpp +++ b/webkit/port/platform/DragDataWin.cpp @@ -37,6 +37,7 @@ #include "Markup.h" #include "WCDataObject.h" +#undef LOG #include "base/file_util.h" #include "base/string_util.h" #include "net/base/base64.h" @@ -62,16 +63,16 @@ WebDropData* dropData(DragDataRef dragData) { namespace WebCore { -Clipboard* DragData::createClipboard(ClipboardAccessPolicy policy) const +PassRefPtr<Clipboard> DragData::createClipboard(ClipboardAccessPolicy policy) const { WCDataObject* data; WCDataObject::createInstance(&data); - ClipboardWin* clipboard = new ClipboardWin(true, data, policy); + RefPtr<ClipboardWin> clipboard = ClipboardWin::create(true, data, policy); // The clipboard keeps a reference to the WCDataObject, so we can release // our reference to it. data->Release(); - return clipboard; + return clipboard.release(); } bool DragData::containsURL() const |