| 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 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 476 } | 476 } |
| 477 | 477 |
| 478 if (!m_page->dragController().canProcessDrag(dragData)) { | 478 if (!m_page->dragController().canProcessDrag(dragData)) { |
| 479 m_page->dragCaretController().clear(); | 479 m_page->dragCaretController().clear(); |
| 480 return false; | 480 return false; |
| 481 } | 481 } |
| 482 | 482 |
| 483 VisibleSelection dragCaret(m_page->dragCaretController().caretPosition()); | 483 VisibleSelection dragCaret(m_page->dragCaretController().caretPosition()); |
| 484 m_page->dragCaretController().clear(); | 484 m_page->dragCaretController().clear(); |
| 485 RefPtrWillBeRawPtr<Range> range = dragCaret.toNormalizedRange(); | 485 RefPtrWillBeRawPtr<Range> range = dragCaret.toNormalizedRange(); |
| 486 RefPtr<Element> rootEditableElement = innerFrame->selection().rootEditableEl
ement(); | 486 RefPtrWillBeRawPtr<Element> rootEditableElement = innerFrame->selection().ro
otEditableElement(); |
| 487 | 487 |
| 488 // For range to be null a WebKit client must have done something bad while | 488 // For range to be null a WebKit client must have done something bad while |
| 489 // manually controlling drag behaviour | 489 // manually controlling drag behaviour |
| 490 if (!range) | 490 if (!range) |
| 491 return false; | 491 return false; |
| 492 ResourceFetcher* fetcher = range->ownerDocument().fetcher(); | 492 ResourceFetcher* fetcher = range->ownerDocument().fetcher(); |
| 493 ResourceCacheValidationSuppressor validationSuppressor(fetcher); | 493 ResourceCacheValidationSuppressor validationSuppressor(fetcher); |
| 494 if (dragIsMove(innerFrame->selection(), dragData) || dragCaret.isContentRich
lyEditable()) { | 494 if (dragIsMove(innerFrame->selection(), dragData) || dragCaret.isContentRich
lyEditable()) { |
| 495 bool chosePlainText = false; | 495 bool chosePlainText = false; |
| 496 RefPtrWillBeRawPtr<DocumentFragment> fragment = documentFragmentFromDrag
Data(dragData, innerFrame.get(), range, true, chosePlainText); | 496 RefPtrWillBeRawPtr<DocumentFragment> fragment = documentFragmentFromDrag
Data(dragData, innerFrame.get(), range, true, chosePlainText); |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 965 | 965 |
| 966 void DragController::trace(Visitor* visitor) | 966 void DragController::trace(Visitor* visitor) |
| 967 { | 967 { |
| 968 visitor->trace(m_page); | 968 visitor->trace(m_page); |
| 969 visitor->trace(m_documentUnderMouse); | 969 visitor->trace(m_documentUnderMouse); |
| 970 visitor->trace(m_dragInitiator); | 970 visitor->trace(m_dragInitiator); |
| 971 visitor->trace(m_fileInputElementUnderMouse); | 971 visitor->trace(m_fileInputElementUnderMouse); |
| 972 } | 972 } |
| 973 | 973 |
| 974 } // namespace WebCore | 974 } // namespace WebCore |
| OLD | NEW |