Merge 116174

Source/WebCore/rendering/mathml/RenderMathMLRow.cpp

 /*
  * Copyright (C) 2010 Alex Milowski (alex@milowski.com). All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 26 matching lines @@
 using namespace MathMLNames;
 
 RenderMathMLRow::RenderMathMLRow(Element* element)
     : RenderMathMLBlock(element)
 {
 }
 
 void RenderMathMLRow::layout() 
 {
     RenderBlock::layout();
+    RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay(parent->style(), INLINE_BLOCK);
+    RenderMathMLRow* newMRow = new (parent->renderArena()) RenderMathMLRow(parent->document() /* is anonymous */);
+    newMRow->setStyle(newStyle.release());
+    return newMRow;
+}
+
+void RenderMathMLRow::computePreferredLogicalWidths()
+{
+    ASSERT(preferredLogicalWidthsDirty() && needsLayout());
     
     int maxHeight = 0;
 
     // Calculate the non-operator max height of the row.
     for (RenderObject* current = firstChild(); current; current = current->nextSibling()) {
         if (current->isRenderMathMLBlock()) {
             RenderMathMLBlock* block = toRenderMathMLBlock(current);
             if (!block->unembellishedOperator() && block->offsetHeight() > maxHeight)
                 maxHeight = block->offsetHeight();
         } else if (current->isBoxModelObject()) {
@@ skipping 22 matching lines @@
             setPreferredLogicalWidthsDirty(true, false);
             RenderBlock::layout();
         }
     }
     
 }    
     
 }
 
 #endif // ENABLE(MATHML)