From ba8643500b749b273ddadbd1e92d45255b1c7c48 Mon Sep 17 00:00:00 2001
From: Tobias Koenig <tobias.koenig@kdab.com>
Date: Mon, 22 Aug 2016 15:37:06 +0200
Subject: Encapsulate locking into QPdfMutexLocker

Create a subclass of QMutexLocker which always acts
on the global pdfMutex instance. This way other components,
outside of qpdfdocument.cpp, can lock/unlock the mutex as well.

Change-Id: Id68abb24ac95b2f6d94b20682986a76549518495
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/pdf/qpdfdocument.cpp | 29 +++++++++++++++++------------
 src/pdf/qpdfdocument_p.h |  7 +++++++
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/pdf/qpdfdocument.cpp b/src/pdf/qpdfdocument.cpp
index 8abf2ab..3ef947f 100644
--- a/src/pdf/qpdfdocument.cpp
+++ b/src/pdf/qpdfdocument.cpp
@@ -33,6 +33,11 @@ QT_BEGIN_NAMESPACE
 Q_GLOBAL_STATIC_WITH_ARGS(QMutex, pdfMutex, (QMutex::Recursive));
 static int libraryRefCount;
 
+QPdfMutexLocker::QPdfMutexLocker()
+    : QMutexLocker(pdfMutex())
+{
+}
+
 QPdfDocumentPrivate::QPdfDocumentPrivate()
     : avail(Q_NULLPTR)
     , doc(Q_NULLPTR)
@@ -43,7 +48,7 @@ QPdfDocumentPrivate::QPdfDocumentPrivate()
     asyncBuffer.setData(QByteArray());
     asyncBuffer.open(QIODevice::ReadWrite);
 
-    const QMutexLocker lock(pdfMutex());
+    const QPdfMutexLocker lock;
 
     if (libraryRefCount == 0)
         FPDF_InitLibrary();
@@ -66,7 +71,7 @@ QPdfDocumentPrivate::~QPdfDocumentPrivate()
 {
     q->close();
 
-    const QMutexLocker lock(pdfMutex());
+    const QPdfMutexLocker lock;
 
     if (!--libraryRefCount)
         FPDF_DestroyLibrary();
@@ -74,7 +79,7 @@ QPdfDocumentPrivate::~QPdfDocumentPrivate()
 
 void QPdfDocumentPrivate::clear()
 {
-    QMutexLocker lock(pdfMutex());
+    QPdfMutexLocker lock;
 
     if (doc)
         FPDF_CloseDocument(doc);
@@ -102,7 +107,7 @@ void QPdfDocumentPrivate::updateLastError()
         return;
     }
 
-    QMutexLocker lock(pdfMutex());
+    QPdfMutexLocker lock;
     const unsigned long error = FPDF_GetLastError();
     lock.unlock();
 
@@ -188,7 +193,7 @@ void QPdfDocumentPrivate::initiateAsyncLoadWithTotalSizeKnown(quint64 totalSize)
     // FPDF_FILEACCESS setup
     m_FileLen = totalSize;
 
-    const QMutexLocker lock(pdfMutex());
+    const QPdfMutexLocker lock;
 
     avail = FPDFAvail_Create(this, this);
 }
@@ -210,7 +215,7 @@ void QPdfDocumentPrivate::_q_copyFromSequentialSourceDevice()
 
 void QPdfDocumentPrivate::tryLoadDocument()
 {
-    QMutexLocker lock(pdfMutex());
+    QPdfMutexLocker lock;
 
     if (!FPDFAvail_IsDocAvail(avail, this))
         return;
@@ -244,7 +249,7 @@ void QPdfDocumentPrivate::checkComplete()
 
     loadComplete = true;
 
-    QMutexLocker lock(pdfMutex());
+    QPdfMutexLocker lock;
 
     for (int i = 0, count = FPDF_GetPageCount(doc); i < count; ++i)
         if (!FPDFAvail_IsPageAvail(avail, i, this))
@@ -389,8 +394,6 @@ QString QPdfDocument::password() const
 */
 QVariant QPdfDocument::metaData(MetaDataField field) const
 {
-    const QMutexLocker lock(pdfMutex());
-
     if (!d->doc)
         return QString();
 
@@ -422,10 +425,12 @@ QVariant QPdfDocument::metaData(MetaDataField field) const
         break;
     }
 
+    QPdfMutexLocker lock;
     const unsigned long len = FPDF_GetMetaText(d->doc, fieldName.constData(), Q_NULLPTR, 0);
 
     QVector<ushort> buf(len);
     FPDF_GetMetaText(d->doc, fieldName.constData(), buf.data(), buf.length());
+    lock.unlock();
 
     QString text = QString::fromUtf16(buf.data());
 
@@ -495,7 +500,7 @@ int QPdfDocument::pageCount() const
     if (!d->doc)
         return 0;
 
-    const QMutexLocker lock(pdfMutex());
+    const QPdfMutexLocker lock;
 
     return FPDF_GetPageCount(d->doc);
 }
@@ -506,7 +511,7 @@ QSizeF QPdfDocument::pageSize(int page) const
     if (!d->doc)
         return result;
 
-    const QMutexLocker lock(pdfMutex());
+    const QPdfMutexLocker lock;
 
     FPDF_GetPageSizeByIndex(d->doc, page, &result.rwidth(), &result.rheight());
     return result;
@@ -517,7 +522,7 @@ QImage QPdfDocument::render(int page, const QSizeF &pageSize)
     if (!d->doc)
         return QImage();
 
-    const QMutexLocker lock(pdfMutex());
+    const QPdfMutexLocker lock;
 
     FPDF_PAGE pdfPage = FPDF_LoadPage(d->doc, page);
     if (!pdfPage)
diff --git a/src/pdf/qpdfdocument_p.h b/src/pdf/qpdfdocument_p.h
index cea59b2..427ffd9 100644
--- a/src/pdf/qpdfdocument_p.h
+++ b/src/pdf/qpdfdocument_p.h
@@ -28,11 +28,18 @@
 #include "public/fpdf_dataavail.h"
 
 #include <qbuffer.h>
+#include <qmutex.h>
 #include <qnetworkreply.h>
 #include <qpointer.h>
 
 QT_BEGIN_NAMESPACE
 
+class QPdfMutexLocker : public QMutexLocker
+{
+public:
+    QPdfMutexLocker();
+};
+
 class QPdfDocumentPrivate: public FPDF_FILEACCESS, public FX_FILEAVAIL, public FX_DOWNLOADHINTS
 {
 public:
-- 
cgit v1.2.3