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

Side by Side Diff: Source/core/page/DragController.cpp

Issue 339593005: Set the target type when creating the request for main resource (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Made the setter method private Created 6 years, 6 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, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Google Inc. 3 * Copyright (C) 2008 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 if ((m_dragDestinationAction & DragDestinationActionEdit) && concludeEditDra g(dragData)) { 256 if ((m_dragDestinationAction & DragDestinationActionEdit) && concludeEditDra g(dragData)) {
257 m_documentUnderMouse = nullptr; 257 m_documentUnderMouse = nullptr;
258 return true; 258 return true;
259 } 259 }
260 260
261 m_documentUnderMouse = nullptr; 261 m_documentUnderMouse = nullptr;
262 262
263 if (operationForLoad(dragData) == DragOperationNone) 263 if (operationForLoad(dragData) == DragOperationNone)
264 return false; 264 return false;
265 265
266 if (m_page->settings().navigateOnDragDrop()) 266 if (m_page->settings().navigateOnDragDrop()) {
267 m_page->deprecatedLocalMainFrame()->loader().load(FrameLoadRequest(0, Re sourceRequest(dragData->asURL()))); 267 ResourceRequest request = ResourceRequest::createMainResourceRequest(KUR L(ParsedURLString, dragData->asURL()), true);
268 m_page->deprecatedLocalMainFrame()->loader().load(FrameLoadRequest(0, re quest));
269 }
268 return true; 270 return true;
269 } 271 }
270 272
271 void DragController::mouseMovedIntoDocument(Document* newDocument) 273 void DragController::mouseMovedIntoDocument(Document* newDocument)
272 { 274 {
273 if (m_documentUnderMouse == newDocument) 275 if (m_documentUnderMouse == newDocument)
274 return; 276 return;
275 277
276 // If we were over another document clear the selection 278 // If we were over another document clear the selection
277 if (m_documentUnderMouse) 279 if (m_documentUnderMouse)
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 967
966 void DragController::trace(Visitor* visitor) 968 void DragController::trace(Visitor* visitor)
967 { 969 {
968 visitor->trace(m_page); 970 visitor->trace(m_page);
969 visitor->trace(m_documentUnderMouse); 971 visitor->trace(m_documentUnderMouse);
970 visitor->trace(m_dragInitiator); 972 visitor->trace(m_dragInitiator);
971 visitor->trace(m_fileInputElementUnderMouse); 973 visitor->trace(m_fileInputElementUnderMouse);
972 } 974 }
973 975
974 } // namespace WebCore 976 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698