Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Side by Side Diff: Source/platform/Language.cpp

Issue 124943003: Remove 'String::append' from some of the blink source. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Incorporated review comments Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "platform/Language.h" 27 #include "platform/Language.h"
28 28
29 #include "public/platform/Platform.h" 29 #include "public/platform/Platform.h"
30 #include "wtf/text/WTFString.h" 30 #include "wtf/text/StringBuilder.h"
31 31
32 namespace WebCore { 32 namespace WebCore {
33 33
34 static String platformLanguage() 34 static String platformLanguage()
35 { 35 {
36 DEFINE_STATIC_LOCAL(String, computedDefaultLanguage, ()); 36 DEFINE_STATIC_LOCAL(StringBuilder, computedDefaultLanguage, ());
37 if (computedDefaultLanguage.isEmpty()) { 37 if (computedDefaultLanguage.isEmpty()) {
38 computedDefaultLanguage.append(blink::Platform::current()->defaultLocale ()); 38 computedDefaultLanguage.append(blink::Platform::current()->defaultLocale ());
39 ASSERT(!computedDefaultLanguage.isEmpty()); 39 ASSERT(!computedDefaultLanguage.isEmpty());
40 } 40 }
41 return computedDefaultLanguage; 41 return computedDefaultLanguage.toString();
42 } 42 }
43 43
44 String defaultLanguage() 44 String defaultLanguage()
45 { 45 {
46 Vector<String> languages = userPreferredLanguages(); 46 Vector<String> languages = userPreferredLanguages();
47 if (languages.size()) 47 if (languages.size())
48 return languages[0]; 48 return languages[0];
49 49
50 return emptyString(); 50 return emptyString();
51 } 51 }
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 if (languageWithoutLocaleMatch.length()) 122 if (languageWithoutLocaleMatch.length())
123 return languageWithoutLocaleMatchIndex; 123 return languageWithoutLocaleMatchIndex;
124 124
125 if (languageMatchButNotLocale.length()) 125 if (languageMatchButNotLocale.length())
126 return languageMatchButNotLocaleMatchIndex; 126 return languageMatchButNotLocaleMatchIndex;
127 127
128 return languageList.size(); 128 return languageList.size();
129 } 129 }
130 130
131 } 131 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698