Implement WebContentsView::GetDropData for Mac; disable on Aura

content/browser/web_contents/web_drag_dest_win.cc

 // 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.
 
 #include "content/browser/web_contents/web_drag_dest_win.h"
 
 #include <windows.h>
 #include <shlobj.h>
 
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 97 matching lines @@
     delegate_->DragInitialize(web_contents_);
 
   // Don't pass messages to the renderer if an interstitial page is showing
   // because we don't want the interstitial page to navigate.  Instead,
   // pass the messages on to a separate interstitial DropTarget handler.
   if (web_contents_->ShowingInterstitialPage())
     return interstitial_drop_target_->OnDragEnter(data_object, effects);
 
   // TODO(tc): PopulateWebDropData can be slow depending on what is in the
   // IDataObject.  Maybe we can do this in a background thread.
-  WebDropData drop_data;
-  WebDropData::PopulateWebDropData(data_object, &drop_data);
+  drop_data_.reset(new WebDropData());
+  WebDropData::PopulateWebDropData(data_object, drop_data_.get());
 
-  if (drop_data.url.is_empty())
-    ui::OSExchangeDataProviderWin::GetPlainTextURL(data_object, &drop_data.url);
+  if (drop_data_->url.is_empty()) {
+    ui::OSExchangeDataProviderWin::GetPlainTextURL(data_object,
+                                                   &drop_data_->url);
+  }
 
   drag_cursor_ = WebDragOperationNone;
 
   POINT client_pt = cursor_position;
   ScreenToClient(GetHWND(), &client_pt);
-  web_contents_->GetRenderViewHost()->DragTargetDragEnter(drop_data,
+  web_contents_->GetRenderViewHost()->DragTargetDragEnter(*drop_data_,
       gfx::Point(client_pt.x, client_pt.y),
       gfx::Point(cursor_position.x, cursor_position.y),
       web_drag_utils_win::WinDragOpMaskToWebDragOpMask(effects));
 
   if (delegate_)
       delegate_->OnDragEnter(data_object);
 
   // We lie here and always return a DROPEFFECT because we don't want to
   // wait for the IPC call to return.
   return web_drag_utils_win::WebDragOpToWinDragOp(drag_cursor_);
@@ skipping 29 matching lines @@
     return;
 
   if (web_contents_->ShowingInterstitialPage()) {
     interstitial_drop_target_->OnDragLeave(data_object);
   } else {
     web_contents_->GetRenderViewHost()->DragTargetDragLeave();
   }
 
   if (delegate_)
     delegate_->OnDragLeave(data_object);
+
+  drop_data_.reset();
 }
 
 DWORD WebDragDest::OnDrop(IDataObject* data_object,
                           DWORD key_state,
                           POINT cursor_position,
                           DWORD effect) {
   DCHECK(current_rvh_);
   if (current_rvh_ != web_contents_->GetRenderViewHost())
     OnDragEnter(data_object, key_state, cursor_position, effect);
 
   if (web_contents_->ShowingInterstitialPage())
     interstitial_drop_target_->OnDragOver(data_object, effect);
 
   if (web_contents_->ShowingInterstitialPage())
     return interstitial_drop_target_->OnDrop(data_object, effect);
 
   POINT client_pt = cursor_position;
   ScreenToClient(GetHWND(), &client_pt);
   web_contents_->GetRenderViewHost()->DragTargetDrop(
       gfx::Point(client_pt.x, client_pt.y),
       gfx::Point(cursor_position.x, cursor_position.y));
 
   if (delegate_)
     delegate_->OnDrop(data_object);
 
   current_rvh_ = NULL;
 
+  drop_data_.reset();

[Aaron Boodman, 2012/05/07 18:50:33]

I'm not sure if this is needed, or if OnDragLeave is always called.

+
   // This isn't always correct, but at least it's a close approximation.
   // For now, we always map a move to a copy to prevent potential data loss.
   DWORD drop_effect = web_drag_utils_win::WebDragOpToWinDragOp(drag_cursor_);
   return drop_effect != DROPEFFECT_MOVE ? drop_effect : DROPEFFECT_COPY;
 }