Skip to content

Commit 620bb2e

Browse files
author
[email protected]
committed
Add new RenderBlockFlow class
https://bugs.webkit.org/show_bug.cgi?id=120777 Reviewed by Simon Fraser. This patch adds a new RenderBlockFlow class. The idea is to get all of the line/float/margin code out of RenderBlock and into the subclass, and then we can make RenderBlock an abstract base. This will save memory for all of the classes that derive from RenderBlock but have their own layout systems (e.g., flexbox, grid, table), and it will let us tighten up types to make it more clear when we're talking about block layout code vs. a more generic block-level object that can have any kind of layout. The only real change here is that isBlockFlow() has been renamed to isRenderBlockFlow() and is now checking if the object is a RenderBlockFlow. All of the block subclasses have been patched to be a RenderBlock or RenderBlockFlow. * CMakeLists.txt: * GNUmakefile.list.am: * Target.pri: * WebCore.vcxproj/WebCore.vcxproj: * WebCore.xcodeproj/project.pbxproj: * 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/ApplyStyleCommand.cpp: (WebCore::ApplyStyleCommand::applyInlineStyleToPushDown): * 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): * html/shadow/SliderThumbElement.cpp: (WebCore::RenderSliderThumb::RenderSliderThumb): * html/shadow/SliderThumbElement.h: * 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/RenderBlock.h: * rendering/RenderBlockFlow.cpp: Added. (WebCore::RenderBlockFlow::RenderBlockFlow): (WebCore::RenderBlockFlow::~RenderBlockFlow): * rendering/RenderBlockFlow.h: Added. (WebCore::toRenderBlockFlow): * rendering/RenderBox.cpp: (WebCore::RenderBox::computeRectForRepaint): (WebCore::RenderBox::positionForPoint): * rendering/RenderBoxModelObject.h: (WebCore::RenderBoxModelObject::canHaveBoxInfoInRegion): * rendering/RenderDeprecatedFlexibleBox.cpp: (WebCore::RenderDeprecatedFlexibleBox::applyLineClamp): (WebCore::RenderDeprecatedFlexibleBox::clearLineClamp): * rendering/RenderDetailsMarker.cpp: (WebCore::RenderDetailsMarker::RenderDetailsMarker): * rendering/RenderDetailsMarker.h: * rendering/RenderFieldset.cpp: (WebCore::RenderFieldset::RenderFieldset): * rendering/RenderFieldset.h: * rendering/RenderFileUploadControl.cpp: (WebCore::RenderFileUploadControl::RenderFileUploadControl): * rendering/RenderFileUploadControl.h: * rendering/RenderFlowThread.cpp: (WebCore::RenderFlowThread::RenderFlowThread): * rendering/RenderFlowThread.h: * rendering/RenderFullScreen.cpp: * rendering/RenderInline.cpp: (WebCore::RenderInline::computeRectForRepaint): * rendering/RenderLineBoxList.cpp: (WebCore::RenderLineBoxList::dirtyLinesFromChangedChild): * rendering/RenderMeter.cpp: (WebCore::RenderMeter::RenderMeter): * rendering/RenderMeter.h: * rendering/RenderMultiColumnBlock.cpp: (WebCore::RenderMultiColumnBlock::RenderMultiColumnBlock): * rendering/RenderMultiColumnBlock.h: * rendering/RenderObject.cpp: (WebCore::RenderObject::computeRectForRepaint): (WebCore::RenderObject::styleWillChange): (WebCore::firstLineStyleForCachedUncachedType): * rendering/RenderObject.h: (WebCore::RenderObject::isBR): (WebCore::RenderObject::isRenderBlockFlow): * rendering/RenderObjectChildList.cpp: (WebCore::RenderObjectChildList::insertChildNode): * rendering/RenderProgress.cpp: (WebCore::RenderProgress::RenderProgress): * rendering/RenderProgress.h: * rendering/RenderRegion.cpp: (WebCore::RenderRegion::RenderRegion): * rendering/RenderRegion.h: * rendering/RenderRuby.cpp: (WebCore::RenderRubyAsBlock::RenderRubyAsBlock): * rendering/RenderRuby.h: * rendering/RenderRubyBase.cpp: (WebCore::RenderRubyBase::RenderRubyBase): * rendering/RenderRubyBase.h: * rendering/RenderRubyRun.cpp: (WebCore::RenderRubyRun::RenderRubyRun): * rendering/RenderRubyRun.h: * rendering/RenderRubyText.cpp: (WebCore::RenderRubyText::RenderRubyText): * rendering/RenderRubyText.h: * rendering/RenderTableCaption.cpp: (WebCore::RenderTableCaption::RenderTableCaption): * rendering/RenderTableCaption.h: * rendering/RenderTableCell.cpp: (WebCore::RenderTableCell::RenderTableCell): * rendering/RenderTableCell.h: * rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::RenderTextControl): * rendering/RenderTextControl.h: * rendering/RenderTextControlSingleLine.h: (WebCore::RenderTextControlInnerBlock::RenderTextControlInnerBlock): * rendering/RenderTextTrackCue.cpp: (WebCore::RenderTextTrackCue::RenderTextTrackCue): * rendering/RenderTextTrackCue.h: * rendering/RenderView.cpp: (WebCore::RenderView::RenderView): * rendering/RenderView.h: * rendering/svg/RenderSVGBlock.cpp: (WebCore::RenderSVGBlock::RenderSVGBlock): * rendering/svg/RenderSVGBlock.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155139 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent b4e37ad commit 620bb2e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+381
-100
lines changed

