Hoist knowledge of image_cache into widgets/basic.dart

sky/sdk/lib/rendering/box.dart

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 import 'dart:math' as math;
 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';
 
 export '../painting/box_painter.dart';
 
 // GENERIC BOX RENDERING
 // Anything that has a concept of x, y, width, height is going to derive from this
 
 // This class should only be used in debug builds
 class _DebugSize extends Size {
@@ skipping 986 matching lines @@
     } else {
       performResize();
     }
   }
 
   String debugDescribeSettings(String prefix) => '${super.debugDescribeSettings(prefix)}${prefix}baseline: ${baseline}\nbaselineType: ${baselineType}';
 }
 
 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;
   Size get requestedSize => _requestedSize;
   void set requestedSize (Size value) {
     if (value == null)
       value = const Size(null, null);
     if (value == _requestedSize)
       return;
     _requestedSize = value;
@@ skipping 61 matching lines @@
       canvas.translate(offset.dx, offset.dy);
       canvas.scale(widthScale, heightScale);
       offset = Offset.zero;
     }
     Paint paint = new Paint();
     canvas.drawImage(_image, offset.toPoint(), paint);
     if (needsScale)
       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 {
 
   RenderDecoratedBox({
     BoxDecoration decoration,
     RenderBox child
   }) : _painter = new BoxPainter(decoration), super(child);
 
   BoxPainter _painter;
@@ skipping 299 matching lines @@
 
   void defaultPaint(PaintingCanvas canvas, Offset offset) {
     RenderBox child = firstChild;
     while (child != null) {
       assert(child.parentData is ParentDataType);
       canvas.paintChild(child, child.parentData.position + offset);
       child = child.parentData.nextSibling;
     }
   }
 }