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

Side by Side Diff: third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp

Issue 1841313003: Reject promise with InvalidStateError instead of null in createImageBitmap(Blob) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « third_party/WebKit/LayoutTests/fast/canvas/resources/canvas-createImageBitmap-invalid-blob-in-workers.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 DEFINE_TRACE(ImageBitmapFactories) 179 DEFINE_TRACE(ImageBitmapFactories)
180 { 180 {
181 visitor->trace(m_pendingLoaders); 181 visitor->trace(m_pendingLoaders);
182 WillBeHeapSupplement<LocalDOMWindow>::trace(visitor); 182 WillBeHeapSupplement<LocalDOMWindow>::trace(visitor);
183 WillBeHeapSupplement<WorkerGlobalScope>::trace(visitor); 183 WillBeHeapSupplement<WorkerGlobalScope>::trace(visitor);
184 } 184 }
185 185
186 void ImageBitmapFactories::ImageBitmapLoader::rejectPromise() 186 void ImageBitmapFactories::ImageBitmapLoader::rejectPromise()
187 { 187 {
188 m_resolver->reject(ScriptValue(m_resolver->getScriptState(), v8::Null(m_reso lver->getScriptState()->isolate()))); 188 m_resolver->reject(DOMException::create(InvalidStateError, "The source image cannot be decoded."));
189 m_factory->didFinishLoading(this); 189 m_factory->didFinishLoading(this);
190 } 190 }
191 191
192 void ImageBitmapFactories::ImageBitmapLoader::didFinishLoading() 192 void ImageBitmapFactories::ImageBitmapLoader::didFinishLoading()
193 { 193 {
194 if (!m_loader.arrayBufferResult()) { 194 if (!m_loader.arrayBufferResult()) {
195 rejectPromise(); 195 rejectPromise();
196 return; 196 return;
197 } 197 }
198 scheduleAsyncImageBitmapDecoding(); 198 scheduleAsyncImageBitmapDecoding();
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 m_factory->didFinishLoading(this); 259 m_factory->didFinishLoading(this);
260 } 260 }
261 261
262 DEFINE_TRACE(ImageBitmapFactories::ImageBitmapLoader) 262 DEFINE_TRACE(ImageBitmapFactories::ImageBitmapLoader)
263 { 263 {
264 visitor->trace(m_factory); 264 visitor->trace(m_factory);
265 visitor->trace(m_resolver); 265 visitor->trace(m_resolver);
266 } 266 }
267 267
268 } // namespace blink 268 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/canvas/resources/canvas-createImageBitmap-invalid-blob-in-workers.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698