Changeset 53418 in webkit

Timestamp:

Jan 18, 2010 11:44:50 AM (14 years ago)

Author:

barraclough@apple.com

Message:

Eeeep! reverting r53416 & r53417, more to be done to fix windows.

Reviewed by NOBODY (build fix).

• WebCore.base.exp:
• platform/sql/SQLiteFileSystem.cpp:

(WebCore::SQLiteFileSystem::openDatabase):

• platform/sql/SQLiteStatement.cpp:

(WebCore::SQLiteStatement::prepare):

• platform/sql/SQLiteStatement.h:
• platform/sql/chromium/SQLiteFileSystemChromium.cpp:

(WebCore::SQLiteFileSystem::openDatabase):

• platform/text/PlatformString.h:
• platform/text/String.cpp:

(WebCore::String::charactersWithNullTermination):

• platform/text/StringImpl.cpp:

(WebCore::StringImpl::operator new):
(WebCore::StringImpl::operator delete):
(WebCore::StringImpl::StringImpl):
(WebCore::StringImpl::~StringImpl):
(WebCore::StringImpl::create):
(WebCore::StringImpl::createWithTerminatingNullCharacter):
(WebCore::StringImpl::crossThreadString):
(WebCore::StringImpl::sharedBuffer):

• platform/text/StringImpl.h:

(WebCore::StringImpl::hasTerminatingNullCharacter):
(WebCore::StringImpl::inTable):
(WebCore::StringImpl::setInTable):
(WebCore::StringImpl::):

• platform/win/ClipboardUtilitiesWin.cpp:

(WebCore::createGlobalData):

• storage/OriginUsageRecord.cpp:

(WebCore::OriginUsageRecord::addDatabase):
(WebCore::OriginUsageRecord::markDatabase):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.base.exp (modified) (1 diff)
• platform/sql/SQLiteFileSystem.cpp (modified) (1 diff)
• platform/sql/SQLiteStatement.cpp (modified) (1 diff)
• platform/sql/SQLiteStatement.h (modified) (1 diff)
• platform/sql/chromium/SQLiteFileSystemChromium.cpp (modified) (1 diff)
• platform/text/PlatformString.h (modified) (2 diffs)
• platform/text/String.cpp (modified) (1 diff)
• platform/text/StringImpl.cpp (modified) (7 diffs)
• platform/text/StringImpl.h (modified) (7 diffs)
• platform/win/ClipboardUtilitiesWin.cpp (modified) (1 diff)
• storage/OriginUsageRecord.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-18  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by NOBODY (build fix).
+
+        Eeeep! reverting r53416 & r53417, more to be done to fix windows.
+
+        * WebCore.base.exp:
+        * platform/sql/SQLiteFileSystem.cpp:
+        (WebCore::SQLiteFileSystem::openDatabase):
+        * platform/sql/SQLiteStatement.cpp:
+        (WebCore::SQLiteStatement::prepare):
+        * platform/sql/SQLiteStatement.h:
+        * platform/sql/chromium/SQLiteFileSystemChromium.cpp:
+        (WebCore::SQLiteFileSystem::openDatabase):
+        * platform/text/PlatformString.h:
+        * platform/text/String.cpp:
+        (WebCore::String::charactersWithNullTermination):
+        * platform/text/StringImpl.cpp:
+        (WebCore::StringImpl::operator new):
+        (WebCore::StringImpl::operator delete):
+        (WebCore::StringImpl::StringImpl):
+        (WebCore::StringImpl::~StringImpl):
+        (WebCore::StringImpl::create):
+        (WebCore::StringImpl::createWithTerminatingNullCharacter):
+        (WebCore::StringImpl::crossThreadString):
+        (WebCore::StringImpl::sharedBuffer):
+        * platform/text/StringImpl.h:
+        (WebCore::StringImpl::hasTerminatingNullCharacter):
+        (WebCore::StringImpl::inTable):
+        (WebCore::StringImpl::setInTable):
+        (WebCore::StringImpl::):
+        * platform/win/ClipboardUtilitiesWin.cpp:
+        (WebCore::createGlobalData):
+        * storage/OriginUsageRecord.cpp:
+        (WebCore::OriginUsageRecord::addDatabase):
+        (WebCore::OriginUsageRecord::markDatabase):
+
 2010-01-18  Gavin Barraclough  <barraclough@apple.com>
 

