bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 142910.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@703 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-06-22 00:10:10 +00:00
parent 65cc337f03
commit 1f42df1b61
11 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cef1/libcef/browser_drag_delegate_win.cc
View File

@@ -279,12 +279,12 @@ void BrowserDragDelegate::DoDragging(const WebDropData& drop_data,
// a shortcut so we add it first.
if (!drop_data.file_contents.empty())
PrepareDragForFileContents(drop_data, &data);
if (!drop_data.text_html.empty())
data.SetHtml(drop_data.text_html, drop_data.html_base_url);
if (!drop_data.html.is_null() && !drop_data.html.string().empty())
data.SetHtml(drop_data.html.string(), drop_data.html_base_url);
// We set the text contents before the URL because the URL also sets text
// content.
if (!drop_data.plain_text.empty())
data.SetString(drop_data.plain_text);
if (!drop_data.text.is_null() && !drop_data.text.string().empty())
data.SetString(drop_data.text.string());
if (drop_data.url.is_valid())
PrepareDragForUrl(drop_data, &data);
}