Changeset 10634 in webkit for trunk/JavaScriptCore/kjs


Ignore:
Timestamp:
Sep 27, 2005, 3:37:33 PM (20 years ago)
Author:
mjs
Message:

JavaScriptCore:

Reviewed by John.

I also moved SharedPtr and the assertion code from WebCore into a
new kxmlcore directory.

  • JavaScriptCore.xcodeproj/project.pbxproj:
  • kjs/collector.cpp: (KJS::Collector::allocate): (KJS::Collector::collect):
  • kjs/config.h:
  • kjs/fast_malloc.cpp: Removed.
  • kjs/fast_malloc.h: Removed.
  • kjs/function.cpp:
  • kjs/function.h:
  • kjs/function_object.cpp:
  • kjs/identifier.cpp: (KJS::Identifier::add):
  • kjs/internal.cpp:
  • kjs/internal.h:
  • kjs/nodes.h:
  • kjs/nodes2string.cpp:
  • kjs/property_map.cpp: (KJS::PropertyMap::~PropertyMap): (KJS::PropertyMap::rehash):
  • kjs/scope_chain.h:
  • kjs/shared_ptr.h: Removed.
  • kjs/string_object.cpp: (StringObjectFuncImp::callAsFunction):
  • kjs/ustring.cpp: (KJS::UString::Rep::createCopying): (KJS::UString::Rep::destroy): (KJS::UString::expandCapacity): (KJS::UString::expandPreCapacity): (KJS::UString::UString): (KJS::UString::spliceSubstringsWithSeparators): (KJS::UString::append): (KJS::UString::operator=): (KJS::UString::detach):
  • kjs/ustring.h:
  • kxmlcore/Assertions.h: Added.
  • kxmlcore/Assertions.mm: Added.
  • kxmlcore/FastMalloc.cpp: Added. (KXMLCore::LgFloor): (KXMLCore::SizeClass): (KXMLCore::ByteSizeForClass): (KXMLCore::InitSizeClasses): (KXMLCore::MetaDataAlloc): (KXMLCore::PageHeapAllocator::Init): (KXMLCore::PageHeapAllocator::New): (KXMLCore::PageHeapAllocator::Delete): (KXMLCore::PageHeapAllocator::inuse): (KXMLCore::pages): (KXMLCore::AllocationSize): (KXMLCore::Event): (KXMLCore::NewSpan): (KXMLCore::DeleteSpan): (KXMLCore::DLL_Init): (KXMLCore::DLL_Remove): (KXMLCore::DLL_IsEmpty): (KXMLCore::DLL_Length): (KXMLCore::DLL_Print): (KXMLCore::DLL_Prepend): (KXMLCore::DLL_InsertOrdered): (KXMLCore::): (KXMLCore::TCMalloc_PageHeap::GetDescriptor): (KXMLCore::TCMalloc_PageHeap::SystemBytes): (KXMLCore::TCMalloc_PageHeap::FreeBytes): (KXMLCore::TCMalloc_PageHeap::RecordSpan): (KXMLCore::TCMalloc_PageHeap::TCMalloc_PageHeap): (KXMLCore::TCMalloc_PageHeap::New): (KXMLCore::TCMalloc_PageHeap::Split): (KXMLCore::TCMalloc_PageHeap::Carve): (KXMLCore::TCMalloc_PageHeap::Delete): (KXMLCore::TCMalloc_PageHeap::RegisterSizeClass): (KXMLCore::TCMalloc_PageHeap::Dump): (KXMLCore::TCMalloc_PageHeap::GrowHeap): (KXMLCore::TCMalloc_PageHeap::Check): (KXMLCore::TCMalloc_PageHeap::CheckList): (KXMLCore::TCMalloc_ThreadCache_FreeList::Init): (KXMLCore::TCMalloc_ThreadCache_FreeList::length): (KXMLCore::TCMalloc_ThreadCache_FreeList::empty): (KXMLCore::TCMalloc_ThreadCache_FreeList::lowwatermark): (KXMLCore::TCMalloc_ThreadCache_FreeList::clear_lowwatermark): (KXMLCore::TCMalloc_ThreadCache_FreeList::Push): (KXMLCore::TCMalloc_ThreadCache_FreeList::Pop): (KXMLCore::TCMalloc_ThreadCache::freelist_length): (KXMLCore::TCMalloc_ThreadCache::Size): (KXMLCore::TCMalloc_Central_FreeList::length): (KXMLCore::TCMalloc_Central_FreeList::Init): (KXMLCore::TCMalloc_Central_FreeList::Insert): (KXMLCore::TCMalloc_Central_FreeList::Remove): (KXMLCore::TCMalloc_Central_FreeList::Populate): (KXMLCore::TCMalloc_ThreadCache::SampleAllocation): (KXMLCore::TCMalloc_ThreadCache::Init): (KXMLCore::TCMalloc_ThreadCache::Cleanup): (KXMLCore::TCMalloc_ThreadCache::Allocate): (KXMLCore::TCMalloc_ThreadCache::Deallocate): (KXMLCore::TCMalloc_ThreadCache::FetchFromCentralCache): (KXMLCore::TCMalloc_ThreadCache::ReleaseToCentralCache): (KXMLCore::TCMalloc_ThreadCache::Scavenge): (KXMLCore::TCMalloc_ThreadCache::GetCache): (KXMLCore::TCMalloc_ThreadCache::GetCacheIfPresent): (KXMLCore::TCMalloc_ThreadCache::PickNextSample): (KXMLCore::TCMalloc_ThreadCache::InitModule): (KXMLCore::TCMalloc_ThreadCache::InitTSD): (KXMLCore::TCMalloc_ThreadCache::CreateCacheIfNecessary): (KXMLCore::TCMalloc_ThreadCache::DeleteCache): (KXMLCore::TCMalloc_ThreadCache::RecomputeThreadCacheSize): (KXMLCore::TCMalloc_ThreadCache::Print): (KXMLCore::ExtractStats): (KXMLCore::DumpStats): (KXMLCore::PrintStats): (KXMLCore::DumpStackTraces): (KXMLCore::TCMallocImplementation::GetStats): (KXMLCore::TCMallocImplementation::ReadStackTraces): (KXMLCore::TCMallocImplementation::GetNumericProperty): (KXMLCore::TCMallocImplementation::SetNumericProperty): (KXMLCore::DoSampledAllocation): (KXMLCore::do_malloc): (KXMLCore::do_free): (KXMLCore::do_memalign): (KXMLCore::TCMallocGuard::TCMallocGuard): (KXMLCore::TCMallocGuard::~TCMallocGuard): (KXMLCore::malloc): (KXMLCore::free): (KXMLCore::calloc): (KXMLCore::cfree): (KXMLCore::realloc): (KXMLCore::memalign): (KXMLCore::posix_memalign): (KXMLCore::valloc): (KXMLCore::pvalloc): (KXMLCore::malloc_stats): (KXMLCore::mallopt): (KXMLCore::mallinfo):
  • kxmlcore/FastMalloc.h: Added. (KXMLCore::FastAllocated::operator new): (KXMLCore::FastAllocated::operator delete): (KXMLCore::FastAllocated::operator new[]): (KXMLCore::FastAllocated::operator delete[]):
  • kxmlcore/SharedPtr.h: Added. (KXMLCore::SharedPtr::SharedPtr): (KXMLCore::SharedPtr::~SharedPtr): (KXMLCore::SharedPtr::isNull): (KXMLCore::SharedPtr::notNull): (KXMLCore::SharedPtr::reset): (KXMLCore::SharedPtr::get): (KXMLCore::SharedPtr::operator*): (KXMLCore::SharedPtr::operator->): (KXMLCore::SharedPtr::operator!): (KXMLCore::SharedPtr::operator bool): (KXMLCore::::operator): (KXMLCore::operator==): (KXMLCore::operator!=): (KXMLCore::static_pointer_cast): (KXMLCore::const_pointer_cast):
  • kxmlcore/TCPageMap.h: Added. (TCMalloc_PageMap1::TCMalloc_PageMap1): (TCMalloc_PageMap1::Ensure): (TCMalloc_PageMap1::get): (TCMalloc_PageMap1::set): (TCMalloc_PageMap2::TCMalloc_PageMap2): (TCMalloc_PageMap2::get): (TCMalloc_PageMap2::set): (TCMalloc_PageMap2::Ensure): (TCMalloc_PageMap3::NewNode): (TCMalloc_PageMap3::TCMalloc_PageMap3): (TCMalloc_PageMap3::get): (TCMalloc_PageMap3::set): (TCMalloc_PageMap3::Ensure):
  • kxmlcore/TCSpinLock.h: Added. (TCMalloc_SpinLock::Init): (TCMalloc_SpinLock::Finalize): (TCMalloc_SpinLock::Lock): (TCMalloc_SpinLock::Unlock): (TCMalloc_SlowLock): (TCMalloc_SpinLockHolder::TCMalloc_SpinLockHolder): (TCMalloc_SpinLockHolder::~TCMalloc_SpinLockHolder):
  • kxmlcore/TCSystemAlloc.cpp: Added. (TrySbrk): (TryMmap): (TryDevMem): (TCMalloc_SystemAlloc):
  • kxmlcore/TCSystemAlloc.h: Added.

