Bug 158021

Created attachment 279644 [details] Patch

Comment on attachment 279644 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=279644&action=review > Source/WebCore/css/CSSParser.cpp:5823 > + const CSSPrimitiveValue& primitiveValue = value.isPrimitiveValue() I think we could use here auto& as it's pretty clear from the right side that we have a CSSPrimitiveValue. > Source/WebCore/css/CSSParser.cpp:5830 > return true; Perhaps adding and ASSERT just before the return here? > Source/WebCore/css/CSSParser.cpp:5867 > + allTracksAreFixedSized = isGridTrackFixedSized(*value); What about allTracksAreFixedSized = allTracksAreFixedSized && isGridTrackFixedSized(*value); > Source/WebCore/css/CSSParser.cpp:5925 > + allTracksAreFixedSized = isGridTrackFixedSized(*trackSize); Ditto. > Source/WebCore/css/CSSParser.cpp:5995 > return CSSValuePool::singleton().createIdentifierValue(value.id); You should remove the braces as there is only one instruction in the if block.

Created attachment 279748 [details] =Patch for landing

Comment on attachment 279644 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=279644&action=review Thanks for the quick review! >> Source/WebCore/css/CSSParser.cpp:5823 >> + const CSSPrimitiveValue& primitiveValue = value.isPrimitiveValue() > > I think we could use here auto& as it's pretty clear from the right side that we have a CSSPrimitiveValue. Done. >> Source/WebCore/css/CSSParser.cpp:5830 >> return true; > > Perhaps adding and ASSERT just before the return here? Yeah, I'll add it. >> Source/WebCore/css/CSSParser.cpp:5867 >> + allTracksAreFixedSized = isGridTrackFixedSized(*value); > > What about > > allTracksAreFixedSized = allTracksAreFixedSized && isGridTrackFixedSized(*value); In that case, even when allTracksAreFixedSized is FALSE, we'll be calling isGridTrackFixedSized() over and over. With the current code, once allTracksAreFixedSized is FALSE, we don't call isGridTrackFixedSized() anymore. >> Source/WebCore/css/CSSParser.cpp:5925 >> + allTracksAreFixedSized = isGridTrackFixedSized(*trackSize); > > Ditto. Ditto. :-) >> Source/WebCore/css/CSSParser.cpp:5995 >> return CSSValuePool::singleton().createIdentifierValue(value.id); > > You should remove the braces as there is only one instruction in the if block. Done.

Comment on attachment 279748 [details] =Patch for landing Clearing flags on attachment: 279748 Committed r201373: <http://trac.webkit.org/changeset/201373>

All reviewed patches have been landed. Closing bug.

Comment on attachment 279748 [details] =Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=279748&action=review > Source/WebCore/css/CSSParser.cpp:5822 > + ASSERT(value.isPrimitiveValue() || (value.isFunctionValue() && downcast<CSSFunctionValue>(value).arguments())); After this landed, we are hitting this assertion in isGridTrackFixedSized in parseGridTrackList in multiple tests. Because of that we will probably need to roll this change out. The problem is that parseGridTrackList calls parseGridBreadth, which can return a numeric value. Then this function incorrectly asserts that it’s not a numeric value.

Re-opened since this is blocked by bug 158064

Created attachment 279762 [details] Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=279748&action=review > Source/WebCore/css/CSSParser.cpp:5830 > + ASSERT(primitiveValue.isLength()); We were actually hitting this ASSERT, as it's not enough to check that the CSSPrimitiveValue is length, it doesn't include percentages or calc(). I've modified it to check the 3 cases and now the tests are passing in debug here.

(In reply to comment #4) > Comment on attachment 279644 [details] > >> Source/WebCore/css/CSSParser.cpp:5867 > >> + allTracksAreFixedSized = isGridTrackFixedSized(*value); > > > > What about > > > > allTracksAreFixedSized = allTracksAreFixedSized && isGridTrackFixedSized(*value); > > In that case, even when allTracksAreFixedSized is FALSE, we'll be calling > isGridTrackFixedSized() over and over. > With the current code, once allTracksAreFixedSized is FALSE, we don't call > isGridTrackFixedSized() anymore. The && operator in C++ shortcircuits meaning that the second part won't be evaluated.

Created attachment 279767 [details] Patch

Comment on attachment 279767 [details] Patch Clearing flags on attachment: 279767 Committed r201382: <http://trac.webkit.org/changeset/201382>

All reviewed patches have been landed. Closing bug.