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

12
cef1/libcef/web_drag_source_mac.mm
View File

@@ -153,9 +153,9 @@ void PromiseWriterHelper(const WebDropData& drop_data,
// HTML.
if ([type isEqualToString:NSHTMLPboardType]) {
DCHECK(!dropData_->text_html.empty());
DCHECK(!dropData_->html.is_null() && !dropData_->html.string().empty());
// See comment on |kHtmlHeader| above.
[pboard setString:SysUTF16ToNSString(kHtmlHeader + dropData_->text_html)
[pboard setString:SysUTF16ToNSString(kHtmlHeader + dropData_->html.string())
forType:NSHTMLPboardType];
// URL.
@@ -202,8 +202,8 @@ void PromiseWriterHelper(const WebDropData& drop_data,
// Plain text.
} else if ([type isEqualToString:NSStringPboardType]) {
DCHECK(!dropData_->plain_text.empty());
[pboard setString:SysUTF16ToNSString(dropData_->plain_text)
DCHECK(!dropData_->text.is_null() && !dropData_->text.string().empty());
[pboard setString:SysUTF16ToNSString(dropData_->text.string())
forType:NSStringPboardType];
// Oops!
@@ -359,7 +359,7 @@ void PromiseWriterHelper(const WebDropData& drop_data,
[pasteboard_ declareTypes:[NSArray array] owner:view_];
// HTML.
if (!dropData_->text_html.empty())
if (!dropData_->html.is_null() && !dropData_->html.string().empty())
[pasteboard_ addTypes:[NSArray arrayWithObject:NSHTMLPboardType]
owner:view_];
@@ -419,7 +419,7 @@ void PromiseWriterHelper(const WebDropData& drop_data,
}
// Plain text.
if (!dropData_->plain_text.empty())
if (!dropData_->text.is_null() && !dropData_->text.string().empty())
[pasteboard_ addTypes:[NSArray arrayWithObject:NSStringPboardType]
owner:view_];
}