Index: Source/core/rendering/RenderInline.cpp |
diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp |
index 280a5a89f94ad814b2969eb38bd2fffb49cd4184..5058b0ab5bc436898d1344e4c6cadddf488dbc4d 100644 |
--- a/Source/core/rendering/RenderInline.cpp |
+++ b/Source/core/rendering/RenderInline.cpp |
@@ -31,7 +31,6 @@ |
#include "core/rendering/InlineTextBox.h" |
#include "core/rendering/LayoutRectRecorder.h" |
#include "core/rendering/RenderBlock.h" |
-#include "core/rendering/RenderFlowThread.h" |
#include "core/rendering/RenderFullScreen.h" |
#include "core/rendering/RenderGeometryMap.h" |
#include "core/rendering/RenderLayer.h" |
@@ -210,14 +209,12 @@ void RenderInline::updateAlwaysCreateLineBoxes(bool fullLayout) |
RenderStyle* parentStyle = parent()->style(); |
RenderInline* parentRenderInline = parent()->isRenderInline() ? toRenderInline(parent()) : 0; |
bool checkFonts = document().inNoQuirksMode(); |
- RenderFlowThread* flowThread = flowThreadContainingBlock(); |
bool alwaysCreateLineBoxes = (parentRenderInline && parentRenderInline->alwaysCreateLineBoxes()) |
|| (parentRenderInline && parentStyle->verticalAlign() != BASELINE) |
|| style()->verticalAlign() != BASELINE |
|| style()->textEmphasisMark() != TextEmphasisMarkNone |
|| (checkFonts && (!parentStyle->font().fontMetrics().hasIdenticalAscentDescentAndLineGap(style()->font().fontMetrics()) |
- || parentStyle->lineHeight() != style()->lineHeight())) |
- || (flowThread && flowThread->hasRegionsWithStyling()); |
+ || parentStyle->lineHeight() != style()->lineHeight())); |
if (!alwaysCreateLineBoxes && checkFonts && document().styleEngine()->usesFirstLineRules()) { |
// Have to check the first line style as well. |
@@ -334,7 +331,6 @@ RenderInline* RenderInline::clone() const |
{ |
RenderInline* cloneInline = new RenderInline(node()); |
cloneInline->setStyle(style()); |
- cloneInline->setFlowThreadState(flowThreadState()); |
return cloneInline; |
} |
@@ -1133,8 +1129,7 @@ LayoutSize RenderInline::offsetFromContainer(RenderObject* container, const Layo |
if (offsetDependsOnPoint) { |
*offsetDependsOnPoint = container->hasColumns() |
- || (container->isBox() && container->style()->isFlippedBlocksWritingMode()) |
- || container->isRenderFlowThread(); |
+ || (container->isBox() && container->style()->isFlippedBlocksWritingMode()); |
} |
return offset; |