Source/WebCore/platform/image-decoders/ImageDecoder.cpp - Issue 13529026: Removing a bunch of unused platform code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/platform/image-decoders/ImageDecoder.cpp

Issue 13529026: Removing a bunch of unused platform code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Fix whitespace and compiler error on Mac. Created 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Source/WebCore/platform/graphics/transforms/TransformationMatrix.h ('k') | Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/image-decoders/ImageDecoder.cpp

diff --git a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp b/Source/WebCore/platform/image-decoders/ImageDecoder.cpp

index b0d5fd0e14c32fe3c1c4a626a128af03c5743a8f..c7e822389af7439c552e5aecbf913a9cdbc06e2f 100644

--- a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp

+++ b/Source/WebCore/platform/image-decoders/ImageDecoder.cpp

@@ -25,12 +25,7 @@

#include "BMPImageDecoder.h"

#include "GIFImageDecoder.h"

#include "ICOImageDecoder.h"

-#if PLATFORM(QT)

-#include "ImageDecoderQt.h"

-#endif

-#if !PLATFORM(QT) || USE(LIBJPEG)

#include "JPEGImageDecoder.h"

-#endif

#include "PNGImageDecoder.h"

#include "PlatformMemoryInstrumentation.h"

#include "SharedBuffer.h"

@@ -113,18 +108,14 @@ PassOwnPtr<ImageDecoder> ImageDecoder::create(const SharedBuffer& data, ImageSou

if (matchesGIFSignature(contents))

return adoptPtr(new GIFImageDecoder(alphaOption, gammaAndColorProfileOption));

-#if !PLATFORM(QT) || (PLATFORM(QT) && USE(LIBPNG))

if (matchesPNGSignature(contents))

return adoptPtr(new PNGImageDecoder(alphaOption, gammaAndColorProfileOption));

if (matchesICOSignature(contents) || matchesCURSignature(contents))

return adoptPtr(new ICOImageDecoder(alphaOption, gammaAndColorProfileOption));

-#endif

-#if !PLATFORM(QT) || (PLATFORM(QT) && USE(LIBJPEG))

if (matchesJPEGSignature(contents))

return adoptPtr(new JPEGImageDecoder(alphaOption, gammaAndColorProfileOption));

-#endif

#if USE(WEBP)

if (matchesWebPSignature(contents))

@@ -134,9 +125,6 @@ PassOwnPtr<ImageDecoder> ImageDecoder::create(const SharedBuffer& data, ImageSou

if (matchesBMPSignature(contents))

return adoptPtr(new BMPImageDecoder(alphaOption, gammaAndColorProfileOption));

-#if PLATFORM(QT)

- return adoptPtr(new ImageDecoderQt(alphaOption, gammaAndColorProfileOption));

-#endif

return nullptr;

}