Index: Source/core/rendering/RenderImage.cpp |
diff --git a/Source/core/rendering/RenderImage.cpp b/Source/core/rendering/RenderImage.cpp |
index 610c79064462fd5f48ddc00abd752e9ab20663ef..0007c8b7ae7548845be5f135c3e4f9bbab76b271 100644 |
--- a/Source/core/rendering/RenderImage.cpp |
+++ b/Source/core/rendering/RenderImage.cpp |
@@ -49,8 +49,6 @@ |
#include "platform/graphics/GraphicsContext.h" |
#include "platform/graphics/GraphicsContextStateSaver.h" |
-using namespace std; |
- |
namespace WebCore { |
using namespace HTMLNames; |
@@ -130,7 +128,7 @@ bool RenderImage::setImageSizeForAltText(ImageResource* newImage /* = 0 */) |
FontCachePurgePreventer fontCachePurgePreventer; |
const Font& font = style()->font(); |
- IntSize paddedTextSize(paddingWidth + min(ceilf(font.width(RenderBlockFlow::constructTextRun(this, font, m_altText, style()))), maxAltTextWidth), paddingHeight + min(font.fontMetrics().height(), maxAltTextHeight)); |
+ IntSize paddedTextSize(paddingWidth + std::min(ceilf(font.width(RenderBlockFlow::constructTextRun(this, font, m_altText, style()))), maxAltTextWidth), paddingHeight + std::min(font.fontMetrics().height(), maxAltTextHeight)); |
imageSize = imageSize.expandedTo(paddedTextSize); |
} |