diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-06 19:12:40 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-06 19:12:40 +0000 |
| commit | 89bc6d77f41481990d42ee41f28dbe90cfd8d872 (patch) | |
| tree | ac4a6ef48cf3d0dcb5c080f0472b62e71d2d5845 /webkit/port/platform/mac | |
| parent | a619b3960db5948e6e7f3f7eea9f6a0630edea95 (diff) | |
| download | chromium_src-89bc6d77f41481990d42ee41f28dbe90cfd8d872.zip chromium_src-89bc6d77f41481990d42ee41f28dbe90cfd8d872.tar.gz chromium_src-89bc6d77f41481990d42ee41f28dbe90cfd8d872.tar.bz2 | |
Merge enough of the trunk WebKit changes into our copy of PasteboardMac.mm to
get it building again.
Review URL: http://codereview.chromium.org/6278
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port/platform/mac')
| -rw-r--r-- | webkit/port/platform/mac/PasteboardMac.mm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/webkit/port/platform/mac/PasteboardMac.mm b/webkit/port/platform/mac/PasteboardMac.mm index 417f74a..9b87314 100644 --- a/webkit/port/platform/mac/PasteboardMac.mm +++ b/webkit/port/platform/mac/PasteboardMac.mm @@ -32,9 +32,11 @@ #import "DocumentFragment.h" #import "Editor.h" #import "EditorClient.h" +#import "Frame.h" #import "HitTestResult.h" #import "Image.h" #import "KURL.h" +#import "LegacyWebArchive.h" #import "LoaderNSURLExtras.h" #import "MIMETypeRegistry.h" #import "RenderImage.h" @@ -173,7 +175,9 @@ void Pasteboard::writeSelection(NSPasteboard* pasteboard, Range* selectedRange, // Put HTML on the pasteboard. if ([types containsObject:WebArchivePboardType]) { - [pasteboard setData:frame->editor()->client()->dataForArchivedSelection(frame) forType:WebArchivePboardType]; + RefPtr<LegacyWebArchive> archive = LegacyWebArchive::createFromSelection(frame); + RetainPtr<CFDataRef> data = archive ? archive->rawDataRepresentation() : 0; + [pasteboard setData:(NSData *)data.get() forType:WebArchivePboardType]; } // Put the attributed string on the pasteboard (RTF/RTFD format). @@ -224,7 +228,7 @@ void Pasteboard::writeURL(NSPasteboard* pasteboard, NSArray* types, const KURL& ASSERT(!url.isEmpty()); - NSURL *cocoaURL = url.getNSURL(); + NSURL *cocoaURL = url; NSString *userVisibleString = frame->editor()->client()->userVisibleString(cocoaURL); NSString *title = (NSString*)titleStr; @@ -284,7 +288,7 @@ void Pasteboard::writeImage(Node* node, const KURL& url, const String& title) ASSERT(node); Frame* frame = node->document()->frame(); - NSURL *cocoaURL = url.getNSURL(); + NSURL *cocoaURL = url; ASSERT(cocoaURL); NSArray* types = writableTypesForImage(); |