From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebCore/rendering/RenderImage.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Source/WebCore/rendering/RenderImage.cpp') diff --git a/Source/WebCore/rendering/RenderImage.cpp b/Source/WebCore/rendering/RenderImage.cpp index 7369f4e..9500aeb 100644 --- a/Source/WebCore/rendering/RenderImage.cpp +++ b/Source/WebCore/rendering/RenderImage.cpp @@ -85,7 +85,7 @@ static const unsigned short paddingHeight = 4; // Alt text is restricted to this maximum size, in pixels. These are // signed integers because they are compared with other signed values. -static const int maxAltTextWidth = 1024; +static const float maxAltTextWidth = 1024; static const int maxAltTextHeight = 256; IntSize RenderImage::imageSizeForError(CachedImage* newImage) const @@ -449,7 +449,6 @@ bool RenderImage::isLogicalWidthSpecified() const return true; case Auto: case Relative: // FIXME: Shouldn't this case return true? - case Static: case Intrinsic: case MinIntrinsic: return false; @@ -466,7 +465,6 @@ bool RenderImage::isLogicalHeightSpecified() const return true; case Auto: case Relative: // FIXME: Shouldn't this case return true? - case Static: case Intrinsic: case MinIntrinsic: return false; -- cgit v1.1