Removing parsing of text from pasteboard.

third_party/mozilla/NSPasteboard+Utils.mm

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 62 matching lines @@
 - (int)declareURLPasteboardWithAdditionalTypes:(NSArray*)additionalTypes owner:(id)newOwner
 {
   NSArray* allTypes = [additionalTypes arrayByAddingObjectsFromArray:
                             [NSArray arrayWithObjects:
                                         kWebURLsWithTitlesPboardType,
                                         NSURLPboardType,
                                         NSStringPboardType,
                                         kCorePasteboardFlavorType_url,
                                         kCorePasteboardFlavorType_urln,
                                         nil]];
-        return [self declareTypes:allTypes owner:newOwner];
+       return [self declareTypes:allTypes owner:newOwner];
 }
 
 //
 // Copy a single URL (with an optional title) to the clipboard in all relevant
 // formats. Convenience method for clients that can only ever deal with one
 // URL and shouldn't have to build up the arrays for setURLs:withTitles:.
 //
 - (void)setDataForURL:(NSString*)url title:(NSString*)title
 {
   NSArray* urlList = [NSArray arrayWithObject:url];
@@ skipping 71 matching lines @@
     [self setData:[NSData dataWithBytes:tempCString length:strlen(tempCString)] forType:kCorePasteboardFlavorType_urln];
   }
 }
 
 // Get the set of URLs and their corresponding titles from the pasteboard.
 // If there are no URLs in a format we understand on the pasteboard empty
 // arrays will be returned. The two arrays will always be the same size.
 // The arrays returned are on the auto release pool. If |convertFilenames|
 // is YES, then the function will attempt to convert filenames in the drag
 // to file URLs.
