Merge 116174

Source/WebCore/rendering/mathml/RenderMathMLSubSup.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 58 matching lines @@
     Element* childElement = toElement(child->node());
 
     if (childElement && !childElement->previousElementSibling()) {
         // Position 1 is always the base of the msub/msup/msubsup.
         RenderBlock* baseWrapper = createAlmostAnonymousBlock(INLINE_BLOCK);
         RenderMathMLBlock::addChild(baseWrapper, firstChild());
         baseWrapper->addChild(child);
             
         // Make sure we have a script block for rendering.
         if (m_kind == SubSup && !m_scripts) {
-            RefPtr<RenderStyle> scriptsStyle = RenderStyle::createAnonymousStyle(style());
-            scriptsStyle->setDisplay(INLINE_BLOCK);
+            RefPtr<RenderStyle> scriptsStyle = RenderStyle::createAnonymousStyleWithDisplay(style(), INLINE_BLOCK);
             scriptsStyle->setVerticalAlign(TOP);
             scriptsStyle->setMarginLeft(Length(gSubsupScriptMargin, Fixed));
             scriptsStyle->setTextAlign(LEFT);
             // Set this wrapper's font-size for its line-height & baseline position.
             scriptsStyle->setBlendedFontSize(static_cast<int>(0.75 * style()->fontSize()));
             m_scripts = new (renderArena()) RenderMathMLBlock(node());
             m_scripts->setStyle(scriptsStyle);
             RenderMathMLBlock::addChild(m_scripts, beforeChild);
         }
     } else {
@@ skipping 87 matching lines @@
     superscriptWrapper->style()->setPaddingBottom(Length(superPaddingBottom, Fixed));
     superscriptWrapper->setNeedsLayout(true, false);
     m_scripts->setNeedsLayout(true, false);
     
     RenderBlock::layout();
 }
 
 }    
 
 #endif // ENABLE(MATHML)