-
pkasting@chromium.org authored
https://bugs.webkit.org/show_bug.cgi?id=28751 Reviewed by Adam Barth. * Make code mostly comply with the style guide (switch indenting, use of "!" vs. "== 0", don't unnecessarily wrap lines, etc.) * Eliminate m_allDataReceived in ICO/BMP decoders since it's in the base ImageDecoder class * Remove some useless or wrong comments, add others * Wrap comments at 80 columns (most already were) for consistency/readability * Avoid casts by using correct variable types * Consistent naming of decode() function/args * Shorter code in some places * Make declaration and definition order match * platform/graphics/qt/ImageDecoderQt.cpp: (WebCore::ImageDecoderQt::frameCount): (WebCore::ImageDecoderQt::frameBufferAtIndex): (WebCore::ImageDecoderQt::forceLoadEverything): * platform/image-decoders/ImageDecoder.cpp: (WebCore::ImageDecoder::create): (WebCore::RGBA32Buffer::clear): (WebCore::RGBA32Buffer::setSize): * platform/image-decoders/ImageDecoder.h: (WebCore::RGBA32Buffer::): (WebCore::ImageDecoder::ImageDecoder): * platform/image-decoders/bmp/BMPImageDecoder.cpp: (WebCore::BMPImageDecoder::BMPImageDecoder): (WebCore::BMPImageDecoder::setData): (WebCore::BMPImageDecoder::isSizeAvailable): (WebCore::BMPImageDecoder::frameBufferAtIndex): (WebCore::BMPImageDecoder::decode): (WebCore::BMPImageDecoder::decodeHelper): (WebCore::BMPImageDecoder::processFileHeader): * platform/image-decoders/bmp/BMPImageDecoder.h: (WebCore::BMPImageDecoder::readUint32): * platform/image-decoders/bmp/BMPImageReader.cpp: (WebCore::BMPImageReader::BMPImageReader): (WebCore::BMPImageReader::decodeBMP): (WebCore::BMPImageReader::readInfoHeaderSize): (WebCore::BMPImageReader::processInfoHeader): (WebCore::BMPImageReader::readInfoHeader): (WebCore::BMPImageReader::isInfoHeaderValid): (WebCore::BMPImageReader::processBitmasks): (WebCore::BMPImageReader::processColorTable): (WebCore::BMPImageReader::processRLEData): (WebCore::BMPImageReader::processNonRLEData): * platform/image-decoders/bmp/BMPImageReader.h: (WebCore::BMPImageReader::readUint32): (WebCore::BMPImageReader::pastEndOfImage): (WebCore::BMPImageReader::readCurrentPixel): (WebCore::BMPImageReader::getComponent): (WebCore::BMPImageReader::getAlpha): (WebCore::BMPImageReader::setI): (WebCore::BMPImageReader::setRGBA): * platform/image-decoders/gif/GIFImageDecoder.cpp: (WebCore::GIFImageDecoder::GIFImageDecoder): (WebCore::GIFImageDecoder::setData): (WebCore::GIFImageDecoder::isSizeAvailable): (WebCore::GIFImageDecoder::frameCount): (WebCore::GIFImageDecoder::frameBufferAtIndex): (WebCore::GIFImageDecoder::clearFrameBufferCache): (WebCore::GIFImageDecoder::sizeNowAvailable): (WebCore::GIFImageDecoder::haveDecodedRow): (WebCore::GIFImageDecoder::frameComplete): (WebCore::GIFImageDecoder::decode): (WebCore::GIFImageDecoder::initFrameBuffer): * platform/image-decoders/gif/GIFImageDecoder.h: (WebCore::GIFImageDecoder::): (WebCore::GIFImageDecoder::filenameExtension): * platform/image-decoders/gif/GIFImageReader.cpp: (GIFImageReader::do_lzw): (GIFImageReader::read): * platform/image-decoders/gif/GIFImageReader.h: (GIFImageReader::~GIFImageReader): * platform/image-decoders/ico/ICOImageDecoder.cpp: (WebCore::ICOImageDecoder::ICOImageDecoder): (WebCore::ICOImageDecoder::~ICOImageDecoder): (WebCore::ICOImageDecoder::setData): (WebCore::ICOImageDecoder::isSizeAvailable): (WebCore::ICOImageDecoder::frameSizeAtIndex): (WebCore::ICOImageDecoder::frameCount): (WebCore::ICOImageDecoder::frameBufferAtIndex): (WebCore::ICOImageDecoder::compareEntries): (WebCore::ICOImageDecoder::setDataForPNGDecoderAtIndex): (WebCore::ICOImageDecoder::decode): (WebCore::ICOImageDecoder::decodeDirectory): (WebCore::ICOImageDecoder::decodeAtIndex): (WebCore::ICOImageDecoder::processDirectoryEntries): (WebCore::ICOImageDecoder::readDirectoryEntry): * platform/image-decoders/ico/ICOImageDecoder.h: (WebCore::ICOImageDecoder::readUint16): (WebCore::ICOImageDecoder::readUint32): * platform/image-decoders/jpeg/JPEGImageDecoder.cpp: (WebCore::): (WebCore::JPEGImageReader::JPEGImageReader): (WebCore::JPEGImageReader::skipBytes): (WebCore::JPEGImageReader::decode): (WebCore::error_exit): (WebCore::fill_input_buffer): (WebCore::term_source): (WebCore::JPEGImageDecoder::setData): (WebCore::JPEGImageDecoder::setSize): (WebCore::JPEGImageDecoder::frameBufferAtIndex): (WebCore::JPEGImageDecoder::jpegComplete): (WebCore::JPEGImageDecoder::decode): * platform/image-decoders/jpeg/JPEGImageDecoder.h: (WebCore::JPEGImageDecoder::filenameExtension): * platform/image-decoders/png/PNGImageDecoder.cpp: (WebCore::decodingFailed): (WebCore::decodingWarning): (WebCore::headerAvailable): (WebCore::rowAvailable): (WebCore::pngComplete): (WebCore::PNGImageReader::PNGImageReader): (WebCore::PNGImageReader::close): (WebCore::PNGImageReader::decode): (WebCore::PNGImageReader::createInterlaceBuffer): (WebCore::PNGImageDecoder::setData): (WebCore::PNGImageDecoder::frameBufferAtIndex): (WebCore::PNGImageDecoder::headerAvailable): (WebCore::PNGImageDecoder::rowAvailable): (WebCore::PNGImageDecoder::pngComplete): (WebCore::PNGImageDecoder::decode): * platform/image-decoders/png/PNGImageDecoder.h: (WebCore::PNGImageDecoder::filenameExtension): * platform/image-decoders/qt/RGBA32BufferQt.cpp: (WebCore::RGBA32Buffer::setDecodedImage): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54823 268f45cc-cd09-0410-ab3c-d52691b4dbfc
910636f4