WebCore:

Reviewed by John.

I also moved SharedPtr and the assertion code from WebCore into a
new kxmlcore directory.

  • ForwardingHeaders/kjs/shared_ptr.h: Removed.
  • ForwardingHeaders/kxmlcore/Assertions.h: Added.
  • ForwardingHeaders/kxmlcore/FastMalloc.h: Added.
  • ForwardingHeaders/kxmlcore/SharedPtr.h: Added.
  • ForwardingHeaders/misc/main_thread_malloc.h: Removed.
  • WebCore.xcodeproj/project.pbxproj:
  • khtml/css/css_base.h:
  • khtml/css/css_computedstyle.cpp:
  • khtml/css/css_ruleimpl.h:
  • khtml/css/css_valueimpl.h:
  • khtml/css/cssstyleselector.h:
  • khtml/ecma/domparser.h:
  • khtml/ecma/kjs_css.h:
  • khtml/ecma/kjs_dom.cpp:
  • khtml/ecma/kjs_dom.h:
  • khtml/ecma/kjs_events.h:
  • khtml/ecma/kjs_html.cpp:
  • khtml/ecma/kjs_html.h:
  • khtml/ecma/kjs_range.h:
  • khtml/ecma/kjs_traversal.h:
  • khtml/ecma/kjs_views.cpp:
  • khtml/ecma/kjs_views.h:
  • khtml/ecma/kjs_window.cpp:
  • khtml/ecma/xmlhttprequest.h:
  • khtml/editing/SelectionController.cpp:
  • khtml/editing/append_node_command.cpp:
  • khtml/editing/apply_style_command.cpp:
  • khtml/editing/break_blockquote_command.cpp:
  • khtml/editing/composite_edit_command.cpp:
  • khtml/editing/delete_from_text_node_command.cpp:
  • khtml/editing/delete_selection_command.cpp:
  • khtml/editing/edit_command.cpp:
  • khtml/editing/htmlediting.cpp:
  • khtml/editing/insert_into_text_node_command.cpp:
  • khtml/editing/insert_line_break_command.cpp:
  • khtml/editing/insert_node_before_command.cpp:
  • khtml/editing/insert_paragraph_separator_command.cpp:
  • khtml/editing/insert_text_command.cpp:
  • khtml/editing/join_text_nodes_command.cpp:
  • khtml/editing/markup.cpp:
  • khtml/editing/merge_identical_elements_command.cpp:
  • khtml/editing/move_selection_command.cpp:
  • khtml/editing/rebalance_whitespace_command.cpp:
  • khtml/editing/remove_css_property_command.cpp:
  • khtml/editing/remove_node_attribute_command.cpp:
  • khtml/editing/remove_node_command.cpp:
  • khtml/editing/remove_node_preserving_children_command.cpp:
  • khtml/editing/replace_selection_command.cpp:
  • khtml/editing/set_node_attribute_command.cpp:
  • khtml/editing/split_element_command.cpp:
  • khtml/editing/split_text_node_command.cpp:
  • khtml/editing/split_text_node_containing_element.cpp:
  • khtml/editing/typing_command.cpp:
  • khtml/editing/visible_position.cpp:
  • khtml/editing/visible_position.h:
  • khtml/editing/wrap_contents_in_dummy_span_command.cpp:
  • khtml/html/html_imageimpl.h:
  • khtml/html/html_tableimpl.h:
  • khtml/html/htmlparser.cpp:
  • khtml/khtmlpart_p.h:
  • khtml/misc/arena.cpp: (ArenaAllocate): (FreeArenaList): (ArenaFinish):
  • khtml/misc/hashtable.h: (khtml::HashTable::~HashTable): (khtml::::allocateTable): (khtml::::rehash): (khtml::::clear): (khtml::::HashTable):
  • khtml/misc/loader.cpp:
  • khtml/misc/main_thread_malloc.cpp: Removed.
  • khtml/misc/main_thread_malloc.h: Removed.
  • khtml/misc/shared.h:
  • khtml/rendering/render_style.h:
  • khtml/xml/dom2_eventsimpl.h:
  • khtml/xml/dom2_rangeimpl.h:
  • khtml/xml/dom2_traversalimpl.h:
  • khtml/xml/dom2_viewsimpl.h:
  • khtml/xml/dom_docimpl.h:
  • khtml/xml/dom_elementimpl.cpp: (NamedAttrMapImpl::clearAttributes): (NamedAttrMapImpl::operator=): (NamedAttrMapImpl::addAttribute): (NamedAttrMapImpl::removeAttribute):
  • khtml/xml/dom_elementimpl.h:
  • khtml/xml/dom_nodeimpl.cpp:
  • khtml/xml/dom_nodeimpl.h:
  • khtml/xml/dom_position.cpp:
  • khtml/xml/dom_stringimpl.h:
  • kwq/DOM-CSS.mm:
  • kwq/DOM.mm:
  • kwq/DOMEvents.mm:
  • kwq/DOMHTML.mm:
  • kwq/DOMInternal.mm:
  • kwq/DOMViews.mm:
  • kwq/KWQAccObject.mm:
  • kwq/KWQAccObjectCache.mm:
  • kwq/KWQArrayImpl.h:
  • kwq/KWQArrayImpl.mm: (KWQArrayImpl::KWQArrayPrivate::KWQArrayPrivate): (KWQArrayImpl::KWQArrayPrivate::~KWQArrayPrivate): (KWQArrayImpl::resize):
  • kwq/KWQAssertions.h: Removed.
  • kwq/KWQAssertions.m: Removed.
  • kwq/KWQButton.mm:
  • kwq/KWQCString.mm:
  • kwq/KWQClipboard.h:
  • kwq/KWQClipboard.mm:
  • kwq/KWQColor.mm:
  • kwq/KWQComboBox.mm:
  • kwq/KWQEditCommand.mm:
  • kwq/KWQExceptions.h:
  • kwq/KWQFileButton.mm:
  • kwq/KWQFontFamily.h:
  • kwq/KWQFormData.mm:
  • kwq/KWQKHTMLPart.h:
  • kwq/KWQKHTMLPart.mm:
  • kwq/KWQKPartsBrowserInterface.mm:
  • kwq/KWQKURL.mm:
  • kwq/KWQListBox.mm:
  • kwq/KWQListImpl.mm:
  • kwq/KWQLogging.h:
  • kwq/KWQLogging.m:
  • kwq/KWQMapImpl.h:
  • kwq/KWQMapImpl.mm:
  • kwq/KWQObject.mm:
  • kwq/KWQPageState.mm:
  • kwq/KWQPainter.mm:
  • kwq/KWQResourceLoader.mm:
  • kwq/KWQSignal.mm:
  • kwq/KWQSlot.mm:
  • kwq/KWQString.h:
  • kwq/KWQString.mm: (ALLOC_QCHAR): (QString::setBufferFromCFString): (allocatePageNode):
  • kwq/KWQTextArea.mm:
  • kwq/KWQTextCodec.mm:
  • kwq/KWQTextEdit.mm:
  • kwq/KWQTextField.mm:
  • kwq/KWQTimer.mm:
  • kwq/KWQValueListImpl.h:
  • kwq/KWQValueListImpl.mm:
  • kwq/WebCoreBridge.mm:
  • kwq/WebCoreCookieAdapter.m:
  • kwq/WebCoreGraphicsBridge.m:
  • kwq/WebCoreImageRendererFactory.m:
  • kwq/WebCoreKeyGenerator.m:
  • kwq/WebCoreTextRendererFactory.mm:
  • kwq/WebCoreViewFactory.m:
