In-place modification of drag related functionality present in LocalFrame

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..c98b954a5f459ff75fd9699f5e182ff17d690dab 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrameTest.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrameTest.cpp
@@ -52,7 +52,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 =
+      GetFrame().NodeImage(GetFrame(), *sample);
   EXPECT_EQ(IntSize(100, 100), image->Size());
 }
 
@@ -64,7 +65,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 =
+      GetFrame().NodeImage(GetFrame(), *sample);
   EXPECT_EQ(
       Color(0, 255, 0),
       sample->firstChild()->GetLayoutObject()->ResolveColor(CSSPropertyColor))
@@ -79,7 +81,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 =
+      GetFrame().NodeImage(GetFrame(), *sample);
   EXPECT_EQ(IntSize(200, 200), image->Size())
       << ":-webkit-drag should affect dragged image.";
 }
@@ -92,7 +95,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 =
+      GetFrame().NodeImage(GetFrame(), *sample);
   EXPECT_EQ(nullptr, image.get()) << ":-webkit-drag blows away layout object";
 }
 
@@ -106,7 +110,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 =
+      GetFrame().NodeImage(GetFrame(), *sample);
 
   EXPECT_TRUE(sample->GetLayoutObject() != before_layout_object)
       << ":-webkit-drag causes sample to have different layout object.";
@@ -130,12 +135,12 @@ TEST_F(LocalFrameTest, dragImageForSelectionUsesPageScaleFactor) {
   GetFrame().Selection().SelectAll();
   UpdateAllLifecyclePhases();
   const std::unique_ptr<DragImage> image1(
-      GetFrame().DragImageForSelection(0.75f));
+      GetFrame().DragImageForSelection(GetFrame(), 0.75f));
   GetFrame().GetPage()->GetVisualViewport().SetScale(2);
   GetFrame().Selection().SelectAll();
   UpdateAllLifecyclePhases();
   const std::unique_ptr<DragImage> image2(
-      GetFrame().DragImageForSelection(0.75f));
+      GetFrame().DragImageForSelection(GetFrame(), 0.75f));
 
   EXPECT_GT(image1->Size().Width(), 0);
   EXPECT_GT(image1->Size().Height(), 0);