!562 GlypyManager操作获取bitmap过程加锁保护，不允许中途修改fontId

Merge pull request !562 from benb365/master

frameworks/font/glyphs_manager.cpp

@@ -236,14 +236,15 @@ int8_t GlyphsManager::SetFile(int32_t fp, uint32_t start)
 int8_t GlyphsManager::SetCurrentFontId(uint8_t fontId)
 {
     uint16_t fontIdx = 0;
-    if (!isFileSet_) {
-        GRAPHIC_LOGE("GlyphsManager::SetCurrentFontId file not set");
-        return INVALID_RET_VALUE;
-    }
     if (fontId > UIFontBuilder::GetInstance()->GetBitmapFontIdMax()) {
         GRAPHIC_LOGE("GlyphsManager::SetCurrentFontId fontId need less than max fontId");
         return INVALID_RET_VALUE;
     }
+    GraphicLockGuard guard(lock_);
+    if (!isFileSet_) {
+        GRAPHIC_LOGE("GlyphsManager::SetCurrentFontId file not set");
+        return INVALID_RET_VALUE;
+    }
     if (fontId_ == fontId) {
         return RET_VALUE_OK;
     }
@@ -385,6 +386,8 @@ int8_t GlyphsManager::GetBitmap(uint32_t unicode, uint8_t* bitmap, uint8_t fontI
         GRAPHIC_LOGE("GlyphsManager::GetBitmap invalid parameter");
         return INVALID_RET_VALUE;
     }
+    
+    GraphicLockGuard guard(lock_);
     if (!isFontIdSet_) {
         GRAPHIC_LOGE("GlyphsManager::GetBitmap fontId not set");
         return INVALID_RET_VALUE;
@@ -396,6 +399,7 @@ int8_t GlyphsManager::GetBitmap(uint32_t unicode, uint8_t* bitmap, uint8_t fontI
         node = GetGlyphNode(unicode);
         tmpBitMapSectionStart = curBitMapSectionStart_;
     }
+    guard.Unlock();
     if (node == nullptr) {
         GRAPHIC_LOGE("GlyphsManager::GetBitmap node not found");
         return INVALID_RET_VALUE;

frameworks/font/glyphs_manager.h

@@ -17,6 +17,7 @@
 #define GLYPHS_MANAGER_FONT_H
 
 #include "font/ui_font_header.h"
+#include "graphic_locker.h"
 
 namespace OHOS {
 class GlyphsManager {
@@ -100,6 +101,7 @@ private:
     CacheType* nodeCache_;
     CacheState* cacheStatus_;
 
+    GraphicMutex lock_;
     int32_t fp_;
     uint8_t fontId_;
     FontHeader* curFontHeader_;