Changeset 207365 in webkit

Timestamp:

Oct 14, 2016 5:37:04 PM (8 years ago)

Author:

Brent Fulgham

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/win/ImageDecoderDirect2D.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-14  Brent Fulgham  <bfulgham@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  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/graphics/win/ImageDecoderDirect2D.cpp

@@ -140 +140 @@
     COMPtr<IWICBitmapFrameDecode> frame;
     HRESULT hr = m_nativeDecoder->GetFrame(index, &frame);
-    if (!SUCCEEDED(hr))
-        return false;
-
+    return SUCCEEDED(hr);
+}
+
+ImageOrientation ImageDecoder::frameOrientationAtIndex(size_t index) const
+{
+    notImplemented();
+    return ImageOrientation();
+}
+
+float ImageDecoder::frameDurationAtIndex(size_t index) const
+{
+    notImplemented();
+    return 0;
+}
+
+bool ImageDecoder::frameAllowSubsamplingAtIndex(size_t) const
+{
+    notImplemented();
     return true;
 }
 
-ImageOrientation ImageDecoder::frameOrientationAtIndex(size_t index) const
-{
-    notImplemented();
-    return ImageOrientation();
-}
-
-float ImageDecoder::frameDurationAtIndex(size_t index) const
-{
-    notImplemented();
-    return 0;
-}
-
-bool ImageDecoder::frameAllowSubsamplingAtIndex(size_t) const
+bool ImageDecoder::frameHasAlphaAtIndex(size_t index) const
 {
     notImplemented();
@@ -164 +167 @@
 }
 
-bool ImageDecoder::frameHasAlphaAtIndex(size_t index) const
-{
-    notImplemented();
-    return true;
-}
-
 unsigned ImageDecoder::frameBytesAtIndex(size_t index, SubsamplingLevel subsamplingLevel) const
 {
@@ -175 +172 @@
         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;
 }