Changeset 83790 in webkit


Ignore:
Timestamp:
Apr 13, 2011 5:25:05 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-13 Noel Gordon <noel.gordon@gmail.com>

Reviewed by Kenneth Russell.

[chromium] Fix canvas.toDataURL mimeType assertion
https://bugs.webkit.org/show_bug.cgi?id=58425

Following r81213, reassert expected toDataURL() mimeType, remove an unused variable.

No new tests. Covered by existing tests.

  • platform/graphics/skia/ImageBufferSkia.cpp: (WebCore::ImageToDataURL): (WebCore::ImageBuffer::toDataURL):
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r83788 r83790  
     12011-04-13  Noel Gordon  <noel.gordon@gmail.com>
     2
     3        Reviewed by Kenneth Russell.
     4
     5        [chromium] Fix canvas.toDataURL mimeType assertion
     6        https://bugs.webkit.org/show_bug.cgi?id=58425
     7
     8        Following r81213, reassert expected toDataURL() mimeType, remove an unused variable.
     9
     10        No new tests. Covered by existing tests.
     11
     12        * platform/graphics/skia/ImageBufferSkia.cpp:
     13        (WebCore::ImageToDataURL):
     14        (WebCore::ImageBuffer::toDataURL):
     15
    1162011-04-12  Luiz Agostini  <luiz.agostini@openbossa.org>
    217
  • trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

    r83666 r83790  
    346346static String ImageToDataURL(T& source, const String& mimeType, const double* quality)
    347347{
     348    ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
     349
    348350    Vector<unsigned char> encodedImage;
    349351    if (mimeType == "image/jpeg") {
     
    367369String ImageBuffer::toDataURL(const String& mimeType, const double* quality) const
    368370{
    369     ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
    370 
    371     Vector<unsigned char> encodedImage;
    372371    SkDevice* device = context()->platformContext()->canvas()->getDevice();
    373372    SkBitmap bitmap = device->accessBitmap(false);
Note: See TracChangeset for help on using the changeset viewer.