Changeset 130706 in webkit

Timestamp:

Oct 8, 2012, 5:55:34 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[CAIRO] Adjust the source rect size when IMAGE_DECODER_DOWN_SAMPLING is enabled
​https://bugs.webkit.org/show_bug.cgi?id=98630

Patch by Jaehun Lim <​ljaehun.lim@samsung.com> on 2012-10-08
Reviewed by Martin Robinson.

IMAGE_DECODER_DOWN_SAMPLING scales down the size of the big image.
CAIRO needs to adjust the source size to the scaled value.

No new tests.

• platform/graphics/cairo/BitmapImageCairo.cpp:

(WebCore::BitmapImage::draw):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/BitmapImageCairo.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-08  Jaehun Lim  <ljaehun.lim@samsung.com>
+
+        [CAIRO] Adjust the source rect size when IMAGE_DECODER_DOWN_SAMPLING is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=98630
+
+        Reviewed by Martin Robinson.
+
+        IMAGE_DECODER_DOWN_SAMPLING scales down the size of the big image.
+        CAIRO needs to adjust the source size to the scaled value.
+
+        No new tests.
+
+        * platform/graphics/cairo/BitmapImageCairo.cpp:
+        (WebCore::BitmapImage::draw):
+
 2012-10-08  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/platform/graphics/cairo/BitmapImageCairo.cpp

@@ -98 +98 @@
     else
         context->setCompositeOperation(op);
-    context->platformContext()->drawSurfaceToContext(nativeImage->surface(), dstRect, srcRect, context);
+
+#if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
+    cairo_surface_t* surface = nativeImage->surface();
+    IntSize scaledSize(cairo_image_surface_get_width(surface), cairo_image_surface_get_height(surface));
+    FloatRect adjustedSrcRect = adjustSourceRectForDownSampling(srcRect, scaledSize);
+#else
+    FloatRect adjustedSrcRect(srcRect);
+#endif
+
+    context->platformContext()->drawSurfaceToContext(nativeImage->surface(), dstRect, adjustedSrcRect, context);
 
     context->restore();