Changeset 192143 in webkit

Timestamp:

Nov 8, 2015 7:32:41 AM (8 years ago)

Author:

ddkilzer@apple.com

Message:

REGRESSION (r192140): Windows build broke after removing ColorSpace argument to all drawing calls
<​http://webkit.org/b/150967>

Unreviewed attempt to fix the Windows build.

• platform/graphics/ca/win/PlatformCALayerWin.cpp:

(PlatformCALayerWin::drawTextAtPoint):

• platform/graphics/win/ImageCGWin.cpp:

(WebCore::BitmapImage::drawFrameMatchingSourceSize):

• rendering/RenderThemeWin.cpp:

(WebCore::RenderThemeWin::paintSearchFieldCancelButton):
(WebCore::RenderThemeWin::paintSearchFieldResultsDecorationPart):
(WebCore::RenderThemeWin::paintSearchFieldResultsButton):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/win/PlatformCALayerWin.cpp (modified) (1 diff)
• platform/graphics/win/ImageCGWin.cpp (modified) (2 diffs)
• rendering/RenderThemeWin.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-08  David Kilzer  <ddkilzer@apple.com>
+
+        REGRESSION (r192140): Windows build broke after removing ColorSpace argument to all drawing calls
+        <http://webkit.org/b/150967>
+
+        Unreviewed attempt to fix the Windows build.
+
+        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+        (PlatformCALayerWin::drawTextAtPoint):
+        * platform/graphics/win/ImageCGWin.cpp:
+        (WebCore::BitmapImage::drawFrameMatchingSourceSize):
+        * rendering/RenderThemeWin.cpp:
+        (WebCore::RenderThemeWin::paintSearchFieldCancelButton):
+        (WebCore::RenderThemeWin::paintSearchFieldResultsDecorationPart):
+        (WebCore::RenderThemeWin::paintSearchFieldResultsButton):
+
 2015-11-08  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp

@@ -928 +928 @@
 
     GraphicsContext cg(context);
-    cg.setFillColor(Color::black, ColorSpaceDeviceRGB);
+    cg.setFillColor(Color::black);
     cg.drawText(font, TextRun(text), IntPoint(x, y));
 }

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

@@ -95 +95 @@
             size_t currentFrame = m_currentFrame;
             m_currentFrame = i;
-            draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, srcSize.width(), srcSize.height()), styleColorSpace, compositeOp, BlendModeNormal, ImageOrientationDescription());
+            draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, srcSize.width(), srcSize.height()), compositeOp, BlendModeNormal, ImageOrientationDescription());
             m_currentFrame = currentFrame;
             return;
@@ -103 +103 @@
     // 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()), styleColorSpace, compositeOp, BlendModeNormal, ImageOrientationDescription());
+    draw(ctxt, dstRect, FloatRect(0.0f, 0.0f, imageSize.width(), imageSize.height()), compositeOp, BlendModeNormal, ImageOrientationDescription());
 }
 

trunk/Source/WebCore/rendering/RenderThemeWin.cpp

@@ -893 +893 @@
     static Image* cancelImage = Image::loadPlatformResource("searchCancel").leakRef();
     static Image* cancelPressedImage = Image::loadPlatformResource("searchCancelPressed").leakRef();
-    paintInfo.context().drawImage(isPressed(o) ? *cancelPressedImage : *cancelImage, o.style().colorSpace(), bounds);
+    paintInfo.context().drawImage(isPressed(o) ? *cancelPressedImage : *cancelImage, bounds);
     return false;
 }
@@ -941 +941 @@
     
     static Image* magnifierImage = Image::loadPlatformResource("searchMagnifier").leakRef();
-    paintInfo.context().drawImage(*magnifierImage, o.style().colorSpace(), bounds);
+    paintInfo.context().drawImage(*magnifierImage, bounds);
     return false;
 }
@@ -976 +976 @@
 
     static Image* magnifierImage = Image::loadPlatformResource("searchMagnifierResults").leakRef();
-    paintInfo.context().drawImage(*magnifierImage, o.style().colorSpace(), bounds);
+    paintInfo.context().drawImage(*magnifierImage, bounds);
     return false;
 }