Changeset 213437 in webkit
- Timestamp:
- Mar 5, 2017 12:31:06 PM (7 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r213436 r213437 234 234 https://bugs.webkit.org/show_bug.cgi?id=169145 235 235 http://trac.webkit.org/changeset/213400 236 237 2017-03-03 Andy Estes <aestes@apple.com> 238 239 Add support for canvas.toBlob 240 https://bugs.webkit.org/show_bug.cgi?id=148878 241 242 Reviewed by Tim Horton. 243 244 Address additional review feedback received after r213412 landed. 245 246 * html/HTMLCanvasElement.cpp: 247 (WebCore::HTMLCanvasElement::toBlob): Passed null to the blob callback if blob conversion 248 fails for any reason. 249 * platform/graphics/cg/ImageBufferCG.cpp: 250 (WebCore::cgImage): Removed an unnecessary local variable. 236 251 237 252 2017-03-03 Andy Estes <aestes@apple.com> -
trunk/Source/WebCore/html/HTMLCanvasElement.cpp
r213412 r213437 505 505 #if USE(CG) 506 506 if (auto imageData = getImageData()) { 507 RefPtr<Blob> blob; 507 508 Vector<uint8_t> blobData = data(*imageData, encodingMIMEType, quality); 508 callback->scheduleCallback(context, Blob::create(WTFMove(blobData), encodingMIMEType)); 509 if (!blobData.isEmpty()) 510 blob = Blob::create(WTFMove(blobData), encodingMIMEType); 511 callback->scheduleCallback(context, WTFMove(blob)); 509 512 return { }; 510 513 } … … 513 516 makeRenderingResultsAvailable(); 514 517 518 RefPtr<Blob> blob; 515 519 Vector<uint8_t> blobData = buffer()->toData(encodingMIMEType, quality); 516 callback->scheduleCallback(context, Blob::create(WTFMove(blobData), encodingMIMEType)); 520 if (!blobData.isEmpty()) 521 blob = Blob::create(WTFMove(blobData), encodingMIMEType); 522 callback->scheduleCallback(context, WTFMove(blob)); 517 523 return { }; 518 524 } -
trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
r213412 r213437 611 611 return nullptr; 612 612 613 auto image = adoptCF(CGImageCreate(source.width(), source.height(), 8, 32, 4 * source.width(), sRGBColorSpaceRef(), kCGBitmapByteOrderDefault | dataAlphaInfo, dataProvider.get(), 0, false, kCGRenderingIntentDefault)); 614 return image; 613 return adoptCF(CGImageCreate(source.width(), source.height(), 8, 32, 4 * source.width(), sRGBColorSpaceRef(), kCGBitmapByteOrderDefault | dataAlphaInfo, dataProvider.get(), 0, false, kCGRenderingIntentDefault)); 615 614 } 616 615
Note: See TracChangeset
for help on using the changeset viewer.