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

Side by Side Diff: third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp

Issue 2695343002: Handle OffscreenCanvas.convertToBlob exceptions: EncodingError & InvalidStateError (Closed)
Patch Set: Created 3 years, 10 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
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 "core/html/canvas/CanvasAsyncBlobCreator.h" 5 #include "core/html/canvas/CanvasAsyncBlobCreator.h"
6 6
7 #include "core/dom/DOMException.h"
7 #include "core/dom/Document.h" 8 #include "core/dom/Document.h"
8 #include "core/dom/TaskRunnerHelper.h" 9 #include "core/dom/TaskRunnerHelper.h"
9 #include "core/fileapi/Blob.h" 10 #include "core/fileapi/Blob.h"
10 #include "platform/CrossThreadFunctional.h" 11 #include "platform/CrossThreadFunctional.h"
11 #include "platform/Histogram.h" 12 #include "platform/Histogram.h"
12 #include "platform/WebTaskRunner.h" 13 #include "platform/WebTaskRunner.h"
13 #include "platform/graphics/ImageBuffer.h" 14 #include "platform/graphics/ImageBuffer.h"
14 #include "platform/image-encoders/JPEGImageEncoder.h" 15 #include "platform/image-encoders/JPEGImageEncoder.h"
15 #include "platform/image-encoders/PNGImageEncoder.h" 16 #include "platform/image-encoders/PNGImageEncoder.h"
16 #include "platform/threading/BackgroundTaskRunner.h" 17 #include "platform/threading/BackgroundTaskRunner.h"
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 void CanvasAsyncBlobCreator::createNullAndReturnResult() { 472 void CanvasAsyncBlobCreator::createNullAndReturnResult() {
472 recordIdleTaskStatusHistogram(m_idleTaskStatus); 473 recordIdleTaskStatusHistogram(m_idleTaskStatus);
473 if (m_functionType == HTMLCanvasToBlobCallback) { 474 if (m_functionType == HTMLCanvasToBlobCallback) {
474 DCHECK(isMainThread()); 475 DCHECK(isMainThread());
475 recordIdleTaskStatusHistogram(m_idleTaskStatus); 476 recordIdleTaskStatusHistogram(m_idleTaskStatus);
476 TaskRunnerHelper::get(TaskType::CanvasBlobSerialization, m_document) 477 TaskRunnerHelper::get(TaskType::CanvasBlobSerialization, m_document)
477 ->postTask(BLINK_FROM_HERE, 478 ->postTask(BLINK_FROM_HERE,
478 WTF::bind(&BlobCallback::handleEvent, 479 WTF::bind(&BlobCallback::handleEvent,
479 wrapPersistent(m_callback.get()), nullptr)); 480 wrapPersistent(m_callback.get()), nullptr));
480 } else { 481 } else {
481 Blob* blob = nullptr; 482 m_scriptPromiseResolver->reject(DOMException::create(
482 m_scriptPromiseResolver->reject(blob); 483 EncodingError, "Encoding of the source image has failed."));
483 } 484 }
484 // Avoid unwanted retention, see dispose(). 485 // Avoid unwanted retention, see dispose().
485 dispose(); 486 dispose();
486 } 487 }
487 488
488 void CanvasAsyncBlobCreator::encodeImageOnEncoderThread(double quality) { 489 void CanvasAsyncBlobCreator::encodeImageOnEncoderThread(double quality) {
489 DCHECK(!isMainThread()); 490 DCHECK(!isMainThread());
490 DCHECK(m_mimeType == MimeTypeWebp); 491 DCHECK(m_mimeType == MimeTypeWebp);
491 492
492 if (!ImageDataBuffer(m_size, m_data->data()) 493 if (!ImageDataBuffer(m_size, m_data->data())
493 .encodeImage("image/webp", quality, m_encodedImage.get())) { 494 .encodeImage("image/webp", quality, m_encodedImage.get())) {
494 m_parentFrameTaskRunner->get(TaskType::CanvasBlobSerialization) 495 m_parentFrameTaskRunner->get(TaskType::CanvasBlobSerialization)
495 ->postTask(BLINK_FROM_HERE, 496 ->postTask(
496 crossThreadBind(&BlobCallback::handleEvent, 497 BLINK_FROM_HERE,
497 wrapCrossThreadPersistent(m_callback.get()), 498 crossThreadBind(&CanvasAsyncBlobCreator::createNullAndReturnResult,
498 nullptr)); 499 wrapCrossThreadPersistent(this)));
499 return; 500 return;
500 } 501 }
501 502
502 m_parentFrameTaskRunner->get(TaskType::CanvasBlobSerialization) 503 m_parentFrameTaskRunner->get(TaskType::CanvasBlobSerialization)
503 ->postTask( 504 ->postTask(
504 BLINK_FROM_HERE, 505 BLINK_FROM_HERE,
505 crossThreadBind(&CanvasAsyncBlobCreator::createBlobAndReturnResult, 506 crossThreadBind(&CanvasAsyncBlobCreator::createBlobAndReturnResult,
506 wrapCrossThreadPersistent(this))); 507 wrapCrossThreadPersistent(this)));
507 } 508 }
508 509
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 616
616 DEFINE_TRACE(CanvasAsyncBlobCreator) { 617 DEFINE_TRACE(CanvasAsyncBlobCreator) {
617 visitor->trace(m_document); 618 visitor->trace(m_document);
618 visitor->trace(m_data); 619 visitor->trace(m_data);
619 visitor->trace(m_callback); 620 visitor->trace(m_callback);
620 visitor->trace(m_parentFrameTaskRunner); 621 visitor->trace(m_parentFrameTaskRunner);
621 visitor->trace(m_scriptPromiseResolver); 622 visitor->trace(m_scriptPromiseResolver);
622 } 623 }
623 624
624 } // namespace blink 625 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698