Changeset 65478 in webkit for trunk/JavaScriptCore/runtime/UString.h

Timestamp:

Aug 16, 2010, 7:13:02 PM (15 years ago)

Author:

[email protected]

Message:

Remove unnecessary includes from UString.h, add new includes as necessary.

Rubber stamped by Sam Weinig

JavaScriptCore:

• profiler/CallIdentifier.h:
• profiler/ProfileNode.h:
• runtime/DateConversion.cpp:
• runtime/Identifier.h:

(JSC::IdentifierRepHash::hash):

• runtime/RegExpCache.h:
• runtime/RegExpKey.h:
• runtime/UString.cpp:

(JSC::UString::substr):

• runtime/UString.h:
• wtf/text/WTFString.h:

WebCore:

• dom/ScriptExecutionContext.h:
• loader/appcache/ApplicationCache.cpp:

WebKit2:

• WebProcess/Plugins/Netscape/NetscapePlugin.h:

File:

• trunk/JavaScriptCore/runtime/UString.h (modified) (5 diffs)

trunk/JavaScriptCore/runtime/UString.h

@@ -1 +1 @@
 /*
- *  Copyright (C) 1999-2000 Harri Porten ([email protected])
- *  Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
- *  Copyright (C) 2009 Google Inc. All rights reserved.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999-2000 Harri Porten ([email protected])
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  */
@@ -24 +24 @@
 #define UString_h
 
-#include "Collector.h"
-#include <stdint.h>
-#include <string.h>
-#include <wtf/Assertions.h>
-#include <wtf/CrossThreadRefCounted.h>
-#include <wtf/OwnFastMallocPtr.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-#include <wtf/text/CString.h>
 #include <wtf/text/StringImpl.h>
-#include <wtf/unicode/Unicode.h>
 
 namespace JSC {
@@ -51 +40 @@
 
     // Construct a string with latin1 data.
+    UString(const char* characters, unsigned length);
+
+    // Construct a string with latin1 data, from a null-terminated source.
     UString(const char* characters);
-
-    // Construct a string with latin1 data, from a null-terminated source.
-    UString(const char* characters, unsigned length);
 
     // Construct a string referencing an existing StringImpl.
@@ -206 +195 @@
 }
 
-// We'd rather not do shared substring append for small strings, since
-// this runs too much risk of a tiny initial string holding down a
-// huge buffer.
-static const unsigned minShareSize = Heap::minExtraCost / sizeof(UChar);
-
-struct IdentifierRepHash : PtrHash<RefPtr<StringImpl> > {
-    static unsigned hash(const RefPtr<StringImpl>& key) { return key->existingHash(); }
-    static unsigned hash(StringImpl* key) { return key->existingHash(); }
-};
-
 } // namespace JSC
 
 namespace WTF {
-
-template<typename T> struct DefaultHash;
-template<typename T> struct StrHash;
-
-template<> struct StrHash<StringImpl*> {
-    static unsigned hash(const StringImpl* key) { return key->hash(); }
-    static bool equal(const StringImpl* a, const StringImpl* b) { return ::equal(a, b); }
-    static const bool safeToCompareToEmptyOrDeleted = false;
-};
-
-template<> struct StrHash<RefPtr<StringImpl> > : public StrHash<StringImpl*> {
-    using StrHash<StringImpl*>::hash;
-    static unsigned hash(const RefPtr<StringImpl>& key) { return key->hash(); }
-    using StrHash<StringImpl*>::equal;
-    static bool equal(const RefPtr<StringImpl>& a, const RefPtr<StringImpl>& b) { return ::equal(a.get(), b.get()); }
-    static bool equal(const StringImpl* a, const RefPtr<StringImpl>& b) { return ::equal(a, b.get()); }
-    static bool equal(const RefPtr<StringImpl>& a, const StringImpl* b) { return ::equal(a.get(), b); }
-
-    static const bool safeToCompareToEmptyOrDeleted = false;
-};
 
 template <> struct VectorTraits<JSC::UString> : SimpleClassVectorTraits
@@ -244 +203 @@
     static const bool canInitializeWithMemset = true;
 };
-    
+
 } // namespace WTF