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

10
cef1/libcef/web_drag_source_gtk.cc
View File

@@ -79,14 +79,14 @@ void WebDragSource::StartDragging(const WebDropData& drop_data,
const WebKit::WebPoint& image_offset) {
drop_data_.reset(new WebDropData(drop_data));
int targets_mask = 0;
if (!drop_data.plain_text.empty())
if (!drop_data.text.is_null() && !drop_data.text.string().empty())
targets_mask |= ui::TEXT_PLAIN;
if (drop_data.url.is_valid()) {
targets_mask |= ui::TEXT_URI_LIST;
targets_mask |= ui::CHROME_NAMED_URL;
targets_mask |= ui::NETSCAPE_URL;
}
if (!drop_data.text_html.empty())
if (!drop_data.html.is_null() && !drop_data.html.string().empty())
targets_mask |= ui::TEXT_HTML;
GtkTargetList* tl = ui::GetTargetListFromCodeMask(targets_mask);
@@ -125,14 +125,16 @@ void WebDragSource::OnDragDataGet(GtkWidget* sender, GdkDragContext* context,
guint target_type, guint time) {
switch (target_type) {
case ui::TEXT_PLAIN: {
std::string utf8_text = UTF16ToUTF8(drop_data_->plain_text);
std::string utf8_text = drop_data_->text.is_null() ?
std::string() : UTF16ToUTF8(drop_data_->text.string());
gtk_selection_data_set_text(selection_data, utf8_text.c_str(),
utf8_text.length());
break;
}
case ui::TEXT_HTML: {
std::string utf8_text = UTF16ToUTF8(drop_data_->text_html);
std::string utf8_text = drop_data_->html.is_null() ?
std::string() : UTF16ToUTF8(drop_data_->html.string());
gtk_selection_data_set(selection_data,
ui::GetAtomForTarget(ui::TEXT_HTML),
8,