| 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 | 151 |
| 152 if (m_platformDragData->types().contains(mimeTypeTextHTML)) { | 152 if (m_platformDragData->types().contains(mimeTypeTextHTML)) { |
| 153 String html; | 153 String html; |
| 154 KURL baseURL; | 154 KURL baseURL; |
| 155 m_platformDragData->htmlAndBaseURL(html, baseURL); | 155 m_platformDragData->htmlAndBaseURL(html, baseURL); |
| 156 ASSERT(frame->document()); | 156 ASSERT(frame->document()); |
| 157 if (RefPtr<DocumentFragment> fragment = createFragmentFromMarkup(*frame-
>document(), html, baseURL, DisallowScriptingAndPluginContent)) | 157 if (RefPtr<DocumentFragment> fragment = createFragmentFromMarkup(*frame-
>document(), html, baseURL, DisallowScriptingAndPluginContent)) |
| 158 return fragment.release(); | 158 return fragment.release(); |
| 159 } | 159 } |
| 160 | 160 |
| 161 return 0; | 161 return nullptr; |
| 162 } | 162 } |
| 163 | 163 |
| 164 String DragData::droppedFileSystemId() const | 164 String DragData::droppedFileSystemId() const |
| 165 { | 165 { |
| 166 DraggedIsolatedFileSystem* filesystem = DraggedIsolatedFileSystem::from(m_pl
atformDragData); | 166 DraggedIsolatedFileSystem* filesystem = DraggedIsolatedFileSystem::from(m_pl
atformDragData); |
| 167 if (!filesystem) | 167 if (!filesystem) |
| 168 return String(); | 168 return String(); |
| 169 return filesystem->filesystemId(); | 169 return filesystem->filesystemId(); |
| 170 } | 170 } |
| 171 | 171 |
| 172 } // namespace WebCore | 172 } // namespace WebCore |
| OLD | NEW |