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

Mon, 10 Dec 2012 10:45:33 -0800

Title: [137182] trunk/Source/WebCore
Revision
137182
Author
[email protected]
Date
2012-12-10 10:47:20 -0800 (Mon, 10 Dec 2012)

Log Message

[WinCairo] Compile fix in ImageCairoWin.cpp
https://bugs.webkit.org/show_bug.cgi?id=104554

Patch by [email protected] <[email protected]> on 2012-12-10
Reviewed by Brent Fulgham.

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

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (137181 => 137182)


--- trunk/Source/WebCore/ChangeLog	2012-12-10 18:47:17 UTC (rev 137181)
+++ trunk/Source/WebCore/ChangeLog	2012-12-10 18:47:20 UTC (rev 137182)
@@ -1,3 +1,14 @@
+2012-12-10  [email protected]  <[email protected]>
+
+        [WinCairo] Compile fix in ImageCairoWin.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=104554
+
+        Reviewed by Brent Fulgham.
+
+        * platform/graphics/win/ImageCairoWin.cpp:
+        (WebCore::BitmapImage::getHBITMAPOfSize): Added parameter.
+        (WebCore::BitmapImage::drawFrameMatchingSourceSize): Added parameter.
+
 2012-12-10  Mike West  <[email protected]>
 
         Log to console when script is blocked by sandbox attributes.

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


--- trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp	2012-12-10 18:47:17 UTC (rev 137181)
+++ trunk/Source/WebCore/platform/graphics/win/ImageCairoWin.cpp	2012-12-10 18:47:20 UTC (rev 137182)
@@ -83,7 +83,7 @@
     if (size)
         drawFrameMatchingSourceSize(&gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), IntSize(*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);
+        draw(&gc, FloatRect(0.0f, 0.0f, bmpInfo.bmWidth, bmpInfo.bmHeight), FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, CompositeCopy, BlendModeNormal);
 
     // Do cleanup
     cairo_destroy(targetRef);
@@ -105,7 +105,7 @@
         if (cairo_image_surface_get_height(image) == static_cast<size_t>(srcSize.height()) && cairo_image_surface_get_width(image) == 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);
+            draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, srcSize.width(), srcSize.height()), ColorSpaceDeviceRGB, compositeOp, BlendModeNormal);
             m_currentFrame = currentFrame;
             return;
         }
@@ -113,7 +113,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);
+    draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), ColorSpaceDeviceRGB, compositeOp, BlendModeNormal);
 }
 
 } // namespace WebCore

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

Reply via email to