diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/platform/win/ClipboardWin.cpp | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/platform/win/ClipboardWin.cpp')
-rw-r--r-- | WebCore/platform/win/ClipboardWin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/win/ClipboardWin.cpp b/WebCore/platform/win/ClipboardWin.cpp index 529963f..7a54737 100644 --- a/WebCore/platform/win/ClipboardWin.cpp +++ b/WebCore/platform/win/ClipboardWin.cpp @@ -38,6 +38,7 @@ #include "FrameLoader.h" #include "FrameView.h" #include "HTMLNames.h" +#include "HTMLParserIdioms.h" #include "Image.h" #include "MIMETypeRegistry.h" #include "NotImplemented.h" @@ -50,7 +51,6 @@ #include "ResourceResponse.h" #include "SharedBuffer.h" #include "WCDataObject.h" -#include "csshelper.h" #include "markup.h" #include <shlwapi.h> #include <wininet.h> @@ -723,7 +723,7 @@ void ClipboardWin::declareAndWriteDragImage(Element* element, const KURL& url, c if (imageURL.isEmpty()) return; - String fullURL = frame->document()->completeURL(deprecatedParseURL(imageURL)).string(); + String fullURL = frame->document()->completeURL(stripLeadingAndTrailingHTMLSpaces(imageURL)).string(); if (fullURL.isEmpty()) return; STGMEDIUM medium = {0}; |