Clean up iOS text autosizing code
https://bugs.webkit.org/show_bug.cgi?id=157489
Reviewed by Zalan Bujtas.
Change the TraverseNextInclusionFunction and HeightTypeTraverseNextInclusionFunction
to take references.
Use downcast<> more.
Whitespace cleanup.
* rendering/RenderBlockFlow.cpp:
(WebCore::isNonBlocksOrNonFixedHeightListItems):
* rendering/RenderElement.cpp:
(WebCore::includeNonFixedHeight):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::traverseNext):
* rendering/RenderObject.h:
* rendering/TextAutoSizing.cpp:
(WebCore::TextAutoSizingValue::adjustNodeSizes):
(WebCore::TextAutoSizingValue::reset):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@200593 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/rendering/RenderBlockFlow.cpp b/Source/WebCore/rendering/RenderBlockFlow.cpp
index 0e6e3a8..55361a3 100644
--- a/Source/WebCore/rendering/RenderBlockFlow.cpp
+++ b/Source/WebCore/rendering/RenderBlockFlow.cpp
@@ -3739,12 +3739,12 @@
return count;
}
-static bool isNonBlocksOrNonFixedHeightListItems(const RenderObject* render)
+static bool isNonBlocksOrNonFixedHeightListItems(const RenderObject& render)
{
- if (!render->isRenderBlock())
+ if (!render.isRenderBlock())
return true;
- if (render->isListItem())
- return render->style().height().type() != Fixed;
+ if (render.isListItem())
+ return render.style().height().type() != Fixed;
return false;
}
@@ -3790,7 +3790,7 @@
for (RenderObject* descendent = traverseNext(this, isNonBlocksOrNonFixedHeightListItems); descendent; descendent = descendent->traverseNext(this, isNonBlocksOrNonFixedHeightListItems)) {
if (isVisibleRenderText(descendent) && resizeTextPermitted(descendent)) {
- RenderText& text = downcast<RenderText>(*descendent);
+ auto& text = downcast<RenderText>(*descendent);
auto& oldStyle = text.style();
auto fontDescription = oldStyle.fontDescription();
float specifiedSize = fontDescription.specifiedSize();