Bug 116349 – [CSS Exclusions] Add CSS parsing support for image URI shape-inside and shape-outside values

• Component: CSS
• Status: RESOLVED FIXED

[Hans Muller]

Add support for parsing image URI values for the shape-inside and shape-outside CSS properties.

[Hans Muller]

Created attachment 202164 [details]
Patch

Note: there are some test changes that I'd like to make in a subequent patch, to keep this one focused on just the mechanics of adding support for shape image URIs. The parsing shape-inside,outside parsing tests should be refactored, since they're nearly identical, and they should be moved to a subdirectory.

[WebKit Commit Bot]

Attachment 202164 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/fast/exclusions/parsing-wrap-shape-inside-expected.txt', u'LayoutTests/fast/exclusions/parsing-wrap-shape-outside-expected.txt', u'LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js', u'LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-outside.js', u'Source/WebCore/ChangeLog', u'Source/WebCore/css/CSSComputedStyleDeclaration.cpp', u'Source/WebCore/css/CSSParser.cpp', u'Source/WebCore/css/DeprecatedStyleBuilder.cpp', u'Source/WebCore/css/StyleResolver.cpp', u'Source/WebCore/rendering/style/ExclusionShapeValue.h']" exit_code: 1
Source/WebCore/rendering/style/ExclusionShapeValue.h:44:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
Source/WebCore/rendering/style/ExclusionShapeValue.h:45:  enum members should use InterCaps with an initial capital letter.  [readability/enum_casing] [4]
Source/WebCore/rendering/style/ExclusionShapeValue.h:66:  More than one command on the same line in if  [whitespace/parens] [4]
Total errors found: 3 in 11 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Hans Muller]

Created attachment 202166 [details]
Patch

Fixed the style bot failure by changing the ExclusionShapeValue::type enum values from AUTO,SHAPE,... to Auto,Shape...

[Alexandru Chiculita]

Comment on attachment 202166 [details]
Patch

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

Thanks, looks good!

> LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js:61
> +    var unevaledString = '"' + value.replace(/\\/g, "\\\\").replace(/"/g, "\"").replace(/\n/g, "\\n").replace(/\r/g, "\\r") + '"';

nit: I think you can use JSON.stringify() now.

> Source/WebCore/rendering/style/ExclusionShapeValue.h:66
> +    void setImage(PassRefPtr<StyleImage> v)

nit: use full names for variables/parameters.

> Source/WebCore/rendering/style/ExclusionShapeValue.h:74
> +    ExclusionShapeValue(PassRefPtr<BasicShape> shape) : m_type(Shape), m_shape(shape) { }

nit: This is not WebKit style. You should have each member on a different line.

[Hans Muller]

Created attachment 202289 [details]
Patch

I made the ExclusionShapeValue.h changes you suggested.  I am going to revise the parsing tests in a separate patch.

[Hans Muller]

(In reply to comment #5)
> Created an attachment (id=202289) [details]
> Patch
> 
> I made the ExclusionShapeValue.h changes you suggested.  I am going to revise the parsing tests in a separate patch.

The test refactoring changes are covered by https://bugs.webkit.org/show_bug.cgi?id=116446

[WebKit Commit Bot]

Comment on attachment 202289 [details]
Patch

Clearing flags on attachment: 202289

Committed r150387: <http://trac.webkit.org/changeset/150387>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.