Changeset 155139 in webkit
- Timestamp:
- Sep 5, 2013 12:32:35 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 added
- 68 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r155108 r155139 2112 2112 rendering/RenderBR.cpp 2113 2113 rendering/RenderBlock.cpp 2114 rendering/RenderBlockFlow.cpp 2114 2115 rendering/RenderBlockLineLayout.cpp 2115 2116 rendering/RenderBox.cpp -
trunk/Source/WebCore/ChangeLog
r155138 r155139 1 2013-09-05 David Hyatt <hyatt@apple.com> 2 3 Add new RenderBlockFlow class 4 https://bugs.webkit.org/show_bug.cgi?id=120777 5 6 Reviewed by Simon Fraser. 7 8 This patch adds a new RenderBlockFlow class. The idea is to get all of the line/float/margin 9 code out of RenderBlock and into the subclass, and then we can make RenderBlock an abstract 10 base. This will save memory for all of the classes that derive from RenderBlock but have 11 their own layout systems (e.g., flexbox, grid, table), and it will let us tighten up 12 types to make it more clear when we're talking about block layout code vs. a more generic 13 block-level object that can have any kind of layout. 14 15 The only real change here is that isBlockFlow() has been renamed to isRenderBlockFlow() and 16 is now checking if the object is a RenderBlockFlow. All of the block subclasses have been patched 17 to be a RenderBlock or RenderBlockFlow. 18 19 * CMakeLists.txt: 20 * GNUmakefile.list.am: 21 * Target.pri: 22 * WebCore.vcxproj/WebCore.vcxproj: 23 * WebCore.xcodeproj/project.pbxproj: 24 * accessibility/AccessibilityRenderObject.cpp: 25 (WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored): 26 (WebCore::AccessibilityRenderObject::determineAccessibilityRole): 27 * dom/Position.cpp: 28 (WebCore::Position::isCandidate): 29 (WebCore::Position::getInlineBoxAndOffset): 30 (WebCore::Position::primaryDirection): 31 * dom/PositionIterator.cpp: 32 (WebCore::PositionIterator::isCandidate): 33 * editing/ApplyStyleCommand.cpp: 34 (WebCore::ApplyStyleCommand::applyInlineStyleToPushDown): 35 * editing/CompositeEditCommand.cpp: 36 (WebCore::CompositeEditCommand::addBlockPlaceholderIfNeeded): 37 * editing/Editor.cpp: 38 (WebCore::Editor::baseWritingDirectionForSelectionStart): 39 * editing/FrameSelection.cpp: 40 (WebCore::caretRenderer): 41 * editing/TextIterator.cpp: 42 (WebCore::TextIterator::shouldRepresentNodeOffsetZero): 43 * editing/TypingCommand.cpp: 44 (WebCore::TypingCommand::makeEditableRootEmpty): 45 * editing/htmlediting.cpp: 46 (WebCore::isBlockFlowElement): 47 * html/shadow/SliderThumbElement.cpp: 48 (WebCore::RenderSliderThumb::RenderSliderThumb): 49 * html/shadow/SliderThumbElement.h: 50 * rendering/LayoutState.cpp: 51 (WebCore::LayoutState::LayoutState): 52 * rendering/RenderBlock.cpp: 53 (WebCore::RenderBlock::layoutBlock): 54 (WebCore::RenderBlock::collapseMargins): 55 (WebCore::RenderBlock::selectionGaps): 56 (WebCore::RenderBlock::firstLineBoxBaseline): 57 (WebCore::RenderBlock::lastLineBoxBaseline): 58 (WebCore::RenderBlock::firstLineBlock): 59 (WebCore::findFirstLetterBlock): 60 (WebCore::shouldCheckLines): 61 (WebCore::RenderBlock::adjustForBorderFit): 62 * rendering/RenderBlock.h: 63 * rendering/RenderBlockFlow.cpp: Added. 64 (WebCore::RenderBlockFlow::RenderBlockFlow): 65 (WebCore::RenderBlockFlow::~RenderBlockFlow): 66 * rendering/RenderBlockFlow.h: Added. 67 (WebCore::toRenderBlockFlow): 68 * rendering/RenderBox.cpp: 69 (WebCore::RenderBox::computeRectForRepaint): 70 (WebCore::RenderBox::positionForPoint): 71 * rendering/RenderBoxModelObject.h: 72 (WebCore::RenderBoxModelObject::canHaveBoxInfoInRegion): 73 * rendering/RenderDeprecatedFlexibleBox.cpp: 74 (WebCore::RenderDeprecatedFlexibleBox::applyLineClamp): 75 (WebCore::RenderDeprecatedFlexibleBox::clearLineClamp): 76 * rendering/RenderDetailsMarker.cpp: 77 (WebCore::RenderDetailsMarker::RenderDetailsMarker): 78 * rendering/RenderDetailsMarker.h: 79 * rendering/RenderFieldset.cpp: 80 (WebCore::RenderFieldset::RenderFieldset): 81 * rendering/RenderFieldset.h: 82 * rendering/RenderFileUploadControl.cpp: 83 (WebCore::RenderFileUploadControl::RenderFileUploadControl): 84 * rendering/RenderFileUploadControl.h: 85 * rendering/RenderFlowThread.cpp: 86 (WebCore::RenderFlowThread::RenderFlowThread): 87 * rendering/RenderFlowThread.h: 88 * rendering/RenderFullScreen.cpp: 89 * rendering/RenderInline.cpp: 90 (WebCore::RenderInline::computeRectForRepaint): 91 * rendering/RenderLineBoxList.cpp: 92 (WebCore::RenderLineBoxList::dirtyLinesFromChangedChild): 93 * rendering/RenderMeter.cpp: 94 (WebCore::RenderMeter::RenderMeter): 95 * rendering/RenderMeter.h: 96 * rendering/RenderMultiColumnBlock.cpp: 97 (WebCore::RenderMultiColumnBlock::RenderMultiColumnBlock): 98 * rendering/RenderMultiColumnBlock.h: 99 * rendering/RenderObject.cpp: 100 (WebCore::RenderObject::computeRectForRepaint): 101 (WebCore::RenderObject::styleWillChange): 102 (WebCore::firstLineStyleForCachedUncachedType): 103 * rendering/RenderObject.h: 104 (WebCore::RenderObject::isBR): 105 (WebCore::RenderObject::isRenderBlockFlow): 106 * rendering/RenderObjectChildList.cpp: 107 (WebCore::RenderObjectChildList::insertChildNode): 108 * rendering/RenderProgress.cpp: 109 (WebCore::RenderProgress::RenderProgress): 110 * rendering/RenderProgress.h: 111 * rendering/RenderRegion.cpp: 112 (WebCore::RenderRegion::RenderRegion): 113 * rendering/RenderRegion.h: 114 * rendering/RenderRuby.cpp: 115 (WebCore::RenderRubyAsBlock::RenderRubyAsBlock): 116 * rendering/RenderRuby.h: 117 * rendering/RenderRubyBase.cpp: 118 (WebCore::RenderRubyBase::RenderRubyBase): 119 * rendering/RenderRubyBase.h: 120 * rendering/RenderRubyRun.cpp: 121 (WebCore::RenderRubyRun::RenderRubyRun): 122 * rendering/RenderRubyRun.h: 123 * rendering/RenderRubyText.cpp: 124 (WebCore::RenderRubyText::RenderRubyText): 125 * rendering/RenderRubyText.h: 126 * rendering/RenderTableCaption.cpp: 127 (WebCore::RenderTableCaption::RenderTableCaption): 128 * rendering/RenderTableCaption.h: 129 * rendering/RenderTableCell.cpp: 130 (WebCore::RenderTableCell::RenderTableCell): 131 * rendering/RenderTableCell.h: 132 * rendering/RenderTextControl.cpp: 133 (WebCore::RenderTextControl::RenderTextControl): 134 * rendering/RenderTextControl.h: 135 * rendering/RenderTextControlSingleLine.h: 136 (WebCore::RenderTextControlInnerBlock::RenderTextControlInnerBlock): 137 * rendering/RenderTextTrackCue.cpp: 138 (WebCore::RenderTextTrackCue::RenderTextTrackCue): 139 * rendering/RenderTextTrackCue.h: 140 * rendering/RenderView.cpp: 141 (WebCore::RenderView::RenderView): 142 * rendering/RenderView.h: 143 * rendering/svg/RenderSVGBlock.cpp: 144 (WebCore::RenderSVGBlock::RenderSVGBlock): 145 * rendering/svg/RenderSVGBlock.h: 146 1 147 2013-09-05 Tim Horton <timothy_horton@apple.com> 2 148 -
trunk/Source/WebCore/GNUmakefile.list.am
r155077 r155139 4375 4375 Source/WebCore/rendering/RenderBlock.cpp \ 4376 4376 Source/WebCore/rendering/RenderBlock.h \ 4377 Source/WebCore/rendering/RenderBlockFlow.cpp \ 4378 Source/WebCore/rendering/RenderBlockFlow.h \ 4377 4379 Source/WebCore/rendering/RenderBlockLineLayout.cpp \ 4378 4380 Source/WebCore/rendering/RenderBox.cpp \ -
trunk/Source/WebCore/Target.pri
r155077 r155139 1156 1156 rendering/RenderArena.cpp \ 1157 1157 rendering/RenderBlock.cpp \ 1158 rendering/RenderBlockFlow.cpp \ 1158 1159 rendering/RenderBlockLineLayout.cpp \ 1159 1160 rendering/RenderBox.cpp \ -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r155108 r155139 9671 9671 </ClCompile> 9672 9672 <ClCompile Include="..\rendering\RenderBlock.cpp"> 9673 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 9674 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 9675 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild> 9676 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild> 9677 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild> 9678 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild> 9679 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 9680 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 9681 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild> 9682 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild> 9683 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild> 9684 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 9685 </ClCompile> 9686 <ClCompile Include="..\rendering\RenderBlockFlow.cpp"> 9673 9687 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 9674 9688 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r155077 r155139 4710 4710 BC0B36A40CD3C67C00AC7EB5 /* Console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0B36A10CD3C67C00AC7EB5 /* Console.cpp */; }; 4711 4711 BC0B36A50CD3C67C00AC7EB5 /* Console.h in Headers */ = {isa = PBXBuildFile; fileRef = BC0B36A20CD3C67C00AC7EB5 /* Console.h */; settings = {ATTRIBUTES = (Private, ); }; }; 4712 BC10D76717D8EE6E005E2626 /* RenderBlockFlow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCFB45F417D8E49400444446 /* RenderBlockFlow.cpp */; }; 4713 BC10D76817D8EE71005E2626 /* RenderBlockFlow.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB45F317D8E39200444446 /* RenderBlockFlow.h */; settings = {ATTRIBUTES = (Private, ); }; }; 4712 4714 BC124EE70C2641CD009E2349 /* BarProp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC124EE40C2641CD009E2349 /* BarProp.cpp */; }; 4713 4715 BC124EE80C2641CD009E2349 /* BarProp.h in Headers */ = {isa = PBXBuildFile; fileRef = BC124EE50C2641CD009E2349 /* BarProp.h */; }; … … 12019 12021 BCFB2F74097A2E1A00BA703D /* Arena.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Arena.cpp; sourceTree = "<group>"; }; 12020 12022 BCFB2F75097A2E1A00BA703D /* Arena.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Arena.h; sourceTree = "<group>"; }; 12023 BCFB45F317D8E39200444446 /* RenderBlockFlow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RenderBlockFlow.h; sourceTree = "<group>"; }; 12024 BCFB45F417D8E49400444446 /* RenderBlockFlow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderBlockFlow.cpp; sourceTree = "<group>"; }; 12021 12025 BCFE2F0F0C1B58370020235F /* JSRect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSRect.cpp; sourceTree = "<group>"; }; 12022 12026 BCFE2F100C1B58370020235F /* JSRect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSRect.h; sourceTree = "<group>"; }; … … 20392 20396 BCEA4820097D93020094C9E4 /* RenderBlock.cpp */, 20393 20397 BCEA4821097D93020094C9E4 /* RenderBlock.h */, 20398 BCFB45F417D8E49400444446 /* RenderBlockFlow.cpp */, 20399 BCFB45F317D8E39200444446 /* RenderBlockFlow.h */, 20394 20400 BCEA4813097D93020094C9E4 /* RenderBlockLineLayout.cpp */, 20395 20401 BCEA4822097D93020094C9E4 /* RenderBox.cpp */, … … 24546 24552 BE16C59317CFE17200852C04 /* InbandGenericTextTrack.h in Headers */, 24547 24553 BE16C59517CFE17200852C04 /* InbandWebVTTTextTrack.h in Headers */, 24554 BC10D76817D8EE71005E2626 /* RenderBlockFlow.h in Headers */, 24548 24555 ); 24549 24556 runOnlyForDeploymentPostprocessing = 0; … … 27569 27576 BE16C59217CFE17200852C04 /* InbandGenericTextTrack.cpp in Sources */, 27570 27577 BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */, 27578 BC10D76717D8EE6E005E2626 /* RenderBlockFlow.cpp in Sources */, 27571 27579 ); 27572 27580 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
r154937 r155139 1226 1226 return true; 1227 1227 1228 if (m_renderer->is BlockFlow() && m_renderer->childrenInline() && !canSetFocusAttribute())1228 if (m_renderer->isRenderBlockFlow() && m_renderer->childrenInline() && !canSetFocusAttribute()) 1229 1229 return !toRenderBlock(m_renderer)->firstLineBox() && !mouseButtonListener(); 1230 1230 … … 2563 2563 return FooterRole; 2564 2564 2565 if (m_renderer->is BlockFlow())2565 if (m_renderer->isRenderBlockFlow()) 2566 2566 return GroupRole; 2567 2567 -
trunk/Source/WebCore/dom/Position.cpp
r154931 r155139 926 926 return false; 927 927 928 if (renderer->is BlockFlow()) {928 if (renderer->isRenderBlockFlow()) { 929 929 if (toRenderBlock(renderer)->logicalHeight() || m_anchorNode->hasTagName(bodyTag)) { 930 930 if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer)) … … 1186 1186 if (!renderer->isText()) { 1187 1187 inlineBox = 0; 1188 if (canHaveChildrenForEditing(deprecatedNode()) && renderer->is BlockFlow() && hasRenderedNonAnonymousDescendantsWithHeight(renderer)) {1188 if (canHaveChildrenForEditing(deprecatedNode()) && renderer->isRenderBlockFlow() && hasRenderedNonAnonymousDescendantsWithHeight(renderer)) { 1189 1189 // Try a visually equivalent position with possibly opposite editability. This helps in case |this| is in 1190 1190 // an editable block but surrounded by non-editable positions. It acts to negate the logic at the beginning … … 1334 1334 TextDirection primaryDirection = LTR; 1335 1335 for (const RenderObject* r = m_anchorNode->renderer(); r; r = r->parent()) { 1336 if (r->is BlockFlow()) {1336 if (r->isRenderBlockFlow()) { 1337 1337 primaryDirection = r->style()->direction(); 1338 1338 break; -
trunk/Source/WebCore/dom/PositionIterator.cpp
r142960 r155139 160 160 return (atStartOfNode() || atEndOfNode()) && !Position::nodeIsUserSelectNone(m_anchorNode->parentNode()); 161 161 162 if (!m_anchorNode->hasTagName(htmlTag) && renderer->is BlockFlow()) {162 if (!m_anchorNode->hasTagName(htmlTag) && renderer->isRenderBlockFlow()) { 163 163 if (toRenderBlock(renderer)->logicalHeight() || m_anchorNode->hasTagName(bodyTag)) { 164 164 if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer)) -
trunk/Source/WebCore/editing/ApplyStyleCommand.cpp
r154938 r155139 1014 1014 // Since addInlineStyleIfNeeded can't add styles to block-flow render objects, add style attribute instead. 1015 1015 // FIXME: applyInlineStyleToRange should be used here instead. 1016 if ((node->renderer()->is BlockFlow() || node->childNodeCount()) && node->isHTMLElement()) {1016 if ((node->renderer()->isRenderBlockFlow() || node->childNodeCount()) && node->isHTMLElement()) { 1017 1017 setNodeAttribute(toHTMLElement(node), styleAttr, newInlineStyle->style()->asText()); 1018 1018 return; -
trunk/Source/WebCore/editing/CompositeEditCommand.cpp
r154943 r155139 875 875 876 876 RenderObject* renderer = container->renderer(); 877 if (!renderer || !renderer->is BlockFlow())877 if (!renderer || !renderer->isRenderBlockFlow()) 878 878 return 0; 879 879 -
trunk/Source/WebCore/editing/Editor.cpp
r154945 r155139 1426 1426 return result; 1427 1427 1428 if (!renderer->is BlockFlow()) {1428 if (!renderer->isRenderBlockFlow()) { 1429 1429 renderer = renderer->containingBlock(); 1430 1430 if (!renderer) -
trunk/Source/WebCore/editing/FrameSelection.cpp
r154877 r155139 1272 1272 1273 1273 // if caretNode is a block and caret is inside it then caret should be painted by that block 1274 bool paintedByBlock = renderer->is BlockFlow() && caretRendersInsideNode(node);1274 bool paintedByBlock = renderer->isRenderBlockFlow() && caretRendersInsideNode(node); 1275 1275 return paintedByBlock ? renderer : renderer->containingBlock(); 1276 1276 } -
trunk/Source/WebCore/editing/TextIterator.cpp
r154931 r155139 919 919 // we would create VisiblePositions on every call to this function without this check. 920 920 if (!m_node->renderer() || m_node->renderer()->style()->visibility() != VISIBLE 921 || (m_node->renderer()->is BlockFlow() && !toRenderBlock(m_node->renderer())->height() && !m_node->hasTagName(bodyTag)))921 || (m_node->renderer()->isRenderBlockFlow() && !toRenderBlock(m_node->renderer())->height() && !m_node->hasTagName(bodyTag))) 922 922 return false; 923 923 -
trunk/Source/WebCore/editing/TypingCommand.cpp
r154943 r155139 405 405 if (root->firstChild() == root->lastChild() && root->firstElementChild() && root->firstElementChild()->hasTagName(brTag)) { 406 406 // If there is a single child and it could be a placeholder, leave it alone. 407 if (root->renderer() && root->renderer()->is BlockFlow())407 if (root->renderer() && root->renderer()->isRenderBlockFlow()) 408 408 return false; 409 409 } -
trunk/Source/WebCore/editing/htmlediting.cpp
r154877 r155139 1291 1291 return false; 1292 1292 RenderObject* renderer = node->renderer(); 1293 return renderer && renderer->is BlockFlow();1293 return renderer && renderer->isRenderBlockFlow(); 1294 1294 } 1295 1295 -
trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp
r154877 r155139 96 96 97 97 RenderSliderThumb::RenderSliderThumb(SliderThumbElement* element) 98 : RenderBlock (element)98 : RenderBlockFlow(element) 99 99 { 100 100 } -
trunk/Source/WebCore/html/shadow/SliderThumbElement.h
r154877 r155139 35 35 #include "HTMLDivElement.h" 36 36 #include "HTMLNames.h" 37 #include "RenderBlock .h"37 #include "RenderBlockFlow.h" 38 38 #include <wtf/Forward.h> 39 39 … … 97 97 // -------------------------------- 98 98 99 class RenderSliderThumb FINAL : public RenderBlock {99 class RenderSliderThumb FINAL : public RenderBlockFlow { 100 100 public: 101 101 RenderSliderThumb(SliderThumbElement*); -
trunk/Source/WebCore/rendering/LayoutState.cpp
r154546 r155139 132 132 133 133 // If we have a new grid to track, then add it to our set. 134 if (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && renderer->is BlockFlow())134 if (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && renderer->isRenderBlockFlow()) 135 135 establishLineGrid(toRenderBlock(renderer)); 136 136 -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r155065 r155139 1721 1721 // One of our children's floats may have become an overhanging float for us. We need to look for it. 1722 1722 for (RenderObject* child = firstChild(); child; child = child->nextSibling()) { 1723 if (child->is BlockFlow() && !child->isFloatingOrOutOfFlowPositioned()) {1723 if (child->isRenderBlockFlow() && !child->isFloatingOrOutOfFlowPositioned()) { 1724 1724 RenderBlock* block = toRenderBlock(child); 1725 1725 if (block->lowestFloatLogicalBottom() + block->logicalTop() > newHeight) … … 2259 2259 setLogicalHeight(logicalTop); 2260 2260 RenderObject* prev = child->previousSibling(); 2261 if (prev && prev->is BlockFlow() && !prev->isFloatingOrOutOfFlowPositioned()) {2261 if (prev && prev->isRenderBlockFlow() && !prev->isFloatingOrOutOfFlowPositioned()) { 2262 2262 RenderBlock* block = toRenderBlock(prev); 2263 2263 if (block->containsFloats() && !block->avoidsFloats() && (block->logicalTop() + block->lowestFloatLogicalBottom()) > logicalTop) … … 3684 3684 // fixed). 3685 3685 GapRects result; 3686 if (!is BlockFlow()) // FIXME: Make multi-column selection gap filling work someday.3686 if (!isRenderBlockFlow()) // FIXME: Make multi-column selection gap filling work someday. 3687 3687 return result; 3688 3688 … … 6763 6763 int RenderBlock::firstLineBoxBaseline() const 6764 6764 { 6765 if (!is BlockFlow() || (isWritingModeRoot() && !isRubyRun()))6765 if (!isRenderBlockFlow() || (isWritingModeRoot() && !isRubyRun())) 6766 6766 return -1; 6767 6767 … … 6792 6792 int RenderBlock::lastLineBoxBaseline(LineDirectionMode lineDirection) const 6793 6793 { 6794 if (!is BlockFlow() || (isWritingModeRoot() && !isRubyRun()))6794 if (!isRenderBlockFlow() || (isWritingModeRoot() && !isRubyRun())) 6795 6795 return -1; 6796 6796 … … 6853 6853 // of flexbox. 6854 6854 if (firstLineBlock->isReplaced() || firstLineBlock->isFloating() 6855 || !parentBlock || parentBlock->firstChild() != firstLineBlock || !parentBlock->is BlockFlow()6855 || !parentBlock || parentBlock->firstChild() != firstLineBlock || !parentBlock->isRenderBlockFlow() 6856 6856 || (parentBlock->isFlexibleBox() && !parentBlock->isRenderButton())) 6857 6857 break; … … 6912 6912 RenderObject* parentBlock = firstLetterBlock->parent(); 6913 6913 if (firstLetterBlock->isReplaced() || !parentBlock || parentBlock->firstChild() != firstLetterBlock || 6914 !parentBlock->is BlockFlow() || (parentBlock->isFlexibleBox() && !parentBlock->isRenderButton()))6914 !parentBlock->isRenderBlockFlow() || (parentBlock->isFlexibleBox() && !parentBlock->isRenderButton())) 6915 6915 return 0; 6916 6916 firstLetterBlock = parentBlock; … … 7094 7094 { 7095 7095 return !obj->isFloatingOrOutOfFlowPositioned() && !obj->isRunIn() 7096 && obj->is BlockFlow() && obj->style()->height().isAuto()7096 && obj->isRenderBlockFlow() && obj->style()->height().isAuto() 7097 7097 && (!obj->isDeprecatedFlexibleBox() || obj->style()->boxOrient() == VERTICAL); 7098 7098 } … … 7199 7199 for (RenderBox* obj = firstChildBox(); obj; obj = obj->nextSiblingBox()) { 7200 7200 if (!obj->isFloatingOrOutOfFlowPositioned()) { 7201 if (obj->is BlockFlow() && !obj->hasOverflowClip())7201 if (obj->isRenderBlockFlow() && !obj->hasOverflowClip()) 7202 7202 toRenderBlock(obj)->adjustForBorderFit(x + obj->x(), left, right); 7203 7203 else if (obj->style()->visibility() == VISIBLE) { -
trunk/Source/WebCore/rendering/RenderBlock.h
r155065 r155139 628 628 629 629 virtual bool isRenderBlock() const OVERRIDE FINAL { return true; } 630 virtual bool isBlockFlow() const OVERRIDE FINAL { return (!isInline() || isReplaced()) && !isTable(); }631 630 virtual bool isInlineBlockOrInlineTable() const OVERRIDE FINAL { return isInline() && isReplaced(); } 632 631 -
trunk/Source/WebCore/rendering/RenderBox.cpp
r155026 r155139 2104 2104 } 2105 2105 2106 if (position != AbsolutePosition && position != FixedPosition && o->hasColumns() && o->is BlockFlow()) {2106 if (position != AbsolutePosition && position != FixedPosition && o->hasColumns() && o->isRenderBlockFlow()) { 2107 2107 LayoutRect repaintRect(topLeft, rect.size()); 2108 2108 toRenderBlock(o)->adjustRectForColumns(repaintRect); … … 4094 4094 4095 4095 for (RenderObject* renderObject = firstChild(); renderObject; renderObject = renderObject->nextSibling()) { 4096 if ((!renderObject->firstChild() && !renderObject->isInline() && !renderObject->is BlockFlow() )4096 if ((!renderObject->firstChild() && !renderObject->isInline() && !renderObject->isRenderBlockFlow() ) 4097 4097 || renderObject->style()->visibility() != VISIBLE) 4098 4098 continue; -
trunk/Source/WebCore/rendering/RenderBoxModelObject.h
r154937 r155139 176 176 virtual void setSelectionState(SelectionState s); 177 177 178 bool canHaveBoxInfoInRegion() const { return !isFloating() && !isReplaced() && !isInline() && !hasColumns() && !isTableCell() && is BlockFlow() && !isRenderSVGBlock(); }178 bool canHaveBoxInfoInRegion() const { return !isFloating() && !isReplaced() && !isInline() && !hasColumns() && !isTableCell() && isRenderBlockFlow() && !isRenderSVGBlock(); } 179 179 180 180 -
trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp
r154931 r155139 989 989 child->clearOverrideSize(); 990 990 if (relayoutChildren || (child->isReplaced() && (child->style()->width().isPercent() || child->style()->height().isPercent())) 991 || (child->style()->height().isAuto() && child->is BlockFlow())) {991 || (child->style()->height().isAuto() && child->isRenderBlockFlow())) { 992 992 child->setChildNeedsLayout(true, MarkOnlyThis); 993 993 … … 999 999 } 1000 1000 child->layoutIfNeeded(); 1001 if (child->style()->height().isAuto() && child->is BlockFlow())1001 if (child->style()->height().isAuto() && child->isRenderBlockFlow()) 1002 1002 maxLineCount = max(maxLineCount, toRenderBlock(child)->lineCount()); 1003 1003 } … … 1011 1011 1012 1012 for (RenderBox* child = iterator.first(); child; child = iterator.next()) { 1013 if (childDoesNotAffectWidthOrFlexing(child) || !child->style()->height().isAuto() || !child->is BlockFlow())1013 if (childDoesNotAffectWidthOrFlexing(child) || !child->style()->height().isAuto() || !child->isRenderBlockFlow()) 1014 1014 continue; 1015 1015 … … 1088 1088 child->clearOverrideSize(); 1089 1089 if ((child->isReplaced() && (child->style()->width().isPercent() || child->style()->height().isPercent())) 1090 || (child->style()->height().isAuto() && child->is BlockFlow())) {1090 || (child->style()->height().isAuto() && child->isRenderBlockFlow())) { 1091 1091 child->setChildNeedsLayout(true); 1092 1092 -
trunk/Source/WebCore/rendering/RenderDetailsMarker.cpp
r152149 r155139 34 34 35 35 RenderDetailsMarker::RenderDetailsMarker(Element* element) 36 : RenderBlock (element)36 : RenderBlockFlow(element) 37 37 { 38 38 } -
trunk/Source/WebCore/rendering/RenderDetailsMarker.h
r153380 r155139 23 23 24 24 #if ENABLE(DETAILS_ELEMENT) 25 #include "RenderBlock .h"25 #include "RenderBlockFlow.h" 26 26 27 27 namespace WebCore { 28 28 29 class RenderDetailsMarker FINAL : public RenderBlock {29 class RenderDetailsMarker FINAL : public RenderBlockFlow { 30 30 public: 31 31 RenderDetailsMarker(Element*); -
trunk/Source/WebCore/rendering/RenderFieldset.cpp
r143479 r155139 38 38 39 39 RenderFieldset::RenderFieldset(Element* element) 40 : RenderBlock (element)40 : RenderBlockFlow(element) 41 41 { 42 42 } -
trunk/Source/WebCore/rendering/RenderFieldset.h
r153380 r155139 25 25 #define RenderFieldset_h 26 26 27 #include "RenderBlock .h"27 #include "RenderBlockFlow.h" 28 28 29 29 namespace WebCore { 30 30 31 class RenderFieldset FINAL : public RenderBlock {31 class RenderFieldset FINAL : public RenderBlockFlow { 32 32 public: 33 33 explicit RenderFieldset(Element*); -
trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp
r154871 r155139 52 52 53 53 RenderFileUploadControl::RenderFileUploadControl(HTMLInputElement* input) 54 : RenderBlock (input)54 : RenderBlockFlow(input) 55 55 , m_canReceiveDroppedFiles(input->canReceiveDroppedFiles()) 56 56 { -
trunk/Source/WebCore/rendering/RenderFileUploadControl.h
r153380 r155139 22 22 #define RenderFileUploadControl_h 23 23 24 #include "RenderBlock .h"24 #include "RenderBlockFlow.h" 25 25 26 26 namespace WebCore { … … 32 32 // associated with it to receive click/hover events. 33 33 34 class RenderFileUploadControl FINAL : public RenderBlock {34 class RenderFileUploadControl FINAL : public RenderBlockFlow { 35 35 public: 36 36 RenderFileUploadControl(HTMLInputElement*); -
trunk/Source/WebCore/rendering/RenderFlowThread.cpp
r155026 r155139 52 52 53 53 RenderFlowThread::RenderFlowThread() 54 : RenderBlock (0)54 : RenderBlockFlow(0) 55 55 , m_previousRegionCount(0) 56 56 , m_autoLogicalHeightRegionsCount(0) -
trunk/Source/WebCore/rendering/RenderFlowThread.h
r155026 r155139 32 32 33 33 34 #include "RenderBlock .h"34 #include "RenderBlockFlow.h" 35 35 #include <wtf/HashCountedSet.h> 36 36 #include <wtf/ListHashSet.h> … … 56 56 // of the RenderFlowThread. 57 57 58 class RenderFlowThread: public RenderBlock {58 class RenderFlowThread: public RenderBlockFlow { 59 59 public: 60 60 RenderFlowThread(); -
trunk/Source/WebCore/rendering/RenderFullScreen.cpp
r154580 r155139 29 29 #include "RenderFullScreen.h" 30 30 31 #include "RenderBlockFlow.h" 31 32 #include "RenderLayer.h" 32 33 … … 37 38 using namespace WebCore; 38 39 39 class RenderFullScreenPlaceholder FINAL : public RenderBlock {40 class RenderFullScreenPlaceholder FINAL : public RenderBlockFlow { 40 41 public: 41 42 RenderFullScreenPlaceholder(RenderFullScreen* owner) 42 : RenderBlock (0)43 : RenderBlockFlow(0) 43 44 , m_owner(owner) 44 45 { -
trunk/Source/WebCore/rendering/RenderInline.cpp
r154931 r155139 1088 1088 LayoutPoint topLeft = rect.location(); 1089 1089 1090 if (o->is BlockFlow() && !style()->hasOutOfFlowPosition()) {1090 if (o->isRenderBlockFlow() && !style()->hasOutOfFlowPosition()) { 1091 1091 RenderBlock* cb = toRenderBlock(o); 1092 1092 if (cb->hasColumns()) { -
trunk/Source/WebCore/rendering/RenderLineBoxList.cpp
r154546 r155139 312 312 void RenderLineBoxList::dirtyLinesFromChangedChild(RenderObject* container, RenderObject* child) 313 313 { 314 if (!container->parent() || (container->isRenderBlock() && (container->selfNeedsLayout() || !container->is BlockFlow())))314 if (!container->parent() || (container->isRenderBlock() && (container->selfNeedsLayout() || !container->isRenderBlockFlow()))) 315 315 return; 316 316 -
trunk/Source/WebCore/rendering/RenderMeter.cpp
r149308 r155139 34 34 35 35 RenderMeter::RenderMeter(HTMLElement* element) 36 : RenderBlock (element)36 : RenderBlockFlow(element) 37 37 { 38 38 } -
trunk/Source/WebCore/rendering/RenderMeter.h
r153380 r155139 23 23 24 24 #if ENABLE(METER_ELEMENT) 25 #include "RenderBlock .h"25 #include "RenderBlockFlow.h" 26 26 #include "RenderWidget.h" 27 27 … … 31 31 class HTMLMeterElement; 32 32 33 class RenderMeter FINAL : public RenderBlock {33 class RenderMeter FINAL : public RenderBlockFlow { 34 34 public: 35 35 explicit RenderMeter(HTMLElement*); -
trunk/Source/WebCore/rendering/RenderMultiColumnBlock.cpp
r154580 r155139 37 37 38 38 RenderMultiColumnBlock::RenderMultiColumnBlock(Element* element) 39 : RenderBlock (element)39 : RenderBlockFlow(element) 40 40 , m_flowThread(0) 41 41 , m_columnCount(1) -
trunk/Source/WebCore/rendering/RenderMultiColumnBlock.h
r153380 r155139 28 28 #define RenderMultiColumnBlock_h 29 29 30 #include "RenderBlock .h"30 #include "RenderBlockFlow.h" 31 31 32 32 namespace WebCore { … … 34 34 class RenderMultiColumnFlowThread; 35 35 36 class RenderMultiColumnBlock FINAL : public RenderBlock {36 class RenderMultiColumnBlock FINAL : public RenderBlockFlow { 37 37 public: 38 38 RenderMultiColumnBlock(Element*); -
trunk/Source/WebCore/rendering/RenderObject.cpp
r155046 r155139 1558 1558 1559 1559 if (RenderObject* o = parent()) { 1560 if (o->is BlockFlow()) {1560 if (o->isRenderBlockFlow()) { 1561 1561 RenderBlock* cb = toRenderBlock(o); 1562 1562 if (cb->hasColumns()) … … 1965 1965 s_affectsParentBlock = isFloatingOrOutOfFlowPositioned() 1966 1966 && (!newStyle->isFloating() && !newStyle->hasOutOfFlowPosition()) 1967 && parent() && (parent()->is BlockFlow() || parent()->isRenderInline());1967 && parent() && (parent()->isRenderBlockFlow() || parent()->isRenderInline()); 1968 1968 1969 1969 s_noLongerAffectsParentBlock = ((!isFloating() && newStyle->isFloating()) || (!isOutOfFlowPositioned() && newStyle->hasOutOfFlowPosition())) … … 2797 2797 rendererForFirstLineStyle = renderer->parent(); 2798 2798 2799 if (rendererForFirstLineStyle->is BlockFlow()) {2799 if (rendererForFirstLineStyle->isRenderBlockFlow()) { 2800 2800 if (RenderBlock* firstLineBlock = rendererForFirstLineStyle->firstLineBlock()) { 2801 2801 if (type == Cached) -
trunk/Source/WebCore/rendering/RenderObject.h
r154973 r155139 322 322 323 323 virtual bool isBR() const { return false; } 324 virtual bool isBlockFlow() const { return false; }325 324 virtual bool isBoxModelObject() const { return false; } 326 325 virtual bool isCounter() const { return false; } … … 351 350 #endif 352 351 virtual bool isRenderBlock() const { return false; } 352 virtual bool isRenderBlockFlow() const { return false; } 353 353 virtual bool isRenderSVGBlock() const { return false; }; 354 354 virtual bool isRenderButton() const { return false; } -
trunk/Source/WebCore/rendering/RenderObjectChildList.cpp
r154580 r155139 119 119 { 120 120 ASSERT(!newChild->parent()); 121 ASSERT(!owner->is BlockFlow() || (!newChild->isTableSection() && !newChild->isTableRow() && !newChild->isTableCell()));121 ASSERT(!owner->isRenderBlockFlow() || (!newChild->isTableSection() && !newChild->isTableRow() && !newChild->isTableCell())); 122 122 123 123 while (beforeChild && beforeChild->parent() && beforeChild->parent() != owner) -
trunk/Source/WebCore/rendering/RenderProgress.cpp
r154706 r155139 35 35 36 36 RenderProgress::RenderProgress(HTMLElement* element) 37 : RenderBlock (element)37 : RenderBlockFlow(element) 38 38 , m_position(HTMLProgressElement::InvalidPosition) 39 39 , m_animationStartTime(0) -
trunk/Source/WebCore/rendering/RenderProgress.h
r153380 r155139 23 23 24 24 #if ENABLE(PROGRESS_ELEMENT) 25 #include "RenderBlock .h"25 #include "RenderBlockFlow.h" 26 26 27 27 namespace WebCore { … … 29 29 class HTMLProgressElement; 30 30 31 class RenderProgress FINAL : public RenderBlock {31 class RenderProgress FINAL : public RenderBlockFlow { 32 32 public: 33 33 explicit RenderProgress(HTMLElement*); -
trunk/Source/WebCore/rendering/RenderRegion.cpp
r155109 r155139 50 50 51 51 RenderRegion::RenderRegion(Element* element, RenderFlowThread* flowThread) 52 : RenderBlock (element)52 : RenderBlockFlow(element) 53 53 , m_flowThread(flowThread) 54 54 , m_parentNamedFlowThread(0) -
trunk/Source/WebCore/rendering/RenderRegion.h
r155109 r155139 31 31 #define RenderRegion_h 32 32 33 #include "RenderBlock .h"33 #include "RenderBlockFlow.h" 34 34 #include "StyleInheritedData.h" 35 35 … … 44 44 class RenderNamedFlowThread; 45 45 46 class RenderRegion : public RenderBlock {46 class RenderRegion : public RenderBlockFlow { 47 47 public: 48 48 explicit RenderRegion(Element*, RenderFlowThread*); -
trunk/Source/WebCore/rendering/RenderRuby.cpp
r154580 r155139 217 217 218 218 RenderRubyAsBlock::RenderRubyAsBlock(Element* element) 219 : RenderBlock (element)219 : RenderBlockFlow(element) 220 220 { 221 221 } -
trunk/Source/WebCore/rendering/RenderRuby.h
r153380 r155139 32 32 #define RenderRuby_h 33 33 34 #include "RenderBlock .h"34 #include "RenderBlockFlow.h" 35 35 #include "RenderInline.h" 36 36 … … 71 71 72 72 // <ruby> when used as 'display:block' or 'display:inline-block' 73 class RenderRubyAsBlock FINAL : public RenderBlock {73 class RenderRubyAsBlock FINAL : public RenderBlockFlow { 74 74 public: 75 75 RenderRubyAsBlock(Element*); -
trunk/Source/WebCore/rendering/RenderRubyBase.cpp
r154937 r155139 40 40 41 41 RenderRubyBase::RenderRubyBase() 42 : RenderBlock (0)42 : RenderBlockFlow(0) 43 43 { 44 44 setInline(false); -
trunk/Source/WebCore/rendering/RenderRubyBase.h
r153380 r155139 32 32 #define RenderRubyBase_h 33 33 34 #include "RenderBlock .h"34 #include "RenderBlockFlow.h" 35 35 36 36 namespace WebCore { … … 38 38 class RenderRubyRun; 39 39 40 class RenderRubyBase FINAL : public RenderBlock {40 class RenderRubyBase FINAL : public RenderBlockFlow { 41 41 public: 42 42 virtual ~RenderRubyBase(); -
trunk/Source/WebCore/rendering/RenderRubyRun.cpp
r154580 r155139 45 45 46 46 RenderRubyRun::RenderRubyRun() 47 : RenderBlock (0)47 : RenderBlockFlow(0) 48 48 { 49 49 setReplaced(true); -
trunk/Source/WebCore/rendering/RenderRubyRun.h
r154937 r155139 32 32 #define RenderRubyRun_h 33 33 34 #include "RenderBlock .h"34 #include "RenderBlockFlow.h" 35 35 36 36 namespace WebCore { … … 42 42 // See RenderRuby.h for further comments on the structure 43 43 44 class RenderRubyRun FINAL : public RenderBlock {44 class RenderRubyRun FINAL : public RenderBlockFlow { 45 45 public: 46 46 virtual ~RenderRubyRun(); -
trunk/Source/WebCore/rendering/RenderRubyText.cpp
r140244 r155139 39 39 40 40 RenderRubyText::RenderRubyText(Element* element) 41 : RenderBlock (element)41 : RenderBlockFlow(element) 42 42 { 43 43 } -
trunk/Source/WebCore/rendering/RenderRubyText.h
r153380 r155139 32 32 #define RenderRubyText_h 33 33 34 #include "RenderBlock .h"34 #include "RenderBlockFlow.h" 35 35 36 36 namespace WebCore { 37 37 38 class RenderRubyText FINAL : public RenderBlock {38 class RenderRubyText FINAL : public RenderBlockFlow { 39 39 public: 40 40 RenderRubyText(Element*); -
trunk/Source/WebCore/rendering/RenderTableCaption.cpp
r140244 r155139 26 26 27 27 RenderTableCaption::RenderTableCaption(Element* element) 28 : RenderBlock (element)28 : RenderBlockFlow(element) 29 29 { 30 30 } -
trunk/Source/WebCore/rendering/RenderTableCaption.h
r153380 r155139 21 21 #define RenderTableCaption_h 22 22 23 #include "RenderBlock .h"23 #include "RenderBlockFlow.h" 24 24 25 25 namespace WebCore { … … 27 27 class RenderTable; 28 28 29 class RenderTableCaption FINAL : public RenderBlock {29 class RenderTableCaption FINAL : public RenderBlockFlow { 30 30 public: 31 31 explicit RenderTableCaption(Element*); -
trunk/Source/WebCore/rendering/RenderTableCell.cpp
r154622 r155139 49 49 using namespace HTMLNames; 50 50 51 struct SameSizeAsRenderTableCell : public RenderBlock {51 struct SameSizeAsRenderTableCell : public RenderBlockFlow { 52 52 unsigned bitfields; 53 53 int paddings[2]; … … 58 58 59 59 RenderTableCell::RenderTableCell(Element* element) 60 : RenderBlock (element)60 : RenderBlockFlow(element) 61 61 , m_column(unsetColumnIndex) 62 62 , m_cellWidthChanged(false) -
trunk/Source/WebCore/rendering/RenderTableCell.h
r154580 r155139 26 26 #define RenderTableCell_h 27 27 28 #include "RenderBlockFlow.h" 28 29 #include "RenderTableRow.h" 29 30 #include "RenderTableSection.h" … … 36 37 enum IncludeBorderColorOrNot { DoNotIncludeBorderColor, IncludeBorderColor }; 37 38 38 class RenderTableCell FINAL : public RenderBlock {39 class RenderTableCell FINAL : public RenderBlockFlow { 39 40 public: 40 41 explicit RenderTableCell(Element*); -
trunk/Source/WebCore/rendering/RenderTextControl.cpp
r154871 r155139 38 38 39 39 RenderTextControl::RenderTextControl(Element* element) 40 : RenderBlock (element)40 : RenderBlockFlow(element) 41 41 { 42 42 ASSERT(isHTMLTextFormControlElement(element)); -
trunk/Source/WebCore/rendering/RenderTextControl.h
r154871 r155139 23 23 #define RenderTextControl_h 24 24 25 #include "RenderBlock .h"25 #include "RenderBlockFlow.h" 26 26 #include "RenderFlexibleBox.h" 27 27 … … 30 30 class HTMLTextFormControlElement; 31 31 32 class RenderTextControl : public RenderBlock {32 class RenderTextControl : public RenderBlockFlow { 33 33 public: 34 34 virtual ~RenderTextControl(); -
trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h
r153380 r155139 109 109 // ---------------------------- 110 110 111 class RenderTextControlInnerBlock : public RenderBlock {111 class RenderTextControlInnerBlock : public RenderBlockFlow { 112 112 public: 113 RenderTextControlInnerBlock(Element* element) : RenderBlock (element) { }113 RenderTextControlInnerBlock(Element* element) : RenderBlockFlow(element) { } 114 114 115 115 private: -
trunk/Source/WebCore/rendering/RenderTextTrackCue.cpp
r155074 r155139 29 29 30 30 #include "RenderTextTrackCue.h" 31 #include "RenderView.h" 31 32 32 33 #include "RenderView.h" … … 38 39 39 40 RenderTextTrackCue::RenderTextTrackCue(TextTrackCueBox* element) 40 : RenderBlock (element)41 : RenderBlockFlow(element) 41 42 , m_cue(element->getCue()) 42 43 { -
trunk/Source/WebCore/rendering/RenderTextTrackCue.h
r155074 r155139 30 30 31 31 #include "FloatPoint.h" 32 #include "RenderBlock .h"32 #include "RenderBlockFlow.h" 33 33 #include "RenderInline.h" 34 34 … … 38 38 class TextTrackCueBox; 39 39 40 class RenderTextTrackCue FINAL : public RenderBlock {40 class RenderTextTrackCue FINAL : public RenderBlockFlow { 41 41 public: 42 42 explicit RenderTextTrackCue(TextTrackCueBox*); -
trunk/Source/WebCore/rendering/RenderView.cpp
r155077 r155139 58 58 59 59 RenderView::RenderView(Document* document) 60 : RenderBlock (document)60 : RenderBlockFlow(document) 61 61 , m_frameView(*document->view()) 62 62 , m_selectionStart(0) -
trunk/Source/WebCore/rendering/RenderView.h
r155077 r155139 26 26 #include "LayoutState.h" 27 27 #include "PODFreeListArena.h" 28 #include "RenderBlock .h"28 #include "RenderBlockFlow.h" 29 29 #include <wtf/OwnPtr.h> 30 30 … … 44 44 #endif 45 45 46 class RenderView FINAL : public RenderBlock {46 class RenderView FINAL : public RenderBlockFlow { 47 47 public: 48 48 explicit RenderView(Document*); … … 254 254 // We push LayoutState even if layoutState is disabled because it stores layoutDelta too. 255 255 if (!doingFullRepaint() || m_layoutState->isPaginated() || renderer->hasColumns() || renderer->flowThreadContainingBlock() 256 || m_layoutState->lineGrid() || (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && renderer->is BlockFlow())256 || m_layoutState->lineGrid() || (renderer->style()->lineGrid() != RenderStyle::initialLineGrid() && renderer->isRenderBlockFlow()) 257 257 #if ENABLE(CSS_SHAPES) 258 258 || (renderer->isRenderBlock() && toRenderBlock(renderer)->shapeInsideInfo()) -
trunk/Source/WebCore/rendering/RenderingAllInOne.cpp
r155084 r155139 47 47 #include "RenderBR.cpp" 48 48 #include "RenderBlock.cpp" 49 #include "RenderBlockFlow.cpp" 49 50 #include "RenderBlockLineLayout.cpp" 50 51 #include "RenderBox.cpp" -
trunk/Source/WebCore/rendering/svg/RenderSVGBlock.cpp
r140244 r155139 33 33 34 34 RenderSVGBlock::RenderSVGBlock(SVGElement* element) 35 : RenderBlock (element)35 : RenderBlockFlow(element) 36 36 { 37 37 } -
trunk/Source/WebCore/rendering/svg/RenderSVGBlock.h
r153380 r155139 22 22 23 23 #if ENABLE(SVG) 24 #include "RenderBlock .h"24 #include "RenderBlockFlow.h" 25 25 #include "SVGRenderSupport.h" 26 26 … … 29 29 class SVGElement; 30 30 31 class RenderSVGBlock : public RenderBlock {31 class RenderSVGBlock : public RenderBlockFlow { 32 32 public: 33 33 explicit RenderSVGBlock(SVGElement*);
Note: See TracChangeset
for help on using the changeset viewer.