Changeset 43392 in webkit for trunk/WebCore/dom/XMLTokenizerLibxml2.cpp

Timestamp:

May 7, 2009, 11:47:19 PM (16 years ago)

Author:

[email protected]

Message:

Fix <​https://bugs.webkit.org/show_bug.cgi?id=25640>.
Bug 25640: Crash on quit in r43384 nightly build on Leopard w/ Safari 4 beta installed

Rubber-stamped by Oliver Hunt.

Roll out r43366 as it removed symbols that Safari 4 Beta uses.

File:

• trunk/WebCore/dom/XMLTokenizerLibxml2.cpp (modified) (5 diffs)

trunk/WebCore/dom/XMLTokenizerLibxml2.cpp

@@ -327 +327 @@
 
 static int globalDescriptor = 0;
-
-static ThreadIdentifier& libxmlLoaderThread() {
-    DEFINE_STATIC_LOCAL(ThreadIdentifier, staticLibxmlLoaderThread, ());
-    return staticLibxmlLoaderThread;
-}
+static ThreadIdentifier libxmlLoaderThread = 0;
 
 static int matchFunc(const char*)
@@ -337 +333 @@
     // Only match loads initiated due to uses of libxml2 from within XMLTokenizer to avoid
     // interfering with client applications that also use libxml2.  http://bugs.webkit.org/show_bug.cgi?id=17353
-    return XMLTokenizerScope::currentDocLoader && currentThread() == libxmlLoaderThread();
+    return XMLTokenizerScope::currentDocLoader && currentThread() == libxmlLoaderThread;
 }
 
@@ -398 +394 @@
 {
     ASSERT(XMLTokenizerScope::currentDocLoader);
-    ASSERT(currentThread() == libxmlLoaderThread());
+    ASSERT(currentThread() == libxmlLoaderThread);
 
     KURL url(KURL(), uri);
@@ -467 +463 @@
         xmlRegisterInputCallbacks(matchFunc, openFunc, readFunc, closeFunc);
         xmlRegisterOutputCallbacks(matchFunc, openFunc, writeFunc, closeFunc);
-        libxmlLoaderThread() = currentThread();
+        libxmlLoaderThread = currentThread();
         didInit = true;
     }
@@ -489 +485 @@
         xmlRegisterInputCallbacks(matchFunc, openFunc, readFunc, closeFunc);
         xmlRegisterOutputCallbacks(matchFunc, openFunc, writeFunc, closeFunc);
-        libxmlLoaderThread() = currentThread();
+        libxmlLoaderThread = currentThread();
         didInit = true;
     }