trunk/WebCore/WebCore.base.exp

@@ -143 +143 @@
 __ZN7WebCore10StringImplD1Ev
 __ZN7WebCore10StringImplcvP8NSStringEv
+__ZN7WebCore10StringImpldlEPv
 __ZN7WebCore10handCursorEv
 __ZN7WebCore10setCookiesEPNS_8DocumentERKNS_4KURLERKNS_6StringE

trunk/WebCore/platform/sql/SQLiteFileSystem.cpp

@@ -50 +50 @@
 {
     // SQLite expects a null terminator on its UTF-16 strings.
-    OwnArrayPtr<const UChar> path;
-    fileName.copyWithNullTermination(path);
-    return sqlite3_open16(path.get(), database);
+    String path = fileName;
+    return sqlite3_open16(path.charactersWithNullTermination(), database);
 }
 

trunk/WebCore/platform/sql/SQLiteStatement.cpp

@@ -64 +64 @@
     const void* tail;
     LOG(SQLDatabase, "SQL - prepare - %s", m_query.ascii().data());
-    if (!m_queryWithNullTermination)
-        m_query.copyWithNullTermination(m_queryWithNullTermination);
-    int error = sqlite3_prepare16_v2(m_database.sqlite3Handle(), m_queryWithNullTermination.get(), -1, &m_statement, &tail);
+    int error = sqlite3_prepare16_v2(m_database.sqlite3Handle(), m_query.charactersWithNullTermination(), -1, &m_statement, &tail);
     if (error != SQLITE_OK)
         LOG(SQLDatabase, "sqlite3_prepare16 failed (%i)\n%s\n%s", error, m_query.ascii().data(), sqlite3_errmsg(m_database.sqlite3Handle()));

trunk/WebCore/platform/sql/SQLiteStatement.h

@@ -92 +92 @@
     SQLiteDatabase& m_database;
     String m_query;
-    OwnArrayPtr<const UChar> m_queryWithNullTermination;
     sqlite3_stmt* m_statement;
 #ifndef NDEBUG

trunk/WebCore/platform/sql/chromium/SQLiteFileSystemChromium.cpp

@@ -52 +52 @@
 {
     if (!ChromiumBridge::sandboxEnabled()) {
-        OwnArrayPtr<const UChar> path;
-        fileName.copyWithNullTermination(path);
-        return sqlite3_open16(path.get(), database);
+        String path = fileName;
+        return sqlite3_open16(path.charactersWithNullTermination(), database);
     }
 

trunk/WebCore/platform/text/PlatformString.h

@@ -27 +27 @@
 
 #include "StringImpl.h"
-#include <wtf/OwnArrayPtr.h>
 
 #ifdef __OBJC__
@@ -95 +94 @@
     unsigned length() const;
     const UChar* characters() const;
-    void copyWithNullTermination(OwnArrayPtr<const UChar>&) const;
+    const UChar* charactersWithNullTermination();
     
     UChar operator[](unsigned i) const; // if i >= length(), returns 0    

trunk/WebCore/platform/text/String.cpp

@@ -330 +330 @@
 }
 
-void String::copyWithNullTermination(OwnArrayPtr<const UChar>& result) const
-{
-    if (!m_impl)
-        CRASH();
-    unsigned length = m_impl->length();
-    UChar* buffer = new UChar[length + 1];
-    memcpy(buffer, m_impl->characters(), length * sizeof(UChar));
-    buffer[length] = 0;
-    result.set(buffer);
+const UChar* String::charactersWithNullTermination()
+{
+    if (!m_impl)
+        return 0;
+    if (m_impl->hasTerminatingNullCharacter())
+        return m_impl->characters();
+    m_impl = StringImpl::createWithTerminatingNullCharacter(*m_impl);
+    return m_impl->characters();
 }
 

trunk/WebCore/platform/text/StringImpl.cpp

@@ -58 +58 @@
 }
 
+// Some of the factory methods create buffers using fastMalloc.
+// We must ensure that all allocations of StringImpl are allocated using
+// fastMalloc so that we don't have mis-matched frees. We accomplish 
+// this by overriding the new and delete operators.
+void* StringImpl::operator new(size_t size, void* address)
+{
+    if (address)
+        return address;  // Allocating using an internal buffer
+    return fastMalloc(size);
+}
+
+void* StringImpl::operator new(size_t size)
+{
+    return fastMalloc(size);
+}
+
+void StringImpl::operator delete(void* address)
+{
+    fastFree(address);
+}
+
 // This constructor is used only to create the empty string.
 StringImpl::StringImpl()
     : m_data(0)
