diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
| commit | 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 (patch) | |
| tree | 4457a7306ea5acb43fe05bfe0973b1f7faf97ba2 /WebCore/platform/android/ClipboardAndroid.cpp | |
| parent | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (diff) | |
| download | external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.zip external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.gz external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'WebCore/platform/android/ClipboardAndroid.cpp')
| -rw-r--r-- | WebCore/platform/android/ClipboardAndroid.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/WebCore/platform/android/ClipboardAndroid.cpp b/WebCore/platform/android/ClipboardAndroid.cpp index d4bf734..f23b4c7 100644 --- a/WebCore/platform/android/ClipboardAndroid.cpp +++ b/WebCore/platform/android/ClipboardAndroid.cpp @@ -29,7 +29,6 @@ #include "CachedImage.h" #include "CSSHelper.h" #include "CString.h" -#include "DeprecatedString.h" #include "Document.h" #include "DragData.h" #include "Element.h" @@ -138,7 +137,7 @@ bool ClipboardAndroid::setData(const String &type, const String &data) ClipboardDataType platformType = clipboardTypeFromMIMEType(type); if (platformType == ClipboardDataTypeURL) { - KURL url = data.deprecatedString(); + KURL url = KURL(data); #if 0 && defined ANDROID // FIXME HACK : KURL no longer defines a public method isValid() if (!url.isValid()) return false; @@ -167,10 +166,10 @@ void ClipboardAndroid::setDragImage(CachedImage* image, Node *node, const IntPoi return; if (m_dragImage) - m_dragImage->deref(this); + m_dragImage->removeClient(this); m_dragImage = image; if (m_dragImage) - m_dragImage->ref(this); + m_dragImage->addClient(this); m_dragLoc = loc; m_dragImageElement = node; |