Don't write image markup to the clipboard when copying images on OS X.

webkit/glue/webclipboard_impl.cc

 // Copyright (c) 2011 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 "webkit/glue/webclipboard_impl.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
@@ skipping 161 matching lines @@
   if (!image.isNull()) {
 #if WEBKIT_USING_SKIA
     const SkBitmap& bitmap = image.getSkBitmap();
 #elif WEBKIT_USING_CG
     const SkBitmap& bitmap = gfx::CGImageToSkBitmap(image.getCGImageRef());
 #endif
     SkAutoLockPixels locked(bitmap);
     scw.WriteBitmapFromPixels(bitmap.getPixels(), image.size());
   }
 
-  // When writing the image, we also write the image markup so that pasting
-  // into rich text editors, such as Gmail, reveals the image. We also don't
-  // want to call writeText(), since some applications (WordPad) don't pick the
-  // image if there is also a text format on the clipboard.
   if (!url.isEmpty()) {
     scw.WriteBookmark(title, url.spec());
+#if !defined(OS_MACOSX)
+    // When writing the image, we also write the image markup so that pasting
+    // into rich text editors, such as Gmail, reveals the image. We also don't
+    // want to call writeText(), since some applications (WordPad) don't pick
+    // the image if there is also a text format on the clipboard.
+    // We also don't want to write HTML on a Mac, since Mail.app prefers to use
+    // the image markup over attaching the actual image.

[Nico, 2011/06/09 16:11:38]

nit: Maybe add "See http://crbug.com/33016"

     scw.WriteHTML(UTF8ToUTF16(URLToImageMarkup(url, title)), "");
+#endif
   }
 }
 
 void WebClipboardImpl::writeData(const WebString& type,
                                  const WebString& data,
                                  const WebString& metadata) {
   // TODO(dcheng): Implement this stub.
 }
 
 WebVector<WebString> WebClipboardImpl::readAvailableTypes(
@@ skipping 45 matching lines @@
       break;
 #endif
     default:
       NOTREACHED();
       return false;
   }
   return true;
 }
 
 }  // namespace webkit_glue