[webkit-changes] cvs commit: WebKit/WebView.subproj WebImageView.m
Timothy
thatcher at opensource.apple.com
Sat Nov 12 17:17:09 PST 2005
thatcher 05/11/12 17:17:09
Modified: . Tag: Safari-1-3-branch ChangeLog
WebView.subproj Tag: Safari-1-3-branch WebImageView.m
Log:
Merged fix from TOT to Safari-1-3-branch
2005-09-16 John Sullivan <sullivan at apple.com>
Reviewed by Tim Omernick
- fixed <rdar://problem/4256557> CrashTracer: 238 crashes in Safari at
com.apple.AppKit: -[NSPasteboard setData:forType:] + 188
* WebView.subproj/WebImageView.m:
(-[WebImageView copy:]):
declare types to pasteboard before starting to set their data
(-[WebImageView writeSelectionToPasteboard:types:]):
ditto
Revision Changes Path
No revision
No revision
1.3120.2.20 +17 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3120.2.19
retrieving revision 1.3120.2.20
diff -u -r1.3120.2.19 -r1.3120.2.20
--- ChangeLog 13 Nov 2005 01:03:28 -0000 1.3120.2.19
+++ ChangeLog 13 Nov 2005 01:16:55 -0000 1.3120.2.20
@@ -1,3 +1,20 @@
+2005-11-12 Timothy Hatcher <timothy at apple.com>
+
+ Merged fix from TOT to Safari-1-3-branch
+
+ 2005-09-16 John Sullivan <sullivan at apple.com>
+
+ Reviewed by Tim Omernick
+
+ - fixed <rdar://problem/4256557> CrashTracer: 238 crashes in Safari at
+ com.apple.AppKit: -[NSPasteboard setData:forType:] + 188
+
+ * WebView.subproj/WebImageView.m:
+ (-[WebImageView copy:]):
+ declare types to pasteboard before starting to set their data
+ (-[WebImageView writeSelectionToPasteboard:types:]):
+ ditto
+
2005-11-10 Timothy Hatcher <timothy at apple.com>
Merged fix from TOT to Safari-1-3-branch
No revision
No revision
1.68.6.1 +4 -1 WebKit/WebView.subproj/WebImageView.m
Index: WebImageView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebImageView.m,v
retrieving revision 1.68
retrieving revision 1.68.6.1
diff -u -r1.68 -r1.68.6.1
--- WebImageView.m 8 Mar 2005 18:53:42 -0000 1.68
+++ WebImageView.m 13 Nov 2005 01:17:08 -0000 1.68.6.1
@@ -200,11 +200,14 @@
- (void)copy:(id)sender
{
- [self writeImageToPasteboard:[NSPasteboard generalPasteboard] types:[NSPasteboard _web_writableTypesForImageIncludingArchive:([rep archive] != nil)]];
+ NSArray *types = [NSPasteboard _web_writableTypesForImageIncludingArchive:([rep archive] != nil)];
+ [pasteboard declareTypes:types owner:nil];
+ [self writeImageToPasteboard:[NSPasteboard generalPasteboard] types:types];
}
- (BOOL)writeSelectionToPasteboard:(NSPasteboard *)pasteboard types:(NSArray *)types
{
+ [pasteboard declareTypes:types owner:nil];
return [self writeImageToPasteboard:pasteboard types:types];
}
More information about the webkit-changes
mailing list