source: webkit/trunk/JavaScriptCore/runtime/UStringImpl.cpp@ 53392

Last change on this file since 53392 was 53392, checked in by [email protected], 15 years ago

https://bugs.webkit.org/show_bug.cgi?id=33731
Remove UntypedPtrAndBitfield from UStringImpl (akin to PtrAndFlags).

Reviewed by Oliver Hunt.

This break the OS X Leaks tool. Instead, free up some more bits from the refCount.

  • runtime/UStringImpl.cpp:

(JSC::UStringImpl::sharedBuffer):
(JSC::UStringImpl::~UStringImpl):

  • runtime/UStringImpl.h:

(JSC::UStringImpl::cost):
(JSC::UStringImpl::checkConsistency):
(JSC::UStringImpl::UStringImpl):
(JSC::UStringImpl::bufferOwnerString):
(JSC::UStringImpl::):

  • wtf/StringHashFunctions.h:

(WTF::stringHash):

File size: 2.5 KB
Line 
1/*
2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include "config.h"
27#include "UStringImpl.h"
28
29#include "Identifier.h"
30#include "UString.h"
31#include <wtf/unicode/UTF8.h>
32
33using namespace WTF::Unicode;
34using namespace std;
35
36namespace JSC {
37
38SharedUChar* UStringImpl::sharedBuffer()
39{
40 if (m_length < s_minLengthToShare || isStatic())
41 return 0;
42
43 switch (bufferOwnership()) {
44 case BufferInternal:
45 return 0;
46 case BufferOwned:
47 m_bufferShared = SharedUChar::create(new OwnFastMallocPtr<UChar>(m_data)).releaseRef();
48 m_refCountAndFlags &= ~s_refCountMaskBufferOwnership;
49 m_refCountAndFlags |= BufferShared;
50 return m_bufferShared;
51 case BufferSubstring:
52 return m_bufferSubstring->sharedBuffer();
53 case BufferShared:
54 return m_bufferShared;
55 }
56
57 ASSERT_NOT_REACHED();
58 return 0;
59}
60
61UStringImpl::~UStringImpl()
62{
63 ASSERT(!isStatic());
64
65 if (isIdentifier())
66 Identifier::remove(this);
67
68 switch (bufferOwnership()) {
69 case BufferInternal:
70 return;
71 case BufferOwned:
72 fastFree(m_data);
73 return;
74 case BufferSubstring:
75 m_bufferSubstring->deref();
76 return;
77 case BufferShared:
78 m_bufferSubstring->deref();
79 }
80}
81
82} // namespace JSC
Note: See TracBrowser for help on using the repository browser.