[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
barraclough at apple.com
barraclough at apple.com
Wed Dec 22 12:12:03 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 79b4e283fb4e57037dd6472616133e1e1f019f00
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 17 02:13:02 2010 +0000
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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65478 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3eab5a7..7b581a9 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,23 @@
2010-08-16 Gavin Barraclough <barraclough at apple.com>
+ Rubber stamped by Sam Weinig
+
+ Remove unnecessary includes from UString.h, add new includes as necessary.
+
+ * 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:
+
+2010-08-16 Gavin Barraclough <barraclough at apple.com>
+
Reviewed by Sam Weinig
Bug 44080 - String find/reverseFind methods need tidying up
diff --git a/JavaScriptCore/profiler/CallIdentifier.h b/JavaScriptCore/profiler/CallIdentifier.h
index 714b140..5487209 100644
--- a/JavaScriptCore/profiler/CallIdentifier.h
+++ b/JavaScriptCore/profiler/CallIdentifier.h
@@ -29,6 +29,8 @@
#include <runtime/UString.h>
#include "FastAllocBase.h"
+#include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
namespace JSC {
diff --git a/JavaScriptCore/profiler/ProfileNode.h b/JavaScriptCore/profiler/ProfileNode.h
index c2c3c02..eafeea6 100644
--- a/JavaScriptCore/profiler/ProfileNode.h
+++ b/JavaScriptCore/profiler/ProfileNode.h
@@ -30,9 +30,10 @@
#define ProfileNode_h
#include "CallIdentifier.h"
-#include <wtf/Vector.h>
+#include <wtf/HashCountedSet.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
+#include <wtf/Vector.h>
namespace JSC {
diff --git a/JavaScriptCore/runtime/DateConversion.cpp b/JavaScriptCore/runtime/DateConversion.cpp
index b66b088..7eb82e4 100644
--- a/JavaScriptCore/runtime/DateConversion.cpp
+++ b/JavaScriptCore/runtime/DateConversion.cpp
@@ -47,6 +47,7 @@
#include "UString.h"
#include <wtf/DateMath.h>
#include <wtf/StringExtras.h>
+#include <wtf/text/CString.h>
using namespace WTF;
diff --git a/JavaScriptCore/runtime/Identifier.h b/JavaScriptCore/runtime/Identifier.h
index 5120697..04dffdf 100644
--- a/JavaScriptCore/runtime/Identifier.h
+++ b/JavaScriptCore/runtime/Identifier.h
@@ -24,6 +24,7 @@
#include "JSGlobalData.h"
#include "ThreadSpecific.h"
#include "UString.h"
+#include <wtf/text/CString.h>
namespace JSC {
@@ -138,6 +139,11 @@ namespace JSC {
IdentifierTable* createIdentifierTable();
void deleteIdentifierTable(IdentifierTable*);
+ 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
#endif // Identifier_h
diff --git a/JavaScriptCore/runtime/RegExpCache.h b/JavaScriptCore/runtime/RegExpCache.h
index fb30a9e..e897b43 100644
--- a/JavaScriptCore/runtime/RegExpCache.h
+++ b/JavaScriptCore/runtime/RegExpCache.h
@@ -28,6 +28,8 @@
#include "RegExp.h"
#include "RegExpKey.h"
#include "UString.h"
+#include <wtf/FixedArray.h>
+#include <wtf/HashMap.h>
#ifndef RegExpCache_h
#define RegExpCache_h
diff --git a/JavaScriptCore/runtime/RegExpKey.h b/JavaScriptCore/runtime/RegExpKey.h
index 1e34de4..cd1368d 100644
--- a/JavaScriptCore/runtime/RegExpKey.h
+++ b/JavaScriptCore/runtime/RegExpKey.h
@@ -26,6 +26,7 @@
*/
#include "UString.h"
+#include <wtf/text/StringHash.h>
#ifndef RegExpKey_h
#define RegExpKey_h
diff --git a/JavaScriptCore/runtime/UString.cpp b/JavaScriptCore/runtime/UString.cpp
index fecf4f1..78f82a5 100644
--- a/JavaScriptCore/runtime/UString.cpp
+++ b/JavaScriptCore/runtime/UString.cpp
@@ -415,6 +415,8 @@ uint32_t UString::toStrictUInt32(bool* ok) const
UString UString::substr(unsigned pos, unsigned len) const
{
+ // FIXME: We used to check against a limit of Heap::minExtraCost / sizeof(UChar).
+
unsigned s = length();
if (pos >= s)
diff --git a/JavaScriptCore/runtime/UString.h b/JavaScriptCore/runtime/UString.h
index e8c135f..add8ebe 100644
--- a/JavaScriptCore/runtime/UString.h
+++ b/JavaScriptCore/runtime/UString.h
@@ -1,40 +1,29 @@
/*
- * Copyright (C) 1999-2000 Harri Porten (porten at kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 1999-2000 Harri Porten (porten at kde.org)
+ * 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 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.
+ * 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.
+ * 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.
*
*/
#ifndef UString_h
#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 {
@@ -50,10 +39,10 @@ public:
UString(const UChar*);
// Construct a string with latin1 data.
- UString(const char* characters);
+ UString(const char* characters, unsigned length);
// Construct a string with latin1 data, from a null-terminated source.
- UString(const char* characters, unsigned length);
+ UString(const char* characters);
// Construct a string referencing an existing StringImpl.
UString(StringImpl* impl) : m_impl(impl) { }
@@ -205,45 +194,15 @@ inline int codePointCompare(const UString& s1, const UString& s2)
return codePointCompare(s1.impl(), s2.impl());
}
-// 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
{
static const bool canInitializeWithMemset = true;
};
-
+
} // namespace WTF
#endif
diff --git a/JavaScriptCore/wtf/text/WTFString.h b/JavaScriptCore/wtf/text/WTFString.h
index 5b07b71..5627307 100644
--- a/JavaScriptCore/wtf/text/WTFString.h
+++ b/JavaScriptCore/wtf/text/WTFString.h
@@ -1,6 +1,6 @@
/*
* (C) 1999 Lars Knoll (knoll at kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple 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
@@ -446,6 +446,5 @@ using WTF::charactersAreAllASCII;
using WTF::charactersToInt;
using WTF::charactersToFloat;
using WTF::charactersToDouble;
-using WTF::operator+;
#endif
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 367c8e7..060bbe5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-16 Gavin Barraclough <barraclough at apple.com>
+
+ Rubber stamped by Sam Weinig
+
+ Remove unnecessary includes from UString.h, add new includes as necessary.
+
+ * dom/ScriptExecutionContext.h:
+ * loader/appcache/ApplicationCache.cpp:
+
2010-08-16 Andreas Kling <andreas.kling at nokia.com>
Reviewed by Darin Adler.
diff --git a/WebCore/dom/ScriptExecutionContext.h b/WebCore/dom/ScriptExecutionContext.h
index 761755a..68beef0 100644
--- a/WebCore/dom/ScriptExecutionContext.h
+++ b/WebCore/dom/ScriptExecutionContext.h
@@ -38,6 +38,10 @@
#include <wtf/Threading.h>
#include <wtf/text/StringHash.h>
+#if USE(JSC)
+#include <runtime/JSGlobalData.h>
+#endif
+
namespace WebCore {
class ActiveDOMObject;
diff --git a/WebCore/loader/appcache/ApplicationCache.cpp b/WebCore/loader/appcache/ApplicationCache.cpp
index 2ad4a4b..2a93765 100644
--- a/WebCore/loader/appcache/ApplicationCache.cpp
+++ b/WebCore/loader/appcache/ApplicationCache.cpp
@@ -32,6 +32,7 @@
#include "ApplicationCacheResource.h"
#include "ApplicationCacheStorage.h"
#include "ResourceRequest.h"
+#include <wtf/text/CString.h>
#include <stdio.h>
namespace WebCore {
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index aa50be7..1d6fdf5 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-16 Gavin Barraclough <barraclough at apple.com>
+
+ Rubber stamped by Sam Weinig
+
+ Remove unnecessary includes from UString.h, add new includes as necessary.
+
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+
2010-08-16 Sam Weinig <sam at webkit.org>
Fix windows build.
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
index eece77d..cb4d12d 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
@@ -30,6 +30,8 @@
#include "Plugin.h"
#include <WebCore/GraphicsLayer.h>
#include <WebCore/IntRect.h>
+#include <wtf/HashMap.h>
+#include <wtf/text/CString.h>
#include <wtf/text/StringHash.h>
namespace WebCore {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list