Merge pull request bilibili#145 from xyczero/master

avoid repeated measuring when static layout is recycled by gc
ctiao · Nov 10, 2015 · 8f669ad · 8f669ad
2 parents 937cf0b + e7487ba
commit 8f669ad
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/...eMaster/src/main/java/master/flame/danmaku/danmaku/model/android/SpannedCacheStuffer.java b/...eMaster/src/main/java/master/flame/danmaku/danmaku/model/android/SpannedCacheStuffer.java
@@ -31,7 +31,10 @@ public void measure(BaseDanmaku danmaku, TextPaint paint) {
                 text = new SpannedString(danmaku.text);
             }
             if (text != null) {
-                createStaticLayout(danmaku);
+                StaticLayout staticLayout = new StaticLayout(text, paint, (int) StaticLayout.getDesiredWidth(danmaku.text, paint), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, true);
+                danmaku.paintWidth = staticLayout.getWidth();
+                danmaku.paintHeight = staticLayout.getHeight();
+                danmaku.obj = new SoftReference<StaticLayout>(staticLayout);
                 return;
             }
         }
@@ -54,7 +57,8 @@ public void drawText(BaseDanmaku danmaku, String lineText, Canvas canvas, float
         SoftReference<StaticLayout> reference = (SoftReference<StaticLayout>) danmaku.obj;
         StaticLayout staticLayout = reference.get();
         if (staticLayout == null) {
-            createStaticLayout(danmaku);
+            StaticLayout staticLayout = new StaticLayout(text, paint, (int) StaticLayout.getDesiredWidth(danmaku.text, paint), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, true);
+            danmaku.obj = new SoftReference<StaticLayout>(staticLayout);
         }
         boolean needRestore = false;
         if (left != 0 && top != 0) {
@@ -73,11 +77,5 @@ public void clearCaches() {
         super.clearCaches();
         System.gc();
     }
-
-    private void createAndMeasureStaticLayout(BaseDanmaku danmaku){
-        StaticLayout staticLayout = new StaticLayout(text, paint, (int) StaticLayout.getDesiredWidth(danmaku.text, paint), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, true);
-        danmaku.paintWidth = staticLayout.getWidth();
-        danmaku.paintHeight = staticLayout.getHeight();
-        danmaku.obj = new SoftReference<StaticLayout>(staticLayout);
-    }
+
 }