Skip to content

GitLab

T
tangled
Commit c2b92742 authored by Fredrik Söderquist's avatar Fredrik Söderquist Committed by Commit Bot
Browse files
Options

Use a table for CSSSelectorParser's custom pseudo element use counter 

This if cascade consumes both a fair bit of footprint while it makes the
switch slightly less readable.

Change-Id: Ia8cb0d14ec831ccfcf7f22154a12f16d44fbc9ad
Reviewed-on: https://chromium-review.googlesource.com/c/1329147
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Reviewed-by: default avatarRune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607223}
parent 46ebe889
Show whitespace changes
Inline Side-by-side
Showing with 134 additions and 150 deletions
third_party/blink/renderer/core/css/parser/css_selector_parser.cc
View file @ c2b92742
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "third_party/blink/renderer/core/css/parser/css_selector_parser.h" #include "third_party/blink/renderer/core/css/parser/css_selector_parser.h"
#include <memory> #include <memory>
#include "base/numerics/safe_conversions.h"
#include "third_party/blink/renderer/core/css/css_selector_list.h" #include "third_party/blink/renderer/core/css/css_selector_list.h"
#include "third_party/blink/renderer/core/css/parser/css_parser_context.h" #include "third_party/blink/renderer/core/css/parser/css_parser_context.h"
#include "third_party/blink/renderer/core/css/parser/css_parser_observer.h" #include "third_party/blink/renderer/core/css/parser/css_parser_observer.h"
...@@ -926,6 +927,137 @@ CSSSelectorParser::SplitCompoundAtImplicitShadowCrossingCombinator( ...@@ -926,6 +927,137 @@ CSSSelectorParser::SplitCompoundAtImplicitShadowCrossingCombinator(
return remaining; return remaining;
} }
namespace {
struct PseudoElementFeatureMapEntry {
template <unsigned key_length>
PseudoElementFeatureMapEntry(const char (&key)[key_length],
WebFeature feature)
: key(key),
key_length(base::checked_cast<uint16_t>(key_length - 1)),
feature(base::checked_cast<uint16_t>(feature)) {}
const char* const key;
const uint16_t key_length;
const uint16_t feature;
};
WebFeature FeatureForWebKitCustomPseudoElement(const AtomicString& name) {
static const PseudoElementFeatureMapEntry feature_table[] = {
{"cue", WebFeature::kCSSSelectorCue},
{"-internal-media-controls-overlay-cast-button",
WebFeature::kCSSSelectorInternalMediaControlsOverlayCastButton},
{"-webkit-calendar-picker-indicator",
WebFeature::kCSSSelectorWebkitCalendarPickerIndicator},
{"-webkit-clear-button", WebFeature::kCSSSelectorWebkitClearButton},
{"-webkit-color-swatch", WebFeature::kCSSSelectorWebkitColorSwatch},
{"-webkit-color-swatch-wrapper",
WebFeature::kCSSSelectorWebkitColorSwatchWrapper},
{"-webkit-date-and-time-value",
WebFeature::kCSSSelectorWebkitDateAndTimeValue},
{"-webkit-datetime-edit", WebFeature::kCSSSelectorWebkitDatetimeEdit},
{"-webkit-datetime-edit-ampm-field",
WebFeature::kCSSSelectorWebkitDatetimeEditAmpmField},
{"-webkit-datetime-edit-day-field",
WebFeature::kCSSSelectorWebkitDatetimeEditDayField},
{"-webkit-datetime-edit-fields-wrapper",
WebFeature::kCSSSelectorWebkitDatetimeEditFieldsWrapper},
{"-webkit-datetime-edit-hour-field",
WebFeature::kCSSSelectorWebkitDatetimeEditHourField},
{"-webkit-datetime-edit-millisecond-field",
WebFeature::kCSSSelectorWebkitDatetimeEditMillisecondField},
{"-webkit-datetime-edit-minute-field",
WebFeature::kCSSSelectorWebkitDatetimeEditMinuteField},
{"-webkit-datetime-edit-month-field",
WebFeature::kCSSSelectorWebkitDatetimeEditMonthField},
{"-webkit-datetime-edit-second-field",
WebFeature::kCSSSelectorWebkitDatetimeEditSecondField},
{"-webkit-datetime-edit-text",
WebFeature::kCSSSelectorWebkitDatetimeEditText},
{"-webkit-datetime-edit-week-field",
WebFeature::kCSSSelectorWebkitDatetimeEditWeekField},
{"-webkit-datetime-edit-year-field",
WebFeature::kCSSSelectorWebkitDatetimeEditYearField},
{"-webkit-details-marker", WebFeature::kCSSSelectorWebkitDetailsMarker},
{"-webkit-file-upload-button",
WebFeature::kCSSSelectorWebkitFileUploadButton},
{"-webkit-inner-spin-button",
WebFeature::kCSSSelectorWebkitInnerSpinButton},
{"-webkit-input-placeholder",
WebFeature::kCSSSelectorWebkitInputPlaceholder},
{"-webkit-media-controls", WebFeature::kCSSSelectorWebkitMediaControls},
{"-webkit-media-controls-current-time-display",
WebFeature::kCSSSelectorWebkitMediaControlsCurrentTimeDisplay},
{"-webkit-media-controls-enclosure",
WebFeature::kCSSSelectorWebkitMediaControlsEnclosure},
{"-webkit-media-controls-fullscreen-button",
WebFeature::kCSSSelectorWebkitMediaControlsFullscreenButton},
{"-webkit-media-controls-mute-button",
WebFeature::kCSSSelectorWebkitMediaControlsMuteButton},
{"-webkit-media-controls-overlay-enclosure",
WebFeature::kCSSSelectorWebkitMediaControlsOverlayEnclosure},
{"-webkit-media-controls-overlay-play-button",
WebFeature::kCSSSelectorWebkitMediaControlsOverlayPlayButton},
{"-webkit-media-controls-panel",
WebFeature::kCSSSelectorWebkitMediaControlsPanel},
{"-webkit-media-controls-play-button",
WebFeature::kCSSSelectorWebkitMediaControlsPlayButton},
{"-webkit-media-controls-timeline",
WebFeature::kCSSSelectorWebkitMediaControlsTimeline},
// Note: This feature is no longer implemented in Blink.
{"-webkit-media-controls-timeline-container",
WebFeature::kCSSSelectorWebkitMediaControlsTimelineContainer},
{"-webkit-media-controls-time-remaining-display",
WebFeature::kCSSSelectorWebkitMediaControlsTimeRemainingDisplay},
{"-webkit-media-controls-toggle-closed-captions-button",
WebFeature::kCSSSelectorWebkitMediaControlsToggleClosedCaptionsButton},
{"-webkit-media-controls-volume-slider",
WebFeature::kCSSSelectorWebkitMediaControlsVolumeSlider},
{"-webkit-media-slider-container",
WebFeature::kCSSSelectorWebkitMediaSliderContainer},
{"-webkit-media-slider-thumb",
WebFeature::kCSSSelectorWebkitMediaSliderThumb},
{"-webkit-media-text-track-container",
WebFeature::kCSSSelectorWebkitMediaTextTrackContainer},
{"-webkit-media-text-track-display",
WebFeature::kCSSSelectorWebkitMediaTextTrackDisplay},
{"-webkit-media-text-track-region",
WebFeature::kCSSSelectorWebkitMediaTextTrackRegion},
{"-webkit-media-text-track-region-container",
WebFeature::kCSSSelectorWebkitMediaTextTrackRegionContainer},
{"-webkit-meter-bar", WebFeature::kCSSSelectorWebkitMeterBar},
{"-webkit-meter-even-less-good-value",
WebFeature::kCSSSelectorWebkitMeterEvenLessGoodValue},
{"-webkit-meter-inner-element",
WebFeature::kCSSSelectorWebkitMeterInnerElement},
{"-webkit-meter-optimum-value",
WebFeature::kCSSSelectorWebkitMeterOptimumValue},
{"-webkit-meter-suboptimum-value",
WebFeature::kCSSSelectorWebkitMeterSuboptimumValue},
{"-webkit-progress-bar", WebFeature::kCSSSelectorWebkitProgressBar},
{"-webkit-progress-inner-element",
WebFeature::kCSSSelectorWebkitProgressInnerElement},
{"-webkit-progress-value", WebFeature::kCSSSelectorWebkitProgressValue},
{"-webkit-search-cancel-button",
WebFeature::kCSSSelectorWebkitSearchCancelButton},
{"-webkit-slider-container",
WebFeature::kCSSSelectorWebkitSliderContainer},
{"-webkit-slider-runnable-track",
WebFeature::kCSSSelectorWebkitSliderRunnableTrack},
{"-webkit-slider-thumb", WebFeature::kCSSSelectorWebkitSliderThumb},
{"-webkit-textfield-decoration-container",
WebFeature::kCSSSelectorWebkitTextfieldDecorationContainer},
};
// TODO(fs): Could use binary search once there's a less finicky way to
// compare (order) String and StringView/non-String.
for (const auto& entry : feature_table) {
if (name == StringView(entry.key, entry.key_length))
return static_cast<WebFeature>(entry.feature);
}
return WebFeature::kCSSSelectorWebkitUnknownPseudo;
}
} // namespace
void CSSSelectorParser::RecordUsageAndDeprecations( void CSSSelectorParser::RecordUsageAndDeprecations(
const CSSSelectorList& selector_list) { const CSSSelectorList& selector_list) {
if (!context_->IsUseCounterRecordingEnabled()) if (!context_->IsUseCounterRecordingEnabled())
...@@ -992,156 +1124,8 @@ void CSSSelectorParser::RecordUsageAndDeprecations( ...@@ -992,156 +1124,8 @@ void CSSSelectorParser::RecordUsageAndDeprecations(
feature = WebFeature::kCSSSelectorInternalPseudoListBox; feature = WebFeature::kCSSSelectorInternalPseudoListBox;
break; break;
case CSSSelector::kPseudoWebKitCustomElement: case CSSSelector::kPseudoWebKitCustomElement:
if (context_->Mode() != kUASheetMode) { if (context_->Mode() != kUASheetMode)
if (current->Value() == "cue") { feature = FeatureForWebKitCustomPseudoElement(current->Value());
feature = WebFeature::kCSSSelectorCue;
} else if (current->Value() ==
"-internal-media-controls-overlay-cast-button") {
feature = WebFeature::
kCSSSelectorInternalMediaControlsOverlayCastButton;
} else if (current->Value() ==
"-webkit-calendar-picker-indicator") {
feature = WebFeature::kCSSSelectorWebkitCalendarPickerIndicator;
} else if (current->Value() == "-webkit-clear-button") {
feature = WebFeature::kCSSSelectorWebkitClearButton;
} else if (current->Value() == "-webkit-color-swatch") {
feature = WebFeature::kCSSSelectorWebkitColorSwatch;
} else if (current->Value() == "-webkit-color-swatch-wrapper") {
feature = WebFeature::kCSSSelectorWebkitColorSwatchWrapper;
} else if (current->Value() == "-webkit-date-and-time-value") {
feature = WebFeature::kCSSSelectorWebkitDateAndTimeValue;
} else if (current->Value() == "-webkit-datetime-edit") {
feature = WebFeature::kCSSSelectorWebkitDatetimeEdit;
} else if (current->Value() == "-webkit-datetime-edit-ampm-field") {
feature = WebFeature::kCSSSelectorWebkitDatetimeEditAmpmField;
} else if (current->Value() == "-webkit-datetime-edit-day-field") {
feature = WebFeature::kCSSSelectorWebkitDatetimeEditDayField;
} else if (current->Value() ==
"-webkit-datetime-edit-fields-wrapper") {
feature = WebFeature::kCSSSelectorWebkitDatetimeEditFieldsWrapper;
} else if (current->Value() == "-webkit-datetime-edit-hour-field") {
feature = WebFeature::kCSSSelectorWebkitDatetimeEditHourField;
} else if (current->Value() ==
"-webkit-datetime-edit-millisecond-field") {
feature =
WebFeature::kCSSSelectorWebkitDatetimeEditMillisecondField;
} else if (current->Value() ==
"-webkit-datetime-edit-minute-field") {
feature = WebFeature::kCSSSelectorWebkitDatetimeEditMinuteField;
} else if (current->Value() ==
"-webkit-datetime-edit-month-field") {
feature = WebFeature::kCSSSelectorWebkitDatetimeEditMonthField;
} else if (current->Value() ==
"-webkit-datetime-edit-second-field") {
feature = WebFeature::kCSSSelectorWebkitDatetimeEditSecondField;
} else if (current->Value() == "-webkit-datetime-edit-text") {
feature = WebFeature::kCSSSelectorWebkitDatetimeEditText;
} else if (current->Value() == "-webkit-datetime-edit-week-field") {
feature = WebFeature::kCSSSelectorWebkitDatetimeEditWeekField;
} else if (current->Value() == "-webkit-datetime-edit-year-field") {
feature = WebFeature::kCSSSelectorWebkitDatetimeEditYearField;
} else if (current->Value() == "-webkit-details-marker") {
feature = WebFeature::kCSSSelectorWebkitDetailsMarker;
} else if (current->Value() == "-webkit-file-upload-button") {
feature = WebFeature::kCSSSelectorWebkitFileUploadButton;
} else if (current->Value() == "-webkit-inner-spin-button") {
feature = WebFeature::kCSSSelectorWebkitInnerSpinButton;
} else if (current->Value() == "-webkit-input-placeholder") {
feature = WebFeature::kCSSSelectorWebkitInputPlaceholder;
} else if (current->Value() == "-webkit-media-controls") {
feature = WebFeature::kCSSSelectorWebkitMediaControls;
} else if (current->Value() ==
"-webkit-media-controls-current-time-display") {
feature =
WebFeature::kCSSSelectorWebkitMediaControlsCurrentTimeDisplay;
} else if (current->Value() == "-webkit-media-controls-enclosure") {
feature = WebFeature::kCSSSelectorWebkitMediaControlsEnclosure;
} else if (current->Value() ==
"-webkit-media-controls-fullscreen-button") {
feature =
WebFeature::kCSSSelectorWebkitMediaControlsFullscreenButton;
} else if (current->Value() ==
"-webkit-media-controls-mute-button") {
feature = WebFeature::kCSSSelectorWebkitMediaControlsMuteButton;
} else if (current->Value() ==
"-webkit-media-controls-overlay-enclosure") {
feature =
WebFeature::kCSSSelectorWebkitMediaControlsOverlayEnclosure;
} else if (current->Value() ==
"-webkit-media-controls-overlay-play-button") {
feature =
WebFeature::kCSSSelectorWebkitMediaControlsOverlayPlayButton;
} else if (current->Value() == "-webkit-media-controls-panel") {
feature = WebFeature::kCSSSelectorWebkitMediaControlsPanel;
} else if (current->Value() ==
"-webkit-media-controls-play-button") {
feature = WebFeature::kCSSSelectorWebkitMediaControlsPlayButton;
} else if (current->Value() == "-webkit-media-controls-timeline") {
feature = WebFeature::kCSSSelectorWebkitMediaControlsTimeline;
} else if (current->Value() ==
"-webkit-media-controls-timeline-container") {
// Note: This feature is no longer implemented in Blink.
feature =
WebFeature::kCSSSelectorWebkitMediaControlsTimelineContainer;
} else if (current->Value() ==
"-webkit-media-controls-time-remaining-display") {
feature = WebFeature::
kCSSSelectorWebkitMediaControlsTimeRemainingDisplay;
} else if (current->Value() ==
"-webkit-media-controls-toggle-closed-captions-button") {
feature = WebFeature::
kCSSSelectorWebkitMediaControlsToggleClosedCaptionsButton;
} else if (current->Value() ==
"-webkit-media-controls-volume-slider") {
feature = WebFeature::kCSSSelectorWebkitMediaControlsVolumeSlider;
} else if (current->Value() == "-webkit-media-slider-container") {
feature = WebFeature::kCSSSelectorWebkitMediaSliderContainer;
} else if (current->Value() == "-webkit-media-slider-thumb") {
feature = WebFeature::kCSSSelectorWebkitMediaSliderThumb;
} else if (current->Value() ==
"-webkit-media-text-track-container") {
feature = WebFeature::kCSSSelectorWebkitMediaTextTrackContainer;
} else if (current->Value() == "-webkit-media-text-track-display") {
feature = WebFeature::kCSSSelectorWebkitMediaTextTrackDisplay;
} else if (current->Value() == "-webkit-media-text-track-region") {
feature = WebFeature::kCSSSelectorWebkitMediaTextTrackRegion;
} else if (current->Value() ==
"-webkit-media-text-track-region-container") {
feature =
WebFeature::kCSSSelectorWebkitMediaTextTrackRegionContainer;
} else if (current->Value() == "-webkit-meter-bar") {
feature = WebFeature::kCSSSelectorWebkitMeterBar;
} else if (current->Value() ==
"-webkit-meter-even-less-good-value") {
feature = WebFeature::kCSSSelectorWebkitMeterEvenLessGoodValue;
} else if (current->Value() == "-webkit-meter-inner-element") {
feature = WebFeature::kCSSSelectorWebkitMeterInnerElement;
} else if (current->Value() == "-webkit-meter-optimum-value") {
feature = WebFeature::kCSSSelectorWebkitMeterOptimumValue;
} else if (current->Value() == "-webkit-meter-suboptimum-value") {
feature = WebFeature::kCSSSelectorWebkitMeterSuboptimumValue;
} else if (current->Value() == "-webkit-progress-bar") {
feature = WebFeature::kCSSSelectorWebkitProgressBar;
} else if (current->Value() == "-webkit-progress-inner-element") {
feature = WebFeature::kCSSSelectorWebkitProgressInnerElement;
} else if (current->Value() == "-webkit-progress-value") {
feature = WebFeature::kCSSSelectorWebkitProgressValue;
} else if (current->Value() == "-webkit-search-cancel-button") {
feature = WebFeature::kCSSSelectorWebkitSearchCancelButton;
} else if (current->Value() == "-webkit-slider-container") {
feature = WebFeature::kCSSSelectorWebkitSliderContainer;
} else if (current->Value() == "-webkit-slider-runnable-track") {
feature = WebFeature::kCSSSelectorWebkitSliderRunnableTrack;
} else if (current->Value() == "-webkit-slider-thumb") {
feature = WebFeature::kCSSSelectorWebkitSliderThumb;
} else if (current->Value() ==
"-webkit-textfield-decoration-container") {
feature =
WebFeature::kCSSSelectorWebkitTextfieldDecorationContainer;
} else {
feature = WebFeature::kCSSSelectorWebkitUnknownPseudo;
}
}
break; break;
case CSSSelector::kPseudoSpatialNavigationFocus: case CSSSelector::kPseudoSpatialNavigationFocus:
if (context_->Mode() != kUASheetMode) { if (context_->Mode() != kUASheetMode) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment