Diff
Modified: trunk/Source/WebCore/ChangeLog (155365 => 155366)
--- trunk/Source/WebCore/ChangeLog 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/ChangeLog 2013-09-09 18:37:33 UTC (rev 155366)
@@ -1,3 +1,63 @@
+2013-09-06 David Hyatt <[email protected]>
+
+ Get rid of isBlockFlowFlexBoxOrGrid().
+ https://bugs.webkit.org/show_bug.cgi?id=120897
+
+ Convert all callers and get rid of this method.
+
+ Reviewed by Beth Dakin.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
+ (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+ * dom/Position.cpp:
+ (WebCore::Position::isCandidate):
+ (WebCore::Position::getInlineBoxAndOffset):
+ (WebCore::Position::primaryDirection):
+ * dom/PositionIterator.cpp:
+ (WebCore::PositionIterator::isCandidate):
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::addBlockPlaceholderIfNeeded):
+ * editing/Editor.cpp:
+ (WebCore::Editor::baseWritingDirectionForSelectionStart):
+ * editing/FrameSelection.cpp:
+ (WebCore::caretRenderer):
+ * editing/TextIterator.cpp:
+ (WebCore::TextIterator::shouldRepresentNodeOffsetZero):
+ * editing/TypingCommand.cpp:
+ (WebCore::TypingCommand::makeEditableRootEmpty):
+ * editing/htmlediting.cpp:
+ (WebCore::isBlockFlowElement):
+ * rendering/LayoutState.cpp:
+ (WebCore::LayoutState::LayoutState):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::layoutBlock):
+ (WebCore::RenderBlock::collapseMargins):
+ (WebCore::RenderBlock::selectionGaps):
+ (WebCore::RenderBlock::firstLineBoxBaseline):
+ (WebCore::RenderBlock::lastLineBoxBaseline):
+ (WebCore::RenderBlock::firstLineBlock):
+ (WebCore::findFirstLetterBlock):
+ (WebCore::shouldCheckLines):
+ (WebCore::RenderBlock::adjustForBorderFit):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeRectForRepaint):
+ (WebCore::RenderBox::positionForPoint):
+ * rendering/RenderBoxModelObject.h:
+ (WebCore::RenderBoxModelObject::canHaveBoxInfoInRegion):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::computeRectForRepaint):
+ * rendering/RenderLineBoxList.cpp:
+ (WebCore::RenderLineBoxList::dirtyLinesFromChangedChild):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::computeRectForRepaint):
+ (WebCore::RenderObject::styleWillChange):
+ (WebCore::firstLineStyleForCachedUncachedType):
+ * rendering/RenderObject.h:
+ * rendering/RenderObjectChildList.cpp:
+ (WebCore::RenderObjectChildList::insertChildNode):
+ * rendering/RenderView.h:
+
2013-09-09 Eric Carlson <[email protected]>
MediaStream API: Stop means stop
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (155365 => 155366)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -1225,7 +1225,7 @@
if (node && node->hasTagName(spanTag))
return true;
- if (m_renderer->isBlockFlowFlexBoxOrGrid() && m_renderer->childrenInline() && !canSetFocusAttribute())
+ if (m_renderer->isRenderBlockFlow() && m_renderer->childrenInline() && !canSetFocusAttribute())
return !toRenderBlock(m_renderer)->firstLineBox() && !mouseButtonListener();
// ignore images seemingly used as spacers
@@ -2562,7 +2562,7 @@
if (node && node->hasTagName(footerTag) && !isDescendantOfElementType(articleTag) && !isDescendantOfElementType(sectionTag))
return FooterRole;
- if (m_renderer->isBlockFlowFlexBoxOrGrid())
+ if (m_renderer->isRenderBlockFlow())
return GroupRole;
// If the element does not have role, but it has ARIA attributes, accessibility should fallback to exposing it as a group.
Modified: trunk/Source/WebCore/dom/Position.cpp (155365 => 155366)
--- trunk/Source/WebCore/dom/Position.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/dom/Position.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -925,7 +925,7 @@
if (m_anchorNode->hasTagName(htmlTag))
return false;
- if (renderer->isBlockFlowFlexBoxOrGrid()) {
+ if (renderer->isRenderBlockFlow()) {
if (toRenderBlock(renderer)->logicalHeight() || m_anchorNode->hasTagName(bodyTag)) {
if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer))
return atFirstEditingPositionForNode() && !Position::nodeIsUserSelectNone(deprecatedNode());
@@ -1185,7 +1185,7 @@
if (!renderer->isText()) {
inlineBox = 0;
- if (canHaveChildrenForEditing(deprecatedNode()) && renderer->isBlockFlowFlexBoxOrGrid() && hasRenderedNonAnonymousDescendantsWithHeight(renderer)) {
+ if (canHaveChildrenForEditing(deprecatedNode()) && renderer->isRenderBlockFlow() && hasRenderedNonAnonymousDescendantsWithHeight(renderer)) {
// Try a visually equivalent position with possibly opposite editability. This helps in case |this| is in
// an editable block but surrounded by non-editable positions. It acts to negate the logic at the beginning
// of RenderObject::createVisiblePosition().
@@ -1333,7 +1333,7 @@
{
TextDirection primaryDirection = LTR;
for (const RenderObject* r = m_anchorNode->renderer(); r; r = r->parent()) {
- if (r->isBlockFlowFlexBoxOrGrid()) {
+ if (r->isRenderBlockFlow()) {
primaryDirection = r->style()->direction();
break;
}
Modified: trunk/Source/WebCore/dom/PositionIterator.cpp (155365 => 155366)
--- trunk/Source/WebCore/dom/PositionIterator.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/dom/PositionIterator.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -159,7 +159,7 @@
if (isTableElement(m_anchorNode) || editingIgnoresContent(m_anchorNode))
return (atStartOfNode() || atEndOfNode()) && !Position::nodeIsUserSelectNone(m_anchorNode->parentNode());
- if (!m_anchorNode->hasTagName(htmlTag) && renderer->isBlockFlowFlexBoxOrGrid()) {
+ if (!m_anchorNode->hasTagName(htmlTag) && renderer->isRenderBlockFlow()) {
if (toRenderBlock(renderer)->logicalHeight() || m_anchorNode->hasTagName(bodyTag)) {
if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer))
return atStartOfNode() && !Position::nodeIsUserSelectNone(m_anchorNode);
Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (155365 => 155366)
--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -874,7 +874,7 @@
document().updateLayoutIgnorePendingStylesheets();
RenderObject* renderer = container->renderer();
- if (!renderer || !renderer->isBlockFlowFlexBoxOrGrid())
+ if (!renderer || !renderer->isRenderBlockFlow())
return 0;
// append the placeholder to make sure it follows
Modified: trunk/Source/WebCore/editing/Editor.cpp (155365 => 155366)
--- trunk/Source/WebCore/editing/Editor.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/editing/Editor.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -1427,7 +1427,7 @@
if (!renderer)
return result;
- if (!renderer->isBlockFlowFlexBoxOrGrid()) {
+ if (!renderer->isRenderBlockFlow()) {
renderer = renderer->containingBlock();
if (!renderer)
return result;
Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (155365 => 155366)
--- trunk/Source/WebCore/editing/FrameSelection.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -1271,7 +1271,7 @@
return 0;
// if caretNode is a block and caret is inside it then caret should be painted by that block
- bool paintedByBlock = renderer->isBlockFlowFlexBoxOrGrid() && caretRendersInsideNode(node);
+ bool paintedByBlock = renderer->isRenderBlockFlow() && caretRendersInsideNode(node);
return paintedByBlock ? renderer : renderer->containingBlock();
}
Modified: trunk/Source/WebCore/editing/TextIterator.cpp (155365 => 155366)
--- trunk/Source/WebCore/editing/TextIterator.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -918,7 +918,7 @@
// Additionally, if the range we are iterating over contains huge sections of unrendered content,
// we would create VisiblePositions on every call to this function without this check.
if (!m_node->renderer() || m_node->renderer()->style()->visibility() != VISIBLE
- || (m_node->renderer()->isBlockFlowFlexBoxOrGrid() && !toRenderBlock(m_node->renderer())->height() && !m_node->hasTagName(bodyTag)))
+ || (m_node->renderer()->isRenderBlockFlow() && !toRenderBlock(m_node->renderer())->height() && !m_node->hasTagName(bodyTag)))
return false;
// The startPos.isNotNull() check is needed because the start could be before the body,
Modified: trunk/Source/WebCore/editing/TypingCommand.cpp (155365 => 155366)
--- trunk/Source/WebCore/editing/TypingCommand.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/editing/TypingCommand.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -404,7 +404,7 @@
if (root->firstChild() == root->lastChild() && root->firstElementChild() && root->firstElementChild()->hasTagName(brTag)) {
// If there is a single child and it could be a placeholder, leave it alone.
- if (root->renderer() && root->renderer()->isBlockFlowFlexBoxOrGrid())
+ if (root->renderer() && root->renderer()->isRenderBlockFlow())
return false;
}
Modified: trunk/Source/WebCore/editing/htmlediting.cpp (155365 => 155366)
--- trunk/Source/WebCore/editing/htmlediting.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/editing/htmlediting.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -1290,7 +1290,7 @@
if (!node->isElementNode())
return false;
RenderObject* renderer = node->renderer();
- return renderer && renderer->isBlockFlowFlexBoxOrGrid();
+ return renderer && renderer->isRenderBlockFlow();
}
Element* deprecatedEnclosingBlockFlowElement(Node* node)
Modified: trunk/Source/WebCore/rendering/LayoutState.cpp (155365 => 155366)
--- trunk/Source/WebCore/rendering/LayoutState.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/rendering/LayoutState.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -131,7 +131,7 @@
computeLineGridPaginationOrigin(renderer);
// If we have a new grid to track, then add it to our set.
- if (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && renderer->isBlockFlowFlexBoxOrGrid())
+ if (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && renderer->isRenderBlockFlow())
establishLineGrid(toRenderBlock(renderer));
// FIXME: <http://bugs.webkit.org/show_bug.cgi?id=13443> Apply control clip if present.
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (155365 => 155366)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -1720,7 +1720,7 @@
if (oldHeight > newHeight && maxFloatLogicalBottom > newHeight && !childrenInline()) {
// One of our children's floats may have become an overhanging float for us. We need to look for it.
for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
- if (child->isBlockFlowFlexBoxOrGrid() && !child->isFloatingOrOutOfFlowPositioned()) {
+ if (child->isRenderBlockFlow() && !child->isFloatingOrOutOfFlowPositioned()) {
RenderBlock* block = toRenderBlock(child);
if (block->lowestFloatLogicalBottom() + block->logicalTop() > newHeight)
addOverhangingFloats(block, false);
@@ -2258,7 +2258,7 @@
LayoutUnit oldLogicalHeight = logicalHeight();
setLogicalHeight(logicalTop);
RenderObject* prev = child->previousSibling();
- if (prev && prev->isBlockFlowFlexBoxOrGrid() && !prev->isFloatingOrOutOfFlowPositioned()) {
+ if (prev && prev->isRenderBlockFlow() && !prev->isFloatingOrOutOfFlowPositioned()) {
RenderBlock* block = toRenderBlock(prev);
if (block->containsFloats() && !block->avoidsFloats() && (block->logicalTop() + block->lowestFloatLogicalBottom()) > logicalTop)
addOverhangingFloats(block, false);
@@ -3681,7 +3681,7 @@
// FIXME: overflow: auto/scroll regions need more math here, since painting in the border box is different from painting in the padding box (one is scrolled, the other is
// fixed).
GapRects result;
- if (!isBlockFlowFlexBoxOrGrid()) // FIXME: Make multi-column selection gap filling work someday.
+ if (!isRenderBlockFlow()) // FIXME: Make multi-column selection gap filling work someday.
return result;
if (hasColumns() || hasTransform() || style()->columnSpan()) {
@@ -6760,7 +6760,7 @@
int RenderBlock::firstLineBoxBaseline() const
{
- if (!isBlockFlowFlexBoxOrGrid() || (isWritingModeRoot() && !isRubyRun()))
+ if (isWritingModeRoot() && !isRubyRun())
return -1;
if (childrenInline()) {
@@ -6789,7 +6789,7 @@
int RenderBlock::lastLineBoxBaseline(LineDirectionMode lineDirection) const
{
- if (!isBlockFlowFlexBoxOrGrid() || (isWritingModeRoot() && !isRubyRun()))
+ if (isWritingModeRoot() && !isRubyRun())
return -1;
if (childrenInline()) {
@@ -6850,8 +6850,7 @@
// FIXME: Remove when buttons are implemented with align-items instead
// of flexbox.
if (firstLineBlock->isReplaced() || firstLineBlock->isFloating()
- || !parentBlock || parentBlock->firstChild() != firstLineBlock || !parentBlock->isBlockFlowFlexBoxOrGrid()
- || (parentBlock->isFlexibleBox() && !parentBlock->isRenderButton()))
+ || !parentBlock || parentBlock->firstChild() != firstLineBlock || (!parentBlock->isRenderBlockFlow() && !parentBlock->isRenderButton()))
break;
ASSERT_WITH_SECURITY_IMPLICATION(parentBlock->isRenderBlock());
firstLineBlock = toRenderBlock(parentBlock);
@@ -6909,7 +6908,7 @@
RenderObject* parentBlock = firstLetterBlock->parent();
if (firstLetterBlock->isReplaced() || !parentBlock || parentBlock->firstChild() != firstLetterBlock ||
- !parentBlock->isBlockFlowFlexBoxOrGrid() || (parentBlock->isFlexibleBox() && !parentBlock->isRenderButton()))
+ (!parentBlock->isRenderBlockFlow() && !parentBlock->isRenderButton()))
return 0;
firstLetterBlock = parentBlock;
}
@@ -7091,7 +7090,7 @@
static bool shouldCheckLines(RenderObject* obj)
{
return !obj->isFloatingOrOutOfFlowPositioned() && !obj->isRunIn()
- && obj->isBlockFlowFlexBoxOrGrid() && obj->style()->height().isAuto()
+ && obj->isRenderBlock() && obj->style()->height().isAuto()
&& (!obj->isDeprecatedFlexibleBox() || obj->style()->boxOrient() == VERTICAL);
}
@@ -7196,7 +7195,7 @@
else {
for (RenderBox* obj = firstChildBox(); obj; obj = obj->nextSiblingBox()) {
if (!obj->isFloatingOrOutOfFlowPositioned()) {
- if (obj->isBlockFlowFlexBoxOrGrid() && !obj->hasOverflowClip())
+ if (obj->isRenderBlockFlow() && !obj->hasOverflowClip())
toRenderBlock(obj)->adjustForBorderFit(x + obj->x(), left, right);
else if (obj->style()->visibility() == VISIBLE) {
// We are a replaced element or some kind of non-block-flow object.
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (155365 => 155366)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -2103,7 +2103,7 @@
topLeft += layer()->offsetForInFlowPosition();
}
- if (position != AbsolutePosition && position != FixedPosition && o->hasColumns() && o->isBlockFlowFlexBoxOrGrid()) {
+ if (position != AbsolutePosition && position != FixedPosition && o->hasColumns() && o->isRenderBlockFlow()) {
LayoutRect repaintRect(topLeft, rect.size());
toRenderBlock(o)->adjustRectForColumns(repaintRect);
topLeft = repaintRect.location();
@@ -4093,7 +4093,7 @@
adjustedPoint.moveBy(location());
for (RenderObject* renderObject = firstChild(); renderObject; renderObject = renderObject->nextSibling()) {
- if ((!renderObject->firstChild() && !renderObject->isInline() && !renderObject->isBlockFlowFlexBoxOrGrid() )
+ if ((!renderObject->firstChild() && !renderObject->isInline() && !renderObject->isRenderBlockFlow() )
|| renderObject->style()->visibility() != VISIBLE)
continue;
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (155365 => 155366)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2013-09-09 18:37:33 UTC (rev 155366)
@@ -175,7 +175,7 @@
virtual void setSelectionState(SelectionState s);
- bool canHaveBoxInfoInRegion() const { return !isFloating() && !isReplaced() && !isInline() && !hasColumns() && !isTableCell() && isBlockFlowFlexBoxOrGrid() && !isRenderSVGBlock(); }
+ bool canHaveBoxInfoInRegion() const { return !isFloating() && !isReplaced() && !isInline() && !hasColumns() && !isTableCell() && isRenderBlock() && !isRenderSVGBlock(); }
void getGeometryForBackgroundImage(const RenderLayerModelObject* paintContainer, IntRect& destRect, IntPoint& phase, IntSize& tileSize) const;
Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (155365 => 155366)
--- trunk/Source/WebCore/rendering/RenderInline.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -1087,7 +1087,7 @@
LayoutPoint topLeft = rect.location();
- if (o->isBlockFlowFlexBoxOrGrid() && !style()->hasOutOfFlowPosition()) {
+ if (o->isRenderBlockFlow() && !style()->hasOutOfFlowPosition()) {
RenderBlock* cb = toRenderBlock(o);
if (cb->hasColumns()) {
LayoutRect repaintRect(topLeft, rect.size());
Modified: trunk/Source/WebCore/rendering/RenderLineBoxList.cpp (155365 => 155366)
--- trunk/Source/WebCore/rendering/RenderLineBoxList.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/rendering/RenderLineBoxList.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -311,7 +311,7 @@
void RenderLineBoxList::dirtyLinesFromChangedChild(RenderObject* container, RenderObject* child)
{
- if (!container->parent() || (container->isRenderBlock() && (container->selfNeedsLayout() || !container->isBlockFlowFlexBoxOrGrid())))
+ if (!container->parent() || (container->isRenderBlock() && (container->selfNeedsLayout() || !container->isRenderBlockFlow())))
return;
RenderInline* inlineContainer = container->isRenderInline() ? toRenderInline(container) : 0;
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (155365 => 155366)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -1556,7 +1556,7 @@
return;
if (RenderObject* o = parent()) {
- if (o->isBlockFlowFlexBoxOrGrid()) {
+ if (o->isRenderBlockFlow()) {
RenderBlock* cb = toRenderBlock(o);
if (cb->hasColumns())
cb->adjustRectForColumns(rect);
@@ -1963,7 +1963,7 @@
s_affectsParentBlock = isFloatingOrOutOfFlowPositioned()
&& (!newStyle->isFloating() && !newStyle->hasOutOfFlowPosition())
- && parent() && (parent()->isBlockFlowFlexBoxOrGrid() || parent()->isRenderInline());
+ && parent() && (parent()->isRenderBlockFlow() || parent()->isRenderInline());
s_noLongerAffectsParentBlock = ((!isFloating() && newStyle->isFloating()) || (!isOutOfFlowPositioned() && newStyle->hasOutOfFlowPosition()))
&& parent() && parent()->isRenderBlock();
@@ -2795,7 +2795,7 @@
if (renderer->isBeforeOrAfterContent())
rendererForFirstLineStyle = renderer->parent();
- if (rendererForFirstLineStyle->isBlockFlowFlexBoxOrGrid()) {
+ if (rendererForFirstLineStyle->isRenderBlockFlow() || rendererForFirstLineStyle->isRenderButton()) {
if (RenderBlock* firstLineBlock = rendererForFirstLineStyle->firstLineBlock()) {
if (type == Cached)
return firstLineBlock->getCachedPseudoStyle(FIRST_LINE, style);
Modified: trunk/Source/WebCore/rendering/RenderObject.h (155365 => 155366)
--- trunk/Source/WebCore/rendering/RenderObject.h 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2013-09-09 18:37:33 UTC (rev 155366)
@@ -406,12 +406,6 @@
bool isTablePart() const { return isTableCell() || isRenderTableCol() || isTableCaption() || isTableRow() || isTableSection(); }
- // FIXME: This is the renamed version of isBlockFlow() and it makes it more obvious that flexible boxes and grids are being included. Most
- // of the current callers did not in fact intend to include flexible boxes and grids (but have been for years), so we will want to
- // convert those callers over to isRenderBlockFlow() instead. We'll do this call site by call site in order to try to find the
- // code that is making bad assumptions and change it. Once that's finished, this method will just go away.
- bool isBlockFlowFlexBoxOrGrid() const { return isRenderBlockFlow() || isFlexibleBoxIncludingDeprecated() || isRenderGrid(); }
-
inline bool isBeforeContent() const;
inline bool isAfterContent() const;
inline bool isBeforeOrAfterContent() const;
Modified: trunk/Source/WebCore/rendering/RenderObjectChildList.cpp (155365 => 155366)
--- trunk/Source/WebCore/rendering/RenderObjectChildList.cpp 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/rendering/RenderObjectChildList.cpp 2013-09-09 18:37:33 UTC (rev 155366)
@@ -118,7 +118,7 @@
void RenderObjectChildList::insertChildNode(RenderObject* owner, RenderObject* newChild, RenderObject* beforeChild, bool notifyRenderer)
{
ASSERT(!newChild->parent());
- ASSERT(!owner->isBlockFlowFlexBoxOrGrid() || (!newChild->isTableSection() && !newChild->isTableRow() && !newChild->isTableCell()));
+ ASSERT(!owner->isRenderBlockFlow() || (!newChild->isTableSection() && !newChild->isTableRow() && !newChild->isTableCell()));
while (beforeChild && beforeChild->parent() && beforeChild->parent() != owner)
beforeChild = beforeChild->parent();
Modified: trunk/Source/WebCore/rendering/RenderView.h (155365 => 155366)
--- trunk/Source/WebCore/rendering/RenderView.h 2013-09-09 18:21:06 UTC (rev 155365)
+++ trunk/Source/WebCore/rendering/RenderView.h 2013-09-09 18:37:33 UTC (rev 155366)
@@ -258,7 +258,7 @@
{
// We push LayoutState even if layoutState is disabled because it stores layoutDelta too.
if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer->hasColumns() || renderer->flowThreadContainingBlock()
- || m_layoutState->lineGrid() || (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && renderer->isBlockFlowFlexBoxOrGrid())
+ || m_layoutState->lineGrid() || (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && renderer->isRenderBlockFlow())
#if ENABLE(CSS_SHAPES)
|| (renderer->isRenderBlock() && toRenderBlock(renderer)->shapeInsideInfo())
|| (m_layoutState->shapeInsideInfo() && renderer->isRenderBlock() && !toRenderBlock(renderer)->allowsShapeInsideInfoSharing())
