Changeset 207365 in webkit
- Timestamp:
- Oct 14, 2016 5:37:04 PM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r207364 r207365 1 2016-10-14 Brent Fulgham <bfulgham@apple.com> 2 3 [Win][Direct2D] Minor cleanups 4 https://bugs.webkit.org/show_bug.cgi?id=162953 5 6 Reviewed by Dean Jackson. 7 8 Code cleanup. No change in behavior. 9 10 * platform/graphics/win/ImageDecoderDirect2D.cpp: 11 (WebCore::ImageDecoder::frameIsCompleteAtIndex): 12 (WebCore::ImageDecoder::frameBytesAtIndex): 13 1 14 2016-10-14 Alex Christensen <achristensen@webkit.org> 2 15 -
trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.cpp
r207357 r207365 140 140 COMPtr<IWICBitmapFrameDecode> frame; 141 141 HRESULT hr = m_nativeDecoder->GetFrame(index, &frame); 142 if (!SUCCEEDED(hr)) 143 return false; 144 142 return SUCCEEDED(hr); 143 } 144 145 ImageOrientation ImageDecoder::frameOrientationAtIndex(size_t index) const 146 { 147 notImplemented(); 148 return ImageOrientation(); 149 } 150 151 float ImageDecoder::frameDurationAtIndex(size_t index) const 152 { 153 notImplemented(); 154 return 0; 155 } 156 157 bool ImageDecoder::frameAllowSubsamplingAtIndex(size_t) const 158 { 159 notImplemented(); 145 160 return true; 146 161 } 147 162 148 ImageOrientation ImageDecoder::frameOrientationAtIndex(size_t index) const 149 { 150 notImplemented(); 151 return ImageOrientation(); 152 } 153 154 float ImageDecoder::frameDurationAtIndex(size_t index) const 155 { 156 notImplemented(); 157 return 0; 158 } 159 160 bool ImageDecoder::frameAllowSubsamplingAtIndex(size_t) const 163 bool ImageDecoder::frameHasAlphaAtIndex(size_t index) const 161 164 { 162 165 notImplemented(); … … 164 167 } 165 168 166 bool ImageDecoder::frameHasAlphaAtIndex(size_t index) const167 {168 notImplemented();169 return true;170 }171 172 169 unsigned ImageDecoder::frameBytesAtIndex(size_t index, SubsamplingLevel subsamplingLevel) const 173 170 { … … 175 172 return 0; 176 173 177 COMPtr<IWICBitmapFrameDecode> frame; 178 HRESULT hr = m_nativeDecoder->GetFrame(index, &frame); 179 if (!SUCCEEDED(hr)) 180 return 0; 181 182 UINT width, height; 183 hr = frame->GetSize(&width, &height); 184 if (!SUCCEEDED(hr)) 185 return 0; 186 187 return width * height * 4; 174 auto frameSize = frameSizeAtIndex(index, subsamplingLevel); 175 return frameSize.area() * 4; 188 176 } 189 177
Note: See TracChangeset
for help on using the changeset viewer.