[webkit-changes] cvs commit: WebKit/Misc.subproj WebNSPasteboardExtras.m

[John]

sullivan    05/06/10 17:42:53

  Modified:    .        ChangeLog
               Misc.subproj WebNSPasteboardExtras.m
  Log:
          reviewed by Dave Harrison (first & second drafts) and Darin Adler (third draft)
  
          - WebKit part of fix for
          <rdar://problem/4145214> REGRESSION (412+): Can't drag URLs from the location bar
  
          * Misc.subproj/WebNSPasteboardExtras.m:
          (+[NSPasteboard initialize]):
          Reinstate variation of old code that uses CreatePasteboardFlavorTypeName to set up our new pasteboard types.
          The newfangled way didn't work.
  
  Revision  Changes    Path
  1.3186    +12 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3185
  retrieving revision 1.3186
  diff -u -r1.3185 -r1.3186
  --- ChangeLog	7 Jun 2005 16:07:09 -0000	1.3185
  +++ ChangeLog	11 Jun 2005 00:42:51 -0000	1.3186
  @@ -1,3 +1,15 @@
  +2005-06-10  John Sullivan  <sullivan at apple.com>
  +
  +        reviewed by Dave Harrison (first & second drafts) and Darin Adler (third draft)
  +
  +        - WebKit part of fix for 
  +        <rdar://problem/4145214> REGRESSION (412+): Can't drag URLs from the location bar
  +
  +        * Misc.subproj/WebNSPasteboardExtras.m:
  +        (+[NSPasteboard initialize]):
  +        Reinstate variation of old code that uses CreatePasteboardFlavorTypeName to set up our new pasteboard types.
  +        The newfangled way didn't work.
  +
   2005-06-07  Darin Adler  <darin at apple.com>
   
           Change by Mark Rowe <opendarwin.org at bdash.net.nz>.
  
  
  
  1.46      +20 -0     WebKit/Misc.subproj/WebNSPasteboardExtras.m
  
  Index: WebNSPasteboardExtras.m
  ===================================================================
  RCS file: /cvs/root/WebKit/Misc.subproj/WebNSPasteboardExtras.m,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- WebNSPasteboardExtras.m	6 Jun 2005 02:27:42 -0000	1.45
  +++ WebNSPasteboardExtras.m	11 Jun 2005 00:42:53 -0000	1.46
  @@ -50,13 +50,33 @@
   
   + (void)initialize
   {
  +    // FIXME  The code below addresses 3446192.  It was awaiting a fix for 3446669. Now that bug has been fixed,
  +    // but this code still does not work; UTTypeCopyPreferredTagWithClass returns nil, which caused 4145214. Some
  +    // day we'll need to investigate why this code is still not working.
  +#ifdef UTI_PB_API
       CFStringRef osTypeString = UTCreateStringForOSType('url ');
       CFStringRef utiTypeString = UTTypeCreatePreferredIdentifierForTag( kUTTagClassOSType, osTypeString, NULL );
       WebURLPboardType = (NSString *)UTTypeCopyPreferredTagWithClass( kUTTagClassNSPboardType, utiTypeString );
  +    if (osTypeString != NULL) {
  +        CFRelease(osTypeString);
  +    }
  +    if (utiTypeString != NULL) {
  +        CFRelease(utiTypeString);
  +    }
       
       osTypeString = UTCreateStringForOSType('urln');
       utiTypeString = UTTypeCreatePreferredIdentifierForTag( kUTTagClassOSType, osTypeString, NULL );
       WebURLNamePboardType = (NSString *)UTTypeCopyPreferredTagWithClass( kUTTagClassNSPboardType, utiTypeString );
  +    if (osTypeString != NULL) {
  +        CFRelease(osTypeString);
  +    }
  +    if (utiTypeString != NULL) {
  +        CFRelease(utiTypeString);
  +    }
  +#else
  +    WebURLPboardType = WKCreateURLPasteboardFlavorTypeName();
  +    WebURLNamePboardType = WKCreateURLNPasteboardFlavorTypeName();
  +#endif
   }
   
   + (NSArray *)_web_writableTypesForURL