Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(838)

Unified Diff: sky/sdk/lib/rendering/box.dart

Issue 1218023013: Hoist knowledge of image_cache into widgets/basic.dart (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: address reviewer comments Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/sdk/lib/mojo/net/image_cache.dart ('k') | sky/sdk/lib/widgets/basic.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/sdk/lib/rendering/box.dart
diff --git a/sky/sdk/lib/rendering/box.dart b/sky/sdk/lib/rendering/box.dart
index a0e58ff05416eb4aa6e4e44013f5ce56bf716b1f..aac7bbea44ca32bef32d1fd7e994195d282a3d56 100644
--- a/sky/sdk/lib/rendering/box.dart
+++ b/sky/sdk/lib/rendering/box.dart
@@ -8,7 +8,6 @@ import 'dart:sky' as sky;
import 'package:vector_math/vector_math.dart';
import '../base/debug.dart';
-import '../mojo/net/image_cache.dart' as image_cache;
import '../painting/box_painter.dart';
import 'object.dart';
@@ -1015,24 +1014,18 @@ class RenderBaseline extends RenderShiftedBox {
class RenderImage extends RenderBox {
- RenderImage(String url, Size dimensions) {
- requestedSize = dimensions;
- src = url;
- }
+ RenderImage(sky.Image image, Size requestedSize)
+ : _image = image, _requestedSize = requestedSize;
sky.Image _image;
- String _src;
- String get src => _src;
- void set src (String value) {
- if (value == _src)
+ sky.Image get image => _image;
+ void set image (sky.Image value) {
+ if (value == _image)
return;
- _src = value;
- image_cache.load(_src).then((result) {
- _image = result;
- if (requestedSize.width == null || requestedSize.height == null)
- markNeedsLayout();
- markNeedsPaint();
- });
+ _image = value;
+ markNeedsPaint();
+ if (_requestedSize.width == null || _requestedSize.height == null)
+ markNeedsLayout();
}
Size _requestedSize;
@@ -1114,7 +1107,7 @@ class RenderImage extends RenderBox {
canvas.restore();
}
- String debugDescribeSettings(String prefix) => '${super.debugDescribeSettings(prefix)}${prefix}url: ${src}\n${prefix}dimensions: ${requestedSize}\n';
+ String debugDescribeSettings(String prefix) => '${super.debugDescribeSettings(prefix)}${prefix}dimensions: ${requestedSize}\n';
}
class RenderDecoratedBox extends RenderProxyBox {
« no previous file with comments | « sky/sdk/lib/mojo/net/image_cache.dart ('k') | sky/sdk/lib/widgets/basic.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698