diff options
| author | Patrick Scott <phanna@android.com> | 2010-12-17 07:16:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-17 07:16:35 -0800 |
| commit | ab1ac7bfdac5723904e94d61f42e9c2d9f15fdb4 (patch) | |
| tree | a60f17bb174a548f8ec3199bab2d22c0a9fbb621 /WebKit | |
| parent | eabb0d15c6f21c671c86c9ceed1ec4b03e7bec1e (diff) | |
| parent | 2b774d3af7925a30ac6d44bfc1e770615304f232 (diff) | |
| download | external_webkit-ab1ac7bfdac5723904e94d61f42e9c2d9f15fdb4.zip external_webkit-ab1ac7bfdac5723904e94d61f42e9c2d9f15fdb4.tar.gz external_webkit-ab1ac7bfdac5723904e94d61f42e9c2d9f15fdb4.tar.bz2 | |
Merge "Use a lock around ioThread creation."
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp | 6 |
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"); |