diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/rendering/RenderImage.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/rendering/RenderImage.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderImage.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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; |