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

Fri, 25 Oct 2013 04:48:30 -0700

Title: [158001] trunk/Source/WebCore
Revision
158001
Author
[email protected]
Date
2013-10-25 04:49:08 -0700 (Fri, 25 Oct 2013)

Log Message

[WinCairo] Compile fixes.
https://bugs.webkit.org/show_bug.cgi?id=123269

Patch by [email protected] <[email protected]> on 2013-10-25
Reviewed by Csaba Osztrogonác.

* platform/graphics/win/ImageCairoWin.cpp: Added new parameter to BitmapImage::draw() calls.
(WebCore::BitmapImage::getHBITMAPOfSize):
(WebCore::BitmapImage::drawFrameMatchingSourceSize):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (158000 => 158001)


--- trunk/Source/WebCore/ChangeLog	2013-10-25 11:19:47 UTC (rev 158000)
+++ trunk/Source/WebCore/ChangeLog	2013-10-25 11:49:08 UTC (rev 158001)
@@ -1,3 +1,14 @@
+2013-10-25  [email protected]  <[email protected]>
+
+        [WinCairo] Compile fixes.
+        https://bugs.webkit.org/show_bug.cgi?id=123269
+
+        Reviewed by Csaba Osztrogonác.
+
+        * platform/graphics/win/ImageCairoWin.cpp: Added new parameter to BitmapImage::draw() calls.
+        (WebCore::BitmapImage::getHBITMAPOfSize):
+        (WebCore::BitmapImage::drawFrameMatchingSourceSize):
+
 2013-10-25  Sergio Villar Senin  <[email protected]>
 
         Use a Vector instead of HashSet to computed the orderValues in RenderFlexibleBox

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


--- trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp	2013-10-25 11:19:47 UTC (rev 158000)
+++ trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp	2013-10-25 11:49:08 UTC (rev 158001)
@@ -84,7 +84,7 @@
     if (size)
         drawFrameMatchingSourceSize(&gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), *size, ColorSpaceDeviceRGB, CompositeCopy);
     else
-        draw(&gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal);
+        draw(&gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal, ImageOrientationDescription());
 
     // Do cleanup
     cairo_destroy(targetRef);
@@ -103,7 +103,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()), ColorSpaceDeviceRGB, compositeOp, BlendModeNormal);
+            draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, srcSize.width(), srcSize.height()), ColorSpaceDeviceRGB, compositeOp, BlendModeNormal, ImageOrientationDescription());
             m_currentFrame = currentFrame;
             return;
         }
@@ -111,7 +111,7 @@
 
     // No image of the correct size was found, fallback to drawing the current frame
     IntSize imageSize = BitmapImage::size();
-    draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, compositeOp, BlendModeNormal);
+    draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, compositeOp, BlendModeNormal, ImageOrientationDescription());
 }
 
 } // namespace WebCore

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to