diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/mac/FileChooserMac.mm | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/mac/FileChooserMac.mm')
| -rw-r--r-- | Source/WebCore/platform/mac/FileChooserMac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/mac/FileChooserMac.mm b/Source/WebCore/platform/mac/FileChooserMac.mm index 03532ff..d9c2426 100644 --- a/Source/WebCore/platform/mac/FileChooserMac.mm +++ b/Source/WebCore/platform/mac/FileChooserMac.mm @@ -47,9 +47,9 @@ String FileChooser::basenameForWidth(const Font& font, int width) const else if (m_filenames.size() == 1) strToTruncate = [[NSFileManager defaultManager] displayNameAtPath:(m_filenames[0])]; else - return StringTruncator::rightTruncate(multipleFileUploadText(m_filenames.size()), width, font, false); + return StringTruncator::rightTruncate(multipleFileUploadText(m_filenames.size()), width, font); - return StringTruncator::centerTruncate(strToTruncate, width, font, false); + return StringTruncator::centerTruncate(strToTruncate, width, font); } } |