Merge 41876 - Revert r41803 and r41799...

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 64 matching lines @@
 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserParams.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebImage.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNodeList.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPageSerializer.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRange.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSearchableFormData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
@@ skipping 53 matching lines @@
 using WebKit::WebDevToolsAgent;
 using WebKit::WebDocument;
 using WebKit::WebDragData;
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebEditingAction;
 using WebKit::WebFindOptions;
 using WebKit::WebFormElement;
 using WebKit::WebFrame;
 using WebKit::WebHistoryItem;
-using WebKit::WebImage;
 using WebKit::WebInputElement;
 using WebKit::WebMediaPlayer;
 using WebKit::WebMediaPlayerAction;
 using WebKit::WebMediaPlayerClient;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebNavigationType;
 using WebKit::WebNode;
 using WebKit::WebPageSerializer;
 using WebKit::WebPageSerializerClient;
 using WebKit::WebPlugin;
@@ skipping 1731 matching lines @@
 void RenderView::setKeyboardFocusURL(const WebURL& url) {
   focus_url_ = GURL(url);
   UpdateTargetURL(focus_url_, mouse_over_url_);
 }
 
 void RenderView::setToolTipText(const WebString& text, WebTextDirection hint) {
   Send(new ViewHostMsg_SetTooltipText(routing_id_, UTF16ToWideHack(text),
                                       hint));
 }
 
-void RenderView::startDragging(const WebKit::WebDragData& data,
-                               WebKit::WebDragOperationsMask mask) {
-  startDragging(data, mask, 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;
-#endif
-
+void RenderView::startDragging(const WebPoint& from, const WebDragData& data,
+                               WebDragOperationsMask allowed_ops) {
   Send(new ViewHostMsg_StartDragging(routing_id_,
                                      WebDropData(data),
-                                     mask,
-                                     bitmap,
-                                     imageOffset));
+                                     allowed_ops));
 }
 
 bool RenderView::acceptsLoadDrops() {
   return renderer_preferences_.can_accept_load_drops;
 }
 
 void RenderView::focusNext() {
   Send(new ViewHostMsg_TakeFocus(routing_id_, false));
 }
 
@@ skipping 2753 matching lines @@
     gfx::PluginWindowHandle window) {
   Send(new ViewHostMsg_AcceleratedSurfaceBuffersSwapped(routing_id(), window));
 }
 #endif
 
 WebKit::WebGeolocationServiceInterface* RenderView::getGeolocationService() {
   if (!geolocation_dispatcher_.get())
     geolocation_dispatcher_.reset(new GeolocationDispatcher(this));
   return geolocation_dispatcher_.get();
 }