‎Source/WebCore/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2111,6 +2111,7 @@ set(WebCore_SOURCES
21112111
rendering/RenderArena.cpp
21122112
rendering/RenderBR.cpp
21132113
rendering/RenderBlock.cpp
2114+
rendering/RenderBlockFlow.cpp
21142115
rendering/RenderBlockLineLayout.cpp
21152116
rendering/RenderBox.cpp
21162117
rendering/RenderBoxModelObject.cpp

‎Source/WebCore/ChangeLog

+146
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,149 @@
1+
2013-09-05 David Hyatt <[email protected]>
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+
1147
2013-09-05 Tim Horton <[email protected]>
2148

3149
iOS build broke with change to make Mac use PDFKit for PDFDocumentImage

‎Source/WebCore/GNUmakefile.list.am

+2
Original file line numberDiff line numberDiff line change
@@ -4374,6 +4374,8 @@ webcore_sources += \
43744374
Source/WebCore/rendering/RenderArena.h \
43754375
Source/WebCore/rendering/RenderBlock.cpp \
43764376
Source/WebCore/rendering/RenderBlock.h \
4377+
Source/WebCore/rendering/RenderBlockFlow.cpp \
4378+
Source/WebCore/rendering/RenderBlockFlow.h \
43774379
Source/WebCore/rendering/RenderBlockLineLayout.cpp \
43784380
Source/WebCore/rendering/RenderBox.cpp \
43794381
Source/WebCore/rendering/RenderBox.h \

‎Source/WebCore/Target.pri

+1
Original file line numberDiff line numberDiff line change
@@ -1155,6 +1155,7 @@ SOURCES += \
11551155
rendering/RenderApplet.cpp \
11561156
rendering/RenderArena.cpp \
11571157
rendering/RenderBlock.cpp \
1158+
rendering/RenderBlockFlow.cpp \
11581159
rendering/RenderBlockLineLayout.cpp \
11591160
rendering/RenderBox.cpp \
11601161
rendering/RenderBoxModelObject.cpp \

‎Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

+14
Original file line numberDiff line numberDiff line change
@@ -9683,6 +9683,20 @@
96839683
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
96849684
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
96859685
</ClCompile>
9686+
<ClCompile Include="..\rendering\RenderBlockFlow.cpp">
9687+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
9688+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
9689+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
9690+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
9691+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
9692+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
9693+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
9694+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
9695+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
9696+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
9697+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
9698+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
9699+
</ClCompile>
96869700
<ClCompile Include="..\rendering\RenderBlockLineLayout.cpp">
96879701
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
96889702
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

‎Source/WebCore/WebCore.xcodeproj/project.pbxproj

+8
Original file line numberDiff line numberDiff line change
@@ -4709,6 +4709,8 @@
47094709
BC0B358814C4F9830055E22A /* RunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = BC0B358614C4F9830055E22A /* RunLoop.h */; settings = {ATTRIBUTES = (Private, ); }; };
47104710
BC0B36A40CD3C67C00AC7EB5 /* Console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0B36A10CD3C67C00AC7EB5 /* Console.cpp */; };
47114711
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, ); }; };
47124714
BC124EE70C2641CD009E2349 /* BarProp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC124EE40C2641CD009E2349 /* BarProp.cpp */; };
47134715
BC124EE80C2641CD009E2349 /* BarProp.h in Headers */ = {isa = PBXBuildFile; fileRef = BC124EE50C2641CD009E2349 /* BarProp.h */; };
47144716
BC124EFF0C26447A009E2349 /* JSBarProp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC124EFD0C26447A009E2349 /* JSBarProp.cpp */; };
@@ -12018,6 +12020,8 @@
1201812020
BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResourceClient.h; sourceTree = "<group>"; };
1201912021
BCFB2F74097A2E1A00BA703D /* Arena.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Arena.cpp; sourceTree = "<group>"; };
1202012022
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>"; };
1202112025
BCFE2F0F0C1B58370020235F /* JSRect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSRect.cpp; sourceTree = "<group>"; };
1202212026
BCFE2F100C1B58370020235F /* JSRect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSRect.h; sourceTree = "<group>"; };
1202312027
BCFF648F0EAD15C200C1D6F7 /* LengthBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LengthBox.h; sourceTree = "<group>"; };
@@ -20391,6 +20395,8 @@
2039120395
BCEA481F097D93020094C9E4 /* RenderArena.h */,
2039220396
BCEA4820097D93020094C9E4 /* RenderBlock.cpp */,
2039320397
BCEA4821097D93020094C9E4 /* RenderBlock.h */,
20398+
BCFB45F417D8E49400444446 /* RenderBlockFlow.cpp */,
20399+
BCFB45F317D8E39200444446 /* RenderBlockFlow.h */,
2039420400
BCEA4813097D93020094C9E4 /* RenderBlockLineLayout.cpp */,
2039520401
BCEA4822097D93020094C9E4 /* RenderBox.cpp */,
2039620402
BCEA4823097D93020094C9E4 /* RenderBox.h */,
@@ -24545,6 +24551,7 @@
2454524551
FBB0C5B817BBD629003D3677 /* CSSFilterImageValue.h in Headers */,
2454624552
BE16C59317CFE17200852C04 /* InbandGenericTextTrack.h in Headers */,
2454724553
BE16C59517CFE17200852C04 /* InbandWebVTTTextTrack.h in Headers */,
24554+
BC10D76817D8EE71005E2626 /* RenderBlockFlow.h in Headers */,
2454824555
);
2454924556
runOnlyForDeploymentPostprocessing = 0;
2455024557
};
@@ -27568,6 +27575,7 @@
2756827575
FBB0C5B717BBD626003D3677 /* CSSFilterImageValue.cpp in Sources */,
2756927576
BE16C59217CFE17200852C04 /* InbandGenericTextTrack.cpp in Sources */,
2757027577
BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */,
27578+
BC10D76717D8EE6E005E2626 /* RenderBlockFlow.cpp in Sources */,
2757127579
);
2757227580
runOnlyForDeploymentPostprocessing = 0;
2757327581
};

