| 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 if ((m_dragDestinationAction & DragDestinationActionEdit) && concludeEditDra
g(dragData)) { | 258 if ((m_dragDestinationAction & DragDestinationActionEdit) && concludeEditDra
g(dragData)) { |
| 259 m_documentUnderMouse = 0; | 259 m_documentUnderMouse = 0; |
| 260 return true; | 260 return true; |
| 261 } | 261 } |
| 262 | 262 |
| 263 m_documentUnderMouse = 0; | 263 m_documentUnderMouse = 0; |
| 264 | 264 |
| 265 if (operationForLoad(dragData) == DragOperationNone) | 265 if (operationForLoad(dragData) == DragOperationNone) |
| 266 return false; | 266 return false; |
| 267 | 267 |
| 268 m_page->mainFrame()->loader()->load(FrameLoadRequest(0, ResourceRequest(drag
Data->asURL()))); | 268 m_page->mainFrame()->loader().load(FrameLoadRequest(0, ResourceRequest(dragD
ata->asURL()))); |
| 269 return true; | 269 return true; |
| 270 } | 270 } |
| 271 | 271 |
| 272 void DragController::mouseMovedIntoDocument(Document* newDocument) | 272 void DragController::mouseMovedIntoDocument(Document* newDocument) |
| 273 { | 273 { |
| 274 if (m_documentUnderMouse == newDocument) | 274 if (m_documentUnderMouse == newDocument) |
| 275 return; | 275 return; |
| 276 | 276 |
| 277 // If we were over another document clear the selection | 277 // If we were over another document clear the selection |
| 278 if (m_documentUnderMouse) | 278 if (m_documentUnderMouse) |
| (...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 926 return false; | 926 return false; |
| 927 #endif | 927 #endif |
| 928 } | 928 } |
| 929 | 929 |
| 930 void DragController::cleanupAfterSystemDrag() | 930 void DragController::cleanupAfterSystemDrag() |
| 931 { | 931 { |
| 932 } | 932 } |
| 933 | 933 |
| 934 } // namespace WebCore | 934 } // namespace WebCore |
| 935 | 935 |
| OLD | NEW |