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

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

Rubber stamped by Sam Weinig & Darin Adler.

Three quick fixes to UStringImpl.

  • The destroy() method can be switched back to a normal destructor; since we've switched the way we protect static strings to be using an odd ref-count the destroy() won't abort.
  • The cost() calculation logic was wrong. If you have multiple JSStrings wrapping substrings of a base string, they would each report the full cost of the base string to the heap. Instead we should only be reporting once for the base string.
  • Remove the overloaded new operator calling fastMalloc, replace this with a 'using' to pick up the implementation from the parent class.

(JSC::UStringImpl::~UStringImpl):

  • runtime/UStringImpl.h:

(JSC::UStringImpl::cost):
(JSC::UStringImpl::deref):

File size: 2.7 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::baseSharedBuffer()
39{
40 ASSERT((bufferOwnership() == BufferShared)
41 || ((bufferOwnership() == BufferOwned) && !m_dataBuffer.asPtr<void*>()));
42
43 if (bufferOwnership() != BufferShared)
44 m_dataBuffer = UntypedPtrAndBitfield(SharedUChar::create(new OwnFastMallocPtr<UChar>(m_data)).releaseRef(), BufferShared);
45
46 return m_dataBuffer.asPtr<SharedUChar*>();
47}
48
49SharedUChar* UStringImpl::sharedBuffer()
50{
51 if (m_length < s_minLengthToShare)
52 return 0;
53 ASSERT(!isStatic());
54
55 UStringImpl* owner = bufferOwnerString();
56 if (owner->bufferOwnership() == BufferInternal)
57 return 0;
58
59 return owner->baseSharedBuffer();
60}
61
62UStringImpl::~UStringImpl()
63{
64 ASSERT(!isStatic());
65 checkConsistency();
66
67 if (isIdentifier())
68 Identifier::remove(this);
69
70 if (bufferOwnership() != BufferInternal) {
71 if (bufferOwnership() == BufferOwned)
72 fastFree(m_data);
73 else if (bufferOwnership() == BufferSubstring)
74 m_dataBuffer.asPtr<UStringImpl*>()->deref();
75 else {
76 ASSERT(bufferOwnership() == BufferShared);
77 m_dataBuffer.asPtr<SharedUChar*>()->deref();
78 }
79 }
80}
81
82}
Note: See TracBrowser for help on using the repository browser.