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

Side by Side Diff: sky/engine/core/loader/CanvasImageDecoder.cpp

Issue 1170413002: Make Sky not crash when an image 404s. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « no previous file | sky/sdk/lib/framework/net/image_cache.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sky/engine/config.h" 5 #include "sky/engine/config.h"
6 #include "sky/engine/core/loader/CanvasImageDecoder.h" 6 #include "sky/engine/core/loader/CanvasImageDecoder.h"
7 #include "sky/engine/core/painting/CanvasImage.h" 7 #include "sky/engine/core/painting/CanvasImage.h"
8 #include "sky/engine/core/script/dom_dart_state.h"
9 #include "sky/engine/platform/SharedBuffer.h" 8 #include "sky/engine/platform/SharedBuffer.h"
10 #include "sky/engine/platform/image-decoders/ImageDecoder.h" 9 #include "sky/engine/platform/image-decoders/ImageDecoder.h"
11 10
12 namespace blink { 11 namespace blink {
13 12
14 PassRefPtr<CanvasImageDecoder> CanvasImageDecoder::create( 13 PassRefPtr<CanvasImageDecoder> CanvasImageDecoder::create(
15 mojo::ScopedDataPipeConsumerHandle handle, 14 mojo::ScopedDataPipeConsumerHandle handle,
16 PassOwnPtr<ImageDecoderCallback> callback) 15 PassOwnPtr<ImageDecoderCallback> callback)
17 { 16 {
18 return adoptRef(new CanvasImageDecoder(handle.Pass(), callback)); 17 return adoptRef(new CanvasImageDecoder(handle.Pass(), callback));
19 } 18 }
20 19
21 CanvasImageDecoder::CanvasImageDecoder(mojo::ScopedDataPipeConsumerHandle handle , PassOwnPtr<ImageDecoderCallback> callback) 20 CanvasImageDecoder::CanvasImageDecoder(
21 mojo::ScopedDataPipeConsumerHandle handle,
22 PassOwnPtr<ImageDecoderCallback> callback)
22 : callback_(callback) { 23 : callback_(callback) {
24 CHECK(callback_);
23 buffer_ = SharedBuffer::create(); 25 buffer_ = SharedBuffer::create();
24 drainer_ = adoptPtr(new mojo::common::DataPipeDrainer(this, handle.Pass())); 26 drainer_ = adoptPtr(new mojo::common::DataPipeDrainer(this, handle.Pass()));
25 } 27 }
26 28
27 CanvasImageDecoder::~CanvasImageDecoder() { 29 CanvasImageDecoder::~CanvasImageDecoder() {
28 } 30 }
29 31
30 void CanvasImageDecoder::OnDataAvailable(const void* data, size_t num_bytes) { 32 void CanvasImageDecoder::OnDataAvailable(const void* data, size_t num_bytes) {
31 buffer_->append(static_cast<const char*>(data), num_bytes); 33 buffer_->append(static_cast<const char*>(data), num_bytes);
32 } 34 }
33 35
34 void CanvasImageDecoder::OnDataComplete() { 36 void CanvasImageDecoder::OnDataComplete() {
35 OwnPtr<ImageDecoder> decoder = 37 OwnPtr<ImageDecoder> decoder =
36 ImageDecoder::create(*buffer_.get(), ImageSource::AlphaPremultiplied, 38 ImageDecoder::create(*buffer_.get(), ImageSource::AlphaPremultiplied,
37 ImageSource::GammaAndColorProfileIgnored); 39 ImageSource::GammaAndColorProfileIgnored);
40 // decoder can be null if the buffer we was empty and we couldn't even guess
41 // what type of image to decode.
42 if (!decoder) {
43 callback_->handleEvent(nullptr);
44 return;
45 }
38 decoder->setData(buffer_.get(), true); 46 decoder->setData(buffer_.get(), true);
39 if (!decoder->failed() && decoder->frameCount() > 0) { 47 if (decoder->failed() || decoder->frameCount() == 0) {
40 RefPtr<CanvasImage> resultImage = CanvasImage::create();
41 resultImage->setBitmap(decoder->frameBufferAtIndex(0)->getSkBitmap());
42 callback_->handleEvent(resultImage.get());
43 } else {
44 callback_->handleEvent(nullptr); 48 callback_->handleEvent(nullptr);
49 return;
45 } 50 }
51
52 RefPtr<CanvasImage> resultImage = CanvasImage::create();
53 resultImage->setBitmap(decoder->frameBufferAtIndex(0)->getSkBitmap());
54 callback_->handleEvent(resultImage.get());
46 } 55 }
47 56
48 } // namespace blink 57 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/sdk/lib/framework/net/image_cache.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698