Location:
trunk/JavaScriptCore/kjs
Files:
3 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/kjs/collector.cpp

    r10457 r10634  
    2222#include "collector.h"
    2323
    24 #include "fast_malloc.h"
     24#include <kxmlcore/FastMalloc.h>
    2525#include "internal.h"
    2626#include "list.h"
    … …  
    119119      numOversizeCells = max(MIN_ARRAY_SIZE, numOversizeCells * GROWTH_FACTOR);
    120120      heap.numOversizeCells = numOversizeCells;
    121       heap.oversizeCells = static_cast<CollectorCell **>(kjs_fast_realloc(heap.oversizeCells, numOversizeCells * sizeof(CollectorCell *)));
     121      heap.oversizeCells = static_cast<CollectorCell **>(fastRealloc(heap.oversizeCells, numOversizeCells * sizeof(CollectorCell *)));
    122122    }
    123123   
    124     void *newCell = kjs_fast_malloc(s);
     124    void *newCell = fastMalloc(s);
    125125    heap.oversizeCells[usedOversizeCells] = static_cast<CollectorCell *>(newCell);
    126126    heap.usedOversizeCells = usedOversizeCells + 1;
    … …  
    157157      numBlocks = max(MIN_ARRAY_SIZE, numBlocks * GROWTH_FACTOR);
    158158      heap.numBlocks = numBlocks;
    159       heap.blocks = static_cast<CollectorBlock **>(kjs_fast_realloc(heap.blocks, numBlocks * sizeof(CollectorBlock *)));
    160     }
    161 
    162     targetBlock = static_cast<CollectorBlock *>(kjs_fast_calloc(1, sizeof(CollectorBlock)));
     159      heap.blocks = static_cast<CollectorBlock **>(fastRealloc(heap.blocks, numBlocks * sizeof(CollectorBlock *)));
     160    }
     161
     162    targetBlock = static_cast<CollectorBlock *>(fastCalloc(1, sizeof(CollectorBlock)));
    163163    targetBlock->freeList = targetBlock->cells;
    164164    targetBlockUsedCells = 0;
    … …  
    455455      if (emptyBlocks > SPARE_EMPTY_BLOCKS) {
    456456#if !DEBUG_COLLECTOR
    457         kjs_fast_free(curBlock);
     457        fastFree(curBlock);
    458458#endif
    459459        // swap with the last block so we compact as we go
    … …  
    464464        if (heap.numBlocks > MIN_ARRAY_SIZE && heap.usedBlocks < heap.numBlocks / LOW_WATER_FACTOR) {
    465465          heap.numBlocks = heap.numBlocks / GROWTH_FACTOR;
    466           heap.blocks = (CollectorBlock **)kjs_fast_realloc(heap.blocks, heap.numBlocks * sizeof(CollectorBlock *));
     466          heap.blocks = (CollectorBlock **)fastRealloc(heap.blocks, heap.numBlocks * sizeof(CollectorBlock *));
    467467        }
    468468      }
    … …  
    482482      heap.oversizeCells[cell]->u.freeCell.zeroIfFree = 0;
    483483#else
    484       kjs_fast_free(imp);
     484      fastFree(imp);
    485485#endif
    486486
    … …  
    493493      if (heap.numOversizeCells > MIN_ARRAY_SIZE && heap.usedOversizeCells < heap.numOversizeCells / LOW_WATER_FACTOR) {
    494494        heap.numOversizeCells = heap.numOversizeCells / GROWTH_FACTOR;
    495         heap.oversizeCells = (CollectorCell **)kjs_fast_realloc(heap.oversizeCells, heap.numOversizeCells * sizeof(CollectorCell *));
     495        heap.oversizeCells = (CollectorCell **)fastRealloc(heap.oversizeCells, heap.numOversizeCells * sizeof(CollectorCell *));
    496496      }
    497497    } else {

  • trunk/JavaScriptCore/kjs/config.h

    r10456 r10634  
    2020#define HAVE_PCREPOSIX 1
    2121#define HAVE_STRING_H 1
     22#define HAVE_STDINT_H 1
     23
     24#define HAVE_MMAP 1
     25#define HAVE_SBRK 1
    2226
    2327#ifdef __ppc__
    … …  
    2731/* define to debug garbage collection */
    2832#undef DEBUG_COLLECTOR
     33
     34#define KXC_CHANGES 1

  • trunk/JavaScriptCore/kjs/function.cpp

    r10457 r10634  
    3232#include "debugger.h"
    3333#include "context.h"
    34 #include "shared_ptr.h"
    3534
    3635#include <stdio.h>
    … …  
    4241
    4342#include <unicode/uchar.h>
    44 
    45 using namespace KXMLCore;
    4643
    4744namespace KJS {

  • trunk/JavaScriptCore/kjs/function.h

    r10456 r10634  
    8282    virtual Completion execute(ExecState *exec);
    8383    CodeType codeType() const { return FunctionCode; }
    84     KXMLCore::SharedPtr<FunctionBodyNode> body;
     84    SharedPtr<FunctionBodyNode> body;
    8585
    8686    virtual const ClassInfo *classInfo() const { return &info; }

  • trunk/JavaScriptCore/kjs/function_object.cpp

    r10399 r10634  
    3535
    3636using namespace KJS;
    37 using namespace KXMLCore;
    3837
    3938// ------------------------------ FunctionPrototypeImp -------------------------

  • trunk/JavaScriptCore/kjs/identifier.cpp

    r10465 r10634  
    3636#include "identifier.h"
    3737
    38 #include "fast_malloc.h"
     38#include <kxmlcore/FastMalloc.h>
    3939#include <string.h> // for strlen
    4040#include <new> // for placement new
    … …  
    127127    }
    128128   
    129     UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * length));
     129    UChar *d = static_cast<UChar *>(fastMalloc(sizeof(UChar) * length));
    130130    for (int j = 0; j != length; j++)
    131131        d[j] = c[j];
    … …  
    166166    }
    167167   
    168     UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * length));
     168    UChar *d = static_cast<UChar *>(fastMalloc(sizeof(UChar) * length));
    169169    for (int j = 0; j != length; j++)
    170170        d[j] = s[j];

  • trunk/JavaScriptCore/kjs/internal.cpp

    r10586 r10634  
    5252
    5353extern int kjsyyparse();
    54 
    55 using namespace KXMLCore;
    5654
    5755namespace KJS {

  • trunk/JavaScriptCore/kjs/internal.h

    r10563 r10634  
    3333#include "interpreter.h"
    3434#include "scope_chain.h"
    35 #include "shared_ptr.h"
     35#include <kxmlcore/SharedPtr.h>
    3636
    3737#if !WIN32
    … …  
    203203  class Parser {
    204204  public:
    205     static KXMLCore::SharedPtr<ProgramNode> parse(const UString &sourceURL, int startingLineNumber,
    206                                                   const UChar *code, unsigned int length, int *sourceId = 0,
    207                                                   int *errLine = 0, UString *errMsg = 0);
     205    static SharedPtr<ProgramNode> parse(const UString &sourceURL, int startingLineNumber,
     206                                        const UChar *code, unsigned int length, int *sourceId = 0,
     207                                        int *errLine = 0, UString *errMsg = 0);
    208208    static void accept(ProgramNode *prog);
    209209

  • trunk/JavaScriptCore/kjs/nodes.h

    r10621 r10634  
    2626#define _NODES_H_
    2727
    28 #include "fast_malloc.h"
    29 #include "shared_ptr.h"
     28#include <kxmlcore/FastMalloc.h>
     29#include <kxmlcore/SharedPtr.h>
    3030
    3131#include "internal.h"
    … …  
    7878  };
    7979
    80   class Node {
     80  class Node : public FastAllocated {
    8181  public:
    8282    Node();
    8383    virtual ~Node();
    84 
    85     KJS_FAST_ALLOCATED;
    8684
    8785    virtual ValueImp *evaluate(ExecState *exec) = 0;
    … …  
    226224       
    227225  private:
    228     KXMLCore::SharedPtr<Node> group;
     226    SharedPtr<Node> group;
    229227  };
    230228
    … …  
    239237  private:
    240238    friend class ArrayNode;
    241     KXMLCore::SharedPtr<ElementNode> list;
     239    SharedPtr<ElementNode> list;
    242240    int elision;
    243     KXMLCore::SharedPtr<Node> node;
     241    SharedPtr<Node> node;
    244242  };
    245243
    … …  
    254252    virtual void streamTo(SourceStream &s) const;
    255253  private:
    256     KXMLCore::SharedPtr<ElementNode> element;
     254    SharedPtr<ElementNode> element;
    257255    int elision;
    258256    bool opt;
    … …  
    270268  private:
    271269    friend class ObjectLiteralNode;
    272     KXMLCore::SharedPtr<PropertyNode> name;
    273     KXMLCore::SharedPtr<Node> assign;
    274     KXMLCore::SharedPtr<PropertyValueNode> list;
     270    SharedPtr<PropertyNode> name;
     271    SharedPtr<Node> assign;
     272    SharedPtr<PropertyValueNode> list;
    275273  };
    276274
    … …  
    282280    virtual void streamTo(SourceStream &s) const;
    283281  private:
    284     KXMLCore::SharedPtr<PropertyValueNode> list;
     282    SharedPtr<PropertyValueNode> list;
    285283  };
    286284
    … …  
    308306
    309307  private:
    310     KXMLCore::SharedPtr<Node> expr1;
    311     KXMLCore::SharedPtr<Node> expr2;
     308    SharedPtr<Node> expr1;
     309    SharedPtr<Node> expr2;
    312310  };
    313311
    … …  
    324322
    325323  private:
    326     KXMLCore::SharedPtr<Node> expr;
     324    SharedPtr<Node> expr;
    327325    Identifier ident;
    328326  };
    … …  
    339337  private:
    340338    friend class ArgumentsNode;
    341     KXMLCore::SharedPtr<ArgumentListNode> list;
    342     KXMLCore::SharedPtr<Node> expr;
     339    SharedPtr<ArgumentListNode> list;
     340    SharedPtr<Node> expr;
    343341  };
    344342
    … …  
    352350    virtual void streamTo(SourceStream &s) const;
    353351  private:
    354     KXMLCore::SharedPtr<ArgumentListNode> list;
     352    SharedPtr<ArgumentListNode> list;
    355353  };
    356354
    … …  
    362360    virtual void streamTo(SourceStream &s) const;
    363361  private:
    364     KXMLCore::SharedPtr<Node> expr;
    365     KXMLCore::SharedPtr<ArgumentsNode> args;
     362    SharedPtr<Node> expr;
     363    SharedPtr<ArgumentsNode> args;
    366364  };
    367365
    … …  
    372370    virtual void streamTo(SourceStream &s) const;
    373371  private:
    374     KXMLCore::SharedPtr<Node> expr;
    375     KXMLCore::SharedPtr<ArgumentsNode> args;
     372    SharedPtr<Node> expr;
     373    SharedPtr<ArgumentsNode> args;
    376374  };
    377375
    … …  
    383381  private:
    384382    Identifier ident;
    385     KXMLCore::SharedPtr<ArgumentsNode> args;
     383    SharedPtr<ArgumentsNode> args;
    386384  };
    387385
    … …  
    392390    virtual void streamTo(SourceStream &s) const;
    393391  protected:
    394     KXMLCore::SharedPtr<Node> base;
    395     KXMLCore::SharedPtr<Node> subscript;
    396     KXMLCore::SharedPtr<ArgumentsNode> args;
     392    SharedPtr<Node> base;
     393    SharedPtr<Node> subscript;
     394    SharedPtr<ArgumentsNode> args;
    397395  };
    398396
    … …  
    409407    virtual void streamTo(SourceStream &s) const;
    410408  protected:
    411     KXMLCore::SharedPtr<Node> base;
     409    SharedPtr<Node> base;
    412410    Identifier ident;
    413     KXMLCore::SharedPtr<ArgumentsNode> args;
     411    SharedPtr<ArgumentsNode> args;
    414412  };
    415413
    … …  
    436434    virtual void streamTo(SourceStream &s) const;
    437435  private:
    438     KXMLCore::SharedPtr<Node> m_base;
    439     KXMLCore::SharedPtr<Node> m_subscript;
     436    SharedPtr<Node> m_base;
     437    SharedPtr<Node> m_subscript;
    440438    Operator m_oper;
    441439  };
    … …  
    447445    virtual void streamTo(SourceStream &s) const;
    448446  private:
    449     KXMLCore::SharedPtr<Node> m_base;
     447    SharedPtr<Node> m_base;
    450448    Identifier m_ident;
    451449    Operator m_oper;
    … …  
    467465    virtual void streamTo(SourceStream &s) const;
    468466  private:
    469     KXMLCore::SharedPtr<Node> m_base;
    470     KXMLCore::SharedPtr<Node> m_subscript;
     467    SharedPtr<Node> m_base;
     468    SharedPtr<Node> m_subscript;
    471469  };
    472470
    … …  
    477475    virtual void streamTo(SourceStream &s) const;
    478476  private:
    479     KXMLCore::SharedPtr<Node> m_base;
     477    SharedPtr<Node> m_base;
    480478    Identifier m_ident;
    481479  };
    … …  
    487485    virtual void streamTo(SourceStream &s) const;
    488486  private:
    489     KXMLCore::SharedPtr<Node> m_expr;
     487    SharedPtr<Node> m_expr;
    490488  };
    491489
    … …  
    496494    virtual void streamTo(SourceStream &s) const;
    497495  private:
    498     KXMLCore::SharedPtr<Node> expr;
     496    SharedPtr<Node> expr;
    499497  };
    500498
    … …  
    514512    virtual void streamTo(SourceStream &s) const;
    515513  private:
    516     KXMLCore::SharedPtr<Node> m_expr;
     514    SharedPtr<Node> m_expr;
    517515  };
    518516
    … …  
    533531    virtual void streamTo(SourceStream &s) const;
    534532  private:
    535     KXMLCore::SharedPtr<Node> m_base;
    536     KXMLCore::SharedPtr<Node> m_subscript;
     533    SharedPtr<Node> m_base;
     534    SharedPtr<Node> m_subscript;
    537535    Operator m_oper;
    538536  };
    … …  
    544542    virtual void streamTo(SourceStream &s) const;
    545543  private:
    546     KXMLCore::SharedPtr<Node> m_base;
     544    SharedPtr<Node> m_base;
    547545    Identifier m_ident;
    548546    Operator m_oper;
    … …  
    555553    virtual void streamTo(SourceStream &s) const;
    556554  private:
    557     KXMLCore::SharedPtr<Node> expr;
     555    SharedPtr<Node> expr;
    558556  };
    559557
    … …  
    564562    virtual void streamTo(SourceStream &s) const;
    565563  private:
    566     KXMLCore::SharedPtr<Node> expr;
     564    SharedPtr<Node> expr;
    567565  };
    568566
    … …  
    573571    virtual void streamTo(SourceStream &s) const;
    574572  private:
    575     KXMLCore::SharedPtr<Node> expr;
     573    SharedPtr<Node> expr;
    576574  };
    577575
    … …  
    582580    virtual void streamTo(SourceStream &s) const;
    583581  private:
    584     KXMLCore::SharedPtr<Node> expr;
     582    SharedPtr<Node> expr;
    585583  };
    586584
    … …  
    591589    virtual void streamTo(SourceStream &s) const;
    592590  private:
    593     KXMLCore::SharedPtr<Node> term1;
    594     KXMLCore::SharedPtr<Node> term2;
     591    SharedPtr<Node> term1;
     592    SharedPtr<Node> term2;
    595593    char oper;
    596594  };
    … …  
    602600    virtual void streamTo(SourceStream &s) const;
    603601  private:
    604     KXMLCore::SharedPtr<Node> term1;
    605     KXMLCore::SharedPtr<Node> term2;
     602    SharedPtr<Node> term1;
     603    SharedPtr<Node> term2;
    606604    char oper;
    607605  };
    … …  
    614612    virtual void streamTo(SourceStream &s) const;
    615613  private:
    616     KXMLCore::SharedPtr<Node> term1;
    617     KXMLCore::SharedPtr<Node> term2;
     614    SharedPtr<Node> term1;
     615    SharedPtr<Node> term2;
    618616    Operator oper;
    619617  };
    … …  
    626624    virtual void streamTo(SourceStream &s) const;
    627625  private:
    628     KXMLCore::SharedPtr<Node> expr1;
    629     KXMLCore::SharedPtr<Node> expr2;
     626    SharedPtr<Node> expr1;
     627    SharedPtr<Node> expr2;
    630628    Operator oper;
    631629  };
    … …  
    638636    virtual void streamTo(SourceStream &s) const;
    639637  private:
    640     KXMLCore::SharedPtr<Node> expr1;
    641     KXMLCore::SharedPtr<Node> expr2;
     638    SharedPtr<Node> expr1;
     639    SharedPtr<Node> expr2;
    642640    Operator oper;
    643641  };
    … …  
    650648    virtual void streamTo(SourceStream &s) const;
    651649  private:
    652     KXMLCore::SharedPtr<Node> expr1;
    653     KXMLCore::SharedPtr<Node> expr2;
     650    SharedPtr<Node> expr1;
     651    SharedPtr<Node> expr2;
    654652    Operator oper;
    655653  };
    … …  
    665663    virtual void streamTo(SourceStream &s) const;
    666664  private:
    667     KXMLCore::SharedPtr<Node> expr1;
    668     KXMLCore::SharedPtr<Node> expr2;
     665    SharedPtr<Node> expr1;
     666    SharedPtr<Node> expr2;
    669667    Operator oper;
    670668  };
    … …  
    680678    virtual void streamTo(SourceStream &s) const;
    681679  private:
    682     KXMLCore::SharedPtr<Node> logical;
    683     KXMLCore::SharedPtr<Node> expr1;
    684     KXMLCore::SharedPtr<Node> expr2;
     680    SharedPtr<Node> logical;
     681    SharedPtr<Node> expr1;
     682    SharedPtr<Node> expr2;
    685683  };
    686684
    … …  
    694692    Identifier m_ident;
    695693    Operator m_oper;
    696     KXMLCore::SharedPtr<Node> m_right;
     694    SharedPtr<Node> m_right;
    697695  };
    698696
    … …  
    704702    virtual void streamTo(SourceStream &s) const;
    705703  protected:
    706     KXMLCore::SharedPtr<Node> m_base;
    707     KXMLCore::SharedPtr<Node> m_subscript;
     704    SharedPtr<Node> m_base;
     705    SharedPtr<Node> m_subscript;
    708706    Operator m_oper;
    709     KXMLCore::SharedPtr<Node> m_right;
     707    SharedPtr<Node> m_right;
    710708  };
    711709
    … …  
    717715    virtual void streamTo(SourceStream &s) const;
    718716  protected:
    719     KXMLCore::SharedPtr<Node> m_base;
     717    SharedPtr<Node> m_base;
    720718    Identifier m_ident;
    721719    Operator m_oper;
    722     KXMLCore::SharedPtr<Node> m_right;
     720    SharedPtr<Node> m_right;
    723721  };
    724722
    … …  
    729727    virtual void streamTo(SourceStream &s) const;
    730728  private:
    731     KXMLCore::SharedPtr<Node> expr1;
    732     KXMLCore::SharedPtr<Node> expr2;
     729    SharedPtr<Node> expr1;
     730    SharedPtr<Node> expr2;
    733731  };
    734732
    … …  
    743741  private:
    744742    friend class CaseClauseNode;
    745     KXMLCore::SharedPtr<StatementNode> statement;
    746     KXMLCore::SharedPtr<StatListNode> list;
     743    SharedPtr<StatementNode> statement;
     744    SharedPtr<StatListNode> list;
    747745  };
    748746
    … …  
    753751    virtual void streamTo(SourceStream &s) const;
    754752  private:
    755     KXMLCore::SharedPtr<Node> expr;
     753    SharedPtr<Node> expr;
    756754  };
    757755
    … …  
    766764    Type varType;
    767765    Identifier ident;
    768     KXMLCore::SharedPtr<AssignExprNode> init;
     766    SharedPtr<AssignExprNode> init;
    769767  };
    770768
    … …  
    781779    friend class ForNode;
    782780    friend class VarStatementNode;
    783     KXMLCore::SharedPtr<VarDeclListNode> list;
    784     KXMLCore::SharedPtr<VarDeclNode> var;
     781    SharedPtr<VarDeclListNode> list;
     782    SharedPtr<VarDeclNode> var;
    785783  };
    786784
    … …  
    792790    virtual void streamTo(SourceStream &s) const;
    793791  private:
    794     KXMLCore::SharedPtr<VarDeclListNode> list;
     792    SharedPtr<VarDeclListNode> list;
    795793  };
    796794
    … …  
    802800    virtual void streamTo(SourceStream &s) const;
    803801  protected:
    804     KXMLCore::SharedPtr<SourceElementsNode> source;
     802    SharedPtr<SourceElementsNode> source;
    805803  };
    806804
    … …  
    818816    virtual void streamTo(SourceStream &s) const;
    819817  private:
    820     KXMLCore::SharedPtr<Node> expr;
     818    SharedPtr<Node> expr;
    821819  };
    822820
    … …  
    829827    virtual void streamTo(SourceStream &s) const;
    830828  private:
    831     KXMLCore::SharedPtr<Node> expr;
    832     KXMLCore::SharedPtr<StatementNode> statement1;
    833     KXMLCore::SharedPtr<StatementNode> statement2;
     829    SharedPtr<Node> expr;
     830    SharedPtr<StatementNode> statement1;
     831    SharedPtr<StatementNode> statement2;
    834832  };
    835833
    … …  
    841839    virtual void streamTo(SourceStream &s) const;
    842840  private:
    843     KXMLCore::SharedPtr<StatementNode> statement;
    844     KXMLCore::SharedPtr<Node> expr;
     841    SharedPtr<StatementNode> statement;
     842    SharedPtr<Node> expr;
    845843  };
    846844
    … …  
    852850    virtual void streamTo(SourceStream &s) const;
    853851  private:
    854     KXMLCore::SharedPtr<Node> expr;
    855     KXMLCore::SharedPtr<StatementNode> statement;
     852    SharedPtr<Node> expr;
     853    SharedPtr<StatementNode> statement;
    856854  };
    857855
    … …  
    866864    virtual void streamTo(SourceStream &s) const;
    867865  private:
    868     KXMLCore::SharedPtr<Node> expr1;
    869     KXMLCore::SharedPtr<Node> expr2;
    870     KXMLCore::SharedPtr<Node> expr3;
    871     KXMLCore::SharedPtr<StatementNode> statement;
     866    SharedPtr<Node> expr1;
     867    SharedPtr<Node> expr2;
     868    SharedPtr<Node> expr3;
     869    SharedPtr<StatementNode> statement;
    872870  };
    873871
    … …  
    881879  private:
    882880    Identifier ident;
    883     KXMLCore::SharedPtr<AssignExprNode> init;
    884     KXMLCore::SharedPtr<Node> lexpr;
    885     KXMLCore::SharedPtr<Node> expr;
    886     KXMLCore::SharedPtr<VarDeclNode> varDecl;
    887     KXMLCore::SharedPtr<StatementNode> statement;
     881    SharedPtr<AssignExprNode> init;
     882    SharedPtr<Node> lexpr;
     883    SharedPtr<Node> expr;
     884    SharedPtr<VarDeclNode> varDecl;
     885    SharedPtr<StatementNode> statement;
    888886  };
    889887
    … …  
    914912    virtual void streamTo(SourceStream &s) const;
    915913  private:
    916     KXMLCore::SharedPtr<Node> value;
     914    SharedPtr<Node> value;
    917915  };
    918916
    … …  
    924922    virtual void streamTo(SourceStream &s) const;
    925923  private:
    926     KXMLCore::SharedPtr<Node> expr;
    927     KXMLCore::SharedPtr<StatementNode> statement;
     924    SharedPtr<Node> expr;
     925    SharedPtr<StatementNode> statement;
    928926  };
    929927
    … …  
    938936    virtual void streamTo(SourceStream &s) const;
    939937  private:
    940     KXMLCore::SharedPtr<Node> expr;
    941     KXMLCore::SharedPtr<StatListNode> list;
     938    SharedPtr<Node> expr;
     939    SharedPtr<StatListNode> list;
    942940  };
    943941
    … …  
    955953  private:
    956954    friend class CaseBlockNode;
    957     KXMLCore::SharedPtr<CaseClauseNode> cl;
    958     KXMLCore::SharedPtr<ClauseListNode> nx;
     955    SharedPtr<CaseClauseNode> cl;
     956    SharedPtr<ClauseListNode> nx;
    959957  };
    960958
    … …  
    967965    virtual void streamTo(SourceStream &s) const;
    968966  private:
    969     KXMLCore::SharedPtr<ClauseListNode> list1;
    970     KXMLCore::SharedPtr<CaseClauseNode> def;
    971     KXMLCore::SharedPtr<ClauseListNode> list2;
     967    SharedPtr<ClauseListNode> list1;
     968    SharedPtr<CaseClauseNode> def;
     969    SharedPtr<ClauseListNode> list2;
    972970  };
    973971
    … …  
    979977    virtual void streamTo(SourceStream &s) const;
    980978  private:
    981     KXMLCore::SharedPtr<Node> expr;
    982     KXMLCore::SharedPtr<CaseBlockNode> block;
     979    SharedPtr<Node> expr;
     980    SharedPtr<CaseBlockNode> block;
    983981  };
    984982
    … …  
    991989  private:
    992990    Identifier label;
    993     KXMLCore::SharedPtr<StatementNode> statement;
     991    SharedPtr<StatementNode> statement;
    994992  };
    995993
    … …  
    1000998    virtual void streamTo(SourceStream &s) const;
    1001999  private:
    1002     KXMLCore::SharedPtr<Node> expr;
     1000    SharedPtr<Node> expr;
    10031001  };
    10041002
    … …  
    10121010  private:
    10131011    Identifier ident;
    1014     KXMLCore::SharedPtr<StatementNode> block;
     1012    SharedPtr<StatementNode> block;
    10151013  };
    10161014
    … …  
    10221020    virtual void streamTo(SourceStream &s) const;
    10231021  private:
    1024     KXMLCore::SharedPtr<StatementNode> block;
     1022    SharedPtr<StatementNode> block;
    10251023  };
    10261024
    … …  
    10371035    virtual void streamTo(SourceStream &s) const;
    10381036  private:
    1039     KXMLCore::SharedPtr<StatementNode> block;
    1040     KXMLCore::SharedPtr<CatchNode> _catch;
    1041     KXMLCore::SharedPtr<FinallyNode> _final;
     1037    SharedPtr<StatementNode> block;
     1038    SharedPtr<CatchNode> _catch;
     1039    SharedPtr<FinallyNode> _final;
    10421040  };
    10431041
    … …  
    10561054    friend class FuncExprNode;
    10571055    Identifier id;
    1058     KXMLCore::SharedPtr<ParameterNode> next;
     1056    SharedPtr<ParameterNode> next;
    10591057  };
    10601058
    … …  
    10791077
    10801078    Identifier ident;
    1081     KXMLCore::SharedPtr<ParameterNode> param;
    1082     KXMLCore::SharedPtr<FunctionBodyNode> body;
     1079    SharedPtr<ParameterNode> param;
     1080    SharedPtr<FunctionBodyNode> body;
    10831081  };
    10841082
    … …  
    10951093  private:
    10961094    Identifier ident;
    1097     KXMLCore::SharedPtr<ParameterNode> param;
    1098     KXMLCore::SharedPtr<FunctionBodyNode> body;
     1095    SharedPtr<ParameterNode> param;
     1096    SharedPtr<FunctionBodyNode> body;
    10991097  };
    11001098
    … …  
    11121110  private:
    11131111    friend class BlockNode;
    1114     KXMLCore::SharedPtr<StatementNode> element; // 'this' element
    1115     KXMLCore::SharedPtr<SourceElementsNode> elements; // pointer to next
     1112    SharedPtr<StatementNode> element; // 'this' element
     1113    SharedPtr<SourceElementsNode> elements; // pointer to next
    11161114  };
    11171115

  • trunk/JavaScriptCore/kjs/nodes2string.cpp

    r10621 r10634  
    2424#include "nodes.h"
    2525
    26 using KXMLCore::SharedPtr;
    27 
    2826namespace KJS {
    2927  /**

  • trunk/JavaScriptCore/kjs/property_map.cpp

    r10563 r10634  
    2222#include "property_map.h"
    2323
    24 #include "fast_malloc.h"
     24#include <kxmlcore/FastMalloc.h>
    2525#include "object.h"
    2626#include "protect.h"
    … …  
    123123            ++minimumKeysToProcess;
    124124    }
    125     kjs_fast_free(_table);
     125    fastFree(_table);
    126126}
    127127
    … …  
    425425    int oldTableKeyCount = oldTable ? oldTable->keyCount : 0;
    426426   
    427     _table = (Table *)kjs_fast_calloc(1, sizeof(Table) + (newTableSize - 1) * sizeof(Entry) );
     427    _table = (Table *)fastCalloc(1, sizeof(Table) + (newTableSize - 1) * sizeof(Entry) );
    428428    _table->size = newTableSize;
    429429    _table->sizeMask = newTableSize - 1;
    … …  
    459459    _table->lastIndexUsed = lastIndexUsed;
    460460
    461     kjs_fast_free(oldTable);
     461    fastFree(oldTable);
    462462
    463463    checkConsistency();

  • trunk/JavaScriptCore/kjs/scope_chain.h

    r10168 r10634  
    2323#define KJS_SCOPE_CHAIN_H
    2424
    25 #include "fast_malloc.h"
     25#include <kxmlcore/FastMalloc.h>
    2626
    2727namespace KJS {
    … …  
    2929    class ObjectImp;
    3030   
    31     class ScopeChainNode {
     31    class ScopeChainNode : public FastAllocated {
    3232    public:
    3333        ScopeChainNode(ScopeChainNode *n, ObjectImp *o)
    3434            : next(n), object(o), refCount(1) { }
    35 
    36         KJS_FAST_ALLOCATED;
    3735
    3836        ScopeChainNode *next;

  • trunk/JavaScriptCore/kjs/string_object.cpp

    r10563 r10634  
    766766  UString s;
    767767  if (args.size()) {
    768     UChar *buf = static_cast<UChar *>(kjs_fast_malloc(args.size() * sizeof(UChar)));
     768    UChar *buf = static_cast<UChar *>(fastMalloc(args.size() * sizeof(UChar)));
    769769    UChar *p = buf;
    770770    ListIterator it = args.begin();

  • trunk/JavaScriptCore/kjs/ustring.cpp

    r10556 r10634  
    3636#endif
    3737
    38 #include "fast_malloc.h"
    3938#include "ustring.h"
    4039#include "operations.h"
    … …  
    180179{
    181180  int sizeInBytes = l * sizeof(UChar);
    182   UChar *copyD = static_cast<UChar *>(kjs_fast_malloc(sizeInBytes));
     181  UChar *copyD = static_cast<UChar *>(fastMalloc(sizeInBytes));
    183182  memcpy(copyD, d, sizeInBytes);
    184183
    … …  
    239238    baseString->deref();
    240239  } else {
    241     kjs_fast_free(buf);
     240    fastFree(buf);
    242241  }
    243242  delete this;
    … …  
    361360  if (requiredLength > r->capacity) {
    362361    int newCapacity = expandedSize(requiredLength, r->preCapacity);
    363     r->buf = static_cast<UChar *>(kjs_fast_realloc(r->buf, newCapacity * sizeof(UChar)));
     362    r->buf = static_cast<UChar *>(fastRealloc(r->buf, newCapacity * sizeof(UChar)));
    364363    r->capacity = newCapacity - r->preCapacity;
    365364  }
    … …  
    377376    int delta = newCapacity - r->capacity - r->preCapacity;
    378377
    379     UChar *newBuf = static_cast<UChar *>(kjs_fast_malloc(newCapacity * sizeof(UChar)));
     378    UChar *newBuf = static_cast<UChar *>(fastMalloc(newCapacity * sizeof(UChar)));
    380379    memcpy(newBuf + delta, r->buf, (r->capacity + r->preCapacity) * sizeof(UChar));
    381     kjs_fast_free(r->buf);
     380    fastFree(r->buf);
    382381    r->buf = newBuf;
    383382
    … …  
    392391UString::UString(char c)
    393392{
    394     UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar)));
     393    UChar *d = static_cast<UChar *>(fastMalloc(sizeof(UChar)));
    395394    d[0] = c;
    396395    rep = Rep::create(d, 1);
    … …  
    408407    return;
    409408  }
    410   UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * length));
     409  UChar *d = static_cast<UChar *>(fastMalloc(sizeof(UChar) * length));
    411410  for (int i = 0; i < length; i++)
    412411    d[i].uc = c[i];
    … …  
    473472    // a does not qualify for append, and b does not qualify for prepend, gotta make a whole new string
    474473    int newCapacity = expandedSize(length, 0);
    475     UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * newCapacity));
     474    UChar *d = static_cast<UChar *>(fastMalloc(sizeof(UChar) * newCapacity));
    476475    memcpy(d, a.data(), aSize * sizeof(UChar));
    477476    memcpy(d + aSize, b.data(), bSize * sizeof(UChar));
    … …  
    644643  }
    645644
    646   UChar *buffer = static_cast<UChar *>(kjs_fast_malloc(totalLength * sizeof(UChar)));
     645  UChar *buffer = static_cast<UChar *>(fastMalloc(totalLength * sizeof(UChar)));
    647646
    648647  int maxCount = max(rangeCount, separatorCount);
    … …  
    697696    // this is shared with someone using more capacity, gotta make a whole new string
    698697    int newCapacity = expandedSize(length, 0);
    699     UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * newCapacity));
     698    UChar *d = static_cast<UChar *>(fastMalloc(sizeof(UChar) * newCapacity));
    700699    memcpy(d, data(), thisSize * sizeof(UChar));
    701700    memcpy(const_cast<UChar *>(d + thisSize), t.data(), tSize * sizeof(UChar));
    … …  
    741740    // this is shared with someone using more capacity, gotta make a whole new string
    742741    int newCapacity = expandedSize(length, 0);
    743     UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * newCapacity));
     742    UChar *d = static_cast<UChar *>(fastMalloc(sizeof(UChar) * newCapacity));
    744743    memcpy(d, data(), thisSize * sizeof(UChar));
    745744    for (int i = 0; i < tSize; ++i)
    … …  
    762761    // this is empty - must make a new rep because we don't want to pollute the shared empty one
    763762    int newCapacity = expandedSize(1, 0);
    764     UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * newCapacity));
     763    UChar *d = static_cast<UChar *>(fastMalloc(sizeof(UChar) * newCapacity));
    765764    d[0] = c;
    766765    release();
    … …  
    785784    // this is shared with someone using more capacity, gotta make a whole new string
    786785    int newCapacity = expandedSize((length + 1), 0);
    787     UChar *d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * newCapacity));
     786    UChar *d = static_cast<UChar *>(fastMalloc(sizeof(UChar) * newCapacity));
    788787    memcpy(d, data(), length * sizeof(UChar));
    789788    d[length] = c;
    … …  
    847846  } else {
    848847    release();
    849     d = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * l));
     848    d = static_cast<UChar *>(fastMalloc(sizeof(UChar) * l));
    850849    rep = Rep::create(d, l);
    851850  }
    … …  
    11531152  if (rep->rc > 1 || rep->baseString) {
    11541153    int l = size();
    1155     UChar *n = static_cast<UChar *>(kjs_fast_malloc(sizeof(UChar) * l));
     1154    UChar *n = static_cast<UChar *>(fastMalloc(sizeof(UChar) * l));
    11561155    memcpy(n, data(), l * sizeof(UChar));
    11571156    release();

  • trunk/JavaScriptCore/kjs/ustring.h

    r10556 r10634  
    2525#define _KJS_USTRING_H_
    2626
    27 #include "fast_malloc.h"
     27#include <kxmlcore/FastMalloc.h>
    2828
    2929#if APPLE_CHANGES
    … …  
    194194   * @short Unicode string class
    195195   */
    196   class UString {
     196  class UString : public FastAllocated {
    197197    friend bool operator==(const UString&, const UString&);
    198198    friend class UCharReference;
    … …  
    205205     */
    206206    struct Rep {
     207
     208      FAST_ALLOCATED_POD;
     209
    207210      static Rep *create(UChar *d, int l);
    208211      static Rep *createCopying(const UChar *d, int l);
    … …  
    217220      static unsigned computeHash(const char *);
    218221
    219       KJS_FAST_ALLOCATED;
    220 
    221222      void ref() { ++rc; }
    222223      void deref() { if (--rc == 0) destroy(); }
    … …  
    291292     */
    292293    ~UString() { release(); }
    293 
    294     KJS_FAST_ALLOCATED;
    295294
    296295    /**
Note: See TracChangeset for help on using the changeset viewer.