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

Linux: Fix compile errors.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@646 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-05-23 21:51:09 +00:00
parent 8d5bad43d3
commit 53e4ce626d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cef1/libcef/web_drag_source_gtk.cc
View File

@ -96,7 +96,7 @@ void WebDragSource::StartDragging(const WebDropData& drop_data,
event); event);
if (!image.isNull()) { if (!image.isNull()) {
const SkBitmap& bitmap = image.getSkBitmap(); const SkBitmap& bitmap = image.getSkBitmap();
GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap); GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(bitmap);
gtk_drag_set_icon_pixbuf(context, pixbuf, image_offset.x, image_offset.y); gtk_drag_set_icon_pixbuf(context, pixbuf, image_offset.x, image_offset.y);
g_object_unref(pixbuf); g_object_unref(pixbuf);
} else { } else {

4
cef1/libcef/web_drop_target_gtk.cc
View File

@ -202,7 +202,9 @@ void WebDropTarget::OnDragDataReceived(GtkWidget* widget,
FilePath file_path; FilePath file_path;
if (url.SchemeIs("file") && if (url.SchemeIs("file") &&
net::FileURLToFilePath(url, &file_path)) { net::FileURLToFilePath(url, &file_path)) {
drop_data_->filenames.push_back(UTF8ToUTF16(file_path.value())); drop_data_->filenames.push_back(
WebDropData::FileInfo(UTF8ToUTF16(file_path.value()),
string16()));
// This is a hack. Some file managers also populate text/plain with // This is a hack. Some file managers also populate text/plain with
// a file URL when dragging files, so we clear it to avoid exposing // a file URL when dragging files, so we clear it to avoid exposing
// it to the web content. // it to the web content.