Add context to gfx::Screen calls in support of simultaneous desktop+ash

content/browser/web_contents/web_contents_view_aura.cc

Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 05dfed09227a7226d214c84a0a4321fe9f528b1e..a8f331d9bcdedec43c4114826809028b84dd29ca 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -266,7 +266,8 @@ void WebContentsViewAura::SizeChangedCommon(const gfx::Size& size) {
 
 void WebContentsViewAura::EndDrag(WebKit::WebDragOperationsMask ops) {
   aura::RootWindow* root_window = GetNativeView()->GetRootWindow();
-  gfx::Point screen_loc = gfx::Screen::GetCursorScreenPoint();
+  gfx::Point screen_loc = gfx::Screen::GetCursorScreenPoint(
+      gfx::Screen::BadTwoWorldsContext());
   gfx::Point client_loc = screen_loc;
   content::RenderViewHost* rvh = web_contents_->GetRenderViewHost();
   aura::Window* window = rvh->GetView()->GetNativeView();

[oshima, 2012/10/04 20:18:26]

you can use this |window| as a reference.

@@ -462,7 +463,8 @@ void WebContentsViewAura::StartDragging(
     // always start from a mouse-event (e.g. a touch or gesture event could
     // initiate the drag). The location information should be carried over from
     // webkit. http://crbug.com/114754
-    gfx::Point location(gfx::Screen::GetCursorScreenPoint());
+    gfx::Point location(
+        gfx::Screen::GetCursorScreenPoint(gfx::Screen::BadTwoWorldsContext()));
     MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
     result_op = aura::client::GetDragDropClient(root_window)->StartDragAndDrop(
         data, root_window, location, ConvertFromWeb(operations));
@@ -603,7 +605,9 @@ ui::EventResult WebContentsViewAura::OnMouseEvent(ui::MouseEvent* event) {
       break;
     case ui::ET_MOUSE_MOVED:
       web_contents_->GetDelegate()->ContentsMouseEvent(
-          web_contents_, gfx::Screen::GetCursorScreenPoint(), true);
+          web_contents_,
+          gfx::Screen::GetCursorScreenPoint(gfx::Screen::BadTwoWorldsContext()),
+          true);
       break;
     default:
       break;
@@ -631,7 +635,8 @@ void WebContentsViewAura::OnDragEntered(const ui::DropTargetEvent& event) {
   PrepareWebDropData(&drop_data, event.data());
   WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
 
-  gfx::Point screen_pt = gfx::Screen::GetCursorScreenPoint();
+  gfx::Point screen_pt = gfx::Screen::GetCursorScreenPoint(
+      gfx::Screen::BadTwoWorldsContext());
   current_rvh_for_drag_ = web_contents_->GetRenderViewHost();
   web_contents_->GetRenderViewHost()->DragTargetDragEnter(
       drop_data, event.location(), screen_pt, op,
@@ -649,7 +654,8 @@ int WebContentsViewAura::OnDragUpdated(const ui::DropTargetEvent& event) {
     OnDragEntered(event);
 
   WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
-  gfx::Point screen_pt = gfx::Screen::GetCursorScreenPoint();
+  gfx::Point screen_pt = gfx::Screen::GetCursorScreenPoint(
+      gfx::Screen::BadTwoWorldsContext());
   web_contents_->GetRenderViewHost()->DragTargetDragOver(
       event.location(), screen_pt, op,
       ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
@@ -677,7 +683,7 @@ int WebContentsViewAura::OnPerformDrop(const ui::DropTargetEvent& event) {
 
   web_contents_->GetRenderViewHost()->DragTargetDrop(
       event.location(),
-      gfx::Screen::GetCursorScreenPoint(),
+      gfx::Screen::GetCursorScreenPoint(gfx::Screen::BadTwoWorldsContext()),
       ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();