diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/rendering/RenderMarquee.cpp | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/rendering/RenderMarquee.cpp')
| -rw-r--r-- | WebCore/rendering/RenderMarquee.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderMarquee.cpp b/WebCore/rendering/RenderMarquee.cpp index 48659f7..31a8305 100644 --- a/WebCore/rendering/RenderMarquee.cpp +++ b/WebCore/rendering/RenderMarquee.cpp @@ -235,7 +235,7 @@ void RenderMarquee::updateMarqueeStyle() // to a marquee of 200px. if (isHorizontal()) { if (s->height().isFixed() && s->height().value() < s->fontSize()) - s->setHeight(Length(s->fontSize(),Fixed)); + s->setHeight(Length(s->fontSize(), Fixed)); } else if (s->height().isAuto()) //vertical marquee with no specified height s->setHeight(Length(200, Fixed)); @@ -309,4 +309,3 @@ void RenderMarquee::timerFired(Timer<RenderMarquee>*) } } // namespace WebCore - |