Merge DragClientImpl into core.

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

 /*
  * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 20 matching lines @@
 #include "core/page/DragActions.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/Forward.h"
 
 namespace blink {
 
 class DataTransfer;
 class Document;
-class DragClient;
 class DragData;
 class DragImage;
 struct DragSession;
 class DragState;
 class LocalFrame;
 class FrameSelection;
 class HTMLInputElement;
 class Node;
 class Page;
 class PlatformMouseEvent;
 
 class CORE_EXPORT DragController final : public GarbageCollectedFinalized<DragController> {
     WTF_MAKE_NONCOPYABLE(DragController);
 public:
     ~DragController();
 
-    static DragController* create(Page*, DragClient*);
+    static DragController* create(Page*);
 
     DragSession dragEntered(DragData*);
     void dragExited(DragData*);
     DragSession dragUpdated(DragData*);
     bool performDrag(DragData*);
 
     enum SelectionDragPolicy {
         ImmediateSelectionDragResolution,
         DelayedSelectionDragResolution,
     };
     Node* draggableNode(const LocalFrame*, Node*, const IntPoint&, SelectionDragPolicy, DragSourceAction&) const;
     void dragEnded();
 
     bool populateDragDataTransfer(LocalFrame* src, const DragState&, const IntPoint& dragOrigin);
     bool startDrag(LocalFrame* src, const DragState&, const PlatformMouseEvent& dragEvent, const IntPoint& dragOrigin);
 
     DECLARE_TRACE();
 
     static const int DragIconRightInset;
     static const int DragIconBottomInset;
 
 private:
-    DragController(Page*, DragClient*);
+    DragController(Page*);

[dcheng, 2016/04/15 07:20:34]

Nit: explicit

 
     DispatchEventResult dispatchTextInputEventFor(LocalFrame*, DragData*);
     bool canProcessDrag(DragData*);
     bool concludeEditDrag(DragData*);
     DragSession dragEnteredOrUpdated(DragData*);
     DragOperation operationForLoad(DragData*);
     bool tryDocumentDrag(DragData*, DragDestinationAction, DragSession&);
     bool tryDHTMLDrag(DragData*, DragOperation&);
     DragOperation dragOperation(DragData*);
     void cancelDrag();
     bool dragIsMove(FrameSelection&, DragData*);
     bool isCopyKeyDown(DragData*);
 
     void mouseMovedIntoDocument(Document*);
 
     void doSystemDrag(DragImage*, const IntPoint& dragLocation, const IntPoint& dragOrigin, DataTransfer*, LocalFrame*, bool forLink);
-    void cleanupAfterSystemDrag();
 
     Member<Page> m_page;
-    DragClient* m_client;
 
     Member<Document> m_documentUnderMouse; // The document the mouse was last dragged over.
     Member<Document> m_dragInitiator; // The Document (if any) that initiated the drag.
     Member<HTMLInputElement> m_fileInputElementUnderMouse;
     bool m_documentIsHandlingDrag;
 
     DragDestinationAction m_dragDestinationAction;
     bool m_didInitiateDrag;
 };
 
 } // namespace blink
 
 #endif // DragController_h