diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/rendering/RenderMarquee.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/rendering/RenderMarquee.cpp')
| -rw-r--r-- | WebCore/rendering/RenderMarquee.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderMarquee.cpp b/WebCore/rendering/RenderMarquee.cpp index bb917f8..90383d8 100644 --- a/WebCore/rendering/RenderMarquee.cpp +++ b/WebCore/rendering/RenderMarquee.cpp @@ -66,6 +66,10 @@ RenderMarquee::RenderMarquee(RenderLayer* l) { } +RenderMarquee::~RenderMarquee() +{ +} + int RenderMarquee::marqueeSpeed() const { int result = m_layer->renderer()->style()->marqueeSpeed(); @@ -110,7 +114,7 @@ int RenderMarquee::computePosition(EMarqueeDirection dir, bool stopAtContentEdge ASSERT(box); RenderStyle* s = box->style(); if (isHorizontal()) { - bool ltr = s->direction() == LTR; + bool ltr = s->isLeftToRightDirection(); int clientWidth = box->clientWidth(); int contentWidth = ltr ? box->rightmostPosition(true, false) : box->leftmostPosition(true, false); if (ltr) |