From d79ef3a6c6aed041bc5bd32b520a278bf414f8d0 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Thu, 18 Jun 2015 09:14:51 -0700 Subject: [PATCH] Fix data loading in the stocks app We can't have two copies of |embedder.dart| or |shell.dart| because they take ownership of some underlying Mojo handles. Instead of duplicating the code, this CL makes the old locations just export all the symbols from the new location. I've also done the same with fetch.dart to avoid code duplication. Finally, I've removed image_cache.dart in the old location because the only clients already live in the new world and ought to use the new location. TBR=ianh@google.com Review URL: https://codereview.chromium.org/1179923004. --- examples/raw/spinning_image.dart | 2 +- examples/rendering/interactive_flex.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/raw/spinning_image.dart b/examples/raw/spinning_image.dart index 1a6a8932ade..a50f4c36f8c 100644 --- a/examples/raw/spinning_image.dart +++ b/examples/raw/spinning_image.dart @@ -4,7 +4,7 @@ import 'dart:math' as math; import 'dart:sky'; -import 'package:sky/framework/net/image_cache.dart' as image_cache; +import 'package:sky/mojo/net/image_cache.dart' as image_cache; double timeBase = null; diff --git a/examples/rendering/interactive_flex.dart b/examples/rendering/interactive_flex.dart index 2e5629dba60..0868ffc0ba9 100644 --- a/examples/rendering/interactive_flex.dart +++ b/examples/rendering/interactive_flex.dart @@ -5,7 +5,7 @@ import 'dart:sky'; import 'dart:math' as math; -import 'package:sky/framework/net/image_cache.dart' as image_cache; +import 'package:sky/mojo/net/image_cache.dart' as image_cache; import 'package:sky/painting/text_style.dart'; import 'package:sky/rendering/block.dart'; import 'package:sky/rendering/box.dart';