[webkit-changes] [214606] trunk/Source/WebCore

[commit-queue]

Title: [214606] trunk/Source/WebCore

Revision

214606

Author

commit-qu...@webkit.org

Date

2017-03-30 08:54:10 -0700 (Thu, 30 Mar 2017)

Log Message

[WinCairo] ImageCairoWin.cpp: error C2660: 'WebCore::BitmapImage::draw': function does not take 6 arguments
https://bugs.webkit.org/show_bug.cgi?id=170275

Patch by Fujii Hironori <hironori.fu...@sony.com> on 2017-03-30
Reviewed by Said Abou-Hallawa.

Apply the similar change of ImageCGWin.cpp of r214450 to ImageCairoWin.cpp.

* platform/graphics/win/ImageCairoWin.cpp:
(WebCore::BitmapImage::getHBITMAPOfSize): Pass DecodingMode::Synchronous to Image::draw().
(WebCore::BitmapImage::drawFrameMatchingSourceSize): Ditto.

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (214605 => 214606)

--- trunk/Source/WebCore/ChangeLog	2017-03-30 15:14:56 UTC (rev 214605)
+++ trunk/Source/WebCore/ChangeLog	2017-03-30 15:54:10 UTC (rev 214606)
@@ -1,3 +1,16 @@
+2017-03-30  Fujii Hironori  <hironori.fu...@sony.com>
+
+        [WinCairo] ImageCairoWin.cpp: error C2660: 'WebCore::BitmapImage::draw': function does not take 6 arguments
+        https://bugs.webkit.org/show_bug.cgi?id=170275
+
+        Reviewed by Said Abou-Hallawa.
+
+        Apply the similar change of ImageCGWin.cpp of r214450 to ImageCairoWin.cpp.
+
+        * platform/graphics/win/ImageCairoWin.cpp:
+        (WebCore::BitmapImage::getHBITMAPOfSize): Pass DecodingMode::Synchronous to Image::draw().
+        (WebCore::BitmapImage::drawFrameMatchingSourceSize): Ditto.
+
 2017-03-27  Sergio Villar Senin  <svil...@igalia.com>
 
         [css-grid] Clamp the number of autorepeat tracks

Modified: trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp (214605 => 214606)

--- trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp	2017-03-30 15:14:56 UTC (rev 214605)
+++ trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp	2017-03-30 15:54:10 UTC (rev 214606)
@@ -81,7 +81,7 @@
     if (size)
         drawFrameMatchingSourceSize(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), *size, CompositeCopy);
     else
-        draw(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), CompositeCopy, BlendModeNormal, ImageOrientationDescription());
+        draw(gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), CompositeCopy, BlendModeNormal, DecodingMode::Synchronous, ImageOrientationDescription());
 
     // Do cleanup
     cairo_destroy(targetRef);
@@ -100,7 +100,7 @@
         if (cairo_image_surface_get_height(surface.get()) == static_cast<size_t>(srcSize.height()) && cairo_image_surface_get_width(surface.get()) == static_cast<size_t>(srcSize.width())) {
             size_t currentFrame = m_currentFrame;
             m_currentFrame = i;
-            draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, srcSize.width(), srcSize.height()), compositeOp, BlendModeNormal, ImageOrientationDescription());
+            draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, srcSize.width(), srcSize.height()), compositeOp, BlendModeNormal, DecodingMode::Synchronous, ImageOrientationDescription());
             m_currentFrame = currentFrame;
             return;
         }
@@ -108,7 +108,7 @@
 
     // No image of the correct size was found, fallback to drawing the current frame
     FloatSize imageSize = BitmapImage::size();
-    draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), compositeOp, BlendModeNormal, ImageOrientationDescription());
+    draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), compositeOp, BlendModeNormal, DecodingMode::Synchronous, ImageOrientationDescription());
 }
 
 } // namespace WebCore

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes