Diff
Modified: trunk/Source/WebCore/ChangeLog (222434 => 222435)
--- trunk/Source/WebCore/ChangeLog 2017-09-24 15:07:32 UTC (rev 222434)
+++ trunk/Source/WebCore/ChangeLog 2017-09-24 18:30:54 UTC (rev 222435)
@@ -1,3 +1,42 @@
+2017-09-24 Antti Koivisto <[email protected]>
+
+ Remove CSS regions related fields from RenderStyle
+ https://bugs.webkit.org/show_bug.cgi?id=177415
+
+ Reviewed by Sam Weinig.
+
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::operator RegionFragment const): Deleted.
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::adjustRenderStyle):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::avoidsFloats const): Deleted.
+ * rendering/RenderBlock.h:
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::hasNextPage const):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects const):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayout const):
+ * rendering/style/RenderStyle.h:
+ (WebCore::pseudoElementRendererIsNeeded):
+ (WebCore::RenderStyle::hasFlowInto const): Deleted.
+ (WebCore::RenderStyle::flowThread const): Deleted.
+ (WebCore::RenderStyle::hasFlowFrom const): Deleted.
+ (WebCore::RenderStyle::regionThread const): Deleted.
+ (WebCore::RenderStyle::regionFragment const): Deleted.
+ (WebCore::RenderStyle::setFlowThread): Deleted.
+ (WebCore::RenderStyle::setRegionThread): Deleted.
+ (WebCore::RenderStyle::setRegionFragment): Deleted.
+ (WebCore::RenderStyle::initialFlowThread): Deleted.
+ (WebCore::RenderStyle::initialRegionThread): Deleted.
+ (WebCore::RenderStyle::initialRegionFragment): Deleted.
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator== const):
+ * rendering/style/StyleRareNonInheritedData.h:
+
2017-09-24 Joanmarie Diggs <[email protected]>
[ATK] Object attributes are missing for ARIA live region roles
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (222434 => 222435)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2017-09-24 15:07:32 UTC (rev 222434)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2017-09-24 18:30:54 UTC (rev 222435)
@@ -2052,37 +2052,6 @@
return MNONE;
}
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(RegionFragment e)
- : CSSValue(PrimitiveClass)
-{
- m_primitiveUnitType = CSS_VALUE_ID;
- switch (e) {
- case AutoRegionFragment:
- m_value.valueID = CSSValueAuto;
- break;
- case BreakRegionFragment:
- m_value.valueID = CSSValueBreak;
- break;
- }
-}
-
-template<> inline CSSPrimitiveValue::operator RegionFragment() const
-{
- ASSERT(isValueID());
-
- switch (m_value.valueID) {
- case CSSValueAuto:
- return AutoRegionFragment;
- case CSSValueBreak:
- return BreakRegionFragment;
- default:
- break;
- }
-
- ASSERT_NOT_REACHED();
- return AutoRegionFragment;
-}
-
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EMarqueeDirection e)
: CSSValue(PrimitiveClass)
{
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (222434 => 222435)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2017-09-24 15:07:32 UTC (rev 222434)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2017-09-24 18:30:54 UTC (rev 222435)
@@ -919,7 +919,6 @@
|| style.hasIsolation()
|| style.position() == StickyPosition
|| style.position() == FixedPosition
- || style.hasFlowFrom()
|| style.willChangeCreatesStackingContext())
style.setZIndex(0);
}
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (222434 => 222435)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2017-09-24 15:07:32 UTC (rev 222434)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2017-09-24 18:30:54 UTC (rev 222435)
@@ -2410,12 +2410,6 @@
return right;
}
-bool RenderBlock::avoidsFloats() const
-{
- // Floats can't intrude into our box if we have a non-auto column count or width.
- return RenderBox::avoidsFloats() || style().hasFlowFrom();
-}
-
bool RenderBlock::isPointInOverflowControl(HitTestResult& result, const LayoutPoint& locationInContainer, const LayoutPoint& accumulatedOffset)
{
if (!scrollsOverflow())
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (222434 => 222435)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2017-09-24 15:07:32 UTC (rev 222434)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2017-09-24 18:30:54 UTC (rev 222435)
@@ -463,8 +463,6 @@
void paintSelection(PaintInfo&, const LayoutPoint&);
void paintCaret(PaintInfo&, const LayoutPoint&, CaretType);
- bool avoidsFloats() const override;
-
virtual bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
// FIXME-BLOCKFLOW: Remove virtualization when all callers have moved to RenderBlockFlow
virtual bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&) { return false; }
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (222434 => 222435)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-09-24 15:07:32 UTC (rev 222434)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-09-24 18:30:54 UTC (rev 222435)
@@ -1835,7 +1835,7 @@
return false;
if (region->isLastRegion())
- return region->isRenderRegionSet() || region->style().regionFragment() == BreakRegionFragment
+ return region->isRenderRegionSet()
|| (pageBoundaryRule == IncludePageBoundary && pageOffset == region->logicalTopForFlowThreadContent());
RenderRegion* startRegion = nullptr;
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (222434 => 222435)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2017-09-24 15:07:32 UTC (rev 222434)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2017-09-24 18:30:54 UTC (rev 222435)
@@ -6275,7 +6275,6 @@
#endif
|| renderer.isTransparent()
|| renderer.isPositioned()
- || renderer.style().hasFlowFrom()
|| renderer.hasReflection()
|| renderer.style().hasIsolation()
|| layer.needsCompositedScrolling()
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (222434 => 222435)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2017-09-24 15:07:32 UTC (rev 222434)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2017-09-24 18:30:54 UTC (rev 222435)
@@ -571,9 +571,6 @@
|| m_rareNonInheritedData->textOverflow != other.m_rareNonInheritedData->textOverflow)
return true;
- if (m_rareNonInheritedData->regionFragment != other.m_rareNonInheritedData->regionFragment)
- return true;
-
if (m_rareNonInheritedData->shapeMargin != other.m_rareNonInheritedData->shapeMargin)
return true;
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (222434 => 222435)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2017-09-24 15:07:32 UTC (rev 222434)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2017-09-24 18:30:54 UTC (rev 222435)
@@ -645,12 +645,6 @@
// End CSS3 Getters
- bool hasFlowInto() const { return !m_rareNonInheritedData->flowThread.isNull(); }
- const AtomicString& flowThread() const { return m_rareNonInheritedData->flowThread; }
- bool hasFlowFrom() const { return !m_rareNonInheritedData->regionThread.isNull(); }
- const AtomicString& regionThread() const { return m_rareNonInheritedData->regionThread; }
- RegionFragment regionFragment() const { return static_cast<RegionFragment>(m_rareNonInheritedData->regionFragment); }
-
const AtomicString& lineGrid() const { return m_rareInheritedData->lineGrid; }
LineSnap lineSnap() const { return static_cast<LineSnap>(m_rareInheritedData->lineSnap); }
LineAlign lineAlign() const { return static_cast<LineAlign>(m_rareInheritedData->lineAlign); }
@@ -1180,10 +1174,6 @@
void setLineSnap(LineSnap lineSnap) { SET_VAR(m_rareInheritedData, lineSnap, lineSnap); }
void setLineAlign(LineAlign lineAlign) { SET_VAR(m_rareInheritedData, lineAlign, lineAlign); }
- void setFlowThread(const AtomicString& flowThread) { SET_VAR(m_rareNonInheritedData, flowThread, flowThread); }
- void setRegionThread(const AtomicString& regionThread) { SET_VAR(m_rareNonInheritedData, regionThread, regionThread); }
- void setRegionFragment(RegionFragment regionFragment) { SET_VAR(m_rareNonInheritedData, regionFragment, regionFragment); }
-
void setPointerEvents(EPointerEvents p) { m_inheritedFlags.pointerEvents = p; }
void clearAnimations();
@@ -1644,10 +1634,6 @@
static LineSnap initialLineSnap() { return LineSnapNone; }
static LineAlign initialLineAlign() { return LineAlignNone; }
- static const AtomicString& initialFlowThread() { return nullAtom(); }
- static const AtomicString& initialRegionThread() { return nullAtom(); }
- static RegionFragment initialRegionFragment() { return AutoRegionFragment; }
-
static IntSize initialInitialLetter() { return IntSize(); }
static LineClampValue initialLineClamp() { return LineClampValue(); }
static ETextSecurity initialTextSecurity() { return TSNONE; }
@@ -2248,7 +2234,7 @@
inline bool pseudoElementRendererIsNeeded(const RenderStyle* style)
{
- return style && style->display() != NONE && (style->contentData() || style->hasFlowFrom());
+ return style && style->display() != NONE && style->contentData();
}
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (222434 => 222435)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2017-09-24 15:07:32 UTC (rev 222434)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2017-09-24 18:30:54 UTC (rev 222435)
@@ -628,8 +628,6 @@
enum Order { LogicalOrder = 0, VisualOrder };
-enum RegionFragment { AutoRegionFragment, BreakRegionFragment };
-
enum ColumnAxis { HorizontalColumnAxis, VerticalColumnAxis, AutoColumnAxis };
enum ColumnProgression { NormalColumnProgression, ReverseColumnProgression };
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (222434 => 222435)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2017-09-24 15:07:32 UTC (rev 222434)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2017-09-24 18:30:54 UTC (rev 222435)
@@ -69,8 +69,6 @@
, clipPath(RenderStyle::initialClipPath())
, visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor())
, order(RenderStyle::initialOrder())
- , flowThread(RenderStyle::initialFlowThread())
- , regionThread(RenderStyle::initialRegionThread())
, alignContent(RenderStyle::initialContentAlignment())
, alignItems(RenderStyle::initialDefaultAlignment())
, alignSelf(RenderStyle::initialSelfAlignment())
@@ -80,7 +78,6 @@
#if ENABLE(TOUCH_EVENTS)
, touchAction(static_cast<unsigned>(RenderStyle::initialTouchAction()))
#endif
- , regionFragment(RenderStyle::initialRegionFragment())
, pageSizeType(PAGE_SIZE_AUTO)
, transformStyle3D(RenderStyle::initialTransformStyle3D())
, backfaceVisibility(RenderStyle::initialBackfaceVisibility())
@@ -162,8 +159,6 @@
, visitedLinkBorderTopColor(o.visitedLinkBorderTopColor)
, visitedLinkBorderBottomColor(o.visitedLinkBorderBottomColor)
, order(o.order)
- , flowThread(o.flowThread)
- , regionThread(o.regionThread)
, alignContent(o.alignContent)
, alignItems(o.alignItems)
, alignSelf(o.alignSelf)
@@ -173,7 +168,6 @@
#if ENABLE(TOUCH_EVENTS)
, touchAction(o.touchAction)
#endif
- , regionFragment(o.regionFragment)
, pageSizeType(o.pageSizeType)
, transformStyle3D(o.transformStyle3D)
, backfaceVisibility(o.backfaceVisibility)
@@ -266,7 +260,6 @@
&& visitedLinkBorderTopColor == o.visitedLinkBorderTopColor
&& visitedLinkBorderBottomColor == o.visitedLinkBorderBottomColor
&& order == o.order
- && flowThread == o.flowThread
&& alignContent == o.alignContent
&& alignItems == o.alignItems
&& alignSelf == o.alignSelf
@@ -273,8 +266,6 @@
&& justifyContent == o.justifyContent
&& justifyItems == o.justifyItems
&& justifySelf == o.justifySelf
- && regionThread == o.regionThread
- && regionFragment == o.regionFragment
&& pageSizeType == o.pageSizeType
&& transformStyle3D == o.transformStyle3D
&& backfaceVisibility == o.backfaceVisibility
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (222434 => 222435)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2017-09-24 15:07:32 UTC (rev 222434)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2017-09-24 18:30:54 UTC (rev 222435)
@@ -164,9 +164,6 @@
int order;
- AtomicString flowThread;
- AtomicString regionThread;
-
StyleContentAlignmentData alignContent;
StyleSelfAlignmentData alignItems;
StyleSelfAlignmentData alignSelf;
@@ -178,13 +175,10 @@
unsigned touchAction : 1; // TouchAction
#endif
- unsigned regionFragment : 1; // RegionFragment
-
unsigned pageSizeType : 2; // PageSizeType
unsigned transformStyle3D : 1; // ETransformStyle3D
unsigned backfaceVisibility : 1; // EBackfaceVisibility
-
unsigned userDrag : 2; // EUserDrag
unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."
unsigned marginBeforeCollapse : 2; // EMarginCollapse
