Title: [102033] branches/safari-534.53-branch/Source/WebCore
Diff
Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (102032 => 102033)
--- branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-12-05 21:03:34 UTC (rev 102032)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-12-05 21:07:00 UTC (rev 102033)
@@ -1,5 +1,18 @@
2011-12-05 Lucas Forschler <[email protected]>
+ Merge 94901
+
+ 2011-09-09 Beth Dakin <[email protected]>
+
+ Attempted Leopard build fix.
+
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::paintReplaced):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::drawPlatformResizerImage):
+
+2011-12-05 Lucas Forschler <[email protected]>
+
Merge 94900
2011-09-09 Beth Dakin <[email protected]>
Modified: branches/safari-534.53-branch/Source/WebCore/rendering/RenderImage.cpp (102032 => 102033)
--- branches/safari-534.53-branch/Source/WebCore/rendering/RenderImage.cpp 2011-12-05 21:03:34 UTC (rev 102032)
+++ branches/safari-534.53-branch/Source/WebCore/rendering/RenderImage.cpp 2011-12-05 21:07:00 UTC (rev 102033)
@@ -272,7 +272,7 @@
image = m_imageResource->cachedImage()->brokenImage(deviceScaleFactor);
IntSize imageSize = image->size();
if (deviceScaleFactor >= 2)
- imageSize.scale(0.5);
+ imageSize.scale(0.5f);
// Center the error image, accounting for border and padding.
int centerX = (usableWidth - imageSize.width()) / 2;
if (centerX < 0)
Modified: branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayer.cpp (102032 => 102033)
--- branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayer.cpp 2011-12-05 21:03:34 UTC (rev 102032)
+++ branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayer.cpp 2011-12-05 21:07:00 UTC (rev 102033)
@@ -2373,7 +2373,7 @@
DEFINE_STATIC_LOCAL(Image*, resizeCornerImageHiRes, (Image::loadPlatformResource("textAreaResizeCorner@2x").leakRef()));
resizeCornerImage = resizeCornerImageHiRes;
cornerResizerSize = resizeCornerImage->size();
- cornerResizerSize.scale(0.5);
+ cornerResizerSize.scale(0.5f);
} else {
DEFINE_STATIC_LOCAL(Image*, resizeCornerImageLoRes, (Image::loadPlatformResource("textAreaResizeCorner").leakRef()));
resizeCornerImage = resizeCornerImageLoRes;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
