Diff
Modified: trunk/LayoutTests/ChangeLog (277366 => 277367)
--- trunk/LayoutTests/ChangeLog 2021-05-12 13:37:43 UTC (rev 277366)
+++ trunk/LayoutTests/ChangeLog 2021-05-12 14:17:38 UTC (rev 277367)
@@ -1,3 +1,22 @@
+2021-05-12 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r277320 and r277329.
+ https://bugs.webkit.org/show_bug.cgi?id=225698
+
+ Added broken test fast/css/visited-link-mix-blend-mode.html
+
+ Reverted changesets:
+
+ "Don't allow :visited link style in subtrees that use mix-
+ blend-mode"
+ https://bugs.webkit.org/show_bug.cgi?id=225446
+ https://trac.webkit.org/changeset/277320
+
+ "Don't allow :visited link style in subtrees that use mix-
+ blend-mode"
+ https://bugs.webkit.org/show_bug.cgi?id=225446
+ https://trac.webkit.org/changeset/277329
+
2021-05-12 Diego Pino Garcia <[email protected]>
[GTK] Unreviewed test gardening. Update baselines for GTK.
Deleted: trunk/LayoutTests/fast/css/visited-link-mix-blend-mode-expected.html (277366 => 277367)
--- trunk/LayoutTests/fast/css/visited-link-mix-blend-mode-expected.html 2021-05-12 13:37:43 UTC (rev 277366)
+++ trunk/LayoutTests/fast/css/visited-link-mix-blend-mode-expected.html 2021-05-12 14:17:38 UTC (rev 277367)
@@ -1,26 +0,0 @@
-<style>
-.box { position: relative; width: 100px; height:100px; }
-a { display: block; position: relative; width: 100px; height:100px; background-color: green; }
-.background { background-color: green; }
-.multiply { mix-blend-mode: multiply; }
-</style>
-<div>
- <div class="box background">
- <a class="multiply"></a>
- </div>
- <div class="box background">
- <a class="multiply"></a>
- </div>
- <div class="box background">
- <a class="multiply"></a>
- </div>
- <div class="box background">
- <a class="multiply"></a>
- </div>
- <div class="box background">
- <a class="multiply"></a>
- </div>
- <div class="box background">
- <a class="multiply"></a>
- </div>
-</div>
Deleted: trunk/LayoutTests/fast/css/visited-link-mix-blend-mode.html (277366 => 277367)
--- trunk/LayoutTests/fast/css/visited-link-mix-blend-mode.html 2021-05-12 13:37:43 UTC (rev 277366)
+++ trunk/LayoutTests/fast/css/visited-link-mix-blend-mode.html 2021-05-12 14:17:38 UTC (rev 277367)
@@ -1,40 +0,0 @@
-<style>
-.box { position: relative; width: 100px; height:100px; }
-a { display: block; position: relative; width: 100px; height:100px; background-color: green; }
-a:visited { background-color: red; }
-.background { background-color: green; }
-.multiply { mix-blend-mode: multiply; }
-</style>
-<div>
- <div class="box background">
- <a class="multiply"></a>
- </div>
- <div class="box background">
- <a class="multiply" href=""
- </div>
- <div class="box background">
- <div class="box multiply">
- <a></a>
- </div>
- </div>
- <div class="box background">
- <div class="box multiply">
- <a href=""
- </div>
- </div>
- <div class="box background">
- <div class="box add_multiply">
- <a></a>
- </div>
- </div>
- <div class="box background">
- <div class="box add_multiply">
- <a href=""
- </div>
- </div>
-</div>
-<script>
-document.body.offsetLeft;
-for (element of document.querySelectorAll(".add_multiply"))
- element.classList.add("multiply");
-</script>
Modified: trunk/Source/WebCore/ChangeLog (277366 => 277367)
--- trunk/Source/WebCore/ChangeLog 2021-05-12 13:37:43 UTC (rev 277366)
+++ trunk/Source/WebCore/ChangeLog 2021-05-12 14:17:38 UTC (rev 277367)
@@ -1,3 +1,22 @@
+2021-05-12 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r277320 and r277329.
+ https://bugs.webkit.org/show_bug.cgi?id=225698
+
+ Added broken test fast/css/visited-link-mix-blend-mode.html
+
+ Reverted changesets:
+
+ "Don't allow :visited link style in subtrees that use mix-
+ blend-mode"
+ https://bugs.webkit.org/show_bug.cgi?id=225446
+ https://trac.webkit.org/changeset/277320
+
+ "Don't allow :visited link style in subtrees that use mix-
+ blend-mode"
+ https://bugs.webkit.org/show_bug.cgi?id=225446
+ https://trac.webkit.org/changeset/277329
+
2021-05-12 Jean-Yves Avenard <[email protected]>
Adopt CoreMedia SPI to identify audio-only playback for MSE clients
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (277366 => 277367)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2021-05-12 13:37:43 UTC (rev 277366)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2021-05-12 14:17:38 UTC (rev 277367)
@@ -2114,11 +2114,6 @@
if (insideLink() != InsideLink::InsideVisited)
return unvisitedColor;
-#if ENABLE(CSS_COMPOSITING)
- if (isInSubtreeWithBlendMode())
- return unvisitedColor;
-#endif
-
Color visitedColor = colorResolvingCurrentColor(colorProperty, true);
// FIXME: Technically someone could explicitly specify the color transparent, but for now we'll just
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (277366 => 277367)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2021-05-12 13:37:43 UTC (rev 277366)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2021-05-12 14:17:38 UTC (rev 277367)
@@ -821,9 +821,8 @@
#if ENABLE(CSS_COMPOSITING)
BlendMode blendMode() const { return static_cast<BlendMode>(m_rareNonInheritedData->effectiveBlendMode); }
- void setBlendMode(BlendMode);
+ void setBlendMode(BlendMode mode) { SET_VAR(m_rareNonInheritedData, effectiveBlendMode, static_cast<unsigned>(mode)); }
bool hasBlendMode() const { return static_cast<BlendMode>(m_rareNonInheritedData->effectiveBlendMode) != BlendMode::Normal; }
- bool isInSubtreeWithBlendMode() const { return m_rareInheritedData->isInSubtreeWithBlendMode; }
Isolation isolation() const { return static_cast<Isolation>(m_rareNonInheritedData->isolation); }
void setIsolation(Isolation isolation) { SET_VAR(m_rareNonInheritedData, isolation, static_cast<unsigned>(isolation)); }
@@ -2206,14 +2205,6 @@
return static_cast<ImageOrientation::Orientation>(m_rareInheritedData->imageOrientation);
}
-#if ENABLE(CSS_COMPOSITING)
-inline void RenderStyle::setBlendMode(BlendMode mode)
-{
- SET_VAR(m_rareNonInheritedData, effectiveBlendMode, static_cast<unsigned>(mode));
- SET_VAR(m_rareInheritedData, isInSubtreeWithBlendMode, mode != BlendMode::Normal);
-}
-#endif
-
inline void RenderStyle::setLogicalWidth(Length&& logicalWidth)
{
if (isHorizontalWritingMode())
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (277366 => 277367)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2021-05-12 13:37:43 UTC (rev 277366)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2021-05-12 14:17:38 UTC (rev 277367)
@@ -135,7 +135,6 @@
, mathStyle(static_cast<unsigned>(RenderStyle::initialMathStyle()))
, hasAutoCaretColor(true)
, hasVisitedLinkAutoCaretColor(true)
- , isInSubtreeWithBlendMode(false)
, effectiveTouchActions(RenderStyle::initialTouchActions())
, strokeWidth(RenderStyle::initialStrokeWidth())
, strokeColor(RenderStyle::initialStrokeColor())
@@ -232,7 +231,6 @@
, mathStyle(o.mathStyle)
, hasAutoCaretColor(o.hasAutoCaretColor)
, hasVisitedLinkAutoCaretColor(o.hasVisitedLinkAutoCaretColor)
- , isInSubtreeWithBlendMode(o.isInSubtreeWithBlendMode)
, effectiveTouchActions(o.effectiveTouchActions)
, eventListenerRegionTypes(o.eventListenerRegionTypes)
, strokeWidth(o.strokeWidth)
@@ -356,7 +354,6 @@
&& mathStyle == o.mathStyle
&& hasAutoCaretColor == o.hasAutoCaretColor
&& hasVisitedLinkAutoCaretColor == o.hasVisitedLinkAutoCaretColor
- && isInSubtreeWithBlendMode == o.isInSubtreeWithBlendMode
&& effectiveTouchActions == o.effectiveTouchActions
&& eventListenerRegionTypes == o.eventListenerRegionTypes
&& strokeWidth == o.strokeWidth
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h (277366 => 277367)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2021-05-12 13:37:43 UTC (rev 277366)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2021-05-12 14:17:38 UTC (rev 277367)
@@ -161,8 +161,6 @@
unsigned hasAutoCaretColor : 1;
unsigned hasVisitedLinkAutoCaretColor : 1;
- unsigned isInSubtreeWithBlendMode : 1;
-
OptionSet<TouchAction> effectiveTouchActions;
OptionSet<EventListenerRegionType> eventListenerRegionTypes;
