Bug 164476 - Fix the !ENABLE(VIDEO_TRACK) build
Summary: Fix the !ENABLE(VIDEO_TRACK) build
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: Other
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Csaba Osztrogonác
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-11-07 05:11 PST by Csaba Osztrogonác
Modified: 2016-11-14 08:07 PST (History)
2 users (show)

See Also:


Attachments
Patch (5.14 KB, patch)
2016-11-07 05:25 PST, Csaba Osztrogonác
darin: review+
Details | Formatted Diff | Diff
patch for landing (5.69 KB, patch)
2016-11-14 05:55 PST, Csaba Osztrogonác
no flags Details | Formatted Diff | Diff
patch for landing (5.47 KB, patch)
2016-11-14 06:28 PST, Csaba Osztrogonác
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Csaba Osztrogonác 2016-11-07 05:11:24 PST
CSSSelector::PseudoElementCue is defined inside ENABLE(VIDEO_TRACK),
but it is used unconditionally. It should be fixed.
Comment 1 Csaba Osztrogonác 2016-11-07 05:25:22 PST
Created attachment 294055 [details]
Patch
Comment 2 Darin Adler 2016-11-07 23:14:00 PST
Comment on attachment 294055 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=294055&action=review

> Source/WebCore/css/parser/CSSParserValues.h:275
> -    bool needsImplicitShadowCombinatorForMatching() const { return match() == CSSSelector::PseudoElement && (pseudoElementType() == CSSSelector::PseudoElementWebKitCustom || pseudoElementType() == CSSSelector::PseudoElementUserAgentCustom || pseudoElementType() == CSSSelector::PseudoElementWebKitCustomLegacyPrefixed || pseudoElementType() == CSSSelector::PseudoElementCue); }
> +    bool needsImplicitShadowCombinatorForMatching() const
> +    {
> +        return match() == CSSSelector::PseudoElement
> +            && (pseudoElementType() == CSSSelector::PseudoElementWebKitCustom
> +                || pseudoElementType() == CSSSelector::PseudoElementUserAgentCustom
> +#if ENABLE(VIDEO_TRACK)
> +                || pseudoElementType() == CSSSelector::PseudoElementCue
> +#endif
> +                || pseudoElementType() == CSSSelector::PseudoElementWebKitCustomLegacyPrefixed);
> +    }

When member function bodies get big like this, I like to move them out of class definitions into separate function definitions, like CSSParserValue::setFromValueList below.
Comment 3 Csaba Osztrogonác 2016-11-14 05:55:37 PST
Created attachment 294698 [details]
patch for landing
Comment 4 Csaba Osztrogonác 2016-11-14 06:28:21 PST
Created attachment 294700 [details]
patch for landing
Comment 5 WebKit Commit Bot 2016-11-14 07:42:36 PST
Comment on attachment 294700 [details]
patch for landing

Clearing flags on attachment: 294700

Committed r208681: <http://trac.webkit.org/changeset/208681>