Changeset 249414 in webkit

Timestamp:

Sep 2, 2019 2:37:06 PM (5 years ago)

Author:

Brent Fulgham

Message:

[FTW] NativeImagePtr is drawn with invalid scaling
​https://bugs.webkit.org/show_bug.cgi?id=201391

Reviewed by Don Olmstead.

The current implementation of FTW improperly applies scaling factors to native images,
resulting in blocky images (in some cases).

This patch corrects the handling of native images, corrects a bug in bitmap render
context scaling, and retrieves more data from the ImageDecoder's metadata system.

• platform/graphics/win/Direct2DUtilities.cpp:

(WebCore::Direct2D::createBitmapRenderTargetOfSize): Supply an appropriately sized
pixel dimension for non-unity scale factors.

• platform/graphics/win/ImageBufferDirect2D.cpp:

(WebCore::ImageBuffer::ImageBuffer): Include the scale factor when creating a
bitmap render target.

• platform/graphics/win/ImageDecoderDirect2D.cpp:

(WebCore::ImageDecoderDirect2D::frameOrientationAtIndex const): Read the orientation
data form the image metadata.
(WebCore::ImageDecoderDirect2D::frameAllowSubsamplingAtIndex const): Always return
true, to match the CG implementation.
(WebCore::ImageDecoderDirect2D::frameHasAlphaAtIndex const): Correct to match the
behavior of CG.

• platform/graphics/win/NativeImageDirect2D.cpp:

(WebCore::drawNativeImage): Pass through the Direct2DOperations helper method, which
handles scaling and subsampling properly.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-02  Brent Fulgham  <bfulgham@apple.com>
+
+        [FTW] NativeImagePtr is drawn with invalid scaling
+        https://bugs.webkit.org/show_bug.cgi?id=201391
+
+        Reviewed by Don Olmstead.
+
+        The current implementation of FTW improperly applies scaling factors to native images,
+        resulting in blocky images (in some cases).
+
+        This patch corrects the handling of native images, corrects a bug in bitmap render
+        context scaling, and retrieves more data from the ImageDecoder's metadata system.
+
+        * platform/graphics/win/Direct2DUtilities.cpp:
+        (WebCore::Direct2D::createBitmapRenderTargetOfSize): Supply an appropriately sized
+        pixel dimension for non-unity scale factors.
+        * platform/graphics/win/ImageBufferDirect2D.cpp:
+        (WebCore::ImageBuffer::ImageBuffer): Include the scale factor when creating a
+        bitmap render target.
+        * platform/graphics/win/ImageDecoderDirect2D.cpp:
+        (WebCore::ImageDecoderDirect2D::frameOrientationAtIndex const): Read the orientation
+        data form the image metadata.
+        (WebCore::ImageDecoderDirect2D::frameAllowSubsamplingAtIndex const): Always return
+        true, to match the CG implementation.
+        (WebCore::ImageDecoderDirect2D::frameHasAlphaAtIndex const): Correct to match the
+        behavior of CG.
+        * platform/graphics/win/NativeImageDirect2D.cpp:
+        (WebCore::drawNativeImage): Pass through the Direct2DOperations helper method, which
+        handles scaling and subsampling properly.
+
 2019-09-02  Youenn Fablet  <youenn@apple.com>
 

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

@@ -225 +225 @@
     COMPtr<ID2D1BitmapRenderTarget> bitmapContext;
     auto desiredSize = D2D1::SizeF(size.width(), size.height());
-    D2D1_SIZE_U pixelSize = size;
+    D2D1_SIZE_U pixelSize = D2D1::SizeU(clampTo<unsigned>(deviceScaleFactor * size.width()), clampTo<unsigned>(deviceScaleFactor * size.height()));
     HRESULT hr = renderTarget->CreateCompatibleRenderTarget(&desiredSize, &pixelSize, nullptr, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_GDI_COMPATIBLE, &bitmapContext);
     if (!SUCCEEDED(hr))

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

@@ -108 +108 @@
         renderTarget = GraphicsContext::defaultRenderTarget();
 
-    D2D1_SIZE_F desiredSize = FloatSize(m_logicalSize);
-    D2D1_SIZE_U pixelSize = IntSize(m_logicalSize);
-
-    auto bitmapContext = Direct2D::createBitmapRenderTargetOfSize(m_logicalSize, renderTarget);
+    auto bitmapContext = Direct2D::createBitmapRenderTargetOfSize(m_logicalSize, renderTarget, m_resolutionScale);
     if (!bitmapContext)
         return;

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

@@ -172 +172 @@
         return ImageOrientation::None;
 
-    // FIXME: Identify image type, and ask proper orientation.
+    PROPVARIANT value;
+    PropVariantInit(&value);
+    hr = metadata->GetMetadataByName(L"System.Photo.Orientation", &value);
+    if (SUCCEEDED(hr))
+        return ImageOrientation(static_cast<ImageOrientation::Orientation>(value.uiVal));
+
     return ImageOrientation::None;
 }
@@ -193 +198 @@
 bool ImageDecoderDirect2D::frameAllowSubsamplingAtIndex(size_t index) const
 {
-    if (!m_nativeDecoder)
-        return false;
-
-    COMPtr<IWICBitmapFrameDecode> frame;
-    HRESULT hr = m_nativeDecoder->GetFrame(index, &frame);
-    if (!SUCCEEDED(hr))
-        return false;
-
-    // FIXME: Figure out correct image format-specific query for subsampling check.
-    notImplemented();
     return true;
 }
@@ -216 +211 @@
         return false;
 
-    // FIXME: Figure out correct image format-specific query for alpha check.
-    notImplemented();
+    COMPtr<IWICMetadataQueryReader> metadata;
+    hr = frame->GetMetadataQueryReader(&metadata);
+    if (!SUCCEEDED(hr))
+        return false;
+
+    GUID containerFormat;
+    hr = metadata->GetContainerFormat(&containerFormat);
+    if (!SUCCEEDED(hr))
+        return false;
+
+    if (::IsEqualGUID(GUID_ContainerFormatJpeg, containerFormat))
+        return false;
+
     return true;
 }

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

@@ -28 +28 @@
 
 #include "Color.h"
+#include "Direct2DOperations.h"
 #include "FloatRect.h"
 #include "GeometryUtilities.h"
@@ -79 +80 @@
 }
 
-void drawNativeImage(const NativeImagePtr& image, GraphicsContext& context, const FloatRect& destRect, const FloatRect& srcRect, const IntSize& srcSize, const ImagePaintingOptions&)
+void drawNativeImage(const NativeImagePtr& image, GraphicsContext& context, const FloatRect& destRect, const FloatRect& srcRect, const IntSize& srcSize, const ImagePaintingOptions& options)
 {
-    auto platformContext = context.platformContext();
+    auto* platformContext = context.platformContext();
 
     // Subsampling may have given us an image that is smaller than size().
@@ -91 +92 @@
         adjustedSrcRect = mapRect(srcRect, FloatRect({ }, srcSize), FloatRect({ }, subsampledImageSize));
 
-    float opacity = 1.0f;
-
-    platformContext->renderTarget()->DrawBitmap(image.get(), destRect, opacity, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, adjustedSrcRect);
+    auto& state = context.state();
+    Direct2D::drawNativeImage(*platformContext, image.get(), subsampledImageSize, destRect, adjustedSrcRect, options, state.alpha, Direct2D::ShadowState(state));
 }