diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebKit/mac/WebCoreSupport/WebPasteboardHelper.mm | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebKit/mac/WebCoreSupport/WebPasteboardHelper.mm')
| -rw-r--r-- | WebKit/mac/WebCoreSupport/WebPasteboardHelper.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/mac/WebCoreSupport/WebPasteboardHelper.mm b/WebKit/mac/WebCoreSupport/WebPasteboardHelper.mm index eb6a58d..fb93f8e 100644 --- a/WebKit/mac/WebCoreSupport/WebPasteboardHelper.mm +++ b/WebKit/mac/WebCoreSupport/WebPasteboardHelper.mm @@ -37,7 +37,7 @@ using namespace WebCore; -String WebPasteboardHelper::urlFromPasteboard(const NSPasteboard* pasteboard, String* title) const +String WebPasteboardHelper::urlFromPasteboard(NSPasteboard* pasteboard, String* title) const { NSURL *URL = [pasteboard _web_bestURL]; if (title) { @@ -48,7 +48,7 @@ String WebPasteboardHelper::urlFromPasteboard(const NSPasteboard* pasteboard, St return [URL _web_originalDataAsString]; } -String WebPasteboardHelper::plainTextFromPasteboard(const NSPasteboard *pasteboard) const +String WebPasteboardHelper::plainTextFromPasteboard(NSPasteboard *pasteboard) const { NSArray *types = [pasteboard types]; @@ -85,7 +85,7 @@ String WebPasteboardHelper::plainTextFromPasteboard(const NSPasteboard *pasteboa return String(); } -DOMDocumentFragment *WebPasteboardHelper::fragmentFromPasteboard(const NSPasteboard *pasteboard) const +DOMDocumentFragment *WebPasteboardHelper::fragmentFromPasteboard(NSPasteboard *pasteboard) const { return [m_view _documentFragmentFromPasteboard:pasteboard]; } |