diff options
| author | Iain Merrick <husky@google.com> | 2010-08-19 17:55:56 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-08-23 11:05:40 +0100 |
| commit | f486d19d62f1bc33246748b14b14a9dfa617b57f (patch) | |
| tree | 195485454c93125455a30e553a73981c3816144d /JavaScriptGlue | |
| parent | 6ba0b43722d16bc295606bec39f396f596e4fef1 (diff) | |
| download | external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.zip external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.gz external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.bz2 | |
Merge WebKit at r65615 : Initial merge by git.
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
Diffstat (limited to 'JavaScriptGlue')
| -rw-r--r-- | JavaScriptGlue/ChangeLog | 14 | ||||
| -rw-r--r-- | JavaScriptGlue/JSUtils.cpp | 6 | ||||
| -rw-r--r-- | JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj | 7 |
3 files changed, 24 insertions, 3 deletions
diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog index 9301542..3b56156 100644 --- a/JavaScriptGlue/ChangeLog +++ b/JavaScriptGlue/ChangeLog @@ -1,3 +1,17 @@ +2010-08-11 Gavin Barraclough <barraclough@apple.com> + + Rubber stamps by Darin Adler & Sam Weinig. + + Bug 43867 - Some UString cleanup + + Change JSC::UString data(), size(), and from(), to characters(), length(), and number() to match WTF::String. + Move string concatenation methods to a new header to simplify down UString.h. Remove is8Bit(). + + * JSUtils.cpp: + (UStringToCFString): + (KJSValueToCFTypeInternal): + * JavaScriptGlue.xcodeproj/project.pbxproj: + 2010-08-04 Gavin Barraclough <barraclough@apple.com> Reviewed by Sam Weinig. diff --git a/JavaScriptGlue/JSUtils.cpp b/JavaScriptGlue/JSUtils.cpp index b83ac52..5c85475 100644 --- a/JavaScriptGlue/JSUtils.cpp +++ b/JavaScriptGlue/JSUtils.cpp @@ -74,7 +74,7 @@ UString CFStringToUString(CFStringRef inCFString) // Caller is responsible for releasing the returned CFStringRef CFStringRef UStringToCFString(const UString& inUString) { - return CFStringCreateWithCharacters(0, (const UniChar*)inUString.data(), inUString.size()); + return CFStringCreateWithCharacters(0, (const UniChar*)inUString.characters(), inUString.length()); } @@ -284,8 +284,8 @@ CFTypeRef KJSValueToCFTypeInternal(JSValue inValue, ExecState *exec, ObjectImpLi { Identifier propName = *iter; UString ustr = propName.ustring(); - const UniChar* uniChars = (const UniChar*)ustr.data(); - int size = ustr.size(); + const UniChar* uniChars = (const UniChar*)ustr.characters(); + int size = ustr.length(); while (size--) { if (uniChars[size] < '0' || uniChars[size] > '9') { isArray = false; diff --git a/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj b/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj index f33bf97..cec8b14 100644 --- a/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj +++ b/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj @@ -287,7 +287,14 @@ isa = PBXProject; buildConfigurationList = 14AC662B08CE7791006915A8 /* Build configuration list for PBXProject "JavaScriptGlue" */; compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 0867D691FE84028FC02AAC07 /* JavaScriptGlue */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; |