Skip to content

GitLab

T
tangled
Commit 010c0cc3 authored by Stephen McGruer's avatar Stephen McGruer Committed by Commit Bot
Browse files
Options

Fix DCHECK when setting transform-box style to 'border-box'. 

This is an invalid value for the property, but had been incorrectly left
in the CSS parser fast-path code as allowed.

Bug: 816534
Change-Id: Ic787508d21b3f385a37e5c4d50989c69d8dd48ac
Reviewed-on: https://chromium-review.googlesource.com/1024775
Commit-Queue: Stephen McGruer <smcgruer@chromium.org>
Reviewed-by: default avatarRune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553224}
parent bef17741
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 11 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ 010c0cc3
......@@ -2112,8 +2112,6 @@ crbug.com/453002 [ Win ] fast/text/orientation-sideways.html [ Failure Pass ]
crbug.com/600248 external/wpt/web-animations/interfaces/Animation/oncancel.html [ Pass Failure ]
crbug.com/771977 external/wpt/web-animations/interfaces/Animation/onfinish.html [ Failure ]
crbug.com/772048 crbug.com/772060 external/wpt/web-animations/timing-model/animations/updating-the-finished-state.html [ Timeout ]
crbug.com/816534 [ Linux Mac10.12 Win ] external/wpt/web-animations/animation-model/animation-types/interpolation-per-property.html [ Crash Pass ]
crbug.com/816534 [ Linux Mac10.12 Win ] external/wpt/web-animations/animation-model/animation-types/addition-per-property.html [ Crash Pass ]
crbug.com/771722 external/wpt/web-animations/timing-model/animations/the-current-time-of-an-animation.html [ Failure ]
crbug.com/771722 crbug.com/771751 crbug.com/772060 external/wpt/web-animations/timing-model/animations/setting-the-start-time-of-an-animation.html [ Failure ]
......@@ -2687,7 +2685,6 @@ crbug.com/626703 external/wpt/wasm/wasm_indexeddb_test.https.html [ Failure ]
crbug.com/626703 external/wpt/wasm/wasm_local_iframe_test.html [ Failure ]
crbug.com/626703 external/wpt/wasm/wasm_serialization_tests.html [ Failure ]
crbug.com/626703 external/wpt/wasm/wasm_service_worker_test.https.html [ Failure ]
crbug.com/816534 external/wpt/web-animations/animation-model/animation-types/accumulation-per-property.html [ Pass Crash ]
crbug.com/626703 external/wpt/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html [ Timeout ]
crbug.com/626703 external/wpt/webrtc/RTCPeerConnection-setLocalDescription-rollback.html [ Timeout ]
crbug.com/626703 virtual/webrtc-wpt-unified-plan/external/wpt/webrtc/RTCPeerConnection-setLocalDescription-rollback.html [ Timeout ]
......@@ -4114,8 +4111,6 @@ crbug.com/833331 [ Win10 ] inspector-protocol/page/pageNavigateToFragment.js [ P
crbug.com/831796 virtual/mouseevent_fractional/fast/events/autoscroll-in-textfield.html [ Failure Pass ]
# Sheriff 2018-04-24
crbug.com/836185 [ Mac10.11 Debug ] external/wpt/web-animations/animation-model/animation-types/addition-per-property.html [ Crash ]
crbug.com/836185 [ Mac10.11 Debug ] external/wpt/web-animations/animation-model/animation-types/interpolation-per-property.html [ Crash ]
crbug.com/836241 [ Linux ] virtual/android/fullscreen/video-controls-timeline.html [ Pass Failure ]
crbug.com/836242 [ Linux Mac Win ] fast/loader/reload-zero-byte-plugin.html [ Pass Failure ]
crbug.com/836275 [ Linux Mac ] fast/spatial-navigation/snav-two-elements-one-line.html [ Pass Failure ]
......
third_party/WebKit/LayoutTests/external/wpt/web-animations/animation-model/animation-types/accumulation-per-property-expected.txt
View file @ 010c0cc3
......@@ -532,7 +532,7 @@ PASS transform: non-invertible matrices in matched transform lists (invertible o
PASS transform: non-invertible matrices in mismatched transform lists (non-invertible onto invertible)
PASS transform: non-invertible matrices in mismatched transform lists (invertible onto non-invertible)
PASS transform-box (type: discrete) has testAccumulation function
FAIL transform-box: "border-box" onto "fill-box" assert_equals: The value should be border-box at 0ms expected "border-box" but got "view-box"
FAIL transform-box: "border-box" onto "fill-box" assert_equals: The value should be border-box at 0ms expected "border-box" but got "fill-box"
PASS transform-box: "fill-box" onto "border-box"
PASS transform-style (type: discrete) has testAccumulation function
PASS transform-style: "preserve-3d" onto "flat"
......
third_party/WebKit/LayoutTests/external/wpt/web-animations/animation-model/animation-types/addition-per-property-expected.txt
View file @ 010c0cc3
......@@ -528,7 +528,7 @@ PASS transform: non-invertible matrices
PASS transform: non-invertible matrices in matched transform lists
PASS transform: non-invertible matrices in mismatched transform lists
PASS transform-box (type: discrete) has testAddition function
FAIL transform-box: "border-box" onto "fill-box" assert_equals: The value should be border-box at 0ms expected "border-box" but got "view-box"
FAIL transform-box: "border-box" onto "fill-box" assert_equals: The value should be border-box at 0ms expected "border-box" but got "fill-box"
PASS transform-box: "fill-box" onto "border-box"
PASS transform-style (type: discrete) has testAddition function
PASS transform-style: "preserve-3d" onto "flat"
......
third_party/WebKit/LayoutTests/platform/mac/external/wpt/web-animations/animation-model/animation-types/accumulation-per-property-expected.txt
View file @ 010c0cc3
......@@ -532,7 +532,7 @@ PASS transform: non-invertible matrices in matched transform lists (invertible o
PASS transform: non-invertible matrices in mismatched transform lists (non-invertible onto invertible)
PASS transform: non-invertible matrices in mismatched transform lists (invertible onto non-invertible)
PASS transform-box (type: discrete) has testAccumulation function
FAIL transform-box: "border-box" onto "fill-box" assert_equals: The value should be border-box at 0ms expected "border-box" but got "view-box"
FAIL transform-box: "border-box" onto "fill-box" assert_equals: The value should be border-box at 0ms expected "border-box" but got "fill-box"
PASS transform-box: "fill-box" onto "border-box"
PASS transform-style (type: discrete) has testAccumulation function
PASS transform-style: "preserve-3d" onto "flat"
......
third_party/WebKit/LayoutTests/platform/mac/external/wpt/web-animations/animation-model/animation-types/addition-per-property-expected.txt
View file @ 010c0cc3
......@@ -528,7 +528,7 @@ PASS transform: non-invertible matrices
PASS transform: non-invertible matrices in matched transform lists
PASS transform: non-invertible matrices in mismatched transform lists
PASS transform-box (type: discrete) has testAddition function
FAIL transform-box: "border-box" onto "fill-box" assert_equals: The value should be border-box at 0ms expected "border-box" but got "view-box"
FAIL transform-box: "border-box" onto "fill-box" assert_equals: The value should be border-box at 0ms expected "border-box" but got "fill-box"
PASS transform-box: "fill-box" onto "border-box"
PASS transform-style (type: discrete) has testAddition function
PASS transform-style: "preserve-3d" onto "flat"
......
third_party/blink/renderer/core/css/parser/css_parser_fast_paths.cc
View file @ 010c0cc3
......@@ -854,8 +854,7 @@ bool CSSParserFastPaths::IsValidKeywordPropertyAndValue(
return value_id == CSSValueDisc || value_id == CSSValueCircle ||
value_id == CSSValueSquare || value_id == CSSValueNone;
case CSSPropertyTransformBox:
return value_id == CSSValueBorderBox || value_id == CSSValueFillBox ||
value_id == CSSValueViewBox;
return value_id == CSSValueFillBox || value_id == CSSValueViewBox;
case CSSPropertyTransformStyle:
return value_id == CSSValueFlat || value_id == CSSValuePreserve3d;
case CSSPropertyWebkitUserDrag:
......
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