Changeset 53152 in webkit
- Timestamp:
- Jan 12, 2010 11:52:37 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 1 deleted
- 6 edited
-
ChangeLog (modified) (1 diff)
-
GNUmakefile.am (modified) (2 diffs)
-
WebCore.gypi (modified) (1 diff)
-
WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
-
WebCoreSources.bkl (modified) (1 diff)
-
platform/image-decoders/ImageDecoder.cpp (modified) (3 diffs)
-
platform/image-decoders/xbm (deleted)
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r53151 r53152 1 2010-01-12 Peter Kasting <pkasting@google.com> 2 3 Reviewed by Dimitri Glazkov. 4 5 Remove XBM support from the open-source image decoders. 6 https://bugs.webkit.org/show_bug.cgi?id=27823 7 8 * GNUmakefile.am: 9 * WebCore.gypi: 10 * WebCore.vcproj/WebCore.vcproj: 11 * WebCoreSources.bkl: 12 * platform/image-decoders/ImageDecoder.cpp: 13 (WebCore::ImageDecoder::create): 14 * platform/image-decoders/xbm: Removed. 15 * platform/image-decoders/xbm/XBMImageDecoder.cpp: Removed. 16 * platform/image-decoders/xbm/XBMImageDecoder.h: Removed. 17 1 18 2010-01-12 Alexey Proskuryakov <ap@apple.com> 2 19 -
trunk/WebCore/GNUmakefile.am
r53086 r53152 42 42 -I$(srcdir)/WebCore/platform/image-decoders/jpeg \ 43 43 -I$(srcdir)/WebCore/platform/image-decoders/png \ 44 -I$(srcdir)/WebCore/platform/image-decoders/xbm \45 44 -I$(srcdir)/WebCore/platform/mock \ 46 45 -I$(srcdir)/WebCore/platform/network \ … … 2035 2034 WebCore/platform/image-decoders/png/PNGImageDecoder.cpp \ 2036 2035 WebCore/platform/image-decoders/png/PNGImageDecoder.h \ 2037 WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp \2038 WebCore/platform/image-decoders/xbm/XBMImageDecoder.h \2039 2036 WebCore/platform/network/soup/AuthenticationChallenge.h \ 2040 2037 WebCore/platform/network/soup/CookieJarSoup.cpp \ -
trunk/WebCore/WebCore.gypi
r53086 r53152 2336 2336 'platform/image-decoders/skia/ImageDecoderSkia.cpp', 2337 2337 'platform/image-decoders/wx/ImageDecoderWx.cpp', 2338 'platform/image-decoders/xbm/XBMImageDecoder.cpp',2339 'platform/image-decoders/xbm/XBMImageDecoder.h',2340 2338 'platform/image-decoders/zlib/crc32.h', 2341 2339 'platform/image-decoders/zlib/deflate.h', -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r53086 r53152 26156 26156 </File> 26157 26157 </Filter> 26158 <Filter26159 Name="xbm"26160 >26161 <File26162 RelativePath="..\platform\image-decoders\xbm\XBMImageDecoder.cpp"26163 >26164 <FileConfiguration26165 Name="Debug|Win32"26166 ExcludedFromBuild="true"26167 >26168 <Tool26169 Name="VCCLCompilerTool"26170 />26171 </FileConfiguration>26172 <FileConfiguration26173 Name="Release|Win32"26174 ExcludedFromBuild="true"26175 >26176 <Tool26177 Name="VCCLCompilerTool"26178 />26179 </FileConfiguration>26180 <FileConfiguration26181 Name="Debug_Internal|Win32"26182 ExcludedFromBuild="true"26183 >26184 <Tool26185 Name="VCCLCompilerTool"26186 />26187 </FileConfiguration>26188 <FileConfiguration26189 Name="Debug_All|Win32"26190 ExcludedFromBuild="true"26191 >26192 <Tool26193 Name="VCCLCompilerTool"26194 />26195 </FileConfiguration>26196 </File>26197 <File26198 RelativePath="..\platform\image-decoders\xbm\XBMImageDecoder.h"26199 >26200 <FileConfiguration26201 Name="Debug|Win32"26202 ExcludedFromBuild="true"26203 >26204 <Tool26205 Name="VCCustomBuildTool"26206 />26207 </FileConfiguration>26208 <FileConfiguration26209 Name="Release|Win32"26210 ExcludedFromBuild="true"26211 >26212 <Tool26213 Name="VCCustomBuildTool"26214 />26215 </FileConfiguration>26216 <FileConfiguration26217 Name="Debug_Internal|Win32"26218 ExcludedFromBuild="true"26219 >26220 <Tool26221 Name="VCCustomBuildTool"26222 />26223 </FileConfiguration>26224 <FileConfiguration26225 Name="Debug_All|Win32"26226 ExcludedFromBuild="true"26227 >26228 <Tool26229 Name="VCCustomBuildTool"26230 />26231 </FileConfiguration>26232 </File>26233 </Filter>26234 </Filter>26235 26158 <Filter 26236 26159 Name="animation" -
trunk/WebCore/WebCoreSources.bkl
r52949 r53152 954 954 </set> 955 955 956 <set append="1" var="WEBCORE_SOURCES_XBM">957 platform/image-decoders/xbm/XBMImageDecoder.cpp958 </set>959 960 956 <set append="1" var="WEBCORE_SOURCES_RENDERING"> 961 957 rendering/AutoTableLayout.cpp -
trunk/WebCore/platform/image-decoders/ImageDecoder.cpp
r53148 r53152 34 34 #include "PNGImageDecoder.h" 35 35 #include "SharedBuffer.h" 36 #include "XBMImageDecoder.h"37 36 38 37 using namespace std; … … 57 56 ImageDecoder* ImageDecoder::create(const SharedBuffer& data) 58 57 { 59 // XBMs require 8 bytes of info. 60 static const unsigned maxMarkerLength = 8; 61 58 // We need at least 4 bytes to figure out what kind of image we're dealing with. 59 static const unsigned maxMarkerLength = 4; 62 60 char contents[maxMarkerLength]; 63 61 unsigned length = copyFromSharedBuffer(contents, maxMarkerLength, data, 0); 64 65 // We need at least 4 bytes to figure out what kind of image we're dealing with. 66 if (length < 4) 62 if (length < maxMarkerLength) 67 63 return 0; 68 64 … … 95 91 !memcmp(contents, "\000\000\002\000", 4)) 96 92 return new ICOImageDecoder(); 97 98 // XBMs require 8 bytes of info.99 if (length >= 8 && strncmp(contents, "#define ", 8) == 0)100 return new XBMImageDecoder();101 93 102 94 // Give up. We don't know what the heck this is.
Note: See TracChangeset
for help on using the changeset viewer.
