Changeset 14652 in webkit
- Timestamp:
- May 31, 2006 3:19:04 PM (18 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 9 added
- 3 edited
-
ChangeLog (modified) (1 diff)
-
WebCore.vcproj/WebCore/WebCore.vcproj (modified) (5 diffs)
-
platform/cairo/ImageSourceCairo.cpp (modified) (3 diffs)
-
platform/image-decoders/bmp (added)
-
platform/image-decoders/bmp/BMPImageDecoder.cpp (added)
-
platform/image-decoders/bmp/BMPImageDecoder.h (added)
-
platform/image-decoders/ico (added)
-
platform/image-decoders/ico/ICOImageDecoder.cpp (added)
-
platform/image-decoders/ico/ICOImageDecoder.h (added)
-
platform/image-decoders/xbm (added)
-
platform/image-decoders/xbm/XBMImageDecoder.cpp (added)
-
platform/image-decoders/xbm/XBMImageDecoder.h (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r14651 r14652 1 2006-05-31 Dave Hyatt <hyatt@apple.com> 2 3 Adding stubs for BMP/ICO/XBM image decoders. They don't 4 do anything yet though. 5 6 * WebCore.vcproj/WebCore/WebCore.vcproj: 7 * platform/cairo/ImageSourceCairo.cpp: 8 (WebCore::createDecoder): 9 * platform/image-decoders/bmp: Added. 10 * platform/image-decoders/bmp/BMPImageDecoder.cpp: Added. 11 (WebCore::BMPImageDecoder::isSizeAvailable): 12 (WebCore::BMPImageDecoder::frameBufferAtIndex): 13 * platform/image-decoders/bmp/BMPImageDecoder.h: Added. 14 * platform/image-decoders/ico: Added. 15 * platform/image-decoders/ico/ICOImageDecoder.cpp: Added. 16 (WebCore::ICOImageDecoder::isSizeAvailable): 17 (WebCore::ICOImageDecoder::frameBufferAtIndex): 18 * platform/image-decoders/ico/ICOImageDecoder.h: Added. 19 * platform/image-decoders/xbm: Added. 20 * platform/image-decoders/xbm/XBMImageDecoder.cpp: Added. 21 (WebCore::XBMImageDecoder::isSizeAvailable): 22 (WebCore::XBMImageDecoder::frameBufferAtIndex): 23 * platform/image-decoders/xbm/XBMImageDecoder.h: Added. 24 1 25 2006-05-31 David Hyatt <hyatt@apple.com> 2 26 -
trunk/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
r14638 r14652 42 42 Name="VCCLCompilerTool" 43 43 Optimization="0" 44 AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\iconv\include";"$(ProjectDir)\..\..\..\icu\include";"$(ProjectDir)\..\..\..\libxml\include";"$(ProjectDir)\..\..\..\libxslt\include";"$(ProjectDir)\..\..\DerivedSources\WebCore";"$(ProjectDir)\..\..\";"$(ProjectDir)\..\..\css";"$(ProjectDir)\..\..\khtml\dom";"$(ProjectDir)\..\..\editing";"$(ProjectDir)\..\..\khtml\misc";"$(ProjectDir)\..\..\rendering";"$(ProjectDir)\..\..\bindings\js";"$(ProjectDir)\..\..\dom";"$(ProjectDir)\..\..\html";"$(ProjectDir)\..\..\khtml";"$(ProjectDir)\..\..\kwq";"$(ProjectDir)\..\..\bridge";"$(ProjectDir)\..\..\bridge\win";"$(ProjectDir)\..\..\loader";"$(ProjectDir)\..\..\page";"$(ProjectDir)\..\..\platform";"$(ProjectDir)\..\..\platform\cairo";"$(ProjectDir)\..\..\platform\image-decoders";"$(ProjectDir)\..\..\platform\image-decoders\ gif";"$(ProjectDir)\..\..\platform\image-decoders\jpeg";"$(ProjectDir)\..\..\platform\image-decoders\png";"$(ProjectDir)\..\..\platform\image-decoders\zlib";"$(ProjectDir)\..\..\xml";"$(ProjectDir)\..\..\xpath";"$(ProjectDir)\..\..\xpath\impl";"$(ProjectDir)\..\..\..\JavaScriptCore";"$(ProjectDir)\..\..\..\JavaScriptCore\os-win32";"$(ProjectDir)\..\..\ForwardingHeaders";"$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources";"$(ProjectDir)\..\..\..\JavaScriptCore\kjs";"$(ProjectDir)\..\..\platform\win";"$(ProjectDir)\..\..\platform\cairo\pixman\src";"$(ProjectDir)\..\..\platform\cairo\cairo\src""44 AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\iconv\include";"$(ProjectDir)\..\..\..\icu\include";"$(ProjectDir)\..\..\..\libxml\include";"$(ProjectDir)\..\..\..\libxslt\include";"$(ProjectDir)\..\..\DerivedSources\WebCore";"$(ProjectDir)\..\..\";"$(ProjectDir)\..\..\css";"$(ProjectDir)\..\..\khtml\dom";"$(ProjectDir)\..\..\editing";"$(ProjectDir)\..\..\khtml\misc";"$(ProjectDir)\..\..\rendering";"$(ProjectDir)\..\..\bindings\js";"$(ProjectDir)\..\..\dom";"$(ProjectDir)\..\..\html";"$(ProjectDir)\..\..\khtml";"$(ProjectDir)\..\..\kwq";"$(ProjectDir)\..\..\bridge";"$(ProjectDir)\..\..\bridge\win";"$(ProjectDir)\..\..\loader";"$(ProjectDir)\..\..\page";"$(ProjectDir)\..\..\platform";"$(ProjectDir)\..\..\platform\cairo";"$(ProjectDir)\..\..\platform\image-decoders";"$(ProjectDir)\..\..\platform\image-decoders\bmp";"$(ProjectDir)\..\..\platform\image-decoders\gif";"$(ProjectDir)\..\..\platform\image-decoders\ico";"$(ProjectDir)\..\..\platform\image-decoders\jpeg";"$(ProjectDir)\..\..\platform\image-decoders\png";"$(ProjectDir)\..\..\platform\image-decoders\xbm";"$(ProjectDir)\..\..\platform\image-decoders\zlib";"$(ProjectDir)\..\..\xml";"$(ProjectDir)\..\..\xpath";"$(ProjectDir)\..\..\xpath\impl";"$(ProjectDir)\..\..\..\JavaScriptCore";"$(ProjectDir)\..\..\..\JavaScriptCore\os-win32";"$(ProjectDir)\..\..\ForwardingHeaders";"$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources";"$(ProjectDir)\..\..\..\JavaScriptCore\kjs";"$(ProjectDir)\..\..\platform\win";"$(ProjectDir)\..\..\platform\cairo\pixman\src";"$(ProjectDir)\..\..\platform\cairo\cairo\src"" 45 45 PreprocessorDefinitions="WIN32;KHTML_NO_XBL;KHTML_XSLT;XPATH_SUPPORT" 46 46 MinimalRebuild="true" … … 109 109 <Tool 110 110 Name="VCCLCompilerTool" 111 AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\iconv\include";"$(ProjectDir)\..\..\..\icu\include";"$(ProjectDir)\..\..\..\libxml\include";"$(ProjectDir)\..\..\..\libxslt\include";"$(ProjectDir)\..\..\DerivedSources\WebCore";"$(ProjectDir)\..\..\";"$(ProjectDir)\..\..\css";"$(ProjectDir)\..\..\khtml\dom";"$(ProjectDir)\..\..\editing";"$(ProjectDir)\..\..\khtml\misc";"$(ProjectDir)\..\..\rendering";"$(ProjectDir)\..\..\bindings\js";"$(ProjectDir)\..\..\dom";"$(ProjectDir)\..\..\html";"$(ProjectDir)\..\..\khtml";"$(ProjectDir)\..\..\kwq";"$(ProjectDir)\..\..\bridge";"$(ProjectDir)\..\..\bridge\win";"$(ProjectDir)\..\..\loader";"$(ProjectDir)\..\..\page";"$(ProjectDir)\..\..\platform";"$(ProjectDir)\..\..\platform\cairo";"$(ProjectDir)\..\..\platform\image-decoders";"$(ProjectDir)\..\..\platform\image-decoders\ gif";"$(ProjectDir)\..\..\platform\image-decoders\jpeg";"$(ProjectDir)\..\..\platform\image-decoders\png";"$(ProjectDir)\..\..\platform\image-decoders\zlib";"$(ProjectDir)\..\..\xml";"$(ProjectDir)\..\..\xpath";"$(ProjectDir)\..\..\xpath\impl";"$(ProjectDir)\..\..\..\JavaScriptCore";"$(ProjectDir)\..\..\..\JavaScriptCore\os-win32";"$(ProjectDir)\..\..\ForwardingHeaders";"$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources";"$(ProjectDir)\..\..\..\JavaScriptCore\kjs";"$(ProjectDir)\..\..\platform\win";"$(ProjectDir)\..\..\platform\cairo\pixman\src";"$(ProjectDir)\..\..\platform\cairo\cairo\src""111 AdditionalIncludeDirectories=""$(ProjectDir)\..\..\..\iconv\include";"$(ProjectDir)\..\..\..\icu\include";"$(ProjectDir)\..\..\..\libxml\include";"$(ProjectDir)\..\..\..\libxslt\include";"$(ProjectDir)\..\..\DerivedSources\WebCore";"$(ProjectDir)\..\..\";"$(ProjectDir)\..\..\css";"$(ProjectDir)\..\..\khtml\dom";"$(ProjectDir)\..\..\editing";"$(ProjectDir)\..\..\khtml\misc";"$(ProjectDir)\..\..\rendering";"$(ProjectDir)\..\..\bindings\js";"$(ProjectDir)\..\..\dom";"$(ProjectDir)\..\..\html";"$(ProjectDir)\..\..\khtml";"$(ProjectDir)\..\..\kwq";"$(ProjectDir)\..\..\bridge";"$(ProjectDir)\..\..\bridge\win";"$(ProjectDir)\..\..\loader";"$(ProjectDir)\..\..\page";"$(ProjectDir)\..\..\platform";"$(ProjectDir)\..\..\platform\cairo";"$(ProjectDir)\..\..\platform\image-decoders";"$(ProjectDir)\..\..\platform\image-decoders\bmp";"$(ProjectDir)\..\..\platform\image-decoders\gif";"$(ProjectDir)\..\..\platform\image-decoders\ico";"$(ProjectDir)\..\..\platform\image-decoders\jpeg";"$(ProjectDir)\..\..\platform\image-decoders\png";"$(ProjectDir)\..\..\platform\image-decoders\xbm";"$(ProjectDir)\..\..\platform\image-decoders\zlib";"$(ProjectDir)\..\..\xml";"$(ProjectDir)\..\..\xpath";"$(ProjectDir)\..\..\xpath\impl";"$(ProjectDir)\..\..\..\JavaScriptCore";"$(ProjectDir)\..\..\..\JavaScriptCore\os-win32";"$(ProjectDir)\..\..\ForwardingHeaders";"$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources";"$(ProjectDir)\..\..\..\JavaScriptCore\kjs";"$(ProjectDir)\..\..\platform\win";"$(ProjectDir)\..\..\platform\cairo\pixman\src";"$(ProjectDir)\..\..\platform\cairo\cairo\src"" 112 112 PreprocessorDefinitions="WIN32;KHTML_NO_XBL;KHTML_XSLT;XPATH_SUPPORT;NDEBUG" 113 113 ExceptionHandling="0" … … 2058 2058 </File> 2059 2059 </Filter> 2060 <Filter 2061 Name="bmp" 2062 > 2063 <File 2064 RelativePath="..\..\platform\image-decoders\bmp\BMPImageDecoder.cpp" 2065 > 2066 </File> 2067 <File 2068 RelativePath="..\..\platform\image-decoders\bmp\BMPImageDecoder.h" 2069 > 2070 </File> 2071 </Filter> 2072 <Filter 2073 Name="ico" 2074 > 2075 <File 2076 RelativePath="..\..\platform\image-decoders\ico\ICOImageDecoder.cpp" 2077 > 2078 </File> 2079 <File 2080 RelativePath="..\..\platform\image-decoders\ico\ICOImageDecoder.h" 2081 > 2082 </File> 2083 </Filter> 2084 <Filter 2085 Name="xbm" 2086 > 2087 <File 2088 RelativePath="..\..\platform\image-decoders\xbm\XBMImageDecoder.cpp" 2089 > 2090 </File> 2091 <File 2092 RelativePath="..\..\platform\image-decoders\xbm\XBMImageDecoder.h" 2093 > 2094 </File> 2095 </Filter> 2060 2096 </Filter> 2061 2097 <Filter … … 2880 2916 </File> 2881 2917 <File 2918 RelativePath="..\..\rendering\RenderContainer.cpp" 2919 > 2920 </File> 2921 <File 2922 RelativePath="..\..\rendering\RenderContainer.h" 2923 > 2924 </File> 2925 <File 2926 RelativePath="..\..\rendering\RenderEmptyApplet.cpp" 2927 > 2928 </File> 2929 <File 2930 RelativePath="..\..\rendering\RenderEmptyApplet.h" 2931 > 2932 </File> 2933 <File 2934 RelativePath="..\..\rendering\RenderFieldset.cpp" 2935 > 2936 </File> 2937 <File 2938 RelativePath="..\..\rendering\RenderFieldset.h" 2939 > 2940 </File> 2941 <File 2942 RelativePath="..\..\rendering\RenderFileButton.cpp" 2943 > 2944 </File> 2945 <File 2946 RelativePath="..\..\rendering\RenderFileButton.h" 2947 > 2948 </File> 2949 <File 2950 RelativePath="..\..\rendering\RenderFlexibleBox.cpp" 2951 > 2952 </File> 2953 <File 2954 RelativePath="..\..\rendering\RenderFlexibleBox.h" 2955 > 2956 </File> 2957 <File 2958 RelativePath="..\..\rendering\RenderFlow.cpp" 2959 > 2960 </File> 2961 <File 2962 RelativePath="..\..\rendering\RenderFlow.h" 2963 > 2964 </File> 2965 <File 2966 RelativePath="..\..\rendering\RenderFormElement.cpp" 2967 > 2968 </File> 2969 <File 2970 RelativePath="..\..\rendering\RenderFormElement.h" 2971 > 2972 </File> 2973 <File 2974 RelativePath="..\..\rendering\RenderFrame.cpp" 2975 > 2976 </File> 2977 <File 2978 RelativePath="..\..\rendering\RenderFrame.h" 2979 > 2980 </File> 2981 <File 2982 RelativePath="..\..\rendering\RenderFrameSet.cpp" 2983 > 2984 </File> 2985 <File 2986 RelativePath="..\..\rendering\RenderFrameSet.h" 2987 > 2988 </File> 2989 <File 2990 RelativePath="..\..\rendering\RenderHTMLCanvas.cpp" 2991 > 2992 </File> 2993 <File 2994 RelativePath="..\..\rendering\RenderHTMLCanvas.h" 2995 > 2996 </File> 2997 <File 2998 RelativePath="..\..\rendering\RenderImage.cpp" 2999 > 3000 </File> 3001 <File 3002 RelativePath="..\..\rendering\RenderImage.h" 3003 > 3004 </File> 3005 <File 3006 RelativePath="..\..\rendering\RenderImageButton.cpp" 3007 > 3008 </File> 3009 <File 3010 RelativePath="..\..\rendering\RenderImageButton.h" 3011 > 3012 </File> 3013 <File 3014 RelativePath="..\..\rendering\RenderInline.cpp" 3015 > 3016 </File> 3017 <File 3018 RelativePath="..\..\rendering\RenderInline.h" 3019 > 3020 </File> 3021 <File 3022 RelativePath="..\..\rendering\RenderLabel.cpp" 3023 > 3024 </File> 3025 <File 3026 RelativePath="..\..\rendering\RenderLabel.h" 3027 > 3028 </File> 3029 <File 3030 RelativePath="..\..\rendering\RenderLayer.cpp" 3031 > 3032 </File> 3033 <File 3034 RelativePath="..\..\rendering\RenderLayer.h" 3035 > 3036 </File> 3037 <File 3038 RelativePath="..\..\rendering\RenderLegend.cpp" 3039 > 3040 </File> 3041 <File 3042 RelativePath="..\..\rendering\RenderLegend.h" 3043 > 3044 </File> 3045 <File 3046 RelativePath="..\..\rendering\RenderLineEdit.cpp" 3047 > 3048 </File> 3049 <File 3050 RelativePath="..\..\rendering\RenderLineEdit.h" 3051 > 3052 </File> 3053 <File 3054 RelativePath="..\..\rendering\RenderListItem.cpp" 3055 > 3056 </File> 3057 <File 3058 RelativePath="..\..\rendering\RenderListItem.h" 3059 > 3060 </File> 3061 <File 3062 RelativePath="..\..\rendering\RenderListMarker.cpp" 3063 > 3064 </File> 3065 <File 3066 RelativePath="..\..\rendering\RenderListMarker.h" 3067 > 3068 </File> 3069 <File 3070 RelativePath="..\..\rendering\RenderObject.cpp" 3071 > 3072 </File> 3073 <File 3074 RelativePath="..\..\rendering\RenderObject.h" 3075 > 3076 </File> 3077 <File 3078 RelativePath="..\..\rendering\RenderPart.cpp" 3079 > 3080 </File> 3081 <File 3082 RelativePath="..\..\rendering\RenderPart.h" 3083 > 3084 </File> 3085 <File 3086 RelativePath="..\..\rendering\RenderPartObject.cpp" 3087 > 3088 </File> 3089 <File 3090 RelativePath="..\..\rendering\RenderPartObject.h" 3091 > 3092 </File> 3093 <File 3094 RelativePath="..\..\rendering\RenderReplaced.cpp" 3095 > 3096 </File> 3097 <File 3098 RelativePath="..\..\rendering\RenderReplaced.h" 3099 > 3100 </File> 3101 <File 3102 RelativePath="..\..\rendering\RenderSelect.cpp" 3103 > 3104 </File> 3105 <File 3106 RelativePath="..\..\rendering\RenderSelect.h" 3107 > 3108 </File> 3109 <File 3110 RelativePath="..\..\rendering\RenderSlider.cpp" 3111 > 3112 </File> 3113 <File 3114 RelativePath="..\..\rendering\RenderSlider.h" 3115 > 3116 </File> 3117 <File 3118 RelativePath="..\..\rendering\RenderTable.cpp" 3119 > 3120 </File> 3121 <File 3122 RelativePath="..\..\rendering\RenderTable.h" 3123 > 3124 </File> 3125 <File 3126 RelativePath="..\..\rendering\RenderTableCell.cpp" 3127 > 3128 </File> 3129 <File 3130 RelativePath="..\..\rendering\RenderTableCell.h" 3131 > 3132 </File> 3133 <File 3134 RelativePath="..\..\rendering\RenderTableCol.cpp" 3135 > 3136 </File> 3137 <File 3138 RelativePath="..\..\rendering\RenderTableCol.h" 3139 > 3140 </File> 3141 <File 3142 RelativePath="..\..\rendering\RenderTableRow.cpp" 3143 > 3144 </File> 3145 <File 3146 RelativePath="..\..\rendering\RenderTableRow.h" 3147 > 3148 </File> 3149 <File 3150 RelativePath="..\..\rendering\RenderTableSection.cpp" 3151 > 3152 </File> 3153 <File 3154 RelativePath="..\..\rendering\RenderTableSection.h" 3155 > 3156 </File> 3157 <File 3158 RelativePath="..\..\rendering\RenderText.cpp" 3159 > 3160 </File> 3161 <File 3162 RelativePath="..\..\rendering\RenderText.h" 3163 > 3164 </File> 3165 <File 3166 RelativePath="..\..\rendering\RenderTextArea.cpp" 3167 > 3168 </File> 3169 <File 3170 RelativePath="..\..\rendering\RenderTextArea.h" 3171 > 3172 </File> 3173 <File 3174 RelativePath="..\..\rendering\RenderTextField.cpp" 3175 > 3176 </File> 3177 <File 3178 RelativePath="..\..\rendering\RenderTextField.h" 3179 > 3180 </File> 3181 <File 3182 RelativePath="..\..\rendering\RenderTextFragment.cpp" 3183 > 3184 </File> 3185 <File 3186 RelativePath="..\..\rendering\RenderTextFragment.h" 3187 > 3188 </File> 3189 <File 3190 RelativePath="..\..\rendering\RenderTheme.cpp" 3191 > 3192 </File> 3193 <File 3194 RelativePath="..\..\rendering\RenderTheme.h" 3195 > 3196 </File> 3197 <File 3198 RelativePath="..\..\rendering\RenderThemeWin.cpp" 3199 > 3200 </File> 3201 <File 3202 RelativePath="..\..\rendering\RenderThemeWin.h" 3203 > 3204 </File> 3205 <File 3206 RelativePath="..\..\rendering\RenderTreeAsText.cpp" 3207 > 3208 </File> 3209 <File 3210 RelativePath="..\..\rendering\RenderTreeAsText.h" 3211 > 3212 </File> 3213 <File 2882 3214 RelativePath="..\..\rendering\RenderView.cpp" 2883 3215 > … … 2885 3217 <File 2886 3218 RelativePath="..\..\rendering\RenderView.h" 2887 >2888 </File>2889 <File2890 RelativePath="..\..\rendering\RenderContainer.cpp"2891 >2892 </File>2893 <File2894 RelativePath="..\..\rendering\RenderContainer.h"2895 >2896 </File>2897 <File2898 RelativePath="..\..\rendering\RenderEmptyApplet.cpp"2899 >2900 </File>2901 <File2902 RelativePath="..\..\rendering\RenderEmptyApplet.h"2903 >2904 </File>2905 <File2906 RelativePath="..\..\rendering\RenderFieldset.cpp"2907 >2908 </File>2909 <File2910 RelativePath="..\..\rendering\RenderFieldset.h"2911 >2912 </File>2913 <File2914 RelativePath="..\..\rendering\RenderFileButton.cpp"2915 >2916 </File>2917 <File2918 RelativePath="..\..\rendering\RenderFileButton.h"2919 >2920 </File>2921 <File2922 RelativePath="..\..\rendering\RenderFlexibleBox.cpp"2923 >2924 </File>2925 <File2926 RelativePath="..\..\rendering\RenderFlexibleBox.h"2927 >2928 </File>2929 <File2930 RelativePath="..\..\rendering\RenderFlow.cpp"2931 >2932 </File>2933 <File2934 RelativePath="..\..\rendering\RenderFlow.h"2935 >2936 </File>2937 <File2938 RelativePath="..\..\rendering\RenderFormElement.cpp"2939 >2940 </File>2941 <File2942 RelativePath="..\..\rendering\RenderFormElement.h"2943 >2944 </File>2945 <File2946 RelativePath="..\..\rendering\RenderFrame.cpp"2947 >2948 </File>2949 <File2950 RelativePath="..\..\rendering\RenderFrame.h"2951 >2952 </File>2953 <File2954 RelativePath="..\..\rendering\RenderFrameSet.cpp"2955 >2956 </File>2957 <File2958 RelativePath="..\..\rendering\RenderFrameSet.h"2959 >2960 </File>2961 <File2962 RelativePath="..\..\rendering\RenderHTMLCanvas.cpp"2963 >2964 </File>2965 <File2966 RelativePath="..\..\rendering\RenderHTMLCanvas.h"2967 >2968 </File>2969 <File2970 RelativePath="..\..\rendering\RenderImage.cpp"2971 >2972 </File>2973 <File2974 RelativePath="..\..\rendering\RenderImage.h"2975 >2976 </File>2977 <File2978 RelativePath="..\..\rendering\RenderImageButton.cpp"2979 >2980 </File>2981 <File2982 RelativePath="..\..\rendering\RenderImageButton.h"2983 >2984 </File>2985 <File2986 RelativePath="..\..\rendering\RenderInline.cpp"2987 >2988 </File>2989 <File2990 RelativePath="..\..\rendering\RenderInline.h"2991 >2992 </File>2993 <File2994 RelativePath="..\..\rendering\RenderLabel.cpp"2995 >2996 </File>2997 <File2998 RelativePath="..\..\rendering\RenderLabel.h"2999 >3000 </File>3001 <File3002 RelativePath="..\..\rendering\RenderLayer.cpp"3003 >3004 </File>3005 <File3006 RelativePath="..\..\rendering\RenderLayer.h"3007 >3008 </File>3009 <File3010 RelativePath="..\..\rendering\RenderLegend.cpp"3011 >3012 </File>3013 <File3014 RelativePath="..\..\rendering\RenderLegend.h"3015 >3016 </File>3017 <File3018 RelativePath="..\..\rendering\RenderLineEdit.cpp"3019 >3020 </File>3021 <File3022 RelativePath="..\..\rendering\RenderLineEdit.h"3023 >3024 </File>3025 <File3026 RelativePath="..\..\rendering\RenderListItem.cpp"3027 >3028 </File>3029 <File3030 RelativePath="..\..\rendering\RenderListItem.h"3031 >3032 </File>3033 <File3034 RelativePath="..\..\rendering\RenderListMarker.cpp"3035 >3036 </File>3037 <File3038 RelativePath="..\..\rendering\RenderListMarker.h"3039 >3040 </File>3041 <File3042 RelativePath="..\..\rendering\RenderObject.cpp"3043 >3044 </File>3045 <File3046 RelativePath="..\..\rendering\RenderObject.h"3047 >3048 </File>3049 <File3050 RelativePath="..\..\rendering\RenderPart.cpp"3051 >3052 </File>3053 <File3054 RelativePath="..\..\rendering\RenderPart.h"3055 >3056 </File>3057 <File3058 RelativePath="..\..\rendering\RenderPartObject.cpp"3059 >3060 </File>3061 <File3062 RelativePath="..\..\rendering\RenderPartObject.h"3063 >3064 </File>3065 <File3066 RelativePath="..\..\rendering\RenderReplaced.cpp"3067 >3068 </File>3069 <File3070 RelativePath="..\..\rendering\RenderReplaced.h"3071 >3072 </File>3073 <File3074 RelativePath="..\..\rendering\RenderSelect.cpp"3075 >3076 </File>3077 <File3078 RelativePath="..\..\rendering\RenderSelect.h"3079 >3080 </File>3081 <File3082 RelativePath="..\..\rendering\RenderSlider.cpp"3083 >3084 </File>3085 <File3086 RelativePath="..\..\rendering\RenderSlider.h"3087 >3088 </File>3089 <File3090 RelativePath="..\..\rendering\RenderTable.cpp"3091 >3092 </File>3093 <File3094 RelativePath="..\..\rendering\RenderTable.h"3095 >3096 </File>3097 <File3098 RelativePath="..\..\rendering\RenderTableCell.cpp"3099 >3100 </File>3101 <File3102 RelativePath="..\..\rendering\RenderTableCell.h"3103 >3104 </File>3105 <File3106 RelativePath="..\..\rendering\RenderTableCol.cpp"3107 >3108 </File>3109 <File3110 RelativePath="..\..\rendering\RenderTableCol.h"3111 >3112 </File>3113 <File3114 RelativePath="..\..\rendering\RenderTableRow.cpp"3115 >3116 </File>3117 <File3118 RelativePath="..\..\rendering\RenderTableRow.h"3119 >3120 </File>3121 <File3122 RelativePath="..\..\rendering\RenderTableSection.cpp"3123 >3124 </File>3125 <File3126 RelativePath="..\..\rendering\RenderTableSection.h"3127 >3128 </File>3129 <File3130 RelativePath="..\..\rendering\RenderText.cpp"3131 >3132 </File>3133 <File3134 RelativePath="..\..\rendering\RenderText.h"3135 >3136 </File>3137 <File3138 RelativePath="..\..\rendering\RenderTextArea.cpp"3139 >3140 </File>3141 <File3142 RelativePath="..\..\rendering\RenderTextArea.h"3143 >3144 </File>3145 <File3146 RelativePath="..\..\rendering\RenderTextField.cpp"3147 >3148 </File>3149 <File3150 RelativePath="..\..\rendering\RenderTextField.h"3151 >3152 </File>3153 <File3154 RelativePath="..\..\rendering\RenderTextFragment.cpp"3155 >3156 </File>3157 <File3158 RelativePath="..\..\rendering\RenderTextFragment.h"3159 >3160 </File>3161 <File3162 RelativePath="..\..\rendering\RenderTheme.cpp"3163 >3164 </File>3165 <File3166 RelativePath="..\..\rendering\RenderTheme.h"3167 >3168 </File>3169 <File3170 RelativePath="..\..\rendering\RenderThemeWin.cpp"3171 >3172 </File>3173 <File3174 RelativePath="..\..\rendering\RenderThemeWin.h"3175 >3176 </File>3177 <File3178 RelativePath="..\..\rendering\RenderTreeAsText.cpp"3179 >3180 </File>3181 <File3182 RelativePath="..\..\rendering\RenderTreeAsText.h"3183 3219 > 3184 3220 </File> -
trunk/WebCore/platform/cairo/ImageSourceCairo.cpp
r13821 r14652 30 30 #include "JPEGImageDecoder.h" 31 31 #include "PNGImageDecoder.h" 32 #include "BMPImageDecoder.h" 33 #include "ICOImageDecoder.h" 34 #include "XBMImageDecoder.h" 35 32 36 #include <cairo.h> 33 37 … … 52 56 uContents[1]==0x50 && 53 57 uContents[2]==0x4E && 54 uContents[3]==0x47) {58 uContents[3]==0x47) 55 59 return new PNGImageDecoder(); 56 }57 60 58 61 // JPEG … … 63 66 64 67 // BMP 65 if (strncmp(contents, "BM", 2) == 0) { 66 return 0; 67 } 68 if (strncmp(contents, "BM", 2) == 0) 69 return new BMPImageDecoder(); 68 70 69 71 // ICOs always begin with a 2-byte 0 followed by a 2-byte 1. 70 72 // CURs begin with 2-byte 0 followed by 2-byte 2. 71 73 if (!memcmp(contents, "\000\000\001\000", 4) || 72 !memcmp(contents, "\000\000\002\000", 4)) { 73 return 0; 74 } 74 !memcmp(contents, "\000\000\002\000", 4)) 75 return new ICOImageDecoder(); 75 76 77 // XBMs require 8 bytes of info. 78 if (length >= 8 && strncmp(contents, "#define ", 8) == 0) 79 return new XBMImageDecoder(); 80 76 81 // Give up. We don't know what the heck this is. 77 82 return 0;
Note: See TracChangeset
for help on using the changeset viewer.
