diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-19 04:15:01 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-19 04:15:01 +0000 |
| commit | 0e4e07b6d93ea2c9a645323d470316bbf8dd49cd (patch) | |
| tree | 6e28d9b7744a35fa644938b9e24b14018419218e /ui | |
| parent | 868c619f617e630a0d730d138fb6273006654526 (diff) | |
| download | chromium_src-0e4e07b6d93ea2c9a645323d470316bbf8dd49cd.zip chromium_src-0e4e07b6d93ea2c9a645323d470316bbf8dd49cd.tar.gz chromium_src-0e4e07b6d93ea2c9a645323d470316bbf8dd49cd.tar.bz2 | |
mac: Use CTFont instead of ATS in font_loader.mm.
ATS is deprecated in the 10.8 sdk.
No intended functionality change.
BUG=139138
TEST=Remove renderer.sb line that allows reading of ~/Library/Fonts.
`cp /Library/Fonts/Arial.ttf ~/Library/Fonts`.
Add logging to the font loader that shows it's being called (see patch swt "with logging").
Create a jsfiddle with a CSS of `* { font-family: Arial; }`.
Verify that that shows up correctly on 10.6, 10.7, 10.8.
TBR=avi
Review URL: https://chromiumcodereview.appspot.com/17102004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/shell_dialogs/select_file_dialog_mac.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/shell_dialogs/select_file_dialog_mac.mm b/ui/shell_dialogs/select_file_dialog_mac.mm index 7a376c2..8c1ffa3 100644 --- a/ui/shell_dialogs/select_file_dialog_mac.mm +++ b/ui/shell_dialogs/select_file_dialog_mac.mm @@ -378,8 +378,7 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() { if (!did_cancel) { if (type == ui::SelectFileDialog::SELECT_SAVEAS_FILE) { if ([[panel URL] isFileURL]) { - paths.push_back(base::FilePath( - base::SysNSStringToUTF8([[panel URL] path]))); + paths.push_back(base::mac::NSStringToFilePath([[panel URL] path])); } NSView* accessoryView = [panel accessoryView]; |