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

Side by Side Diff: third_party/WebKit/WebCore/page/DragController.cpp

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 m_document = 0; 193 m_document = 0;
194 return true; 194 return true;
195 } 195 }
196 196
197 m_document = 0; 197 m_document = 0;
198 198
199 if (operationForLoad(dragData) == DragOperationNone) 199 if (operationForLoad(dragData) == DragOperationNone)
200 return false; 200 return false;
201 201
202 m_client->willPerformDragDestinationAction(DragDestinationActionLoad, dragDa ta); 202 m_client->willPerformDragDestinationAction(DragDestinationActionLoad, dragDa ta);
203 m_page->mainFrame()->loader()->load(ResourceRequest(dragData->asURL())); 203 m_page->mainFrame()->loader()->load(ResourceRequest(dragData->asURL()), fals e);
204 return true; 204 return true;
205 } 205 }
206 206
207 DragOperation DragController::dragEnteredOrUpdated(DragData* dragData) 207 DragOperation DragController::dragEnteredOrUpdated(DragData* dragData)
208 { 208 {
209 ASSERT(dragData); 209 ASSERT(dragData);
210 IntPoint windowPoint = dragData->clientPosition(); 210 IntPoint windowPoint = dragData->clientPosition();
211 211
212 Document* newDraggingDoc = 0; 212 Document* newDraggingDoc = 0;
213 if (Frame* frame = m_page->mainFrame()) 213 if (Frame* frame = m_page->mainFrame())
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 ASSERT(frame); 769 ASSERT(frame);
770 FrameView* frameView = frame->view(); 770 FrameView* frameView = frame->view();
771 if (!frameView) 771 if (!frameView)
772 return; 772 return;
773 IntPoint framePoint = frameView->windowToContents(windowPoint); 773 IntPoint framePoint = frameView->windowToContents(windowPoint);
774 Selection dragCaret(frame->visiblePositionForPoint(framePoint)); 774 Selection dragCaret(frame->visiblePositionForPoint(framePoint));
775 m_page->dragCaretController()->setSelection(dragCaret); 775 m_page->dragCaretController()->setSelection(dragCaret);
776 } 776 }
777 777
778 } 778 }
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/page/DOMTimer.cpp ('k') | third_party/WebKit/WebCore/page/SecurityOrigin.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698