Changeset 228492 in webkit
- Timestamp:
- Feb 14, 2018 3:41:55 PM (6 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r228486 r228492 1 2018-02-14 Zalan Bujtas <zalan@apple.com> 2 3 [RenderTreeBuilder] Move RenderSVG*::addChild() to RenderTreeBuilder 4 https://bugs.webkit.org/show_bug.cgi?id=182811 5 <rdar://problem/37549714> 6 7 Reviewed by Antti Koivisto. 8 9 No change in functionality. 10 11 * rendering/svg/RenderSVGContainer.cpp: 12 (WebCore::RenderSVGContainer::addChild): Deleted. 13 * rendering/svg/RenderSVGContainer.h: 14 * rendering/svg/RenderSVGInline.cpp: 15 (WebCore::RenderSVGInline::addChild): Deleted. 16 * rendering/svg/RenderSVGInline.h: 17 * rendering/svg/RenderSVGRoot.cpp: 18 (WebCore::RenderSVGRoot::addChild): Deleted. 19 * rendering/svg/RenderSVGRoot.h: 20 * rendering/svg/RenderSVGText.cpp: 21 (WebCore::RenderSVGText::addChild): Deleted. 22 * rendering/svg/RenderSVGText.h: 23 * rendering/updating/RenderTreeBuilder.cpp: 24 (WebCore::RenderTreeBuilder::insertChild): 25 (WebCore::RenderTreeBuilder::insertChildToSVGContainer): Deleted. 26 (WebCore::RenderTreeBuilder::insertChildToSVGInline): Deleted. 27 (WebCore::RenderTreeBuilder::insertChildToSVGRoot): Deleted. 28 (WebCore::RenderTreeBuilder::insertChildToSVGText): Deleted. 29 * rendering/updating/RenderTreeBuilder.h: 30 1 31 2018-02-14 Daniel Bates <dabates@apple.com> 2 32 -
trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp
r228429 r228492 89 89 repainter.repaintAfterLayout(); 90 90 clearNeedsLayout(); 91 }92 93 void RenderSVGContainer::addChild(RenderTreeBuilder& builder, RenderPtr<RenderObject> newChild, RenderObject* beforeChild)94 {95 builder.insertChildToSVGContainer(*this, WTFMove(newChild), beforeChild);96 91 } 97 92 -
trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h
r228429 r228492 49 49 void layout() override; 50 50 51 void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> child, RenderObject* beforeChild = 0) final;52 51 void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) final; 53 52 -
trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp
r228429 r228492 124 124 } 125 125 126 void RenderSVGInline::addChild(RenderTreeBuilder& builder, RenderPtr<RenderObject> newChild, RenderObject* beforeChild)127 {128 builder.insertChildToSVGInline(*this, WTFMove(newChild), beforeChild);129 126 } 130 131 } -
trunk/Source/WebCore/rendering/svg/RenderSVGInline.h
r228429 r228492 61 61 void willBeDestroyed(RenderTreeBuilder&) final; 62 62 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final; 63 64 void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr) final;65 63 }; 66 64 -
trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp
r228429 r228492 304 304 } 305 305 306 void RenderSVGRoot::addChild(RenderTreeBuilder& builder, RenderPtr<RenderObject> newChild, RenderObject* beforeChild)307 {308 builder.insertChildToSVGRoot(*this, WTFMove(newChild), beforeChild);309 }310 311 306 // RenderBox methods will expect coordinates w/o any transforms in coordinates 312 307 // relative to our borderBox origin. This method gives us exactly that. -
trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h
r228429 r228492 83 83 84 84 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override; 85 void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> child, RenderObject* beforeChild = 0) override;86 85 87 86 const AffineTransform& localToParentTransform() const override; -
trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp
r228429 r228492 521 521 } 522 522 523 void RenderSVGText::addChild(RenderTreeBuilder& builder, RenderPtr<RenderObject> newChild, RenderObject* beforeChild)524 {525 builder.insertChildToSVGText(*this, WTFMove(newChild), beforeChild);526 }527 528 523 // Fix for <rdar://problem/8048875>. We should not render :first-line CSS Style 529 524 // in a SVG text element context. -
trunk/Source/WebCore/rendering/svg/RenderSVGText.h
r228429 r228492 84 84 void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags, bool* wasFixed) const override; 85 85 const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override; 86 void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr) override;87 86 void willBeDestroyed(RenderTreeBuilder&) override; 88 87 -
trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
r228465 r228492 195 195 } 196 196 197 if (is<RenderSVGContainer>(parent)) { 198 svgBuilder().insertChild(downcast<RenderSVGContainer>(parent), WTFMove(child), beforeChild); 199 return; 200 } 201 202 if (is<RenderSVGInline>(parent)) { 203 svgBuilder().insertChild(downcast<RenderSVGInline>(parent), WTFMove(child), beforeChild); 204 return; 205 } 206 207 if (is<RenderSVGRoot>(parent)) { 208 svgBuilder().insertChild(downcast<RenderSVGRoot>(parent), WTFMove(child), beforeChild); 209 return; 210 } 211 212 if (is<RenderSVGText>(parent)) { 213 svgBuilder().insertChild(downcast<RenderSVGText>(parent), WTFMove(child), beforeChild); 214 return; 215 } 216 197 217 parent.addChild(*this, WTFMove(child), beforeChild); 198 218 } … … 468 488 } 469 489 470 void RenderTreeBuilder::insertChildToSVGContainer(RenderSVGContainer& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)471 {472 svgBuilder().insertChild(parent, WTFMove(child), beforeChild);473 }474 475 void RenderTreeBuilder::insertChildToSVGInline(RenderSVGInline& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)476 {477 svgBuilder().insertChild(parent, WTFMove(child), beforeChild);478 }479 480 void RenderTreeBuilder::insertChildToSVGRoot(RenderSVGRoot& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)481 {482 svgBuilder().insertChild(parent, WTFMove(child), beforeChild);483 }484 485 void RenderTreeBuilder::insertChildToSVGText(RenderSVGText& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)486 {487 svgBuilder().insertChild(parent, WTFMove(child), beforeChild);488 }489 490 490 void RenderTreeBuilder::insertChildToRenderTable(RenderTable& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild) 491 491 { -
trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.h
r228465 r228492 70 70 void insertChildToRenderInline(RenderInline& parent, RenderPtr<RenderObject>, RenderObject* beforeChild = nullptr); 71 71 void insertChildToRenderInlineIgnoringContinuation(RenderInline& parent, RenderPtr<RenderObject>, RenderObject* beforeChild = nullptr); 72 void insertChildToSVGContainer(RenderSVGContainer& parent, RenderPtr<RenderObject>, RenderObject* beforeChild = nullptr);73 void insertChildToSVGInline(RenderSVGInline& parent, RenderPtr<RenderObject>, RenderObject* beforeChild = nullptr);74 void insertChildToSVGRoot(RenderSVGRoot& parent, RenderPtr<RenderObject>, RenderObject* beforeChild = nullptr);75 void insertChildToSVGText(RenderSVGText& parent, RenderPtr<RenderObject>, RenderObject* beforeChild = nullptr);76 72 void insertChildToRenderTable(RenderTable& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr); 77 73 void insertChildToRenderTableSection(RenderTableSection& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr);
Note: See TracChangeset
for help on using the changeset viewer.