Have tests verify clientX/Y and pageX/Y properties in drag-and-drop DOM events.

chrome/browser/ui/views/drag_and_drop_interactive_uitest.cc

 // 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 <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 132 matching lines @@
   void CalculateEventLocations(gfx::Point web_contents_relative_location,
                                gfx::Point* out_event_location,
                                gfx::Point* out_event_root_location) {
     gfx::NativeView view = web_contents_->GetNativeView();
 
     *out_event_location = web_contents_relative_location;
 
     gfx::Point root_location = web_contents_relative_location;
     aura::Window::ConvertPointToTarget(view, view->GetRootWindow(),
                                        &root_location);
-    *out_event_location = root_location;
+    *out_event_root_location = root_location;

[Łukasz Anforowicz, 2016/11/16 23:02:38]

Ooops... :->

   }
 
   // These are ui::DropTargetEvent::source_operations_ being sent when manually
   // trying out drag&drop of an image file from Nemo (Ubuntu's file explorer)
   // into a content_shell.
   static constexpr int kDefaultSourceOperations = ui::DragDropTypes::DRAG_MOVE |
                                                   ui::DragDropTypes::DRAG_COPY |
                                                   ui::DragDropTypes::DRAG_LINK;
 
   content::WebContents* web_contents_;
@@ skipping 164 matching lines @@
   content::DOMMessageQueue dom_message_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(DOMDragEventWaiter);
 };
 
 // Helper for verifying contents of DOM events associated with drag-and-drop.
 class DOMDragEventVerifier {
  public:
   DOMDragEventVerifier() {}
 
+  void set_expected_client_position(const std::string& value) {
+    expected_client_position_ = value;
+  }
+
   void set_expected_drop_effect(const std::string& value) {
     expected_drop_effect_ = value;
   }
 
   void set_expected_effect_allowed(const std::string& value) {
     expected_effect_allowed_ = value;
   }
 
   void set_expected_mime_types(const std::string& value) {
     expected_mime_types_ = value;
   }
 
+  void set_expected_page_position(const std::string& value) {
+    expected_page_position_ = value;
+  }
+
   // Returns a matcher that will match a std::string (drag event data - e.g.
   // one returned by DOMDragEventWaiter::WaitForNextMatchingEvent) if it matches
   // the expectations of this DOMDragEventVerifier.
   testing::Matcher<std::string> Matches() const {
     return testing::AllOf(
+        FieldMatches("client_position", expected_client_position_),
         FieldMatches("drop_effect", expected_drop_effect_),
         FieldMatches("effect_allowed", expected_effect_allowed_),
-        FieldMatches("mime_types", expected_mime_types_));
+        FieldMatches("mime_types", expected_mime_types_),
+        FieldMatches("page_position", expected_page_position_));
   }
 
  private:
   static testing::Matcher<std::string> FieldMatches(
       const std::string& field_name,
       const std::string& expected_value) {
     if (expected_value == "<no expectation>")
       return testing::A<std::string>();
 
     return testing::HasSubstr(base::StringPrintf(
         "\"%s\":\"%s\"", field_name.c_str(), expected_value.c_str()));
   }
 
   std::string expected_drop_effect_ = "<no expectation>";
   std::string expected_effect_allowed_ = "<no expectation>";
   std::string expected_mime_types_ = "<no expectation>";
+  std::string expected_client_position_ = "<no expectation>";
+  std::string expected_page_position_ = "<no expectation>";
 
   DISALLOW_COPY_AND_ASSIGN(DOMDragEventVerifier);
 };
 
 const char kTestPagePath[] = "/drag_and_drop/page.html";
 
 }  // namespace
 
 class DragAndDropBrowserTest : public InProcessBrowserTest,
                                public testing::WithParamInterface<bool> {
@@ skipping 180 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(DragAndDropBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_P(DragAndDropBrowserTest, DropTextFromOutside) {
   std::string frame_site = use_cross_site_subframe() ? "b.com" : "a.com";
   ASSERT_TRUE(NavigateToTestPage("a.com"));
   ASSERT_TRUE(NavigateRightFrame(frame_site, "drop_target.html"));
 
   // Setup test expectations.
   DOMDragEventVerifier expected_dom_event_data;
+  expected_dom_event_data.set_expected_client_position("(100, 100)");
   expected_dom_event_data.set_expected_drop_effect("none");
   expected_dom_event_data.set_expected_effect_allowed("all");
   expected_dom_event_data.set_expected_mime_types("text/plain");
+  expected_dom_event_data.set_expected_page_position("(100, 100)");
 
   // Drag text from outside the browser into/over the right frame.
   {
     DOMDragEventWaiter dragover_waiter("dragover", right_frame());
     ASSERT_TRUE(SimulateDragEnterToRightFrame("Dragged test text"));
 
     std::string dragover_event;
     ASSERT_TRUE(dragover_waiter.WaitForNextMatchingEvent(&dragover_event));
     EXPECT_THAT(dragover_event, expected_dom_event_data.Matches());
   }
@@ skipping 10 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_P(DragAndDropBrowserTest, DragStartInFrame) {
   std::string frame_site = use_cross_site_subframe() ? "b.com" : "a.com";
   ASSERT_TRUE(NavigateToTestPage("a.com"));
   ASSERT_TRUE(NavigateLeftFrame(frame_site, "image_source.html"));
 
   // Setup test expectations.
   // (dragstart event handler in image_source.html is asking for "copy" only).
   DOMDragEventVerifier expected_dom_event_data;
+  expected_dom_event_data.set_expected_client_position("(100, 100)");
   expected_dom_event_data.set_expected_drop_effect("none");
   expected_dom_event_data.set_expected_effect_allowed("copy");
   expected_dom_event_data.set_expected_mime_types(
       "Files,text/html,text/uri-list");
+  expected_dom_event_data.set_expected_page_position("(100, 100)");
 
   // Start the drag in the left frame.
   DragStartWaiter drag_start_waiter(web_contents());
   DOMDragEventWaiter dragstart_event_waiter("dragstart", left_frame());
   EXPECT_TRUE(SimulateMouseDownAndDragStartInLeftFrame());
 
   // Verify Javascript event data.
   {
     std::string dragstart_event;
     EXPECT_TRUE(
@@ skipping 25 matching lines @@
   SimulateMouseUp();
 }
 
 INSTANTIATE_TEST_CASE_P(
     SameSiteSubframe, DragAndDropBrowserTest, ::testing::Values(false));
 
 INSTANTIATE_TEST_CASE_P(
     CrossSiteSubframe, DragAndDropBrowserTest, ::testing::Values(true));
 
 }  // namespace chrome