Convert RTF on the pasteboard to HTML and all it to substitute if present and...

app/clipboard/clipboard_mac.mm

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/clipboard/clipboard.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/scoped_cftyperef.h"
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/size.h"
+#import "third_party/mozilla/NSPasteboard+Utils.h"
 
 namespace {
 
 // Would be nice if this were in UTCoreTypes.h, but it isn't
 const NSString* kUTTypeURLName = @"public.url-name";
 
 // Tells us if WebKit was the last to write to the pasteboard. There's no
 // actual data associated with this type.
 const NSString *kWebSmartPastePboardType = @"NeXT smart paste pasteboard type";
 
@@ skipping 131 matching lines @@
 }
 
 bool Clipboard::IsFormatAvailable(const Clipboard::FormatType& format,
                                   Clipboard::Buffer buffer) const {
   DCHECK_EQ(buffer, BUFFER_STANDARD);
   NSString* format_ns = base::SysUTF8ToNSString(format);
 
   NSPasteboard* pb = GetPasteboard();
   NSArray* types = [pb types];
 
+  // Safari only places RTF on the pasteboard, never HTML. We can convert RTF
+  // to HTML, so the presence of either indicates success when looking for HTML.
+  if ([format_ns isEqualToString:NSHTMLPboardType]) {
+    return [types containsObject:NSHTMLPboardType] ||
+           [types containsObject:NSRTFPboardType];
+  }
   return [types containsObject:format_ns];
 }
 
 void Clipboard::ReadText(Clipboard::Buffer buffer, string16* result) const {
   DCHECK_EQ(buffer, BUFFER_STANDARD);
   NSPasteboard* pb = GetPasteboard();
   NSString* contents = [pb stringForType:NSStringPboardType];
 
   UTF8ToUTF16([contents UTF8String],
               [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
@@ skipping 10 matching lines @@
     result->clear();
   else
     result->assign([contents UTF8String]);
 }
 
 void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
                          std::string* src_url) const {
   DCHECK_EQ(buffer, BUFFER_STANDARD);
   if (markup) {
     NSPasteboard* pb = GetPasteboard();
-    NSArray *supportedTypes = [NSArray arrayWithObjects:NSHTMLPboardType,
+    NSArray* supportedTypes = [NSArray arrayWithObjects:NSHTMLPboardType,
+                                                        NSRTFPboardType,
                                                         NSStringPboardType,
                                                         nil];
-    NSString *bestType = [pb availableTypeFromArray:supportedTypes];
+    NSString* bestType = [pb availableTypeFromArray:supportedTypes];
     NSString* contents = [pb stringForType:bestType];
+    if ([bestType isEqualToString:NSRTFPboardType])
+      contents = [pb htmlFromRtf];
     UTF8ToUTF16([contents UTF8String],
                 [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
                 markup);
   }
 
   // TODO(avi): src_url?
   if (src_url)
     src_url->clear();
 }
 
@@ skipping 97 matching lines @@
   static const std::string type = base::SysNSStringToUTF8(NSTIFFPboardType);
   return type;
 }
 
 // static
 Clipboard::FormatType Clipboard::GetWebKitSmartPasteFormatType() {
   static const std::string type =
       base::SysNSStringToUTF8(kWebSmartPastePboardType);
   return type;
 }