Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/rendering/RenderFlexibleBox.cpp

 /*
  * This file is part of the render object implementation for KHTML.
  *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 206 matching lines @@
 
     setHeight(0);
     m_overflowHeight = 0;
     m_flexingChildren = m_stretchingChildren = false;
 
     initMaxMarginValues();
 
     // For overflow:scroll blocks, ensure we have both scrollbars in place always.
     if (scrollsOverflow()) {
         if (style()->overflowX() == OSCROLL)
-            layer()->setHasHorizontalScrollbar(true);
+            m_layer->setHasHorizontalScrollbar(true);
         if (style()->overflowY() == OSCROLL)
-            layer()->setHasVerticalScrollbar(true);
+            m_layer->setHasVerticalScrollbar(true);
     }
 
     if (isHorizontal())
         layoutHorizontalBox(relayoutChildren);
     else
         layoutVerticalBox(relayoutChildren);
 
     int oldHeight = height();
     calcHeight();
     if (oldHeight != height()) {
@@ skipping 45 matching lines @@
             m_overflowLeft = min(m_overflowLeft, reflection.x());
             m_overflowHeight = max(m_overflowWidth, reflection.right());
         }
     }
 
     statePusher.pop();
 
     // Update our scrollbars if we're overflow:auto/scroll/hidden now that we know if
     // we overflow or not.
     if (hasOverflowClip())
-        layer()->updateScrollInfoAfterLayout();
+        m_layer->updateScrollInfoAfterLayout();
 
     // Repaint with our new bounds if they are different from our old bounds.
     repainter.repaintAfterLayout();
     
     setNeedsLayout(false);
 }
 
 void RenderFlexibleBox::layoutHorizontalBox(bool relayoutChildren)
 {
     int toAdd = borderBottom() + paddingBottom() + horizontalScrollbarHeight();
@@ skipping 97 matching lines @@
         relayoutChildren = false;
         if (oldHeight != height())
             heightSpecified = true;
         
         // Now that our height is actually known, we can place our boxes.
         m_stretchingChildren = (style()->boxAlign() == BSTRETCH);
         child = iterator.first();
         while (child) {
             if (child->isPositioned()) {
                 child->containingBlock()->insertPositionedObject(child);
-                if (child->style()->hasStaticX()) {
+                if (child->hasStaticX()) {
                     if (style()->direction() == LTR)
-                        child->layer()->setStaticX(xPos);
-                    else child->layer()->setStaticX(width() - xPos);
+                        child->setStaticX(xPos);
+                    else child->setStaticX(width() - xPos);
                 }
-                if (child->style()->hasStaticY())
-                    child->layer()->setStaticY(yPos);
+                if (child->hasStaticY())
+                    child->setStaticY(yPos);
                 child = iterator.next();
                 continue;
             }
     
             // We need to see if this child's height has changed, since we make block elements
             // fill the height of a containing box by default.
             // Now do a layout.
             int oldChildHeight = child->height();
             child->calcHeight();
             if (oldChildHeight != child->height())
@@ skipping 364 matching lines @@
 
         child = iterator.first();
         while (child) {
             // make sure we relayout children if we need it.
             if (!haveLineClamp && (relayoutChildren || (child->isReplaced() && (child->style()->width().isPercent() || child->style()->height().isPercent()))))
                 child->setChildNeedsLayout(true, false);
     
             if (child->isPositioned())
             {
                 child->containingBlock()->insertPositionedObject(child);
-                if (child->style()->hasStaticX()) {
+                if (child->hasStaticX()) {
                     if (style()->direction() == LTR)
-                        child->layer()->setStaticX(borderLeft()+paddingLeft());
+                        child->setStaticX(borderLeft()+paddingLeft());
                     else
-                        child->layer()->setStaticX(borderRight()+paddingRight());
+                        child->setStaticX(borderRight()+paddingRight());
                 }
-                if (child->style()->hasStaticY())
-                    child->layer()->setStaticY(height());
+                if (child->hasStaticY())
+                    child->setStaticY(height());
                 child = iterator.next();
                 continue;
             } 
     
             // Compute the child's vertical margins.
             child->calcVerticalMargins();
     
             // Add in the child's marginTop to our height.
             setHeight(height() + child->marginTop());
     
@@ skipping 307 matching lines @@
         return "RenderFlexibleBox (floating)";
     if (isPositioned())
         return "RenderFlexibleBox (positioned)";
     if (isRelPositioned())
         return "RenderFlexibleBox (relative positioned)";
     return "RenderFlexibleBox";
 }
 
 } // namespace WebCore