source: webkit/trunk/JavaScriptCore/API/JSStringRefCF.cpp@ 19059

Last change on this file since 19059 was 19059, checked in by ggaren, 18 years ago

Reviewed by Maciej Stachowiak.


Fixed <rdar://problem/4885131> Move CFString function declarations from
JSStringRef.h to JSStringRefCF.h


Also removed remaining API FIXMEs and changed them into Radars.

  • API/JSClassRef.cpp: (OpaqueJSClass::OpaqueJSClass): Added Radar numbers for UTF8 conversion.
  • API/JSContextRef.cpp: (JSGlobalContextCreate): Replaced FIXME for NULL JSContextRef with Radar number.
  • API/JSObjectRef.h: Removed FIXME, which is unprofessional in a public header.
  • API/JSStringRef.cpp: Moved CF related implementations to JSStringRefCF.cpp. (JSStringCreateWithUTF8CString): Replaced FIXME with Radar number.
  • API/JSStringRef.h: Moved CF related declarations to JSStringRefCF.h. Added #include of JSStringRefCF.h as a stopgap until clients start #including it as needed by themselves.
  • API/JSStringRefCF.cpp: Added. (JSStringCreateWithCFString): (JSStringCopyCFString): Replaced JSChar cast with UniChar cast, which is more appropriate for a CF call.
  • API/JSStringRefCF.h: Added.
  • JavaScriptCore.xcodeproj/project.pbxproj:
File size: 2.4 KB
Line 
1// -*- mode: c++; c-basic-offset: 4 -*-
2/*
3 * Copyright (C) 2006, 2007 Apple Computer, Inc. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include "config.h"
28#include "JSStringRefCF.h"
29
30#include "APICast.h"
31#include "JSStringRef.h"
32#include <kjs/JSLock.h>
33#include <kjs/ustring.h>
34#include <kjs/value.h>
35
36using namespace KJS;
37
38JSStringRef JSStringCreateWithCFString(CFStringRef string)
39{
40 JSLock lock;
41 CFIndex length = CFStringGetLength(string);
42
43 // Optimized path for when CFString backing store is a UTF16 buffer
44 if (const UniChar* buffer = CFStringGetCharactersPtr(string)) {
45 UString::Rep* rep = UString(reinterpret_cast<const UChar*>(buffer), length).rep()->ref();
46 return toRef(rep);
47 }
48
49 UniChar* buffer = static_cast<UniChar*>(fastMalloc(sizeof(UniChar) * length));
50 CFStringGetCharacters(string, CFRangeMake(0, length), buffer);
51 UString::Rep* rep = UString(reinterpret_cast<UChar*>(buffer), length, false).rep()->ref();
52 return toRef(rep);
53}
54
55CFStringRef JSStringCopyCFString(CFAllocatorRef alloc, JSStringRef string)
56{
57 UString::Rep* rep = toJS(string);
58 return CFStringCreateWithCharacters(alloc, reinterpret_cast<const UniChar*>(rep->data()), rep->size());
59}
Note: See TracBrowser for help on using the repository browser.