Fix dropping images into content editable divs.

content/browser/web_contents/web_drag_source_mac.mm

 // Copyright (c) 2012 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.
 
 #import "content/browser/web_contents/web_drag_source_mac.h"
 
 #include <sys/param.h>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 138 matching lines @@
   const string16 kHtmlHeader = ASCIIToUTF16(
       "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\">");
 
   // Be extra paranoid; avoid crashing.
   if (!dropData_.get()) {
     NOTREACHED();
     return;
   }
 
   // HTML.
-  if ([type isEqualToString:NSHTMLPboardType]) {
+  if ([type isEqualToString:NSHTMLPboardType] ||
+      [type isEqualToString:ui::kChromeDragImageHTMLPboardType]) {
     DCHECK(!dropData_->html.string().empty());
     // See comment on |kHtmlHeader| above.
     [pboard setString:SysUTF16ToNSString(kHtmlHeader + dropData_->html.string())
-              forType:NSHTMLPboardType];
+              forType:type];
 
   // URL.
   } else if ([type isEqualToString:NSURLPboardType]) {
     DCHECK(dropData_->url.is_valid());
     NSURL* url = [NSURL URLWithString:SysUTF8ToNSString(dropData_->url.spec())];
     // If NSURL creation failed, check for a badly-escaped JavaScript URL.
     // Strip out any existing escapes and then re-escape uniformly.
     if (!url && dropData_->url.SchemeIs(chrome::kJavaScriptScheme)) {
       net::UnescapeRule::Type unescapeRules =
           net::UnescapeRule::SPACES |
@@ skipping 184 matching lines @@
 }
 
 @end  // @implementation WebDragSource
 
 
 @implementation WebDragSource (Private)
 
 - (void)fillPasteboard {
   DCHECK(pasteboard_.get());
 
-  [pasteboard_
-      declareTypes:[NSArray arrayWithObject:ui::kChromeDragDummyPboardType]
-             owner:contentsView_];
+  [pasteboard_ declareTypes:@[ui::kChromeDragDummyPboardType]
+                      owner:contentsView_];
 
   // URL (and title).
-  if (dropData_->url.is_valid())
-    [pasteboard_ addTypes:[NSArray arrayWithObjects:NSURLPboardType,
-                                                    kNSURLTitlePboardType, nil]
+  if (dropData_->url.is_valid()) {
+    [pasteboard_ addTypes:@[NSURLPboardType, kNSURLTitlePboardType]
                     owner:contentsView_];
+  }
 
   // MIME type.
   std::string mimeType;
 
   // File extension.
   std::string fileExtension;
 
   // File.
   if (!dropData_->file_contents.empty() ||
       !dropData_->download_metadata.empty()) {
@@ skipping 43 matching lines @@
         NSArray* types = @[base::mac::CFToNSCast(fileUTI_.get())];
         [pasteboard_ addTypes:types owner:contentsView_];
       }
     }
   }
 
   // HTML.
   bool hasHTMLData = !dropData_->html.string().empty();
   // Mail.app and TextEdit accept drags that have both HTML and image flavors on
   // them, but don't process them correctly <http://crbug.com/55879>. Therefore,
-  // omit the HTML flavor if there is an image flavor. (The only time that
-  // WebKit fills in the WebDropData::file_contents is with an image drop, but
-  // the MIME time is tested anyway for paranoia's sake.)
+  // if there is an image flavor, don't put the HTML data on as HTML, but rather
+  // put it on as this Chrome-only flavor.
+  //
+  // (The only time that Blink fills in the WebDropData::file_contents is with
+  // an image drop, but the MIME time is tested anyway for paranoia's sake.)
   bool hasImageData = !dropData_->file_contents.empty() &&
                       fileUTI_ &&
                       UTTypeConformsTo(fileUTI_.get(), kUTTypeImage);
-  if (hasHTMLData && !hasImageData)
-    [pasteboard_ addTypes:[NSArray arrayWithObject:NSHTMLPboardType]
-                    owner:contentsView_];
+  if (hasHTMLData) {
+    if (hasImageData) {
+      [pasteboard_ addTypes:@[ui::kChromeDragImageHTMLPboardType]
+                      owner:contentsView_];
+    } else {
+      [pasteboard_ addTypes:@[NSHTMLPboardType] owner:contentsView_];
+    }
+  }
 
   // Plain text.
-  if (!dropData_->text.string().empty())
-    [pasteboard_ addTypes:[NSArray arrayWithObject:NSStringPboardType]
+  if (!dropData_->text.string().empty()) {
+    [pasteboard_ addTypes:@[NSStringPboardType]
                     owner:contentsView_];
+  }
 
   if (!dropData_->custom_data.empty()) {
-    [pasteboard_
-        addTypes:[NSArray arrayWithObject:ui::kWebCustomDataPboardType]
-           owner:contentsView_];
+    [pasteboard_ addTypes:@[ui::kWebCustomDataPboardType]
+                    owner:contentsView_];
   }
 }
 
 - (NSImage*)dragImage {
   if (dragImage_)
     return dragImage_;
 
   // Default to returning a generic image.
   return content::GetContentClient()->GetNativeImageNamed(
       IDR_DEFAULT_FAVICON).ToNSImage();
 }
 
 @end  // @implementation WebDragSource (Private)