Attachment 348416 Details for Bug 189089 – Patch

[patch] Patch

bug-189089-20180829200851.patch (text/plain), 6.21 KB, created by Emilio Cobos Álvarez (:emilio) on 2018-08-29 11:08:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Emilio Cobos Álvarez (:emilio)

Created: 2018-08-29 11:08:53 PDT

Size: 6.21 KB

patch

obsolete

>Subversion Revision: 235463
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d17dc740f5a79bf25e3711dbecc3d0e70b21f1ea..8589eae41beb3c4355b8ec6279412d6cd8905f10 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,8 +1,27 @@
>+2018-08-29  Emilio Cobos Ãlvarez  <emilio@crisal.io>
>+
>+        Remove PseudoElementUserAgentCustom.
>+        https://bugs.webkit.org/show_bug.cgi?id=189089
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Tests at https://github.com/web-platform-tests/wpt/pull/12743.
>+
>+        * css/CSSSelector.cpp:
>+        (WebCore::CSSSelector::pseudoId):
>+        (WebCore::CSSSelector::parsePseudoElementType):
>+        * css/CSSSelector.h:
>+        (WebCore::CSSSelector::isCustomPseudoElement const):
>+        * css/RuleSet.cpp:
>+        (WebCore::RuleSet::addRule):
>+        * css/parser/CSSParserSelector.h:
>+        (WebCore::CSSParserSelector::needsImplicitShadowCombinatorForMatching const):
>+
> 2018-08-29  David Kilzer  <ddkilzer@apple.com>
> 
>         Remove empty directories from from svn.webkit.org repository
>         <https://webkit.org/b/189081>
> 
>         * Modules/proximity: Removed.
> 
> 2018-08-28  Zalan Bujtas  <zalan@apple.com>
>diff --git a/Source/WebCore/css/CSSSelector.cpp b/Source/WebCore/css/CSSSelector.cpp
>index b2fdd1bd5efe9eaad4ecc0bfe9f35268f3f8b7b2..b347735712ea26b80a80fbc23aacbd98f7879891 100644
>--- a/Source/WebCore/css/CSSSelector.cpp
>+++ b/Source/WebCore/css/CSSSelector.cpp
>@@ -294,17 +294,16 @@ PseudoId CSSSelector::pseudoId(PseudoElementType type)
>         return PseudoId::ScrollbarTrackPiece;
>     case PseudoElementResizer:
>         return PseudoId::Resizer;
> #if ENABLE(VIDEO_TRACK)
>     case PseudoElementCue:
> #endif
>     case PseudoElementSlotted:
>     case PseudoElementUnknown:
>-    case PseudoElementUserAgentCustom:
>     case PseudoElementWebKitCustom:
>     case PseudoElementWebKitCustomLegacyPrefixed:
>         return PseudoId::None;
>     }
> 
>     ASSERT_NOT_REACHED();
>     return PseudoId::None;
> }
>@@ -313,19 +312,16 @@ CSSSelector::PseudoElementType CSSSelector::parsePseudoElementType(const String&
> {
>     if (name.isNull())
>         return PseudoElementUnknown;
> 
>     PseudoElementType type = parsePseudoElementString(*name.impl());
>     if (type == PseudoElementUnknown) {
>         if (name.startsWith("-webkit-"))
>             type = PseudoElementWebKitCustom;
>-
>-        if (name.startsWith("x-"))
>-            type = PseudoElementUserAgentCustom;
>     }
>     return type;
> }
> 
> 
> bool CSSSelector::operator==(const CSSSelector& other) const
> {
>     const CSSSelector* sel1 = this;
>diff --git a/Source/WebCore/css/CSSSelector.h b/Source/WebCore/css/CSSSelector.h
>index a6a1bd96d635f450c2f4f376bbfabaa8cb4ae3c2..0ec5870ace4ab7bbc97ed9f5bfbbb6c253636009 100644
>--- a/Source/WebCore/css/CSSSelector.h
>+++ b/Source/WebCore/css/CSSSelector.h
>@@ -178,17 +178,16 @@ namespace WebCore {
>             PseudoElementScrollbar,
>             PseudoElementScrollbarButton,
>             PseudoElementScrollbarCorner,
>             PseudoElementScrollbarThumb,
>             PseudoElementScrollbarTrack,
>             PseudoElementScrollbarTrackPiece,
>             PseudoElementSelection,
>             PseudoElementSlotted,
>-            PseudoElementUserAgentCustom,
>             PseudoElementWebKitCustom,
> 
>             // WebKitCustom that appeared in an old prefixed form
>             // and need special handling.
>             PseudoElementWebKitCustomLegacyPrefixed,
>         };
> 
>         enum PagePseudoClassType {
>@@ -406,18 +405,17 @@ inline bool CSSSelector::matchesPseudoElement() const
> inline bool CSSSelector::isUnknownPseudoElement() const
> {
>     return match() == PseudoElement && pseudoElementType() == PseudoElementUnknown;
> }
> 
> inline bool CSSSelector::isCustomPseudoElement() const
> {
>     return match() == PseudoElement
>-        && (pseudoElementType() == PseudoElementUserAgentCustom
>-            || pseudoElementType() == PseudoElementWebKitCustom
>+        && (pseudoElementType() == PseudoElementWebKitCustom
>             || pseudoElementType() == PseudoElementWebKitCustomLegacyPrefixed);
> }
> 
> inline bool CSSSelector::isWebKitCustomPseudoElement() const
> {
>     return pseudoElementType() == PseudoElementWebKitCustom || pseudoElementType() == PseudoElementWebKitCustomLegacyPrefixed;
> }
> 
>diff --git a/Source/WebCore/css/RuleSet.cpp b/Source/WebCore/css/RuleSet.cpp
>index f4b5bff3c2bdd825775d4c763fdccf070218db24..2e11ae1f9ab5d2f1e89bac095d69cac051855c00 100644
>--- a/Source/WebCore/css/RuleSet.cpp
>+++ b/Source/WebCore/css/RuleSet.cpp
>@@ -237,17 +237,16 @@ void RuleSet::addRule(StyleRule* rule, unsigned selectorIndex, unsigned selector
>             break;
>         }
>         case CSSSelector::Tag:
>             if (selector->tagQName().localName() != starAtom())
>                 tagSelector = selector;
>             break;
>         case CSSSelector::PseudoElement:
>             switch (selector->pseudoElementType()) {
>-            case CSSSelector::PseudoElementUserAgentCustom:
>             case CSSSelector::PseudoElementWebKitCustom:
>             case CSSSelector::PseudoElementWebKitCustomLegacyPrefixed:
>                 customPseudoElementSelector = selector;
>                 break;
>             case CSSSelector::PseudoElementSlotted:
>                 slottedPseudoElementSelector = selector;
>                 break;
> #if ENABLE(VIDEO_TRACK)
>diff --git a/Source/WebCore/css/parser/CSSParserSelector.h b/Source/WebCore/css/parser/CSSParserSelector.h
>index 498bea0622fc3efb2663814bf3b59418600f1a0b..860fda1c1112ab99a3283e3a23c6417cea5727ce 100644
>--- a/Source/WebCore/css/parser/CSSParserSelector.h
>+++ b/Source/WebCore/css/parser/CSSParserSelector.h
>@@ -112,16 +112,15 @@ inline bool CSSParserSelector::hasShadowDescendant() const
> {
>     return m_selector->relation() == CSSSelector::ShadowDescendant;
> }
> 
> inline bool CSSParserSelector::needsImplicitShadowCombinatorForMatching() const
> {
>     return match() == CSSSelector::PseudoElement
>         && (pseudoElementType() == CSSSelector::PseudoElementWebKitCustom
>-            || pseudoElementType() == CSSSelector::PseudoElementUserAgentCustom
> #if ENABLE(VIDEO_TRACK)
>             || pseudoElementType() == CSSSelector::PseudoElementCue
> #endif
>             || pseudoElementType() == CSSSelector::PseudoElementWebKitCustomLegacyPrefixed);
> }
> 
> }

Flags:

rniwa: review+
commit-queue: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 189089: 348416