| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 import 'dart:sky'; | 5 import 'dart:async'; |
| 6 import 'dart:sky' as sky; |
| 6 import 'dart:collection'; | 7 import 'dart:collection'; |
| 7 | 8 |
| 8 import 'package:mojom/mojo/url_response.mojom.dart'; | 9 import 'package:mojom/mojo/url_response.mojom.dart'; |
| 9 | 10 |
| 10 import 'fetch.dart'; | 11 import 'fetch.dart'; |
| 11 | 12 |
| 12 final HashMap<String, List<ImageDecoderCallback>> _pendingRequests = | 13 final HashMap<String, List<sky.ImageDecoderCallback>> _pendingRequests = |
| 13 new HashMap<String, List<ImageDecoderCallback>>(); | 14 new HashMap<String, List<sky.ImageDecoderCallback>>(); |
| 14 | 15 |
| 15 final HashMap<String, Image> _completedRequests = | 16 final HashMap<String, sky.Image> _completedRequests = |
| 16 new HashMap<String, Image>(); | 17 new HashMap<String, sky.Image>(); |
| 17 | 18 |
| 18 void _loadComplete(url, image) { | 19 void _loadComplete(String url, sky.Image image) { |
| 19 _completedRequests[url] = image; | 20 _completedRequests[url] = image; |
| 20 _pendingRequests[url].forEach((c) => c(image)); | 21 _pendingRequests[url].forEach((c) => c(image)); |
| 21 _pendingRequests.remove(url); | 22 _pendingRequests.remove(url); |
| 22 } | 23 } |
| 23 | 24 |
| 24 void load(String url, ImageDecoderCallback callback) { | 25 void _load(String url, sky.ImageDecoderCallback callback) { |
| 25 Image result = _completedRequests[url]; | 26 sky.Image result = _completedRequests[url]; |
| 26 if (result != null) { | 27 if (result != null) { |
| 27 callback(_completedRequests[url]); | 28 callback(_completedRequests[url]); |
| 28 return; | 29 return; |
| 29 } | 30 } |
| 30 | 31 |
| 31 bool newRequest = false; | 32 bool newRequest = false; |
| 32 _pendingRequests.putIfAbsent(url, () { | 33 _pendingRequests.putIfAbsent(url, () { |
| 33 newRequest = true; | 34 newRequest = true; |
| 34 return new List<ImageDecoderCallback>(); | 35 return new List<sky.ImageDecoderCallback>(); |
| 35 }).add(callback); | 36 }).add(callback); |
| 36 if (newRequest) { | 37 if (newRequest) { |
| 37 fetchUrl(url).then((UrlResponse response) { | 38 fetchUrl(url).then((UrlResponse response) { |
| 38 if (response.statusCode >= 400) { | 39 if (response.statusCode >= 400) { |
| 39 _loadComplete(url, null); | 40 _loadComplete(url, null); |
| 40 return; | 41 return; |
| 41 } | 42 } |
| 42 new ImageDecoder(response.body.handle.h, | 43 new sky.ImageDecoder(response.body.handle.h, (image) { |
| 43 (image) => _loadComplete(url, image)); | 44 _loadComplete(url, image); |
| 45 }); |
| 44 }); | 46 }); |
| 45 } | 47 } |
| 46 } | 48 } |
| 49 |
| 50 Future<sky.Image> load(String url) { |
| 51 Completer<sky.Image> completer = new Completer<sky.Image>(); |
| 52 _load(url, completer.complete); |
| 53 return completer.future; |
| 54 } |
| OLD | NEW |