Changeset 20233 in webkit
- Timestamp:
- Mar 15, 2007 11:50:16 PM (17 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r20232 r20233 1 2007-03-15 Beth Dakin <bdakin@apple.com> 2 3 Reviewed by Geoff. 4 5 Fix for http://bugs.webkit.org/show_bug.cgi?id=13088 REGRESSION 6 (r19761-19779): Copy image no longer includes image address 7 (rdar://5067927) 8 9 writeURL() does not need an isImage parameter. Now that it accepts 10 the types as a parameter, we can just declare the appropriate image 11 types within writeImage and send them to writeURL(). Also, 12 declaring the types twice is what broke this. 13 14 * platform/Pasteboard.h: 15 * platform/mac/PasteboardMac.mm: 16 (WebCore::Pasteboard::writeURL): 17 (WebCore::Pasteboard::writeImage): 18 1 19 2007-03-15 Adele Peterson <adele@apple.com> 2 20 -
trunk/WebCore/platform/Pasteboard.h
r19764 r20233 69 69 //Helper functions to allow Clipboard to share code 70 70 static void writeSelection(NSPasteboard* pasteboard, Range* selectedRange, bool canSmartCopyOrDelete, Frame* frame); 71 static void writeURL(NSPasteboard* pasteboard, NSArray* types, const KURL& url, const String& titleStr, Frame* frame , bool isImage = false);71 static void writeURL(NSPasteboard* pasteboard, NSArray* types, const KURL& url, const String& titleStr, Frame* frame); 72 72 #endif 73 73 74 74 static Pasteboard* generalPasteboard(); 75 75 void writeSelection(Range*, bool canSmartCopyOrDelete, Frame*); 76 void writeURL(const KURL&, const String&, Frame* = 0 , bool isImage = false);76 void writeURL(const KURL&, const String&, Frame* = 0); 77 77 void writeImage(const HitTestResult&); 78 78 #if PLATFORM(MAC) -
trunk/WebCore/platform/mac/PasteboardMac.mm
r20182 r20233 201 201 } 202 202 203 void Pasteboard::writeURL(NSPasteboard* pasteboard, NSArray* types, const KURL& url, const String& titleStr, Frame* frame , bool isImage)203 void Pasteboard::writeURL(NSPasteboard* pasteboard, NSArray* types, const KURL& url, const String& titleStr, Frame* frame) 204 204 { 205 205 if (WebArchivePboardType == nil) … … 207 207 208 208 if (types == nil) { 209 if (isImage) 210 types = writableTypesForImage(); 211 else 212 types = writableTypesForURL(); 209 types = writableTypesForURL(); 213 210 [pasteboard declareTypes:types owner:nil]; 214 211 } … … 241 238 } 242 239 243 void Pasteboard::writeURL(const KURL& url, const String& titleStr, Frame* frame , bool isImage)244 { 245 Pasteboard::writeURL(m_pasteboard, nil, url, titleStr, frame , isImage);240 void Pasteboard::writeURL(const KURL& url, const String& titleStr, Frame* frame) 241 { 242 Pasteboard::writeURL(m_pasteboard, nil, url, titleStr, frame); 246 243 } 247 244 … … 286 283 Frame* frame = node->document()->frame(); 287 284 288 writeURL(URL, title, frame, true); 289 NSArray *types = [m_pasteboard types]; 285 NSArray* types = writableTypesForImage(); 290 286 [m_pasteboard declareTypes:types owner:nil]; 287 writeURL(m_pasteboard, types, URL, title, frame); 291 288 292 289 Image* coreImage = result.image();
Note: See TracChangeset
for help on using the changeset viewer.