Move LocalFrame::DragImageForSelection DragController

third_party/WebKit/Source/core/frame/LocalFrameTest.cpp

Index: third_party/WebKit/Source/core/frame/LocalFrameTest.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrameTest.cpp b/third_party/WebKit/Source/core/frame/LocalFrameTest.cpp
index 7d0b8418e367e16ee281c2af8add411bea4a89eb..2e64c2077e2c1ff62a789423829377a318d52b08 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrameTest.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrameTest.cpp
@@ -1,15 +1,16 @@
 // Copyright 2016 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 "core/frame/LocalFrame.h"
 
+#include "core/clipboard/DataTransfer.h"
 #include "core/editing/FrameSelection.h"
 #include "core/frame/LocalFrameView.h"
 #include "core/frame/PerformanceMonitor.h"
 #include "core/frame/VisualViewport.h"
 #include "core/html/HTMLElement.h"
 #include "core/layout/LayoutObject.h"
+#include "core/page/DragController.h"
 #include "core/testing/DummyPageHolder.h"
 #include "core/timing/Performance.h"
 #include "platform/DragImage.h"
@@ -52,7 +53,8 @@ TEST_F(LocalFrameTest, nodeImage) {
       "</style>"
       "<div id=sample></div>");
   Element* sample = GetDocument().getElementById("sample");
-  const std::unique_ptr<DragImage> image = GetFrame().NodeImage(*sample);
+  const std::unique_ptr<DragImage> image =
+      DataTransfer::NodeImage(GetFrame(), *sample);

[Xiaocheng, 2017/06/02 18:26:47]

Let's create a DataTransferTest for these unit tests of NodeImage().

   EXPECT_EQ(IntSize(100, 100), image->Size());
 }
 
@@ -64,7 +66,8 @@ TEST_F(LocalFrameTest, nodeImageWithNestedElement) {
       "</style>"
       "<div id=sample><span>Green when dragged</span></div>");
   Element* sample = GetDocument().getElementById("sample");
-  const std::unique_ptr<DragImage> image = GetFrame().NodeImage(*sample);
+  const std::unique_ptr<DragImage> image =
+      DataTransfer::NodeImage(GetFrame(), *sample);
   EXPECT_EQ(
       Color(0, 255, 0),
       sample->firstChild()->GetLayoutObject()->ResolveColor(CSSPropertyColor))
@@ -79,7 +82,8 @@ TEST_F(LocalFrameTest, nodeImageWithPsuedoClassWebKitDrag) {
       "</style>"
       "<div id=sample></div>");
   Element* sample = GetDocument().getElementById("sample");
-  const std::unique_ptr<DragImage> image = GetFrame().NodeImage(*sample);
+  const std::unique_ptr<DragImage> image =
+      DataTransfer::NodeImage(GetFrame(), *sample);
   EXPECT_EQ(IntSize(200, 200), image->Size())
       << ":-webkit-drag should affect dragged image.";
 }
@@ -92,7 +96,8 @@ TEST_F(LocalFrameTest, nodeImageWithoutDraggedLayoutObject) {
       "</style>"
       "<div id=sample></div>");
   Element* sample = GetDocument().getElementById("sample");
-  const std::unique_ptr<DragImage> image = GetFrame().NodeImage(*sample);
+  const std::unique_ptr<DragImage> image =
+      DataTransfer::NodeImage(GetFrame(), *sample);
   EXPECT_EQ(nullptr, image.get()) << ":-webkit-drag blows away layout object";
 }
 
@@ -106,7 +111,8 @@ TEST_F(LocalFrameTest, nodeImageWithChangingLayoutObject) {
   Element* sample = GetDocument().getElementById("sample");
   UpdateAllLifecyclePhases();
   LayoutObject* before_layout_object = sample->GetLayoutObject();
-  const std::unique_ptr<DragImage> image = GetFrame().NodeImage(*sample);
+  const std::unique_ptr<DragImage> image =
+      DataTransfer::NodeImage(GetFrame(), *sample);
 
   EXPECT_TRUE(sample->GetLayoutObject() != before_layout_object)
       << ":-webkit-drag causes sample to have different layout object.";
@@ -130,12 +136,12 @@ TEST_F(LocalFrameTest, dragImageForSelectionUsesPageScaleFactor) {
   GetFrame().Selection().SelectAll();
   UpdateAllLifecyclePhases();
   const std::unique_ptr<DragImage> image1(
-      GetFrame().DragImageForSelection(0.75f));
+      DragController::DragImageForSelection(&GetFrame(), 0.75f));

[Xiaocheng, 2017/06/02 18:26:47]

Let's create a DragControllerTest for these unit tests of
DragImageForSelection().

   GetFrame().GetPage()->GetVisualViewport().SetScale(2);
   GetFrame().Selection().SelectAll();
   UpdateAllLifecyclePhases();
   const std::unique_ptr<DragImage> image2(
-      GetFrame().DragImageForSelection(0.75f));
+      DragController::DragImageForSelection(&GetFrame(), 0.75f));
 
   EXPECT_GT(image1->Size().Width(), 0);
   EXPECT_GT(image1->Size().Height(), 0);