Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderMarquee.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 87 matching lines @@
     return result;
 }
 
 bool RenderMarquee::isHorizontal() const
 {
     return direction() == MLEFT || direction() == MRIGHT;
 }
 
 int RenderMarquee::computePosition(EMarqueeDirection dir, bool stopAtContentEdge)
 {
-    RenderBox* box = m_layer->renderBox();
-    ASSERT(box);
-    RenderStyle* s = box->style();
+    RenderBox* o = m_layer->renderer();
+    RenderStyle* s = o->style();
     if (isHorizontal()) {
         bool ltr = s->direction() == LTR;
-        int clientWidth = box->clientWidth();
-        int contentWidth = ltr ? box->rightmostPosition(true, false) : box->leftmostPosition(true, false);
+        int clientWidth = o->clientWidth();
+        int contentWidth = ltr ? o->rightmostPosition(true, false) : o->leftmostPosition(true, false);
         if (ltr)
-            contentWidth += (box->paddingRight() - box->borderLeft());
+            contentWidth += (o->paddingRight() - o->borderLeft());
         else {
-            contentWidth = box->width() - contentWidth;
-            contentWidth += (box->paddingLeft() - box->borderRight());
+            contentWidth = o->width() - contentWidth;
+            contentWidth += (o->paddingLeft() - o->borderRight());
         }
         if (dir == MRIGHT) {
             if (stopAtContentEdge)
                 return max(0, ltr ? (contentWidth - clientWidth) : (clientWidth - contentWidth));
             else
                 return ltr ? contentWidth : clientWidth;
         }
         else {
             if (stopAtContentEdge)
                 return min(0, ltr ? (contentWidth - clientWidth) : (clientWidth - contentWidth));
             else
                 return ltr ? -clientWidth : -contentWidth;
         }
     }
     else {
-        int contentHeight = box->lowestPosition(true, false) - 
-                            box->borderTop() + box->paddingBottom();
-        int clientHeight = box->clientHeight();
+        int contentHeight = m_layer->renderer()->lowestPosition(true, false) - 
+                            m_layer->renderer()->borderTop() + m_layer->renderer()->paddingBottom();
+        int clientHeight = m_layer->renderer()->clientHeight();
         if (dir == MUP) {
             if (stopAtContentEdge)
                  return min(contentHeight - clientHeight, 0);
             else
                 return -clientHeight;
         }
         else {
             if (stopAtContentEdge)
                 return max(contentHeight - clientHeight, 0);
             else 
@@ skipping 129 matching lines @@
     else {  
         bool addIncrement = direction() == MUP || direction() == MLEFT;
         bool isReversed = s->marqueeBehavior() == MALTERNATE && m_currentLoop % 2;
         if (isReversed) {
             // We're going in the reverse direction.
             endPoint = m_start;
             range = -range;
             addIncrement = !addIncrement;
         }
         bool positive = range > 0;
-        int clientSize = (isHorizontal() ? m_layer->renderBox()->clientWidth() : m_layer->renderBox()->clientHeight());
+        int clientSize = (isHorizontal() ? m_layer->renderer()->clientWidth() : m_layer->renderer()->clientHeight());
         int increment = max(1, abs(m_layer->renderer()->style()->marqueeIncrement().calcValue(clientSize)));
         int currentPos = (isHorizontal() ? m_layer->scrollXOffset() : m_layer->scrollYOffset());
         newPos =  currentPos + (addIncrement ? increment : -increment);
         if (positive)
             newPos = min(newPos, endPoint);
         else
             newPos = max(newPos, endPoint);
     }
 
     if (newPos == endPoint) {
         m_currentLoop++;
         if (m_totalLoops > 0 && m_currentLoop >= m_totalLoops)
             m_timer.stop();
         else if (s->marqueeBehavior() != MALTERNATE)
             m_reset = true;
     }
     
     if (isHorizontal())
         m_layer->scrollToXOffset(newPos);
     else
         m_layer->scrollToYOffset(newPos);
 }
 
 } // namespace WebCore