Title: [207365] trunk/Source/WebCore
- Revision
- 207365
- Author
- bfulg...@apple.com
- Date
- 2016-10-14 17:37:04 -0700 (Fri, 14 Oct 2016)
Log Message
[Win][Direct2D] Minor cleanups
https://bugs.webkit.org/show_bug.cgi?id=162953
Reviewed by Dean Jackson.
Code cleanup. No change in behavior.
* platform/graphics/win/ImageDecoderDirect2D.cpp:
(WebCore::ImageDecoder::frameIsCompleteAtIndex):
(WebCore::ImageDecoder::frameBytesAtIndex):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (207364 => 207365)
--- trunk/Source/WebCore/ChangeLog 2016-10-15 00:11:24 UTC (rev 207364)
+++ trunk/Source/WebCore/ChangeLog 2016-10-15 00:37:04 UTC (rev 207365)
@@ -1,3 +1,16 @@
+2016-10-14 Brent Fulgham <bfulg...@apple.com>
+
+ [Win][Direct2D] Minor cleanups
+ https://bugs.webkit.org/show_bug.cgi?id=162953
+
+ Reviewed by Dean Jackson.
+
+ Code cleanup. No change in behavior.
+
+ * platform/graphics/win/ImageDecoderDirect2D.cpp:
+ (WebCore::ImageDecoder::frameIsCompleteAtIndex):
+ (WebCore::ImageDecoder::frameBytesAtIndex):
+
2016-10-14 Alex Christensen <achristen...@webkit.org>
Fix CMake build.
Modified: trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.cpp (207364 => 207365)
--- trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.cpp 2016-10-15 00:11:24 UTC (rev 207364)
+++ trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.cpp 2016-10-15 00:37:04 UTC (rev 207365)
@@ -139,10 +139,7 @@
COMPtr<IWICBitmapFrameDecode> frame;
HRESULT hr = m_nativeDecoder->GetFrame(index, &frame);
- if (!SUCCEEDED(hr))
- return false;
-
- return true;
+ return SUCCEEDED(hr);
}
ImageOrientation ImageDecoder::frameOrientationAtIndex(size_t index) const
@@ -174,17 +171,8 @@
if (!m_nativeDecoder)
return 0;
- COMPtr<IWICBitmapFrameDecode> frame;
- HRESULT hr = m_nativeDecoder->GetFrame(index, &frame);
- if (!SUCCEEDED(hr))
- return 0;
-
- UINT width, height;
- hr = frame->GetSize(&width, &height);
- if (!SUCCEEDED(hr))
- return 0;
-
- return width * height * 4;
+ auto frameSize = frameSizeAtIndex(index, subsamplingLevel);
+ return frameSize.area() * 4;
}
void ImageDecoder::setTargetContext(ID2D1RenderTarget* renderTarget)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
