Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Side by Side Diff: webkit/port/platform/chromium/DragDataChromium.cpp

Issue 11247: Remove cf_html from webdropdata.h. This is windows (Closed)
Patch Set: fix feedback Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webkit/port/platform/chromium/ClipboardChromium.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 /* 119 /*
120 * Order is richest format first. On OSX this is: 120 * Order is richest format first. On OSX this is:
121 * * Web Archive 121 * * Web Archive
122 * * Filenames 122 * * Filenames
123 * * HTML 123 * * HTML
124 * * RTF 124 * * RTF
125 * * TIFF 125 * * TIFF
126 * * PICT 126 * * PICT
127 */ 127 */
128 128
129 // TODO(tc): Disabled because containsFilenames is hardcoded to return 129 if (containsFiles()) {
130 // false. We need to implement fragmentFromFilenames when this is 130 // TODO(tc): Implement this. Should be pretty simple to make some HTML
131 // re-enabled in Apple's win port. 131 // and call createFragmentFromMarkup.
132 //if (containsFilenames()) 132 //if (RefPtr<DocumentFragment> fragment = createFragmentFromMarkup(doc,
133 // if (PassRefPtr<DocumentFragment> fragment = fragmentFromFilenames(doc , m_platformDragData)) 133 // ?, KURL()))
134 // return fragment; 134 // return fragment;
135 }
135 136
136 if (!m_platformDragData->text_html.isEmpty()) { 137 if (!m_platformDragData->text_html.isEmpty()) {
137 String url; 138 RefPtr<DocumentFragment> fragment = createFragmentFromMarkup(doc,
138 RefPtr<DocumentFragment> fragment = createFragmentFromMarkup(doc, 139 m_platformDragData->text_html, m_platformDragData->html_base_url);
139 m_platformDragData->text_html, url); 140 return fragment.release();
140 return fragment; 141 }
141 }
142 142
143 return 0; 143 return 0;
144 } 144 }
145 145
146 Color DragData::asColor() const 146 Color DragData::asColor() const
147 { 147 {
148 return Color(); 148 return Color();
149 } 149 }
150 150
151 } 151 }
OLDNEW
« no previous file with comments | « webkit/port/platform/chromium/ClipboardChromium.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698