Bug 952507 - Fix locking in ContentClient. r=nrc
Bug 952507 - Fix locking in double buffered ContentClient. r=nrc