Refactor image handling in Sky

sky/engine/core/painting/CanvasImage.h

Index: sky/engine/core/painting/CanvasImage.h
diff --git a/sky/engine/core/painting/CanvasImage.h b/sky/engine/core/painting/CanvasImage.h
index 1f40d7bab83124db57b22bf2cb5aa7663c0f828f..c92e9ebd9885a4287ad9e4cf48d24f9515d1bd09 100644
--- a/sky/engine/core/painting/CanvasImage.h
+++ b/sky/engine/core/painting/CanvasImage.h
@@ -5,7 +5,6 @@
 #ifndef SKY_ENGINE_CORE_PAINTING_CANVASIMAGE_H_
 #define SKY_ENGINE_CORE_PAINTING_CANVASIMAGE_H_
 
-#include "sky/engine/core/loader/NewImageLoader.h"
 #include "sky/engine/platform/weborigin/KURL.h"
 #include "sky/engine/tonic/dart_wrappable.h"
 #include "sky/engine/wtf/PassRefPtr.h"
@@ -15,8 +14,7 @@
 namespace blink {
 
 class CanvasImage final : public RefCounted<CanvasImage>,
-                          public DartWrappable,
-                          public NewImageLoaderClient {
+                          public DartWrappable {
   DEFINE_WRAPPERTYPEINFO();
  public:
   ~CanvasImage() override;
@@ -25,21 +23,13 @@ class CanvasImage final : public RefCounted<CanvasImage>,
   int width() const;
   int height() const;
 
-  KURL src() const { return srcURL_; }
-  void setSrc(const String&);
-
   const SkBitmap& bitmap() const { return bitmap_; }
   void setBitmap(const SkBitmap& bitmap) { bitmap_ = bitmap; }
 
  private:
   CanvasImage();
 
-  // NewImageLoaderClient
-  void OnLoadFinished(const SkBitmap& result) override;
-
-  KURL srcURL_;
   SkBitmap bitmap_;
-  OwnPtr<NewImageLoader> imageLoader_;
 };
 
 }  // namespace blink