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

Side by Side Diff: Source/core/platform/text/win/LocaleWin.cpp

Issue 21262003: Remove String::adopt(Vector<UChar>) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix typo Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/page/EventSource.cpp ('k') | Source/wtf/text/StringBuffer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 24 matching lines...) Expand all
35 #include <limits> 35 #include <limits>
36 #include "core/platform/DateComponents.h" 36 #include "core/platform/DateComponents.h"
37 #include "core/platform/Language.h" 37 #include "core/platform/Language.h"
38 #include "core/platform/LocalizedStrings.h" 38 #include "core/platform/LocalizedStrings.h"
39 #include "core/platform/text/DateTimeFormat.h" 39 #include "core/platform/text/DateTimeFormat.h"
40 #include "wtf/CurrentTime.h" 40 #include "wtf/CurrentTime.h"
41 #include "wtf/DateMath.h" 41 #include "wtf/DateMath.h"
42 #include "wtf/HashMap.h" 42 #include "wtf/HashMap.h"
43 #include "wtf/OwnPtr.h" 43 #include "wtf/OwnPtr.h"
44 #include "wtf/PassOwnPtr.h" 44 #include "wtf/PassOwnPtr.h"
45 #include "wtf/text/StringBuffer.h"
45 #include "wtf/text/StringBuilder.h" 46 #include "wtf/text/StringBuilder.h"
46 #include "wtf/text/StringHash.h" 47 #include "wtf/text/StringHash.h"
47 48
48 using namespace std; 49 using namespace std;
49 50
50 namespace WebCore { 51 namespace WebCore {
51 52
52 typedef LCID (WINAPI* LocaleNameToLCIDPtr)(LPCWSTR, DWORD); 53 typedef LCID (WINAPI* LocaleNameToLCIDPtr)(LPCWSTR, DWORD);
53 typedef HashMap<String, LCID> NameToLCIDMap; 54 typedef HashMap<String, LCID> NameToLCIDMap;
54 55
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 173
173 LocaleWin::~LocaleWin() 174 LocaleWin::~LocaleWin()
174 { 175 {
175 } 176 }
176 177
177 String LocaleWin::getLocaleInfoString(LCTYPE type) 178 String LocaleWin::getLocaleInfoString(LCTYPE type)
178 { 179 {
179 int bufferSizeWithNUL = ::GetLocaleInfo(m_lcid, type, 0, 0); 180 int bufferSizeWithNUL = ::GetLocaleInfo(m_lcid, type, 0, 0);
180 if (bufferSizeWithNUL <= 0) 181 if (bufferSizeWithNUL <= 0)
181 return String(); 182 return String();
182 Vector<UChar> buffer(bufferSizeWithNUL); 183 StringBuffer<UChar> buffer(bufferSizeWithNUL);
183 ::GetLocaleInfo(m_lcid, type, buffer.data(), bufferSizeWithNUL); 184 ::GetLocaleInfo(m_lcid, type, buffer.characters(), bufferSizeWithNUL);
184 buffer.shrink(bufferSizeWithNUL - 1); 185 buffer.shrink(bufferSizeWithNUL - 1);
185 return String::adopt(buffer); 186 return String::adopt(buffer);
186 } 187 }
187 188
188 void LocaleWin::getLocaleInfo(LCTYPE type, DWORD& result) 189 void LocaleWin::getLocaleInfo(LCTYPE type, DWORD& result)
189 { 190 {
190 ::GetLocaleInfo(m_lcid, type | LOCALE_RETURN_NUMBER, reinterpret_cast<LPWSTR >(&result), sizeof(DWORD) / sizeof(TCHAR)); 191 ::GetLocaleInfo(m_lcid, type | LOCALE_RETURN_NUMBER, reinterpret_cast<LPWSTR >(&result), sizeof(DWORD) / sizeof(TCHAR));
191 } 192 }
192 193
193 void LocaleWin::ensureShortMonthLabels() 194 void LocaleWin::ensureShortMonthLabels()
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 case NegativeFormatSignPrefix: // Fall through. 574 case NegativeFormatSignPrefix: // Fall through.
574 default: 575 default:
575 negativePrefix = negativeSign; 576 negativePrefix = negativeSign;
576 break; 577 break;
577 } 578 }
578 m_didInitializeNumberData = true; 579 m_didInitializeNumberData = true;
579 setLocaleData(symbols, emptyString(), emptyString(), negativePrefix, negativ eSuffix); 580 setLocaleData(symbols, emptyString(), emptyString(), negativePrefix, negativ eSuffix);
580 } 581 }
581 582
582 } 583 }
OLDNEW
« no previous file with comments | « Source/core/page/EventSource.cpp ('k') | Source/wtf/text/StringBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698