| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Google Inc. | 3 * Copyright (C) 2013 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 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/page/DragData.h" | 28 #include "core/page/DragData.h" |
| 29 | 29 |
| 30 #include "core/clipboard/DataObject.h" | 30 #include "core/clipboard/DataObject.h" |
| 31 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
| 32 #include "core/dom/DocumentFragment.h" | 32 #include "core/dom/DocumentFragment.h" |
| 33 #include "core/dom/Range.h" | 33 #include "core/dom/Range.h" |
| 34 #include "core/editing/markup.h" | 34 #include "core/editing/markup.h" |
| 35 #include "core/frame/LocalFrame.h" | 35 #include "core/frame/LocalFrame.h" |
| 36 #include "modules/filesystem/DraggedIsolatedFileSystem.h" | |
| 37 #include "platform/FileMetadata.h" | 36 #include "platform/FileMetadata.h" |
| 38 #include "platform/clipboard/ClipboardMimeTypes.h" | 37 #include "platform/clipboard/ClipboardMimeTypes.h" |
| 39 #include "platform/weborigin/KURL.h" | 38 #include "platform/weborigin/KURL.h" |
| 40 #include "wtf/text/WTFString.h" | 39 #include "wtf/text/WTFString.h" |
| 41 | 40 |
| 42 namespace WebCore { | 41 namespace WebCore { |
| 43 | 42 |
| 44 DragData::DragData(DataObject* data, const IntPoint& clientPosition, const IntPo
int& globalPosition, | 43 DragData::DragData(DataObject* data, const IntPoint& clientPosition, const IntPo
int& globalPosition, |
| 45 DragOperation sourceOperationMask, DragApplicationFlags flags) | 44 DragOperation sourceOperationMask, DragApplicationFlags flags) |
| 46 : m_clientPosition(clientPosition) | 45 : m_clientPosition(clientPosition) |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 ASSERT(frame->document()); | 155 ASSERT(frame->document()); |
| 157 if (RefPtr<DocumentFragment> fragment = createFragmentFromMarkup(*frame-
>document(), html, baseURL, DisallowScriptingAndPluginContent)) | 156 if (RefPtr<DocumentFragment> fragment = createFragmentFromMarkup(*frame-
>document(), html, baseURL, DisallowScriptingAndPluginContent)) |
| 158 return fragment.release(); | 157 return fragment.release(); |
| 159 } | 158 } |
| 160 | 159 |
| 161 return nullptr; | 160 return nullptr; |
| 162 } | 161 } |
| 163 | 162 |
| 164 String DragData::droppedFileSystemId() const | 163 String DragData::droppedFileSystemId() const |
| 165 { | 164 { |
| 166 DraggedIsolatedFileSystem* filesystem = DraggedIsolatedFileSystem::from(m_pl
atformDragData); | 165 return m_platformDragData->filesystemId(); |
| 167 if (!filesystem) | |
| 168 return String(); | |
| 169 return filesystem->filesystemId(); | |
| 170 } | 166 } |
| 171 | 167 |
| 172 } // namespace WebCore | 168 } // namespace WebCore |
| OLD | NEW |