-    , m_sharedBuffer(0)
     , m_length(0)
-    , m_refCountAndFlags(s_refCountIncrement)
     , m_hash(0)
 {
@@ -74 +93 @@
 inline StringImpl::StringImpl(const UChar* characters, unsigned length)
     : m_data(characters)
-    , m_sharedBuffer(0)
     , m_length(length)
-    , m_refCountAndFlags(s_refCountIncrement)
     , m_hash(0)
 {
@@ -88 +105 @@
         AtomicString::remove(this);
     if (!bufferIsInternal()) {
-        SharedUChar* sharedBuffer = m_sharedBuffer;
+        SharedUChar* sharedBuffer = m_sharedBufferAndFlags.get();
         if (sharedBuffer)
             sharedBuffer->deref();
@@ -954 +971 @@
         PassRefPtr<StringImpl> impl = adoptRef(new StringImpl(str.data(), str.size()));
         sharedBuffer->ref();
-        impl->m_sharedBuffer = sharedBuffer;
+        impl->m_sharedBufferAndFlags.set(sharedBuffer);
         return impl;
     }
@@ -969 +986 @@
 }
 #endif
+
+PassRefPtr<StringImpl> StringImpl::createWithTerminatingNullCharacter(const StringImpl& string)
+{
+    // Use createUninitialized instead of 'new StringImpl' so that the string and its buffer
+    // get allocated in a single malloc block.
+    UChar* data;
+    int length = string.m_length;
+    RefPtr<StringImpl> terminatedString = createUninitialized(length + 1, data);
+    memcpy(data, string.m_data, length * sizeof(UChar));
+    data[length] = 0;
+    terminatedString->m_length--;
+    terminatedString->m_hash = string.m_hash;
+    terminatedString->m_sharedBufferAndFlags.setFlag(HasTerminatingNullCharacter);
+    return terminatedString.release();
+}
 
 PassRefPtr<StringImpl> StringImpl::threadsafeCopy() const
@@ -983 +1015 @@
     if (shared) {
         RefPtr<StringImpl> impl = adoptRef(new StringImpl(m_data, m_length));
-        impl->m_sharedBuffer = shared->crossThreadCopy().releaseRef();
+        impl->m_sharedBufferAndFlags.set(shared->crossThreadCopy().releaseRef());
         return impl.release();
     }
@@ -996 +1028 @@
         return 0;
 
-    if (!m_sharedBuffer)
-        m_sharedBuffer = SharedUChar::create(new OwnFastMallocPtr<UChar>(const_cast<UChar*>(m_data))).releaseRef();
-    return m_sharedBuffer;
+    if (!m_sharedBufferAndFlags.get())
+        m_sharedBufferAndFlags.set(SharedUChar::create(new OwnFastMallocPtr<UChar>(const_cast<UChar*>(m_data))).releaseRef());
+    return m_sharedBufferAndFlags.get();
 }
 

trunk/WebCore/platform/text/StringImpl.h

@@ -27 +27 @@
 #include <wtf/ASCIICType.h>
 #include <wtf/CrossThreadRefCounted.h>
-#include <wtf/Noncopyable.h>
 #include <wtf/OwnFastMallocPtr.h>
+#include <wtf/PtrAndFlags.h>
 #include <wtf/RefCounted.h>
 #include <wtf/StringHashFunctions.h>
@@ -59 +59 @@
 typedef bool (*CharacterMatchFunctionPtr)(UChar);
 
