Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Syncronize pdfium initialization between users." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-27 18:53:33 +00:00
committed by Android (Google) Code Review
parent 25459e135d be2e712187
commit 9594487548
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/jni/android/graphics/pdf/PdfEditor.cpp
View File

@@ -51,22 +51,22 @@ static struct {
jfieldID bottom; jfieldID bottom;
} gRectClassInfo; } gRectClassInfo;
static Mutex sLock; // Also used in PdfRenderer.cpp
Mutex sPdfiumLock;
static int sUnmatchedInitRequestCount = 0; int sUnmatchedPdfiumInitRequestCount = 0;
static void initializeLibraryIfNeeded() { static void initializeLibraryIfNeeded() {
Mutex::Autolock _l(sLock); Mutex::Autolock _l(sPdfiumLock);
if (sUnmatchedInitRequestCount == 0) { if (sUnmatchedPdfiumInitRequestCount == 0) {
FPDF_InitLibrary(); FPDF_InitLibrary();
} }
sUnmatchedInitRequestCount++; sUnmatchedPdfiumInitRequestCount++;
} }
static void destroyLibraryIfNeeded() { static void destroyLibraryIfNeeded() {
Mutex::Autolock _l(sLock); Mutex::Autolock _l(sPdfiumLock);
sUnmatchedInitRequestCount--; sUnmatchedPdfiumInitRequestCount--;
if (sUnmatchedInitRequestCount == 0) { if (sUnmatchedPdfiumInitRequestCount == 0) {
FPDF_DestroyLibrary(); FPDF_DestroyLibrary();
} }
} }

18
core/jni/android/graphics/pdf/PdfRenderer.cpp
View File

@@ -43,22 +43,22 @@ static struct {
jfieldID y; jfieldID y;
} gPointClassInfo; } gPointClassInfo;
static Mutex sLock; // See PdfEditor.cpp
extern Mutex sPdfiumLock;
static int sUnmatchedInitRequestCount = 0; extern int sUnmatchedPdfiumInitRequestCount;
static void initializeLibraryIfNeeded() { static void initializeLibraryIfNeeded() {
Mutex::Autolock _l(sLock); Mutex::Autolock _l(sPdfiumLock);
if (sUnmatchedInitRequestCount == 0) { if (sUnmatchedPdfiumInitRequestCount == 0) {
FPDF_InitLibrary(); FPDF_InitLibrary();
} }
sUnmatchedInitRequestCount++; sUnmatchedPdfiumInitRequestCount++;
} }
static void destroyLibraryIfNeeded() { static void destroyLibraryIfNeeded() {
Mutex::Autolock _l(sLock); Mutex::Autolock _l(sPdfiumLock);
sUnmatchedInitRequestCount--; sUnmatchedPdfiumInitRequestCount--;
if (sUnmatchedInitRequestCount == 0) { if (sUnmatchedPdfiumInitRequestCount == 0) {
FPDF_DestroyLibrary(); FPDF_DestroyLibrary();
} }
} }