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 2446151fbe74df05ec38b847cde74acee719ea8d..c6ec7155025e546c8206895539f0e34ac1683291 100644 |
--- a/content/browser/web_contents/web_contents_view_aura.cc |
+++ b/content/browser/web_contents/web_contents_view_aura.cc |
@@ -308,7 +308,7 @@ class WebDragSourceAura : public MessageLoopForUI::Observer, |
aura::Window* window = rvh->GetView()->GetNativeView(); |
aura::Window::ConvertPointToTarget(window->GetRootWindow(), |
window, &client_loc); |
- rvh->DragSourceMovedTo(client_loc.x(), client_loc.y(), |
+ contents_->DragSourceMovedTo(client_loc.x(), client_loc.y(), |
screen_loc.x(), screen_loc.y()); |
} |
break; |
@@ -936,8 +936,10 @@ void WebContentsViewAura::EndDrag(WebKit::WebDragOperationsMask ops) { |
RenderViewHost* rvh = web_contents_->GetRenderViewHost(); |
aura::Window* window = rvh->GetView()->GetNativeView(); |
aura::Window::ConvertPointToTarget(root_window, window, &client_loc); |
- rvh->DragSourceEndedAt(client_loc.x(), client_loc.y(), screen_loc.x(), |
- screen_loc.y(), ops); |
+ if (!web_contents_) |
+ return; |
+ web_contents_->DragSourceEndedAt(client_loc.x(), client_loc.y(), |
+ screen_loc.x(), screen_loc.y(), ops); |
} |
void WebContentsViewAura::PrepareOverscrollWindow() { |