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

Timestamp:

Oct 28, 2013, 7:58:43 PM (12 years ago)

Author:

[email protected]

Message:

RenderElement::style() should return a reference.
<​https://webkit.org/b/123414>

Now that renderers always have style, go ahead and make style()
return a RenderStyle&.

There are countless opportunities for further cleanup enabled by
this change. I'm simply passing &style() in many cases where we
can really do something nicer instead.

Reviewed by Anders Carlsson.

File:

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

trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp

@@ -50 +50 @@
     RenderBlockFlow::styleDidChange(diff, oldStyle);
     for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox())
-        child->setStyle(RenderStyle::createAnonymousStyleWithDisplay(style(), BLOCK));
+        child->setStyle(RenderStyle::createAnonymousStyleWithDisplay(&style(), BLOCK));
 }
 
@@ -60 +60 @@
     m_columnWidth = contentLogicalWidth();
     
-    ASSERT(!style()->hasAutoColumnCount() || !style()->hasAutoColumnWidth());
+    ASSERT(!style().hasAutoColumnCount() || !style().hasAutoColumnWidth());
 
     LayoutUnit availWidth = m_columnWidth;
     LayoutUnit colGap = columnGap();
-    LayoutUnit colWidth = max<LayoutUnit>(1, LayoutUnit(style()->columnWidth()));
-    int colCount = max<int>(1, style()->columnCount());
-
-    if (style()->hasAutoColumnWidth() && !style()->hasAutoColumnCount()) {
+    LayoutUnit colWidth = max<LayoutUnit>(1, LayoutUnit(style().columnWidth()));
+    int colCount = max<int>(1, style().columnCount());
+
+    if (style().hasAutoColumnWidth() && !style().hasAutoColumnCount()) {
         m_columnCount = colCount;
         m_columnWidth = max<LayoutUnit>(0, (availWidth - ((m_columnCount - 1) * colGap)) / m_columnCount);
-    } else if (!style()->hasAutoColumnWidth() && style()->hasAutoColumnCount()) {
+    } else if (!style().hasAutoColumnWidth() && style().hasAutoColumnCount()) {
         m_columnCount = max<LayoutUnit>(1, (availWidth + colGap) / (colWidth + colGap));
         m_columnWidth = ((availWidth + colGap) / m_columnCount) - colGap;
@@ -140 +140 @@
 {
     if (!m_flowThread) {
-        m_flowThread = new RenderMultiColumnFlowThread(document(), RenderStyle::createAnonymousStyleWithDisplay(style(), BLOCK));
+        m_flowThread = new RenderMultiColumnFlowThread(document(), RenderStyle::createAnonymousStyleWithDisplay(&style(), BLOCK));
         m_flowThread->initializeStyle();
         RenderBlockFlow::addChild(m_flowThread);