Merge 116174

Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp

 /*
  * Copyright (C) 2009 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 33 matching lines @@
 {
 }
 
 bool RenderMathMLBlock::isChildAllowed(RenderObject* child, RenderStyle*) const
 {
     return child->node() && child->node()->nodeType() == Node::ELEMENT_NODE;
 }
 
 RenderMathMLBlock* RenderMathMLBlock::createAlmostAnonymousBlock(EDisplay display)
 {
-    RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyle(style());
-    newStyle->setDisplay(display);
-    
+    RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay(style(), display);
     RenderMathMLBlock* newBlock = new (renderArena()) RenderMathMLBlock(node() /* "almost" anonymous block */);
     newBlock->setStyle(newStyle.release());
     return newBlock;
 }
 
 void RenderMathMLBlock::stretchToHeight(int height) 
 {
     for (RenderObject* current = firstChild(); current; current = current->nextSibling())
        if (current->isRenderMathMLBlock()) {
           RenderMathMLBlock* block = toRenderMathMLBlock(current);
@@ skipping 32 matching lines @@
     
     info.context->setStrokeColor(Color(255, 0, 0), ColorSpaceSRGB);
     
     info.context->drawLine(IntPoint(adjustedPaintOffset.x(), adjustedPaintOffset.y() + baseline), IntPoint(adjustedPaintOffset.x() + pixelSnappedOffsetWidth(), adjustedPaintOffset.y() + baseline));
 }
 #endif // ENABLE(DEBUG_MATH_LAYOUT)
 
 }    
 
 #endif