Merge pull request #1758 from Tyriar/1757_cjk_glyph_key

Move dynamic atlas canCache check higher
xtermjs · Oct 16, 2018 · 5bc7fc4 · 5bc7fc4
2 parents af0ca6c + 3edd2f2
commit 5bc7fc4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/renderer/atlas/DynamicCharAtlas.ts b/src/renderer/atlas/DynamicCharAtlas.ts
@@ -129,12 +129,17 @@ export default class DynamicCharAtlas extends BaseCharAtlas {
       return true;
     }
 
+    // Exit early for uncachable glyphs
+    if (!this._canCache(glyph)) {
+      return false;
+    }
+
     const glyphKey = getGlyphCacheKey(glyph);
     const cacheValue = this._cacheMap.get(glyphKey);
     if (cacheValue !== null && cacheValue !== undefined) {
       this._drawFromCache(ctx, cacheValue, x, y);
       return true;
-    } else if (this._canCache(glyph) && this._drawToCacheCount < FRAME_CACHE_DRAW_LIMIT) {
+    } else if (this._drawToCacheCount < FRAME_CACHE_DRAW_LIMIT) {
       let index;
       if (this._cacheMap.size < this._cacheMap.capacity) {
         index = this._cacheMap.size;