[webkit-changes] cvs commit: WebKit/WebView.subproj WebImageView.m

[Timothy]

thatcher    05/11/10 12:22:50

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               WebView.subproj Tag: Safari-2-0-branch WebImageView.m
  Log:
          Merged fix from TOT to Safari-2-0-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.3118.4.77 +17 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3118.4.76
  retrieving revision 1.3118.4.77
  diff -u -r1.3118.4.76 -r1.3118.4.77
  --- ChangeLog	21 Oct 2005 22:17:36 -0000	1.3118.4.76
  +++ ChangeLog	10 Nov 2005 20:22:36 -0000	1.3118.4.77
  @@ -1,3 +1,20 @@
  +2005-11-10  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-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
  +
   === WebKit-417.3 ===
   
   2005-10-19  Timothy Hatcher  <timothy at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.68.8.1  +5 -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.8.1
  diff -u -r1.68 -r1.68.8.1
  --- WebImageView.m	8 Mar 2005 18:53:42 -0000	1.68
  +++ WebImageView.m	10 Nov 2005 20:22:50 -0000	1.68.8.1
  @@ -200,11 +200,15 @@
   
   - (void)copy:(id)sender
   {
  -    [self writeImageToPasteboard:[NSPasteboard generalPasteboard] types:[NSPasteboard _web_writableTypesForImageIncludingArchive:([rep archive] != nil)]];
  +    NSArray *types = [NSPasteboard _web_writableTypesForImageIncludingArchive:([rep archive] != nil)];
  +    NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
  +    [pasteboard declareTypes:types owner:nil];
  +    [self writeImageToPasteboard:pasteboard types:types];
   }
   
   - (BOOL)writeSelectionToPasteboard:(NSPasteboard *)pasteboard types:(NSArray *)types
   {
  +    [pasteboard declareTypes:types owner:nil];
       return [self writeImageToPasteboard:pasteboard types:types];
   }