‎Source/WebCore/accessibility/AccessibilityRenderObject.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ bool AccessibilityRenderObject::computeAccessibilityIsIgnored() const
12251225
if (node && node->hasTagName(spanTag))
12261226
return true;
12271227

1228-
if (m_renderer->isBlockFlow() && m_renderer->childrenInline() && !canSetFocusAttribute())
1228+
if (m_renderer->isRenderBlockFlow() && m_renderer->childrenInline() && !canSetFocusAttribute())
12291229
return !toRenderBlock(m_renderer)->firstLineBox() && !mouseButtonListener();
12301230

12311231
// ignore images seemingly used as spacers
@@ -2562,7 +2562,7 @@ AccessibilityRole AccessibilityRenderObject::determineAccessibilityRole()
25622562
if (node && node->hasTagName(footerTag) && !isDescendantOfElementType(articleTag) && !isDescendantOfElementType(sectionTag))
25632563
return FooterRole;
25642564

2565-
if (m_renderer->isBlockFlow())
2565+
if (m_renderer->isRenderBlockFlow())
25662566
return GroupRole;
25672567

25682568
// If the element does not have role, but it has ARIA attributes, accessibility should fallback to exposing it as a group.

‎Source/WebCore/dom/Position.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ bool Position::isCandidate() const
925925
if (m_anchorNode->hasTagName(htmlTag))
926926
return false;
927927