-- (void) getURLs:(NSArray**)outUrls
-    andTitles:(NSArray**)outTitles
-    convertingFilenames:(BOOL)convertFilenames
-{
+- (void)getURLsFromType:(NSArray**)outUrls
+              andTitles:(NSArray**)outTitles
+    convertingFilenames:(BOOL)convertFilenames {
   NSArray* types = [self types];
   NSURL* urlFromNSURL = nil;  // Used below in getting an URL from the NSURLPboardType.
   if ([types containsObject:kWebURLsWithTitlesPboardType]) {
     NSArray* urlAndTitleContainer = [self propertyListForType:kWebURLsWithTitlesPboardType];
     *outUrls = [urlAndTitleContainer objectAtIndex:0];
     *outTitles = [urlAndTitleContainer objectAtIndex:1];
   } else if ([types containsObject:NSFilenamesPboardType]) {
     NSArray *files = [self propertyListForType:NSFilenamesPboardType];
     *outUrls = [NSMutableArray arrayWithCapacity:[files count]];
     *outTitles = [NSMutableArray arrayWithCapacity:[files count]];
@@ skipping 35 matching lines @@
   } else if ([types containsObject:NSURLPboardType] && (urlFromNSURL = [NSURL URLFromPasteboard:self])) {
     *outUrls = [NSArray arrayWithObject:[urlFromNSURL absoluteString]];
     NSString* title = nil;
     if ([types containsObject:kCorePasteboardFlavorType_urld])
       title = [self stringForType:kCorePasteboardFlavorType_urld];
     if (!title && [types containsObject:kCorePasteboardFlavorType_urln])
       title = [self stringForType:kCorePasteboardFlavorType_urln];
     if (!title && [types containsObject:NSStringPboardType])
       title = [self stringForType:NSStringPboardType];
     *outTitles = [NSArray arrayWithObject:(title ? title : @"")];
-  } else if ([types containsObject:NSStringPboardType]) {
-    NSString* potentialURLString = [self cleanedStringWithPasteboardString:[self stringForType:NSStringPboardType]];
+  } else {
+    // We don't recognise any of these formats - return empty arrays
+    *outUrls = [NSArray array];
+    *outTitles = [NSArray array];
+  }
+}
+
+- (void)getURLsFromTypeOrText:(NSArray**)outUrls

[Mark Mentovai, 2016/05/26 20:21:51]

GetURLsOrTextFromType

+                     andTitles:(NSArray**)outTitles

[Mark Mentovai, 2016/05/26 20:21:51]

align colons

+                     convertingFilenames:(BOOL)convertFilenames
+{
+  if ([self containsURLDataInType]) {
+    [self getURLsFromType:outUrls
+                  andTitles:outTitles

[Mark Mentovai, 2016/05/26 20:21:51]

align colons

+        convertingFilenames:convertFilenames];
+    return;
+  }
+
+  NSArray* types = [self types];
+  if ([types containsObject:NSStringPboardType]) {
+    NSString* potentialURLString =
+        [self cleanedStringWithPasteboardString:
+                  [self stringForType:NSStringPboardType]];
     if ([potentialURLString isValidURI]) {
       *outUrls = [NSArray arrayWithObject:potentialURLString];
       NSString* title = nil;
       if ([types containsObject:kCorePasteboardFlavorType_urld])
         title = [self stringForType:kCorePasteboardFlavorType_urld];
       if (!title && [types containsObject:kCorePasteboardFlavorType_urln])
         title = [self stringForType:kCorePasteboardFlavorType_urln];
       *outTitles = [NSArray arrayWithObject:(title ? title : @"")];
     } else {
       // The string doesn't look like a URL - return empty arrays
       *outUrls = [NSArray array];
       *outTitles = [NSArray array];
     }
-  } else {
-    // We don't recognise any of these formats - return empty arrays
-    *outUrls = [NSArray array];
-    *outTitles = [NSArray array];
   }
 }
-
 //
 // Indicates if this pasteboard contains URL data that we understand
 // Deals with all our URL formats. Only strings that are valid URLs count.
 // If this returns YES it is safe to use getURLs:andTitles: to retrieve the data.
 //
 // NB: Does not consider our internal bookmark list format, because callers
 // usually need to deal with this separately because it can include folders etc.
 //
-- (BOOL) containsURLData
+- (BOOL)containsURLDataInType
 {
   NSArray* types = [self types];
-  if (    [types containsObject:kWebURLsWithTitlesPboardType]
-       || [types containsObject:NSURLPboardType]
-       || [types containsObject:NSFilenamesPboardType] )
+  return [types containsObject:kWebURLsWithTitlesPboardType] ||
+         [types containsObject:NSURLPboardType] ||
+         [types containsObject:NSFilenamesPboardType];
+}
+
+- (BOOL) containsURLDataInTypeOrText
+{
+  if([self containsURLDataInType])
     return YES;
-  
-  if ([types containsObject:NSStringPboardType]) {
+   if ([[self types] containsObject:NSStringPboardType]) {
     // Trim whitespace off the ends and newlines out of the middle so we don't reject otherwise-valid URLs;
     // we'll do another cleaning when we set the URLs and titles later, so this is safe.
     NSString* potentialURLString = [self cleanedStringWithPasteboardString:[self stringForType:NSStringPboardType]];
     return [potentialURLString isValidURI];
   }
-  
   return NO;
 }
 @end
 
 @implementation NSPasteboard(ChromiumHTMLUtils)
 
 // Convert the RTF to HTML via an NSAttributedString.
 - (NSString*)htmlFromRtf {
   if (![[self types] containsObject:NSRTFPboardType])
     return @"";
 
   NSAttributedString* attributed =
       [[[NSAttributedString alloc]
              initWithRTF:[self dataForType:NSRTFPboardType]
       documentAttributes:nil] autorelease];
   NSDictionary* attributeDict =
       [NSDictionary dictionaryWithObject:NSHTMLTextDocumentType
                                   forKey:NSDocumentTypeDocumentAttribute];
   NSData* htmlData =
       [attributed dataFromRange:NSMakeRange(0, [attributed length])
              documentAttributes:attributeDict
                           error:nil];
   // According to the docs, NSHTMLTextDocumentType is UTF8.
   return [[[NSString alloc] 
       initWithData:htmlData encoding:NSUTF8StringEncoding] autorelease];
 }
 
 @end