-class StringImpl : public Noncopyable {
+class StringImpl : public RefCounted<StringImpl> {
     friend struct CStringTranslator;
     friend struct HashAndCharactersTranslator;
@@ -83 +83 @@
     static PassRefPtr<StringImpl> createUninitialized(unsigned length, UChar*& data);
 
+    static PassRefPtr<StringImpl> createWithTerminatingNullCharacter(const StringImpl&);
+
     static PassRefPtr<StringImpl> createStrippingNullCharacters(const UChar*, unsigned length);
     static PassRefPtr<StringImpl> adopt(StringBuffer&);
@@ -95 +97 @@
     unsigned length() { return m_length; }
 
-    bool inTable() const { return m_refCountAndFlags & s_refCountFlagInTable; }
-    void setInTable() { m_refCountAndFlags |= s_refCountFlagInTable; }
+    bool hasTerminatingNullCharacter() const { return m_sharedBufferAndFlags.isFlagSet(HasTerminatingNullCharacter); }
+
+    bool inTable() const { return m_sharedBufferAndFlags.isFlagSet(InTable); }
+    void setInTable() { return m_sharedBufferAndFlags.setFlag(InTable); }
 
     unsigned hash() { if (m_hash == 0) m_hash = computeHash(m_data, m_length); return m_hash; }
@@ -103 +107 @@
     inline static unsigned computeHash(const char* data) { return WTF::stringHash(data); }
     
-    StringImpl* ref() { m_refCountAndFlags += s_refCountIncrement; return this; }
-    ALWAYS_INLINE void deref() { m_refCountAndFlags -= s_refCountIncrement; if (!(m_refCountAndFlags & s_refCountMask)) delete this; }
-    ALWAYS_INLINE bool hasOneRef() const { return (m_refCountAndFlags & s_refCountMask) == s_refCountIncrement; }
-
     // Returns a StringImpl suitable for use on another thread.
     PassRefPtr<StringImpl> crossThreadString();
@@ -176 +176 @@
 #endif
 
+    void operator delete(void*);
+
 private:
-    using Noncopyable::operator new;
-    void* operator new(size_t, void* inPlace) { ASSERT(inPlace); return inPlace; }
+    // Allocation from a custom buffer is only allowed internally to avoid
+    // mismatched allocators. Callers should use create().
+    void* operator new(size_t size);
+    void* operator new(size_t size, void* address);
 
     static PassRefPtr<StringImpl> createStrippingNullCharactersSlowCase(const UChar*, unsigned length);
@@ -186 +190 @@
     bool bufferIsInternal() { return m_data == reinterpret_cast<const UChar*>(this + 1); }
 
-    static const unsigned s_refCountMask = 0xFFFFFFFE;
-    static const unsigned s_refCountIncrement = 0x2;
-    static const unsigned s_refCountFlagInTable = 0x1;
+    enum StringImplFlags {
+        HasTerminatingNullCharacter,
+        InTable,
+    };
 
     const UChar* m_data;
-    SharedUChar* m_sharedBuffer;
     unsigned m_length;
-    unsigned m_refCountAndFlags;
     mutable unsigned m_hash;
+    PtrAndFlags<SharedUChar, StringImplFlags> m_sharedBufferAndFlags;
     // There is a fictitious variable-length UChar array at the end, which is used
     // as the internal buffer by the createUninitialized and create methods.

trunk/WebCore/platform/win/ClipboardUtilitiesWin.cpp

@@ -115 +115 @@
     if (cbData) {
         PWSTR buffer = (PWSTR)::GlobalLock(cbData);
-        OwnArrayPtr<const UChar> nullTerminatedURL;
-        mutableURL.copyWithNullTermination(nullTerminatedURL);
-        OwnArrayPtr<const UChar> nullTerminatedTitle;
-        mutableTitle.copyWithNullTermination(nullTerminatedTitle);
-        swprintf_s(buffer, size, L"%s\n%s", nullTerminatedURL.get(), nullTerminatedTitle.get());
+        swprintf_s(buffer, size, L"%s\n%s", mutableURL.charactersWithNullTermination(), mutableTitle.charactersWithNullTermination());
         ::GlobalUnlock(cbData);
     }

trunk/WebCore/storage/OriginUsageRecord.cpp

@@ -43 +43 @@
 {
     ASSERT(!m_databaseMap.contains(identifier));
-    ASSERT_ARG(identifier, identifier.impl()->hasOneRef());
-    ASSERT_ARG(fullPath, fullPath.impl()->hasOneRef());
+    ASSERT_ARG(identifier, identifier.impl()->refCount() == 1);
+    ASSERT_ARG(fullPath, fullPath.impl()->refCount() == 1);
 
     m_databaseMap.set(identifier, DatabaseEntry(fullPath));
@@ -64 +64 @@
 {
     ASSERT(m_databaseMap.contains(identifier));
-    ASSERT_ARG(identifier, identifier.impl()->hasOneRef());
+    ASSERT_ARG(identifier, identifier.impl()->refCount() == 1);
 
     m_unknownSet.add(identifier);