summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
index 7bba3c2..29a97cc 100644
--- a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
+++ b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
@@ -45,6 +45,12 @@ namespace android {
base::Thread* WebUrlLoaderClient::ioThread()
{
static base::Thread* networkThread = 0;
+ static Lock networkThreadLock;
+
+ // Multiple threads appear to access the ioThread so we must ensure the
+ // critical section ordering.
+ AutoLock lock(networkThreadLock);
+
if (!networkThread)
networkThread = new base::Thread("network");