Mac: Make image dragging 162.4% more awesome.

chrome/renderer/render_view.cc

 // 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 110 matching lines @@
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webmediaplayer_impl.h"
 
 #if defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * theming
 #include "gfx/native_theme_win.h"
 #elif defined(USE_X11)
 #include "third_party/WebKit/WebKit/chromium/public/linux/WebRenderTheme.h"
+#elif defined(OS_MACOSX)
+#include "skia/ext/skia_utils_mac.h"
 #endif
 
 using appcache::WebApplicationCacheHostImpl;
 using base::Time;
 using base::TimeDelta;
 using webkit_glue::AltErrorPageResourceFetcher;
 using webkit_glue::FormData;
 using webkit_glue::FormField;
 using webkit_glue::ImageResourceFetcher;
 using webkit_glue::PasswordForm;
@@ skipping 1757 matching lines @@
   startDragging(data, allowed_ops, WebImage(), WebPoint());
 }
 
 void RenderView::startDragging(const WebDragData& data,
                                WebDragOperationsMask mask,
                                const WebImage& image,
                                const WebPoint& imageOffset) {
 #if WEBKIT_USING_SKIA
   SkBitmap bitmap(image.getSkBitmap());
 #elif WEBKIT_USING_CG
-  // Needs implementing: http://crbug.com/11457
-  SkBitmap bitmap;
+  SkBitmap bitmap = gfx::CGImageToSkBitmap(image.getCGImageRef());
 #endif
 
   Send(new ViewHostMsg_StartDragging(routing_id_,
                                      WebDropData(data),
                                      mask,
                                      bitmap,
                                      imageOffset));
 }
 
 bool RenderView::acceptsLoadDrops() {
@@ skipping 3018 matching lines @@
 
     if (last_top_level_navigation_page_id_ != page_id_ &&
         // Not interested in reloads.
         type != WebKit::WebNavigationTypeReload &&
         type != WebKit::WebNavigationTypeFormSubmitted) {
       return true;
     }
   }
   return false;
 }