Title: [144637] trunk/Source/WebCore
- Revision
- 144637
- Author
- [email protected]
- Date
- 2013-03-04 09:16:05 -0800 (Mon, 04 Mar 2013)
Log Message
[New Multicolumn] Eliminate the unique multicolumn flow thread style creation function
https://bugs.webkit.org/show_bug.cgi?id=111338
Reviewed by Allan Jensen.
There is nothing special about a multi-column flow thread style now, so we can just
use the existing anonymous style creation function.
* rendering/RenderMultiColumnBlock.cpp:
(WebCore):
(WebCore::RenderMultiColumnBlock::addChild):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144636 => 144637)
--- trunk/Source/WebCore/ChangeLog 2013-03-04 17:06:15 UTC (rev 144636)
+++ trunk/Source/WebCore/ChangeLog 2013-03-04 17:16:05 UTC (rev 144637)
@@ -1,3 +1,17 @@
+2013-03-04 David Hyatt <[email protected]>
+
+ [New Multicolumn] Eliminate the unique multicolumn flow thread style creation function
+ https://bugs.webkit.org/show_bug.cgi?id=111338
+
+ Reviewed by Allan Jensen.
+
+ There is nothing special about a multi-column flow thread style now, so we can just
+ use the existing anonymous style creation function.
+
+ * rendering/RenderMultiColumnBlock.cpp:
+ (WebCore):
+ (WebCore::RenderMultiColumnBlock::addChild):
+
2013-03-04 Mario Sanchez Prada <[email protected]>
[GTK] WebCore::returnString is unsafe and should be removed!
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp (144636 => 144637)
--- trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp 2013-03-04 17:06:15 UTC (rev 144636)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp 2013-03-04 17:16:05 UTC (rev 144637)
@@ -103,20 +103,11 @@
return false;
}
-static PassRefPtr<RenderStyle> createMultiColumnFlowThreadStyle(RenderStyle* parentStyle)
-{
- RefPtr<RenderStyle> newStyle(RenderStyle::create());
- newStyle->inheritFrom(parentStyle);
- newStyle->setDisplay(BLOCK);
- newStyle->font().update(0);
- return newStyle.release();
-}
-
void RenderMultiColumnBlock::addChild(RenderObject* newChild, RenderObject* beforeChild)
{
if (!m_flowThread) {
m_flowThread = new (renderArena()) RenderMultiColumnFlowThread(document());
- m_flowThread->setStyle(createMultiColumnFlowThreadStyle(style()));
+ m_flowThread->setStyle(RenderStyle::createAnonymousStyleWithDisplay(style(), BLOCK));
RenderBlock::addChild(m_flowThread); // Always put the flow thread at the end.
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
