From 058ccc7ba0a4d59b9f6e92808332aa9895425fc7 Mon Sep 17 00:00:00 2001 From: Andrei Popescu Date: Wed, 19 Aug 2009 14:09:30 +0100 Subject: Revert "Merge WebKit r47420" This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524. --- WebCore/rendering/RenderMarquee.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'WebCore/rendering/RenderMarquee.cpp') diff --git a/WebCore/rendering/RenderMarquee.cpp b/WebCore/rendering/RenderMarquee.cpp index bb917f8..31a8305 100644 --- a/WebCore/rendering/RenderMarquee.cpp +++ b/WebCore/rendering/RenderMarquee.cpp @@ -1,6 +1,5 @@ /* * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. - * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) * * Portions are Copyright (C) 1998 Netscape Communications Corporation. * @@ -153,11 +152,7 @@ int RenderMarquee::computePosition(EMarqueeDirection dir, bool stopAtContentEdge void RenderMarquee::start() { - if (m_timer.isActive() || m_layer->renderer()->style()->marqueeIncrement().isZero() -#if ENABLE(WCSS) && ENABLE(XHTMLMP) - || (m_layer->renderer()->document()->isXHTMLMPDocument() && !m_layer->renderer()->style()->marqueeLoopCount()) -#endif - ) + if (m_timer.isActive() || m_layer->renderer()->style()->marqueeIncrement().isZero()) return; // We may end up propagating a scroll event. It is important that we suspend events until -- cgit v1.1