diff options
Diffstat (limited to 'WebCore/platform/android/FileChooserAndroid.cpp')
| -rw-r--r-- | WebCore/platform/android/FileChooserAndroid.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebCore/platform/android/FileChooserAndroid.cpp b/WebCore/platform/android/FileChooserAndroid.cpp index c293e66..c8e1999 100644 --- a/WebCore/platform/android/FileChooserAndroid.cpp +++ b/WebCore/platform/android/FileChooserAndroid.cpp @@ -36,12 +36,20 @@ String FileChooser::basenameForWidth(const Font& font, int width) const return String(); // FIXME: This could be a lot faster, but assuming the data will not // often be much longer than the provided width, this may be fast enough. +<<<<<<< HEAD:WebCore/platform/android/FileChooserAndroid.cpp // If this does not need to be threadsafe, we can use crossThreadString(). // See http://trac.webkit.org/changeset/49160. +======= +>>>>>>> webkit.org at r50258.:WebCore/platform/android/FileChooserAndroid.cpp String output = m_filenames[0].threadsafeCopy(); +<<<<<<< HEAD:WebCore/platform/android/FileChooserAndroid.cpp while (font.width(TextRun(output.impl())) > width && output.length() > 4) { output = output.replace(0, 4, String("...")); } +======= + while (font.width(TextRun(output.impl())) > width && output.length() > 4) + output = output.replace(output.length() - 4, 4, String("...")); +>>>>>>> webkit.org at r50258.:WebCore/platform/android/FileChooserAndroid.cpp return output; } |