Merge 116174

Source/WebCore/rendering/style/RenderStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 69 matching lines @@
 PassRefPtr<RenderStyle> RenderStyle::create()
 {
     return adoptRef(new RenderStyle());
 }
 
 PassRefPtr<RenderStyle> RenderStyle::createDefaultStyle()
 {
     return adoptRef(new RenderStyle(true));
 }
 
-PassRefPtr<RenderStyle> RenderStyle::createAnonymousStyle(const RenderStyle* parentStyle)
+PassRefPtr<RenderStyle> RenderStyle::createAnonymousStyleWithDisplay(const RenderStyle* parentStyle, EDisplay display)
 {
     RefPtr<RenderStyle> newStyle = RenderStyle::create();
     newStyle->inheritFrom(parentStyle);
     newStyle->inheritUnicodeBidiFrom(parentStyle);
+    newStyle->setDisplay(display);
     return newStyle;
 }
 
 PassRefPtr<RenderStyle> RenderStyle::clone(const RenderStyle* other)
 {
     return adoptRef(new RenderStyle(*other));
 }
 
 ALWAYS_INLINE RenderStyle::RenderStyle()
     : m_box(defaultStyle()->m_box)
@@ skipping 1504 matching lines @@
     left = NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth());
 }
 
 void RenderStyle::getImageVerticalOutsets(const NinePieceImage& image, LayoutUnit& top, LayoutUnit& bottom) const
 {
     top = NinePieceImage::computeOutset(image.outset().top(), borderTopWidth());
     bottom = NinePieceImage::computeOutset(image.outset().bottom(), borderBottomWidth());
 }
 
 } // namespace WebCore