Ignore:
Timestamp:
May 13, 2009, 3:09:21 PM (16 years ago)
Author:
[email protected]
Message:

JavaScriptCore:

2009-05-13 Dmitry Titov <​[email protected]>

Rubber-stamped by Mark Rowe.

​https://bugs.webkit.org/show_bug.cgi?id=25746
Revert ​http://trac.webkit.org/changeset/43507 which caused crash in PPC nightlies with Safari 4.

  • JavaScriptCore.exp:
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def:
  • bytecode/SamplingTool.cpp: (JSC::SamplingThread::start): (JSC::SamplingThread::stop):
  • bytecode/SamplingTool.h:
  • wtf/CrossThreadRefCounted.h: (WTF::CrossThreadRefCounted::CrossThreadRefCounted): (WTF::::ref): (WTF::::deref):
  • wtf/Threading.h:
  • wtf/ThreadingNone.cpp:
  • wtf/ThreadingPthreads.cpp: (WTF::threadMapMutex): (WTF::initializeThreading): (WTF::threadMap): (WTF::identifierByPthreadHandle): (WTF::establishIdentifierForPthreadHandle): (WTF::pthreadHandleForIdentifier): (WTF::clearPthreadHandleForIdentifier): (WTF::createThreadInternal): (WTF::waitForThreadCompletion): (WTF::detachThread): (WTF::currentThread):
  • wtf/ThreadingWin.cpp: (WTF::threadMapMutex): (WTF::initializeThreading): (WTF::threadMap): (WTF::storeThreadHandleByIdentifier): (WTF::threadHandleForIdentifier): (WTF::clearThreadHandleForIdentifier): (WTF::createThreadInternal): (WTF::waitForThreadCompletion): (WTF::detachThread): (WTF::currentThread):
  • wtf/gtk/ThreadingGtk.cpp: (WTF::threadMapMutex): (WTF::initializeThreading): (WTF::threadMap): (WTF::identifierByGthreadHandle): (WTF::establishIdentifierForThread): (WTF::threadForIdentifier): (WTF::clearThreadForIdentifier): (WTF::createThreadInternal): (WTF::waitForThreadCompletion): (WTF::currentThread):
  • wtf/qt/ThreadingQt.cpp: (WTF::threadMapMutex): (WTF::threadMap): (WTF::identifierByQthreadHandle): (WTF::establishIdentifierForThread): (WTF::clearThreadForIdentifier): (WTF::threadForIdentifier): (WTF::initializeThreading): (WTF::createThreadInternal): (WTF::waitForThreadCompletion): (WTF::currentThread):

WebCore:

2009-05-13 Dmitry Titov <​[email protected]>

Rubber-stamped by Mark Rowe.

​https://bugs.webkit.org/show_bug.cgi?id=25746
Revert ​http://trac.webkit.org/changeset/43507 which caused crash in PPC nightlies with Safari 4.

  • dom/XMLTokenizerLibxml2.cpp: (WebCore::matchFunc): (WebCore::openFunc): (WebCore::createStringParser): (WebCore::createMemoryParser):
  • loader/icon/IconDatabase.cpp: (WebCore::IconDatabase::open):
  • platform/sql/SQLiteDatabase.cpp: (WebCore::SQLiteDatabase::SQLiteDatabase): (WebCore::SQLiteDatabase::close):
  • storage/DatabaseThread.cpp: (WebCore::DatabaseThread::DatabaseThread): (WebCore::DatabaseThread::start): (WebCore::DatabaseThread::databaseThread):
  • storage/LocalStorageThread.cpp: (WebCore::LocalStorageThread::LocalStorageThread): (WebCore::LocalStorageThread::start): (WebCore::LocalStorageThread::localStorageThread): (WebCore::LocalStorageThread::scheduleImport): (WebCore::LocalStorageThread::scheduleSync): (WebCore::LocalStorageThread::terminate):
  • workers/WorkerThread.cpp: (WebCore::WorkerThread::WorkerThread): (WebCore::WorkerThread::start):

WebKit/win:

2009-05-13 Dmitry Titov <​[email protected]>

Rubber-stamped by Mark Rowe.

​https://bugs.webkit.org/show_bug.cgi?id=25746
Revert ​http://trac.webkit.org/changeset/43507 which caused crash in PPC nightlies with Safari 4.

  • WebKit.vcproj/WebKit.def:
  • WebKit.vcproj/WebKit_debug.def:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/dom/XMLTokenizerLibxml2.cpp

    r43507 r43663  
    327327
    328328static int globalDescriptor = 0;
    329 
    330 static ThreadIdentifier& libxmlLoaderThread() {
    331     DEFINE_STATIC_LOCAL(ThreadIdentifier, staticLibxmlLoaderThread, ());
    332     return staticLibxmlLoaderThread;
    333 }
     329static ThreadIdentifier libxmlLoaderThread = 0;
    334330
    335331static int matchFunc(const char*)
    … …  
    337333    // Only match loads initiated due to uses of libxml2 from within XMLTokenizer to avoid
    338334    // interfering with client applications that also use libxml2.  http://bugs.webkit.org/show_bug.cgi?id=17353
    339     return XMLTokenizerScope::currentDocLoader && currentThread() == libxmlLoaderThread();
     335    return XMLTokenizerScope::currentDocLoader && currentThread() == libxmlLoaderThread;
    340336}
    341337
    … …  
    398394{
    399395    ASSERT(XMLTokenizerScope::currentDocLoader);
    400     ASSERT(currentThread() == libxmlLoaderThread());
     396    ASSERT(currentThread() == libxmlLoaderThread);
    401397
    402398    KURL url(KURL(), uri);
    … …  
    467463        xmlRegisterInputCallbacks(matchFunc, openFunc, readFunc, closeFunc);
    468464        xmlRegisterOutputCallbacks(matchFunc, openFunc, writeFunc, closeFunc);
    469         libxmlLoaderThread() = currentThread();
     465        libxmlLoaderThread = currentThread();
    470466        didInit = true;
    471467    }
    … …  
    489485        xmlRegisterInputCallbacks(matchFunc, openFunc, readFunc, closeFunc);
    490486        xmlRegisterOutputCallbacks(matchFunc, openFunc, writeFunc, closeFunc);
    491         libxmlLoaderThread() = currentThread();
     487        libxmlLoaderThread = currentThread();
    492488        didInit = true;
    493489    }
Note: See TracChangeset for help on using the changeset viewer.