Skip to content

GitLab

T
tangled
Commit 93767bcd authored by hyatt's avatar hyatt
Browse files
Options

LayoutTests: 

       Force column-width to parse in strict mode so that there is no confusion when it is used in the columns
       shorthand (it can be mistaken for column-count otherwise).

       Reviewed by Mark
       
        * fast/multicol/columns-shorthand-parsing-expected.checksum: Added.
        * fast/multicol/columns-shorthand-parsing-expected.png: Added.
        * fast/multicol/columns-shorthand-parsing-expected.txt: Added.
        * fast/multicol/columns-shorthand-parsing.html: Added.

WebCore:

        Force column-width to parse in strict mode so that there is no confusion when it is used in the columns
        shorthand (it can be mistaken for column-count otherwise).

        Reviewed by Mark

        fast/multicol/columns-shorthand-parsing.html

        * css/cssparser.cpp:
        (WebCore::CSSParser::parseValue):



git-svn-id: svn://svn.chromium.org/blink/trunk@18792 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent bf3ddd59
Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 2 deletions
third_party/WebKit/LayoutTests/ChangeLog
View file @ 93767bcd
2007-01-11 David Hyatt <hyatt@apple.com>
Force column-width to parse in strict mode so that there is no confusion when it is used in the columns
shorthand (it can be mistaken for column-count otherwise).
Reviewed by Mark
* fast/multicol/columns-shorthand-parsing-expected.checksum: Added.
* fast/multicol/columns-shorthand-parsing-expected.png: Added.
* fast/multicol/columns-shorthand-parsing-expected.txt: Added.
* fast/multicol/columns-shorthand-parsing.html: Added.
2007-01-11 Mitz Pettel <mitz@webkit.org> 2007-01-11 Mitz Pettel <mitz@webkit.org>
Reviewed by Hyatt. Reviewed by Hyatt.
third_party/WebKit/LayoutTests/fast/multicol/columns-shorthand-parsing-expected.checksum 0 → 100644
View file @ 93767bcd
150df902f144186529e937ae6ccd1b0e
\ No newline at end of file
third_party/WebKit/LayoutTests/fast/multicol/columns-shorthand-parsing-expected.txt 0 → 100644
View file @ 93767bcd
layer at (0,0) size 785x664
RenderView at (0,0) size 785x600
layer at (0,0) size 785x664
RenderBlock {HTML} at (0,0) size 785x664
RenderBody {BODY} at (8,8) size 769x648
RenderBlock {DIV} at (0,0) size 769x648
RenderText {#text} at (0,0) size 376x1296
text run at (0,0) width 372: "This content should be split into two columns. This content"
text run at (0,18) width 355: "should be split into two columns. This content should be"
text run at (0,36) width 376: "split into two columns. This content should be split into two"
text run at (0,54) width 351: "columns. This content should be split into two columns."
text run at (0,72) width 372: "This content should be split into two columns. This content"
text run at (0,90) width 355: "should be split into two columns. This content should be"
text run at (0,108) width 376: "split into two columns. This content should be split into two"
text run at (0,126) width 351: "columns. This content should be split into two columns."
text run at (0,144) width 372: "This content should be split into two columns. This content"
text run at (0,162) width 355: "should be split into two columns. This content should be"
text run at (0,180) width 376: "split into two columns. This content should be split into two"
text run at (0,198) width 351: "columns. This content should be split into two columns."
text run at (0,216) width 372: "This content should be split into two columns. This content"
text run at (0,234) width 355: "should be split into two columns. This content should be"
text run at (0,252) width 376: "split into two columns. This content should be split into two"
text run at (0,270) width 351: "columns. This content should be split into two columns."
text run at (0,288) width 372: "This content should be split into two columns. This content"
text run at (0,306) width 355: "should be split into two columns. This content should be"
text run at (0,324) width 376: "split into two columns. This content should be split into two"
text run at (0,342) width 351: "columns. This content should be split into two columns."
text run at (0,360) width 372: "This content should be split into two columns. This content"
text run at (0,378) width 355: "should be split into two columns. This content should be"
text run at (0,396) width 376: "split into two columns. This content should be split into two"
text run at (0,414) width 351: "columns. This content should be split into two columns."
text run at (0,432) width 372: "This content should be split into two columns. This content"
text run at (0,450) width 355: "should be split into two columns. This content should be"
text run at (0,468) width 376: "split into two columns. This content should be split into two"
text run at (0,486) width 351: "columns. This content should be split into two columns."
text run at (0,504) width 372: "This content should be split into two columns. This content"
text run at (0,522) width 355: "should be split into two columns. This content should be"
text run at (0,540) width 376: "split into two columns. This content should be split into two"
text run at (0,558) width 351: "columns. This content should be split into two columns."
text run at (0,576) width 372: "This content should be split into two columns. This content"
text run at (0,594) width 355: "should be split into two columns. This content should be"
text run at (0,612) width 376: "split into two columns. This content should be split into two"
text run at (0,630) width 351: "columns. This content should be split into two columns."
text run at (0,648) width 372: "This content should be split into two columns. This content"
text run at (0,666) width 355: "should be split into two columns. This content should be"
text run at (0,684) width 376: "split into two columns. This content should be split into two"
text run at (0,702) width 351: "columns. This content should be split into two columns."
text run at (0,720) width 372: "This content should be split into two columns. This content"
text run at (0,738) width 355: "should be split into two columns. This content should be"
text run at (0,756) width 376: "split into two columns. This content should be split into two"
text run at (0,774) width 351: "columns. This content should be split into two columns."
text run at (0,792) width 372: "This content should be split into two columns. This content"
text run at (0,810) width 355: "should be split into two columns. This content should be"
text run at (0,828) width 376: "split into two columns. This content should be split into two"
text run at (0,846) width 351: "columns. This content should be split into two columns."
text run at (0,864) width 372: "This content should be split into two columns. This content"
text run at (0,882) width 355: "should be split into two columns. This content should be"
text run at (0,900) width 376: "split into two columns. This content should be split into two"
text run at (0,918) width 351: "columns. This content should be split into two columns."
text run at (0,936) width 372: "This content should be split into two columns. This content"
text run at (0,954) width 355: "should be split into two columns. This content should be"
text run at (0,972) width 376: "split into two columns. This content should be split into two"
text run at (0,990) width 351: "columns. This content should be split into two columns."
text run at (0,1008) width 372: "This content should be split into two columns. This content"
text run at (0,1026) width 355: "should be split into two columns. This content should be"
text run at (0,1044) width 376: "split into two columns. This content should be split into two"
text run at (0,1062) width 351: "columns. This content should be split into two columns."
text run at (0,1080) width 372: "This content should be split into two columns. This content"
text run at (0,1098) width 355: "should be split into two columns. This content should be"
text run at (0,1116) width 376: "split into two columns. This content should be split into two"
text run at (0,1134) width 351: "columns. This content should be split into two columns."
text run at (0,1152) width 372: "This content should be split into two columns. This content"
text run at (0,1170) width 355: "should be split into two columns. This content should be"
text run at (0,1188) width 376: "split into two columns. This content should be split into two"
text run at (0,1206) width 351: "columns. This content should be split into two columns."
text run at (0,1224) width 372: "This content should be split into two columns. This content"
text run at (0,1242) width 355: "should be split into two columns. This content should be"
text run at (0,1260) width 376: "split into two columns. This content should be split into two"
text run at (0,1278) width 351: "columns. This content should be split into two columns."
third_party/WebKit/LayoutTests/fast/multicol/columns-shorthand-parsing.html 0 → 100644
View file @ 93767bcd
<html>
<head>
<style>
div {
-webkit-columns: 2;
-moz-column-count: 2;
}
</style>
</head>
<body>
<div>
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
This content should be split into two columns.
</div>
</body>
</html>
third_party/WebKit/WebCore/ChangeLog
View file @ 93767bcd
2007-01-11 David Hyatt <hyatt@apple.com>
Force column-width to parse in strict mode so that there is no confusion when it is used in the columns
shorthand (it can be mistaken for column-count otherwise).
Reviewed by Mark
fast/multicol/columns-shorthand-parsing.html
* css/cssparser.cpp:
(WebCore::CSSParser::parseValue):
2007-01-11 Mitz Pettel <mitz@webkit.org> 2007-01-11 Mitz Pettel <mitz@webkit.org>
Reviewed by Hyatt. Reviewed by Hyatt.
......
third_party/WebKit/WebCore/css/cssparser.cpp
View file @ 93767bcd
...@@ -1217,8 +1217,8 @@ bool CSSParser::parseValue(int propId, bool important) ...@@ -1217,8 +1217,8 @@ bool CSSParser::parseValue(int propId, bool important)
case CSS_PROP__WEBKIT_COLUMN_WIDTH: // auto | <length> case CSS_PROP__WEBKIT_COLUMN_WIDTH: // auto | <length>
if (id == CSS_VAL_AUTO) if (id == CSS_VAL_AUTO)
valid_primitive = true; valid_primitive = true;
else else // Always parse this property in strict mode, since it would be ambiguous otherwise when used in the 'columns' shorthand property.
valid_primitive = validUnit(value, FLength, strict); valid_primitive = validUnit(value, FLength, true);
break; break;
// End of CSS3 properties // End of CSS3 properties
......
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