TweetThumbnail内でHttpClientインスタンスを保持する

サムネイル表示の度に HttpClient を生成していた負担を軽減させる

diff --git a/OpenTween/Thumbnail/ThumbnailInfo.cs b/OpenTween/Thumbnail/ThumbnailInfo.cs
index b16ab98..67090aa 100644 (file)
--- a/OpenTween/Thumbnail/ThumbnailInfo.cs
+++ b/OpenTween/Thumbnail/ThumbnailInfo.cs
@@ -41,13 +41,16 @@ namespace OpenTween.Thumbnail
             return this.LoadThumbnailImageAsync(CancellationToken.None);
         }
 
-        public async Task<MemoryImage> LoadThumbnailImageAsync(CancellationToken cancellationToken)
+        public Task<MemoryImage> LoadThumbnailImageAsync(CancellationToken cancellationToken)
         {
-            using (var http = MyCommon.CreateHttpClient())
+            return Task.Run(async () =>
             {
-                return await this.LoadThumbnailImageAsync(http, cancellationToken)
-                    .ConfigureAwait(false);
-            }
+                using (var http = MyCommon.CreateHttpClient())
+                {
+                    return await this.LoadThumbnailImageAsync(http, cancellationToken)
+                        .ConfigureAwait(false);
+                }
+            }, cancellationToken);
         }
 
         public async virtual Task<MemoryImage> LoadThumbnailImageAsync(HttpClient http, CancellationToken cancellationToken)

diff --git a/OpenTween/TweetThumbnail.cs b/OpenTween/TweetThumbnail.cs
index b784fc4..7e0e5b2 100644 (file)
--- a/OpenTween/TweetThumbnail.cs
+++ b/OpenTween/TweetThumbnail.cs
@@ -44,6 +44,8 @@ namespace OpenTween
         public event EventHandler<ThumbnailDoubleClickEventArgs> ThumbnailDoubleClick;
         public event EventHandler<ThumbnailImageSearchEventArgs> ThumbnailImageSearchClick;
 
+        private readonly HttpClient http = MyCommon.CreateHttpClient();
+
         private object uiLockObj = new object();
 
         public ThumbnailInfo Thumbnail
@@ -85,7 +87,7 @@ namespace OpenTween
                     picbox.Tag = thumb;
                     picbox.ContextMenuStrip = this.contextMenuStrip;
 
-                    var loadTask = picbox.SetImageFromTask(() => thumb.LoadThumbnailImageAsync(cancelToken));
+                    var loadTask = picbox.SetImageFromTask(() => thumb.LoadThumbnailImageAsync(this.http, cancelToken));
                     loadTasks.Add(loadTask);
 
                     var tooltipText = thumb.TooltipText;