| OLD | NEW |
| 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 Loading... |
| 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(dragData->asURL()); |
| 268 request.initializeForMainResource(true); |
| 269 m_page->deprecatedLocalMainFrame()->loader().load(FrameLoadRequest(0, re
quest)); |
| 270 } |
| 268 return true; | 271 return true; |
| 269 } | 272 } |
| 270 | 273 |
| 271 void DragController::mouseMovedIntoDocument(Document* newDocument) | 274 void DragController::mouseMovedIntoDocument(Document* newDocument) |
| 272 { | 275 { |
| 273 if (m_documentUnderMouse == newDocument) | 276 if (m_documentUnderMouse == newDocument) |
| 274 return; | 277 return; |
| 275 | 278 |
| 276 // If we were over another document clear the selection | 279 // If we were over another document clear the selection |
| 277 if (m_documentUnderMouse) | 280 if (m_documentUnderMouse) |
| (...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 965 | 968 |
| 966 void DragController::trace(Visitor* visitor) | 969 void DragController::trace(Visitor* visitor) |
| 967 { | 970 { |
| 968 visitor->trace(m_page); | 971 visitor->trace(m_page); |
| 969 visitor->trace(m_documentUnderMouse); | 972 visitor->trace(m_documentUnderMouse); |
| 970 visitor->trace(m_dragInitiator); | 973 visitor->trace(m_dragInitiator); |
| 971 visitor->trace(m_fileInputElementUnderMouse); | 974 visitor->trace(m_fileInputElementUnderMouse); |
| 972 } | 975 } |
| 973 | 976 |
| 974 } // namespace WebCore | 977 } // namespace WebCore |
| OLD | NEW |