Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Side by Side Diff: third_party/WebKit/Source/core/page/DragController.h

Issue 2687193004: Tie DragState to DragController. (Closed)
Patch Set: tidy up DragState resetting Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 void dragEnded(); 72 void dragEnded();
73 73
74 bool populateDragDataTransfer(LocalFrame* src, 74 bool populateDragDataTransfer(LocalFrame* src,
75 const DragState&, 75 const DragState&,
76 const IntPoint& dragOrigin); 76 const IntPoint& dragOrigin);
77 bool startDrag(LocalFrame* src, 77 bool startDrag(LocalFrame* src,
78 const DragState&, 78 const DragState&,
79 const WebMouseEvent& dragEvent, 79 const WebMouseEvent& dragEvent,
80 const IntPoint& dragOrigin); 80 const IntPoint& dragOrigin);
81 81
82 DragState& dragState();
83
82 DECLARE_TRACE(); 84 DECLARE_TRACE();
83 85
84 private: 86 private:
85 DragController(Page*); 87 explicit DragController(Page*);
86 88
87 DispatchEventResult dispatchTextInputEventFor(LocalFrame*, DragData*); 89 DispatchEventResult dispatchTextInputEventFor(LocalFrame*, DragData*);
88 bool canProcessDrag(DragData*, LocalFrame& localRoot); 90 bool canProcessDrag(DragData*, LocalFrame& localRoot);
89 bool concludeEditDrag(DragData*); 91 bool concludeEditDrag(DragData*);
90 DragOperation operationForLoad(DragData*, LocalFrame& localRoot); 92 DragOperation operationForLoad(DragData*, LocalFrame& localRoot);
91 bool tryDocumentDrag(DragData*, 93 bool tryDocumentDrag(DragData*,
92 DragDestinationAction, 94 DragDestinationAction,
93 DragSession&, 95 DragSession&,
94 LocalFrame& localRoot); 96 LocalFrame& localRoot);
95 bool tryDHTMLDrag(DragData*, DragOperation&, LocalFrame& localRoot); 97 bool tryDHTMLDrag(DragData*, DragOperation&, LocalFrame& localRoot);
(...skipping 11 matching lines...) Expand all
107 LocalFrame*, 109 LocalFrame*,
108 bool forLink); 110 bool forLink);
109 111
110 Member<Page> m_page; 112 Member<Page> m_page;
111 113
112 // The document the mouse was last dragged over. 114 // The document the mouse was last dragged over.
113 Member<Document> m_documentUnderMouse; 115 Member<Document> m_documentUnderMouse;
114 // The Document (if any) that initiated the drag. 116 // The Document (if any) that initiated the drag.
115 Member<Document> m_dragInitiator; 117 Member<Document> m_dragInitiator;
116 118
119 Member<DragState> m_dragState;
120
117 Member<HTMLInputElement> m_fileInputElementUnderMouse; 121 Member<HTMLInputElement> m_fileInputElementUnderMouse;
118 bool m_documentIsHandlingDrag; 122 bool m_documentIsHandlingDrag;
119 123
120 DragDestinationAction m_dragDestinationAction; 124 DragDestinationAction m_dragDestinationAction;
121 bool m_didInitiateDrag; 125 bool m_didInitiateDrag;
122 }; 126 };
123 127
124 } // namespace blink 128 } // namespace blink
125 129
126 #endif // DragController_h 130 #endif // DragController_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/input/MouseEventManager.cpp ('k') | third_party/WebKit/Source/core/page/DragController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698