Commit 1baaf879 authored by Chris Nardi's avatar Chris Nardi Committed by Commit Bot

Update css_parser_proto_fuzzer

Due to modifications to the string lists in css_proto_converter.cc,
the proto definition no longer matched up with the proto converter.
Update both lists to match, including some additional properties/values
not previously included. Also remove the restriction on building the
fuzzer for Windows, as it appears to build now.

Bug: 990327
Change-Id: I0c2b22a0db2aae3c53bb95eb5f539b151be3dddf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1742727Reviewed-by: default avatarJonathan Metzman <metzman@chromium.org>
Reviewed-by: default avatarRune Lillesveen <futhark@chromium.org>
Commit-Queue: Chris Nardi <cnardi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688564}
parent 5a26bb98
......@@ -1714,30 +1714,25 @@ fuzzer_test("content_security_policy_fuzzer") {
seed_corpus = "//testing/libfuzzer/fuzzers/content_security_policy_corpus"
}
# Since libFuzzer isn't working on Windows, and the proto_library cannot build
# on Windows because of a build error, prevent it from being built on Windows.
# TODO(metzman): Figure out how to get this building on Windows.
if (!is_win) {
fuzzer_test("css_parser_proto_fuzzer") {
sources = [
"css/parser/css_parser_proto_fuzzer.cc",
"css/parser/css_proto_converter.cc",
"css/parser/css_proto_converter.h",
]
deps = [
":core",
":css_proto",
"//third_party/blink/renderer/platform:blink_fuzzer_test_support",
"//third_party/libprotobuf-mutator",
]
dict = "//third_party/blink/renderer/core/css/css.dict"
}
fuzzer_test("css_parser_proto_fuzzer") {
sources = [
"css/parser/css_parser_proto_fuzzer.cc",
"css/parser/css_proto_converter.cc",
"css/parser/css_proto_converter.h",
]
deps = [
":core",
":css_proto",
"//third_party/blink/renderer/platform:blink_fuzzer_test_support",
"//third_party/libprotobuf-mutator",
]
dict = "//third_party/blink/renderer/core/css/css.dict"
}
proto_library("css_proto") {
sources = [
"css/parser/css.proto",
]
}
proto_library("css_proto") {
sources = [
"css/parser/css.proto",
]
}
# Fuzzers for blink::FeaturePolicy.
......
......@@ -897,50 +897,50 @@ message Property {
_WEBKIT_COLUMN_RULE = 10;
_WEBKIT_ORDER = 11;
GRID_ROW_GAP = 12;
BACKDROP_FILTER = 13;
FONT_VARIANT_EAST_ASIAN = 14;
BUFFERED_RENDERING = 15;
_WEBKIT_APPEARANCE = 16;
OUTLINE_WIDTH = 17;
ALIGNMENT_BASELINE = 18;
_WEBKIT_FLEX_FLOW = 19;
COLUMN_RULE = 20;
GRID_COLUMN_GAP = 21;
_WEBKIT_BORDER_AFTER = 22;
_WEBKIT_COLUMN_BREAK_INSIDE = 23;
_WEBKIT_SHAPE_OUTSIDE = 24;
_WEBKIT_PRINT_COLOR_ADJUST = 25;
LIST_STYLE_TYPE = 26;
PAGE_BREAK_BEFORE = 27;
FLOOD_COLOR = 28;
TEXT_ANCHOR = 29;
_WEBKIT_PADDING_START = 30;
_WEBKIT_USER_SELECT = 31;
_WEBKIT_COLUMN_RULE_COLOR = 32;
PADDING_LEFT = 33;
_WEBKIT_BACKFACE_VISIBILITY = 34;
_WEBKIT_MARGIN_BEFORE = 35;
BREAK_INSIDE = 36;
COLUMN_COUNT = 37;
_WEBKIT_LOGICAL_HEIGHT = 38;
PERSPECTIVE = 39;
MAX_BLOCK_SIZE = 40;
_WEBKIT_ANIMATION_PLAY_STATE = 41;
BORDER_IMAGE_REPEAT = 42;
_WEBKIT_FONT_SIZE_DELTA = 43;
SCROLL_PADDING_BOTTOM = 44;
BORDER_RIGHT_STYLE = 45;
BORDER_LEFT_STYLE = 46;
SCROLL_MARGIN_BLOCK = 47;
FLEX_FLOW = 48;
OUTLINE_COLOR = 49;
FLEX_GROW = 50;
MAX_WIDTH = 51;
GRID_COLUMN = 52;
IMAGE_ORIENTATION = 53;
ANIMATION_DURATION = 54;
_WEBKIT_COLUMNS = 55;
_WEBKIT_BOX_FLEX_GROUP = 56;
ROW_GAP = 13;
BACKDROP_FILTER = 14;
FONT_VARIANT_EAST_ASIAN = 15;
BUFFERED_RENDERING = 16;
_WEBKIT_APPEARANCE = 17;
OUTLINE_WIDTH = 18;
ALIGNMENT_BASELINE = 19;
_WEBKIT_FLEX_FLOW = 20;
COLUMN_RULE = 21;
GRID_COLUMN_GAP = 22;
_WEBKIT_BORDER_AFTER = 23;
_WEBKIT_COLUMN_BREAK_INSIDE = 24;
_WEBKIT_SHAPE_OUTSIDE = 25;
_WEBKIT_PRINT_COLOR_ADJUST = 26;
LIST_STYLE_TYPE = 27;
PAGE_BREAK_BEFORE = 28;
FLOOD_COLOR = 29;
TEXT_ANCHOR = 30;
_WEBKIT_PADDING_START = 31;
_WEBKIT_USER_SELECT = 32;
_WEBKIT_COLUMN_RULE_COLOR = 33;
PADDING_LEFT = 34;
_WEBKIT_BACKFACE_VISIBILITY = 35;
_WEBKIT_MARGIN_BEFORE = 36;
BREAK_INSIDE = 37;
COLUMN_COUNT = 38;
_WEBKIT_LOGICAL_HEIGHT = 39;
PERSPECTIVE = 40;
MAX_BLOCK_SIZE = 41;
_WEBKIT_ANIMATION_PLAY_STATE = 42;
BORDER_IMAGE_REPEAT = 43;
_WEBKIT_FONT_SIZE_DELTA = 44;
SCROLL_PADDING_BOTTOM = 45;
BORDER_RIGHT_STYLE = 46;
BORDER_LEFT_STYLE = 47;
SCROLL_MARGIN_BLOCK = 48;
FLEX_FLOW = 49;
OUTLINE_COLOR = 50;
FLEX_GROW = 51;
MAX_WIDTH = 52;
GRID_COLUMN = 53;
IMAGE_ORIENTATION = 54;
ANIMATION_DURATION = 55;
_WEBKIT_COLUMNS = 56;
_WEBKIT_ANIMATION_DELAY = 57;
_EPUB_TEXT_EMPHASIS = 58;
FLEX_SHRINK = 59;
......@@ -988,8 +988,8 @@ message Property {
FLEX_BASIS = 101;
BORDER_IMAGE_SLICE = 102;
_WEBKIT_TRANSFORM_ORIGIN = 103;
OVERSCROLL_BEHAVIOR_X = 104;
OVERSCROLL_BEHAVIOR_Y = 105;
SCROLL_BOUNDARY_BEHAVIOR_X = 104;
SCROLL_BOUNDARY_BEHAVIOR_Y = 105;
VECTOR_EFFECT = 106;
_WEBKIT_ANIMATION_TIMING_FUNCTION = 107;
_WEBKIT_BORDER_AFTER_STYLE = 108;
......@@ -1054,7 +1054,7 @@ message Property {
CLIP_RULE = 167;
FONT_FAMILY = 168;
SCROLL_SNAP_TYPE = 169;
TEXT_DECORATION_SKIP = 170;
TEXT_DECORATION_SKIP_INK = 170;
TRANSITION = 171;
FILTER = 172;
BORDER_RIGHT_WIDTH = 173;
......@@ -1330,50 +1330,51 @@ message Property {
_WEBKIT_BOX_DIRECTION = 443;
IMAGE_RENDERING = 444;
SRC = 445;
GRID_GAP = 446;
POINTER_EVENTS = 447;
BORDER_IMAGE_WIDTH = 448;
MIN_BLOCK_SIZE = 449;
TRANSITION_PROPERTY = 450;
_WEBKIT_MASK_IMAGE = 451;
FLOAT = 452;
MAX_HEIGHT = 453;
OUTLINE_OFFSET = 454;
_WEBKIT_BOX_SHADOW = 455;
OVERFLOW_WRAP = 456;
BLOCK_SIZE = 457;
TRANSFORM = 458;
PLACE_SELF = 459;
WIDTH = 460;
STROKE_MITERLIMIT = 461;
STOP_OPACITY = 462;
BORDER_TOP_COLOR = 463;
TRANSLATE = 464;
OBJECT_FIT = 465;
_WEBKIT_MASK_BOX_IMAGE_WIDTH = 466;
_WEBKIT_BACKGROUND_ORIGIN = 467;
_WEBKIT_ALIGN_ITEMS = 468;
TRANSITION_DELAY = 469;
SCROLL_MARGIN_LEFT = 470;
BORDER_STYLE = 471;
ANIMATION_ITERATION_COUNT = 472;
_WEBKIT_MARGIN_AFTER_COLLAPSE = 473;
// Should be named OVERFLOW but can't because a macro uses this.
_OVERFLOW = 474;
USER_ZOOM = 475;
_WEBKIT_BORDER_TOP_RIGHT_RADIUS = 476;
GRID_TEMPLATE_COLUMNS = 477;
_WEBKIT_ALIGN_SELF = 478;
_WEBKIT_PERSPECTIVE_ORIGIN = 479;
COLUMN_RULE_STYLE = 480;
DISPLAY = 481;
_WEBKIT_COLUMN_RULE_WIDTH = 482;
_WEBKIT_BOX_LINES = 483;
GAP = 446;
GRID_GAP = 447;
POINTER_EVENTS = 448;
BORDER_IMAGE_WIDTH = 449;
MIN_BLOCK_SIZE = 450;
TRANSITION_PROPERTY = 451;
_WEBKIT_MASK_IMAGE = 452;
FLOAT = 453;
MAX_HEIGHT = 454;
OUTLINE_OFFSET = 455;
_WEBKIT_BOX_SHADOW = 456;
OVERFLOW_WRAP = 457;
BLOCK_SIZE = 458;
TRANSFORM = 459;
PLACE_SELF = 460;
WIDTH = 461;
STROKE_MITERLIMIT = 462;
STOP_OPACITY = 463;
BORDER_TOP_COLOR = 464;
TRANSLATE = 465;
OBJECT_FIT = 466;
_WEBKIT_MASK_BOX_IMAGE_WIDTH = 467;
_WEBKIT_BACKGROUND_ORIGIN = 468;
_WEBKIT_ALIGN_ITEMS = 469;
TRANSITION_DELAY = 470;
SCROLL_MARGIN_LEFT = 471;
BORDER_STYLE = 472;
ANIMATION_ITERATION_COUNT = 473;
_WEBKIT_MARGIN_AFTER_COLLAPSE = 474;
// Should be named OVERFLOW but can't because a macro uses this. Needs two
// underscores for Windows.
__OVERFLOW = 475;
USER_ZOOM = 476;
_WEBKIT_BORDER_TOP_RIGHT_RADIUS = 477;
GRID_TEMPLATE_COLUMNS = 478;
_WEBKIT_ALIGN_SELF = 479;
_WEBKIT_PERSPECTIVE_ORIGIN = 480;
COLUMN_RULE_STYLE = 481;
DISPLAY = 482;
_WEBKIT_COLUMN_RULE_WIDTH = 483;
BORDER_COLOR = 484;
_WEBKIT_FLEX_BASIS = 485;
STROKE_DASHOFFSET = 486;
_WEBKIT_TEXT_SIZE_ADJUST = 487;
OVERSCROLL_BEHAVIOR = 488;
SCROLL_BOUNDARY_BEHAVIOR = 488;
_WEBKIT_TEXT_STROKE = 489;
WIDOWS = 490;
FILL = 491;
......@@ -1395,7 +1396,57 @@ message Property {
STOP_COLOR = 507;
STROKE_DASHARRAY = 508;
_WEBKIT_LINE_CLAMP = 509;
INVALID_PROPERTY = 510;
MARGIN_BLOCK_START = 510;
MARGIN_BLOCK_END = 511;
MARGIN_INLINE_START = 512;
MARGIN_INLINE_END = 513;
PADDING_BLOCK_START = 514;
PADDING_BLOCK_END = 515;
PADDING_INLINE_START = 516;
PADDING_INLINE_END = 517;
BORDER_BLOCK_START_WIDTH = 518;
BORDER_BLOCK_START_STYLE = 519;
BORDER_BLOCK_START_COLOR = 520;
BORDER_BLOCK_END_WIDTH = 521;
BORDER_BLOCK_END_STYLE = 522;
BORDER_BLOCK_END_COLOR = 523;
BORDER_INLINE_START_WIDTH = 524;
BORDER_INLINE_START_STYLE = 525;
BORDER_INLINE_START_COLOR = 526;
BORDER_INLINE_END_WIDTH = 527;
BORDER_INLINE_END_STYLE = 528;
BORDER_INLINE_END_COLOR = 529;
BORDER_BLOCK_START = 530;
BORDER_BLOCK_END = 531;
BORDER_INLINE_START = 532;
BORDER_INLINE_END = 533;
MARGIN_BLOCK = 534;
MARGIN_INLINE = 535;
PADDING_BLOCK = 536;
PADDING_INLINE = 537;
BORDER_BLOCK_WIDTH = 538;
BORDER_BLOCK_STYLE = 539;
BORDER_BLOCK_COLOR = 540;
BORDER_INLINE_WIDTH = 541;
BORDER_INLINE_STYLE = 542;
BORDER_INLINE_COLOR = 543;
BORDER_BLOCK = 544;
BORDER_INLINE = 545;
INSET_BLOCK_START = 546;
INSET_BLOCK_END = 547;
INSET_BLOCK = 548;
INSET_INLINE_START = 549;
INSET_INLINE_END = 550;
INSET_INLINE = 551;
INSET = 552;
OVERFLOW_BLOCK = 553;
OVERFLOW_INLINE = 554;
FORCED_COLOR_ADJUST = 555;
OVERSCROLL_BEHAVIOR_INLINE = 556;
OVERSCROLL_BEHAVIOR_BLOCK = 557;
OVERSCROLL_BEHAVIOR_X = 558;
OVERSCROLL_BEHAVIOR_Y = 559;
INVALID_PROPERTY = 560;
}
required NameId name_id = 1;
}
......@@ -1455,95 +1506,96 @@ message Selector {
enum PseudoValueId {
_INTERNAL_AUTOFILL_PREVIEWED = 1;
_INTERNAL_AUTOFILL_SELECTED = 2;
_INTERNAL_LIST_BOX = 3;
_INTERNAL_MEDIA_CONTROLS_OVERLAY_CAST_BUTTON = 4;
_INTERNAL_SHADOW_HOST_HAS_APPEARANCE = 5;
_INTERNAL_SPATIAL_NAVIGATION_FOCUS = 6;
_INTERNAL_VIDEO_PERSISTENT = 7;
_INTERNAL_VIDEO_PERSISTENT_ANCESTOR = 8;
_WEBKIT_ANY_LINK = 9;
_WEBKIT_AUTOFILL = 10;
_WEBKIT_DRAG = 11;
_WEBKIT_FULL_PAGE_MEDIA = 12;
_WEBKIT_FULL_SCREEN = 13;
_WEBKIT_FULL_SCREEN_ANCESTOR = 14;
_WEBKIT_RESIZER = 15;
_WEBKIT_SCROLLBAR = 16;
_WEBKIT_SCROLLBAR_BUTTON = 17;
_WEBKIT_SCROLLBAR_CORNER = 18;
_WEBKIT_SCROLLBAR_THUMB = 19;
_WEBKIT_SCROLLBAR_TRACK = 20;
_WEBKIT_SCROLLBAR_TRACK_PIECE = 21;
ACTIVE = 22;
AFTER = 23;
BACKDROP = 24;
BEFORE = 25;
CHECKED = 26;
CONTENT = 27;
CORNER_PRESENT = 28;
CUE = 29;
DECREMENT = 30;
DEFAULT = 31;
DEFINED = 32;
DISABLED = 33;
DOUBLE_BUTTON = 34;
EMPTY = 35;
ENABLED = 36;
END = 37;
FIRST = 38;
FIRST_CHILD = 39;
FIRST_LETTER = 40;
FIRST_LINE = 41;
FIRST_OF_TYPE = 42;
FOCUS = 43;
FOCUS_WITHIN = 44;
FULLSCREEN = 45;
FUTURE = 46;
HORIZONTAL = 47;
HOST = 48;
HOVER = 49;
IN_RANGE = 50;
INCREMENT = 51;
INDETERMINATE = 52;
INVALID = 53;
LAST_CHILD = 54;
LAST_OF_TYPE = 55;
LEFT = 56;
LINK = 57;
NO_BUTTON = 58;
ONLY_CHILD = 59;
ONLY_OF_TYPE = 60;
OPTIONAL = 61;
OUT_OF_RANGE = 62;
PAST = 63;
PLACEHOLDER = 64;
PLACEHOLDER_SHOWN = 65;
READ_ONLY = 66;
READ_WRITE = 67;
REQUIRED = 68;
RIGHT = 69;
ROOT = 70;
SCOPE = 71;
SELECTION = 72;
SHADOW = 73;
SINGLE_BUTTON = 74;
START = 75;
TARGET = 76;
UNRESOLVED = 77;
VALID = 78;
VERTICAL = 79;
VISITED = 80;
WINDOW_INACTIVE = 81;
_WEBKIT_ANY = 82;
HOST_CONTEXT = 85;
LANG = 86;
NOT = 87;
NTH_CHILD = 88;
NTH_LAST_CHILD = 89;
NTH_LAST_OF_TYPE = 90;
NTH_OF_TYPE = 91;
SLOTTED = 92;
INVALID_PSEUDO_VALUE = 93;
_INTERNAL_IS_HTML = 3;
_INTERNAL_LIST_BOX = 4;
_INTERNAL_MEDIA_CONTROLS_OVERLAY_CAST_BUTTON = 5;
_INTERNAL_SHADOW_HOST_HAS_APPEARANCE = 6;
_INTERNAL_SPATIAL_NAVIGATION_FOCUS = 7;
_INTERNAL_VIDEO_PERSISTENT = 8;
_INTERNAL_VIDEO_PERSISTENT_ANCESTOR = 9;
_WEBKIT_ANY_LINK = 10;
_WEBKIT_AUTOFILL = 11;
_WEBKIT_DRAG = 12;
_WEBKIT_FULL_PAGE_MEDIA = 13;
_WEBKIT_FULL_SCREEN = 14;
_WEBKIT_FULL_SCREEN_ANCESTOR = 15;
_WEBKIT_RESIZER = 16;
_WEBKIT_SCROLLBAR = 17;
_WEBKIT_SCROLLBAR_BUTTON = 18;
_WEBKIT_SCROLLBAR_CORNER = 19;
_WEBKIT_SCROLLBAR_THUMB = 20;
_WEBKIT_SCROLLBAR_TRACK = 21;
_WEBKIT_SCROLLBAR_TRACK_PIECE = 22;
ACTIVE = 23;
AFTER = 24;
BACKDROP = 25;
BEFORE = 26;
CHECKED = 27;
CONTENT = 28;
CORNER_PRESENT = 29;
CUE = 30;
DECREMENT = 31;
DEFAULT = 32;
DEFINED = 33;
DISABLED = 34;
DOUBLE_BUTTON = 35;
EMPTY = 36;
ENABLED = 37;
END = 38;
FIRST = 39;
FIRST_CHILD = 40;
FIRST_LETTER = 41;
FIRST_LINE = 42;
FIRST_OF_TYPE = 43;
FOCUS = 44;
FOCUS_WITHIN = 45;
FULLSCREEN = 46;
FUTURE = 47;
HORIZONTAL = 48;
HOST = 49;
HOVER = 50;
IN_RANGE = 51;
INCREMENT = 52;
INDETERMINATE = 53;
INVALID = 54;
LAST_CHILD = 55;
LAST_OF_TYPE = 56;
LEFT = 57;
LINK = 58;
NO_BUTTON = 59;
ONLY_CHILD = 60;
ONLY_OF_TYPE = 61;
OPTIONAL = 62;
OUT_OF_RANGE = 63;
PAST = 64;
PLACEHOLDER = 65;
PLACEHOLDER_SHOWN = 66;
READ_ONLY = 67;
READ_WRITE = 68;
REQUIRED = 69;
RIGHT = 70;
ROOT = 71;
SCOPE = 72;
SELECTION = 73;
SHADOW = 74;
SINGLE_BUTTON = 75;
START = 76;
TARGET = 77;
UNRESOLVED = 78;
VALID = 79;
VERTICAL = 80;
VISITED = 81;
WINDOW_INACTIVE = 82;
_WEBKIT_ANY = 83;
HOST_CONTEXT = 84;
LANG = 85;
NOT = 86;
NTH_CHILD = 87;
NTH_LAST_CHILD = 88;
NTH_LAST_OF_TYPE = 89;
NTH_OF_TYPE = 90;
SLOTTED = 91;
INVALID_PSEUDO_VALUE = 92;
}
optional PseudoValueId pseudo_value_id = 4;
required Combinator combinator = 5;
......@@ -2296,9 +2348,41 @@ message PropertyAndValue {
INSET = 723;
MEDIUMAQUAMARINE = 724;
SCROLL = 725;
LINKTEXT = 726;
VISITEDTEXT = 727;
INVALID_VALUE = 728;
LAYOUT = 726;
BREAK_SPACES = 727;
PAN_LEFT = 728;
PROXIMITY = 729;
INLINE_START = 730;
PAN_X = 731;
GRAB = 732;
GRABBING = 733;
INLINE_END = 734;
PAN_RIGHT = 735;
JUMP_END = 736;
MANIPULATION = 737;
PINCH_ZOOM = 738;
XXX_LARGE = 739;
PAN_DOWN = 740;
ANYWHERE = 741;
JUMP_NONE = 742;
DRAG = 743;
AVOID_PAGE = 744;
MANDATORY = 745;
PAINT = 746;
JUMP_BOTH = 747;
SIZE = 748;
STYLE = 749;
PAN_Y = 750;
RECTO = 751;
MARKERS = 752;
VERSO = 753;
PAGE = 754;
PAN_UP = 755;
AVOID_COLUMN = 756;
SMOOTH = 757;
JUMP_START = 758;
NO_DRAG = 759;
INVALID_VALUE = 760;
};
optional ValueId value_id = 4;
......
......@@ -111,8 +111,6 @@ const std::string Converter::kPseudoLookupTable[] = {
"visited",
"window-inactive",
"-webkit-any",
"cue",
"host",
"host-context",
"lang",
"not",
......@@ -922,6 +920,40 @@ const std::string Converter::kValueLookupTable[] = {
"inset",
"mediumaquamarine",
"scroll",
"layout",
"break-spaces",
"pan-left",
"proximity",
"inline-start",
"pan-x",
"grab",
"grabbing",
"inline-end",
"pan-right",
"jump-end",
"manipulation",
"pinch-zoom",
"xxx-large",
"pan-down",
"anywhere",
"jump-none",
"drag",
"avoid-page",
"mandatory",
"paint",
"jump-both",
"size",
"style",
"pan-y",
"recto",
"markers",
"verso",
"page",
"pan-up",
"avoid-column",
"smooth",
"jump-start",
"no-drag",
"INVALID_VALUE",
};
......@@ -1482,6 +1514,10 @@ const std::string Converter::kPropertyLookupTable[] = {
"overflow-block",
"overflow-inline",
"forced-color-adjust",
"overscroll-behavior-inline",
"overscroll-behavior-block",
"overscroll-behavior-x",
"overscroll-behavior-y",
"INVALID_PROPERTY",
};
......
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