Changeset 47840 in webkit
- Timestamp:
- Aug 27, 2009 4:14:53 PM (15 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r47836 r47840 1 2009-08-27 Peter Kasting <pkasting@google.com> 2 3 Reviewed by Eric Seidel. 4 5 https://bugs.webkit.org/show_bug.cgi?id=28751 6 Clean up ImageSource.* in preparation for more fixes on bug 27965. 7 8 * platform/graphics/ImageSource.cpp: Put functions in the same order as in header file. 9 (WebCore::ImageSource::isSizeAvailable): Shorten. 10 (WebCore::ImageSource::size): Shorten. 11 (WebCore::ImageSource::frameSizeAtIndex): Shorten. 12 (WebCore::ImageSource::repetitionCount): Shorten. 13 (WebCore::ImageSource::frameIsCompleteAtIndex): 14 * platform/graphics/ImageSource.h: Shorten #ifdef section a bit by sharing common typedefs. 15 1 16 2009-08-27 Peter Kasting <pkasting@google.com> 2 17 -
trunk/WebCore/platform/graphics/ImageSource.cpp
r47381 r47840 145 145 bool ImageSource::isSizeAvailable() 146 146 { 147 if (!m_decoder) 148 return false; 149 150 return m_decoder->isSizeAvailable(); 147 return m_decoder && m_decoder->isSizeAvailable(); 151 148 } 152 149 153 150 IntSize ImageSource::size() const 154 151 { 155 if (!m_decoder) 156 return IntSize(); 157 158 return m_decoder->size(); 152 return m_decoder ? m_decoder->size() : IntSize(); 159 153 } 160 154 161 155 IntSize ImageSource::frameSizeAtIndex(size_t index) const 162 156 { 163 if (!m_decoder) 164 return IntSize(); 165 166 return m_decoder->frameSizeAtIndex(index); 157 return m_decoder ? frameSizeAtIndex(index) : IntSize(); 167 158 } 168 159 169 160 int ImageSource::repetitionCount() 170 161 { 171 if (!m_decoder) 172 return cAnimationNone; 173 174 return m_decoder->repetitionCount(); 162 return m_decoder ? m_decoder->repetitionCount() : cAnimationNone; 175 163 } 176 164 … … 197 185 // is already in a native container, and this just increments its refcount. 198 186 return buffer->asNewNativeImage(); 199 }200 201 bool ImageSource::frameIsCompleteAtIndex(size_t index)202 {203 if (!m_decoder)204 return false;205 206 RGBA32Buffer* buffer = m_decoder->frameBufferAtIndex(index);207 return buffer && buffer->status() == RGBA32Buffer::FrameComplete;208 187 } 209 188 … … 238 217 } 239 218 240 } 219 bool ImageSource::frameIsCompleteAtIndex(size_t index) 220 { 221 if (!m_decoder) 222 return false; 223 224 RGBA32Buffer* buffer = m_decoder->frameBufferAtIndex(index); 225 return buffer && buffer->status() == RGBA32Buffer::FrameComplete; 226 } 227 228 } -
trunk/WebCore/platform/graphics/ImageSource.h
r47146 r47840 60 60 class String; 61 61 62 #if PLATFORM(WX) 63 class ImageDecoder; 64 typedef ImageDecoder* NativeImageSourcePtr; 65 typedef const Vector<char>* NativeBytePtr; 66 #if USE(WXGC) 67 typedef wxGraphicsBitmap* NativeImagePtr; 68 #else 69 typedef wxBitmap* NativeImagePtr; 70 #endif 71 #elif PLATFORM(CG) 62 #if PLATFORM(CG) 72 63 typedef CGImageSourceRef NativeImageSourcePtr; 73 64 typedef CGImageRef NativeImagePtr; … … 76 67 typedef ImageDecoderQt* NativeImageSourcePtr; 77 68 typedef QPixmap* NativeImagePtr; 78 #el if PLATFORM(CAIRO)69 #else 79 70 class ImageDecoder; 80 71 typedef ImageDecoder* NativeImageSourcePtr; 72 #if PLATFORM(WX) 73 #if USE(WXGC) 74 typedef wxGraphicsBitmap* NativeImagePtr; 75 #else 76 typedef wxBitmap* NativeImagePtr; 77 #endif 78 #elif PLATFORM(CAIRO) 81 79 typedef cairo_surface_t* NativeImagePtr; 82 80 #elif PLATFORM(SKIA) 83 class ImageDecoder;84 typedef ImageDecoder* NativeImageSourcePtr;85 81 typedef NativeImageSkia* NativeImagePtr; 86 82 #elif PLATFORM(HAIKU) 87 class ImageDecoder;88 typedef ImageDecoder* NativeImageSourcePtr;89 83 typedef BBitmap* NativeImagePtr; 90 84 #elif PLATFORM(WINCE) 91 class ImageDecoder;92 typedef ImageDecoder* NativeImageSourcePtr;93 85 typedef RefPtr<SharedBitmap> NativeImagePtr; 86 #endif 94 87 #endif 95 88
Note: See TracChangeset
for help on using the changeset viewer.