Changeset 158097 in webkit for trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp

Timestamp:

Oct 27, 2013, 3:54:07 PM (12 years ago)

Author:

[email protected]

Message:

Renderers should receive their style at construction.
<​https://webkit.org/b/123396>

Pass the RenderStyle to all non-text renderer constructors.
After construction, initializeStyle() must be called (as a stopgap
measure) until we are able to do style-derived initialization
without virtual function calls.

With this change, RenderElement::m_style is never null. Subsequent
patches will add enforcement for this and also make style() return
a RenderStyle&.

I'm adding three FIXME's in this patch:

• createRendererIfNeeded() calls AnimationController to set up the initial style manually instead of asking RenderElement's setAnimatedStyle() to do it. This can probably be done in a nicer way, but it's not clear yet how.

• ImageContentData::createRenderer() does a bit of unnecessary work. This should be easy to clean up but got too distracting to be part of this patch.

• Document::createRenderTree() creates the RenderView with an initial dummy RenderStyle. I've done this because resolving the document style assumes we already have a RenderView.

For styleWillChange() implementations to detect that they are
reacting to the initial style, I've added a hasInitializedStyle()
function on RenderElement. This will return false until you've
called initializeStyle() on the renderer. This should go away
along with initializeStyle() eventually.

Reviewed by Antti Koivisto.

File:

• trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp

@@ -36 +36 @@
 namespace WebCore {
 
-RenderMultiColumnBlock::RenderMultiColumnBlock(Element& element)
-    : RenderBlockFlow(element)
+RenderMultiColumnBlock::RenderMultiColumnBlock(Element& element, PassRef<RenderStyle> style)
+    : RenderBlockFlow(element, std::move(style))
     , m_flowThread(0)
     , m_columnCount(1)
@@ -140 +140 @@
 {
     if (!m_flowThread) {
-        m_flowThread = new RenderMultiColumnFlowThread(document());
-        m_flowThread->setStyle(RenderStyle::createAnonymousStyleWithDisplay(style(), BLOCK));
+        m_flowThread = new RenderMultiColumnFlowThread(document(), RenderStyle::createAnonymousStyleWithDisplay(style(), BLOCK));
+        m_flowThread->initializeStyle();
         RenderBlockFlow::addChild(m_flowThread);
     }