⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 277367 in webkit


Ignore:
Timestamp:
May 12, 2021, 7:17:38 AM (5 years ago)
Author:
commit-queue@webkit.org
Message:

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

Location:
trunk
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r277366 r277367  
     12021-05-12  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r277320 and r277329.
     4        https://bugs.webkit.org/show_bug.cgi?id=225698
     5
     6        Added broken test fast/css/visited-link-mix-blend-mode.html
     7
     8        Reverted changesets:
     9
     10        "Don't allow :visited link style in subtrees that use mix-
     11        blend-mode"
     12        https://bugs.webkit.org/show_bug.cgi?id=225446
     13        https://trac.webkit.org/changeset/277320
     14
     15        "Don't allow :visited link style in subtrees that use mix-
     16        blend-mode"
     17        https://bugs.webkit.org/show_bug.cgi?id=225446
     18        https://trac.webkit.org/changeset/277329
     19
    1202021-05-12  Diego Pino Garcia  <dpino@igalia.com>
    221

  • trunk/Source/WebCore/ChangeLog

    r277365 r277367  
     12021-05-12  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r277320 and r277329.
     4        https://bugs.webkit.org/show_bug.cgi?id=225698
     5
     6        Added broken test fast/css/visited-link-mix-blend-mode.html
     7
     8        Reverted changesets:
     9
     10        "Don't allow :visited link style in subtrees that use mix-
     11        blend-mode"
     12        https://bugs.webkit.org/show_bug.cgi?id=225446
     13        https://trac.webkit.org/changeset/277320
     14
     15        "Don't allow :visited link style in subtrees that use mix-
     16        blend-mode"
     17        https://bugs.webkit.org/show_bug.cgi?id=225446
     18        https://trac.webkit.org/changeset/277329
     19
    1202021-05-12  Jean-Yves Avenard  <jya@apple.com>
    221

  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r277320 r277367  
    21152115        return unvisitedColor;
    21162116
    2117 #if ENABLE(CSS_COMPOSITING)
    2118     if (isInSubtreeWithBlendMode())
    2119         return unvisitedColor;
    2120 #endif
    2121    
    21222117    Color visitedColor = colorResolvingCurrentColor(colorProperty, true);
    21232118

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r277329 r277367  
    822822#if ENABLE(CSS_COMPOSITING)
    823823    BlendMode blendMode() const { return static_cast<BlendMode>(m_rareNonInheritedData->effectiveBlendMode); }
    824     void setBlendMode(BlendMode);
     824    void setBlendMode(BlendMode mode) { SET_VAR(m_rareNonInheritedData, effectiveBlendMode, static_cast<unsigned>(mode)); }
    825825    bool hasBlendMode() const { return static_cast<BlendMode>(m_rareNonInheritedData->effectiveBlendMode) != BlendMode::Normal; }
    826     bool isInSubtreeWithBlendMode() const { return m_rareInheritedData->isInSubtreeWithBlendMode; }
    827826
    828827    Isolation isolation() const { return static_cast<Isolation>(m_rareNonInheritedData->isolation); }
    … …  
    22072206}
    22082207
    2209 #if ENABLE(CSS_COMPOSITING)
    2210 inline void RenderStyle::setBlendMode(BlendMode mode)
    2211 {
    2212     SET_VAR(m_rareNonInheritedData, effectiveBlendMode, static_cast<unsigned>(mode));
    2213     SET_VAR(m_rareInheritedData, isInSubtreeWithBlendMode, mode != BlendMode::Normal);
    2214 }
    2215 #endif
    2216 
    22172208inline void RenderStyle::setLogicalWidth(Length&& logicalWidth)
    22182209{

  • trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp

    r277320 r277367  
    136136    , hasAutoCaretColor(true)
    137137    , hasVisitedLinkAutoCaretColor(true)
    138     , isInSubtreeWithBlendMode(false)
    139138    , effectiveTouchActions(RenderStyle::initialTouchActions())
    140139    , strokeWidth(RenderStyle::initialStrokeWidth())
    … …  
    233232    , hasAutoCaretColor(o.hasAutoCaretColor)
    234233    , hasVisitedLinkAutoCaretColor(o.hasVisitedLinkAutoCaretColor)
    235     , isInSubtreeWithBlendMode(o.isInSubtreeWithBlendMode)
    236234    , effectiveTouchActions(o.effectiveTouchActions)
    237235    , eventListenerRegionTypes(o.eventListenerRegionTypes)
    … …  
    357355        && hasAutoCaretColor == o.hasAutoCaretColor
    358356        && hasVisitedLinkAutoCaretColor == o.hasVisitedLinkAutoCaretColor
    359         && isInSubtreeWithBlendMode == o.isInSubtreeWithBlendMode
    360357        && effectiveTouchActions == o.effectiveTouchActions
    361358        && eventListenerRegionTypes == o.eventListenerRegionTypes

  • trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h

    r277320 r277367  
    162162    unsigned hasVisitedLinkAutoCaretColor : 1;
    163163
    164     unsigned isInSubtreeWithBlendMode : 1;
    165 
    166164    OptionSet<TouchAction> effectiveTouchActions;
    167165    OptionSet<EventListenerRegionType> eventListenerRegionTypes;
Note: See TracChangeset for help on using the changeset viewer.