Drag-and-drop: DragEnter, DragOver, DragLeave, DragDrop

third_party/WebKit/Source/core/page/DragController.cpp

Index: third_party/WebKit/Source/core/page/DragController.cpp
diff --git a/third_party/WebKit/Source/core/page/DragController.cpp b/third_party/WebKit/Source/core/page/DragController.cpp
index dab1f265a1cfb62ed8376d92624c8041b4aad96d..8f343e53aa4eec7910dd7eb9037d9f4e958cfb45 100644
--- a/third_party/WebKit/Source/core/page/DragController.cpp
+++ b/third_party/WebKit/Source/core/page/DragController.cpp
@@ -1150,13 +1150,10 @@ void DragController::doSystemDrag(DragImage* image,
                                   DataTransfer* dataTransfer,
                                   LocalFrame* frame,
                                   bool forLink) {
-  // TODO(dcheng): Drag and drop is not yet supported for OOPI.
-  if (m_page->mainFrame()->isRemoteFrame())
-    return;
   m_didInitiateDrag = true;
   m_dragInitiator = frame->document();
 
-  LocalFrame* mainFrame = m_page->deprecatedLocalMainFrame();
+  LocalFrame* mainFrame = frame->localFrameRoot();
   FrameView* mainFrameView = mainFrame->view();
   IntPoint adjustedDragLocation = mainFrameView->rootFrameToContents(
       frame->view()->contentsToRootFrame(dragLocation));