928-
if (renderer->isBlockFlow()) {
928+
if (renderer->isRenderBlockFlow()) {
929929
if (toRenderBlock(renderer)->logicalHeight() || m_anchorNode->hasTagName(bodyTag)) {
930930
if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer))
931931
return atFirstEditingPositionForNode() && !Position::nodeIsUserSelectNone(deprecatedNode());
@@ -1185,7 +1185,7 @@ void Position::getInlineBoxAndOffset(EAffinity affinity, TextDirection primaryDi
11851185

11861186
if (!renderer->isText()) {
11871187
inlineBox = 0;
1188-
if (canHaveChildrenForEditing(deprecatedNode()) && renderer->isBlockFlow() && hasRenderedNonAnonymousDescendantsWithHeight(renderer)) {
1188+
if (canHaveChildrenForEditing(deprecatedNode()) && renderer->isRenderBlockFlow() && hasRenderedNonAnonymousDescendantsWithHeight(renderer)) {
11891189
// Try a visually equivalent position with possibly opposite editability. This helps in case |this| is in
11901190
// an editable block but surrounded by non-editable positions. It acts to negate the logic at the beginning
11911191
// of RenderObject::createVisiblePosition().
@@ -1333,7 +1333,7 @@ TextDirection Position::primaryDirection() const
13331333
{
13341334
TextDirection primaryDirection = LTR;
13351335
for (const RenderObject* r = m_anchorNode->renderer(); r; r = r->parent()) {
1336-
if (r->isBlockFlow()) {
1336+
if (r->isRenderBlockFlow()) {
13371337
primaryDirection = r->style()->direction();
13381338
break;
13391339
}

‎Source/WebCore/dom/PositionIterator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ bool PositionIterator::isCandidate() const
159159
if (isTableElement(m_anchorNode) || editingIgnoresContent(m_anchorNode))
160160
return (atStartOfNode() || atEndOfNode()) && !Position::nodeIsUserSelectNone(m_anchorNode->parentNode());
161161

162-
if (!m_anchorNode->hasTagName(htmlTag) && renderer->isBlockFlow()) {
162+
if (!m_anchorNode->hasTagName(htmlTag) && renderer->isRenderBlockFlow()) {
163163
if (toRenderBlock(renderer)->logicalHeight() || m_anchorNode->hasTagName(bodyTag)) {
164164
if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer))
165165
return atStartOfNode() && !Position::nodeIsUserSelectNone(m_anchorNode);

‎Source/WebCore/editing/ApplyStyleCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ void ApplyStyleCommand::applyInlineStyleToPushDown(Node* node, EditingStyle* sty
10131013

10141014
// Since addInlineStyleIfNeeded can't add styles to block-flow render objects, add style attribute instead.
10151015
// FIXME: applyInlineStyleToRange should be used here instead.
1016-
if ((node->renderer()->isBlockFlow() || node->childNodeCount()) && node->isHTMLElement()) {
1016+
if ((node->renderer()->isRenderBlockFlow() || node->childNodeCount()) && node->isHTMLElement()) {
10171017
setNodeAttribute(toHTMLElement(node), styleAttr, newInlineStyle->style()->asText());
10181018
return;
10191019
}

‎Source/WebCore/editing/CompositeEditCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ PassRefPtr<Node> CompositeEditCommand::addBlockPlaceholderIfNeeded(Element* cont
874874
document().updateLayoutIgnorePendingStylesheets();
875875

876876
RenderObject* renderer = container->renderer();
877-
if (!renderer || !renderer->isBlockFlow())
877+
if (!renderer || !renderer->isRenderBlockFlow())
878878
return 0;
879879

880880
// append the placeholder to make sure it follows

‎Source/WebCore/editing/Editor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,7 @@ WritingDirection Editor::baseWritingDirectionForSelectionStart() const
14251425
if (!renderer)
14261426
return result;
14271427

1428-
if (!renderer->isBlockFlow()) {
1428+
if (!renderer->isRenderBlockFlow()) {
14291429
renderer = renderer->containingBlock();
14301430
if (!renderer)
14311431
return result;

‎Source/WebCore/editing/FrameSelection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,7 @@ static RenderObject* caretRenderer(Node* node)
12711271
return 0;
12721272

12731273
// if caretNode is a block and caret is inside it then caret should be painted by that block
1274-
bool paintedByBlock = renderer->isBlockFlow() && caretRendersInsideNode(node);
1274+
bool paintedByBlock = renderer->isRenderBlockFlow() && caretRendersInsideNode(node);
12751275
return paintedByBlock ? renderer : renderer->containingBlock();
12761276
}
12771277

‎Source/WebCore/editing/TextIterator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,7 @@ bool TextIterator::shouldRepresentNodeOffsetZero()
918918
// Additionally, if the range we are iterating over contains huge sections of unrendered content,
919919
// we would create VisiblePositions on every call to this function without this check.
920920
if (!m_node->renderer() || m_node->renderer()->style()->visibility() != VISIBLE
921-
|| (m_node->renderer()->isBlockFlow() && !toRenderBlock(m_node->renderer())->height() && !m_node->hasTagName(bodyTag)))
921+
|| (m_node->renderer()->isRenderBlockFlow() && !toRenderBlock(m_node->renderer())->height() && !m_node->hasTagName(bodyTag)))
922922
return false;
923923

924924
// The startPos.isNotNull() check is needed because the start could be before the body,

‎Source/WebCore/editing/TypingCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ bool TypingCommand::makeEditableRootEmpty()
404404

405405
if (root->firstChild() == root->lastChild() && root->firstElementChild() && root->firstElementChild()->hasTagName(brTag)) {
406406
// If there is a single child and it could be a placeholder, leave it alone.
407-
if (root->renderer() && root->renderer()->isBlockFlow())
407+
if (root->renderer() && root->renderer()->isRenderBlockFlow())
408408
return false;
409409
}
410410

0 commit comments

Comments
 (0)