8237833: Check glyph size before adding to glyph texture cache

Reviewed-by: kcr
openjdk · Jan 31, 2020 · d05e8fc · d05e8fc
1 parent 1213ea7
commit d05e8fc
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/prism/impl/GlyphCache.java b/modules/javafx.graphics/src/main/java/com/sun/prism/impl/GlyphCache.java
@@ -291,7 +291,12 @@ private GlyphData getCachedGlyph(int glyphCode, int subPixel) {
                     }
                     // If add fails,clear up the cache. Try add again.
                     clearAll();
-                    packer.add(rect);
+                    if (!packer.add(rect)) {
+                        if (PrismSettings.verbose) {
+                            System.out.println(rect + " won't fit in GlyphCache");
+                        }
+                        return null;
+                    }
                 }
 
                 // We always pass skipFlush=true to backingStore.update()
@@ -320,7 +325,9 @@ private GlyphData getCachedGlyph(int glyphCode, int subPixel) {
                                         0, 0, emw, emh, stride,
                                         skipFlush);
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    if (PrismSettings.verbose) {
+                        e.printStackTrace();
+                    }
                     return null;
                 }
                 // Upload the glyph