| Index: sky/engine/core/loader/CanvasImageDecoder.h | 
| diff --git a/sky/engine/core/loader/CanvasImageLoader.h b/sky/engine/core/loader/CanvasImageDecoder.h | 
| similarity index 52% | 
| rename from sky/engine/core/loader/CanvasImageLoader.h | 
| rename to sky/engine/core/loader/CanvasImageDecoder.h | 
| index a8f255b0341f005daa63cc97972fffb97037a00b..f0686ae9c10dcac1277b3c0b9aa70a177ce16658 100644 | 
| --- a/sky/engine/core/loader/CanvasImageLoader.h | 
| +++ b/sky/engine/core/loader/CanvasImageDecoder.h | 
| @@ -7,41 +7,32 @@ | 
| #define SKY_ENGINE_CORE_LOADER_CANVASIMAGELOADER_H_ | 
|  | 
| #include "mojo/common/data_pipe_drainer.h" | 
| -#include "sky/engine/core/loader/ImageLoaderCallback.h" | 
| +#include "sky/engine/core/loader/ImageDecoderCallback.h" | 
| #include "sky/engine/platform/SharedBuffer.h" | 
| -#include "sky/engine/platform/fetcher/MojoFetcher.h" | 
| #include "sky/engine/tonic/dart_wrappable.h" | 
| #include "sky/engine/wtf/OwnPtr.h" | 
| #include "sky/engine/wtf/text/AtomicString.h" | 
|  | 
| namespace blink { | 
|  | 
| -class CanvasImageLoader : public MojoFetcher::Client, | 
| -                          public mojo::common::DataPipeDrainer::Client, | 
| -                          public RefCounted<CanvasImageLoader>, | 
| -                          public DartWrappable { | 
| +class CanvasImageDecoder : public mojo::common::DataPipeDrainer::Client, | 
| +                           public RefCounted<CanvasImageDecoder>, | 
| +                           public DartWrappable { | 
| DEFINE_WRAPPERTYPEINFO(); | 
| public: | 
| -  static PassRefPtr<CanvasImageLoader> create(const String& src, PassOwnPtr<ImageLoaderCallback> callback) | 
| -  { | 
| -    return adoptRef(new CanvasImageLoader(src, callback)); | 
| -  } | 
| -  virtual ~CanvasImageLoader(); | 
| - | 
| -  // MojoFetcher::Client | 
| -  void OnReceivedResponse(mojo::URLResponsePtr) override; | 
| +  static PassRefPtr<CanvasImageDecoder> create(mojo::ScopedDataPipeConsumerHandle handle, PassOwnPtr<ImageDecoderCallback> callback); | 
| +  virtual ~CanvasImageDecoder(); | 
|  | 
| // mojo::common::DataPipeDrainer::Client | 
| void OnDataAvailable(const void*, size_t) override; | 
| void OnDataComplete() override; | 
|  | 
| private: | 
| -  explicit CanvasImageLoader(const String& src, PassOwnPtr<ImageLoaderCallback> callback); | 
| +  CanvasImageDecoder(mojo::ScopedDataPipeConsumerHandle handle, PassOwnPtr<ImageDecoderCallback> callback); | 
|  | 
| -  OwnPtr<MojoFetcher> fetcher_; | 
| OwnPtr<mojo::common::DataPipeDrainer> drainer_; | 
| RefPtr<SharedBuffer> buffer_; | 
| -  OwnPtr<ImageLoaderCallback> callback_; | 
| +  OwnPtr<ImageDecoderCallback> callback_; | 
| }; | 
|  | 
| }  // namespace blink | 
|  |