Changeset 109015 in webkit


Ignore:
Timestamp:
Feb 27, 2012 12:36:46 PM (12 years ago)
Author:
mihnea@adobe.com
Message:

[CSSRegions]-webkit-flow-into initial value should be none instead of auto
​https://bugs.webkit.org/show_bug.cgi?id=79670

Reviewed by Simon Fraser.

Source/WebCore:

No new tests, modified expectations for existing tests.

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseFlowThread):

  • css/CSSStyleApplyProperty.cpp:

(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):

LayoutTests:

  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • fast/regions/css-regions-disabled-expected.txt:
  • fast/regions/script-tests/css-regions-disabled.js:
  • fast/regions/script-tests/webkit-flow-parsing.js:
  • fast/regions/webkit-flow-parsing-expected.txt:
  • platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt:
  • platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt:
  • platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/qt/svg/css/getComputedStyle-basic-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r109014 r109015  
     12012-02-27  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSSRegions]-webkit-flow-into initial value should be none instead of auto
     4        https://bugs.webkit.org/show_bug.cgi?id=79670
     5
     6        Reviewed by Simon Fraser.
     7
     8        * fast/css/getComputedStyle/computed-style-expected.txt:
     9        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     10        * fast/regions/css-regions-disabled-expected.txt:
     11        * fast/regions/script-tests/css-regions-disabled.js:
     12        * fast/regions/script-tests/webkit-flow-parsing.js:
     13        * fast/regions/webkit-flow-parsing-expected.txt:
     14        * platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-expected.txt:
     15        * platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     16        * platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt:
     17        * platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
     18        * platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     19        * platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt:
     20        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     21        * platform/qt/svg/css/getComputedStyle-basic-expected.txt:
     22        * svg/css/getComputedStyle-basic-expected.txt:
     23
    1242012-02-27  Ojan Vafai  <ojan@chromium.org>
    225

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt

    r108158 r109015  
    212212-webkit-user-select: text;
    213213-webkit-writing-mode: horizontal-tb;
    214 -webkit-flow-into: auto;
     214-webkit-flow-into: none;
    215215-webkit-flow-from: none;
    216216-webkit-region-overflow: auto;

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r108158 r109015  
    211211    -webkit-user-select: text
    212212    -webkit-writing-mode: horizontal-tb
    213     -webkit-flow-into: auto
     213    -webkit-flow-into: none
    214214    -webkit-flow-from: none
    215215    -webkit-region-overflow: auto

  • trunk/LayoutTests/fast/regions/css-regions-disabled-expected.txt

    r108108 r109015  
    44
    55
    6 PASS testWebKitFlowInto("-webkit-flow-into: auto") is ""
     6PASS testWebKitFlowInto("-webkit-flow-into: none") is ""
    77PASS testWebKitFlowInto("-webkit-flow-into: first-flow") is ""
    8 PASS testComputedStyleWebKitFlowInto("auto") is "auto"
    9 PASS testComputedStyleWebKitFlowInto("first-flow") is "auto"
     8PASS testComputedStyleWebKitFlowInto("none") is "none"
     9PASS testComputedStyleWebKitFlowInto("first-flow") is "none"
    1010PASS testWebKitFlowFrom("-webkit-flow-from: first-flow") is ""
    1111PASS testWebKitFlowFrom("-webkit-flow-from: none") is ""

  • trunk/LayoutTests/fast/regions/script-tests/css-regions-disabled.js

    r108108 r109015  
    4949}
    5050
    51 shouldBeEqualToString('testWebKitFlowInto("-webkit-flow-into: auto")', "");
     51shouldBeEqualToString('testWebKitFlowInto("-webkit-flow-into: none")', "");
    5252shouldBeEqualToString('testWebKitFlowInto("-webkit-flow-into: first-flow")', "");
    53 shouldBeEqualToString('testComputedStyleWebKitFlowInto("auto")', "auto");
    54 shouldBeEqualToString('testComputedStyleWebKitFlowInto("first-flow")', "auto");
     53shouldBeEqualToString('testComputedStyleWebKitFlowInto("none")', "none");
     54shouldBeEqualToString('testComputedStyleWebKitFlowInto("first-flow")', "none");
    5555
    5656shouldBeEqualToString('testWebKitFlowFrom("-webkit-flow-from: first-flow")', "");

  • trunk/LayoutTests/fast/regions/script-tests/webkit-flow-parsing.js

    r98407 r109015  
    3333}
    3434
    35 shouldBeEqualToString('test("-webkit-flow-into: auto")', "auto");
     35shouldBeEqualToString('test("-webkit-flow-into: none")', "none");
    3636shouldBeEqualToString('test("-webkit-flow-into: first-flow")', "first-flow");
    3737shouldBeEqualToString('test("-webkit-flow-into: \'first flow\'")', "");
    … …  
    4242shouldBeEqualToString('test("-webkit-flow-into: 12px")', "");
    4343
    44 shouldBeEqualToString('testComputedStyle("auto")', "auto");
    45 shouldBeEqualToString('testComputedStyle("")', "auto");
    46 shouldBeEqualToString('testComputedStyle("\'first-flow\'")', "auto");
     44shouldBeEqualToString('testComputedStyle("none")', "none");
     45shouldBeEqualToString('testComputedStyle("")', "none");
     46shouldBeEqualToString('testComputedStyle("\'first-flow\'")', "none");
    4747shouldBeEqualToString('testComputedStyle("first-flow")', "first-flow");
    48 shouldBeEqualToString('testComputedStyle("12px")', "auto");
     48shouldBeEqualToString('testComputedStyle("12px")', "none");
    4949
    50 shouldBeEqualToString('testNotInherited("auto", "auto")', "auto");
    51 shouldBeEqualToString('testNotInherited("auto", "child-flow")', "child-flow");
    52 shouldBeEqualToString('testNotInherited("parent-flow", "auto")', "auto");
     50shouldBeEqualToString('testNotInherited("none", "none")', "none");
     51shouldBeEqualToString('testNotInherited("none", "child-flow")', "child-flow");
     52shouldBeEqualToString('testNotInherited("parent-flow", "none")', "none");
    5353shouldBeEqualToString('testNotInherited("parent-flow", "child-flow")', "child-flow");

  • trunk/LayoutTests/fast/regions/webkit-flow-parsing-expected.txt

    r97454 r109015  
    44
    55
    6 PASS test("-webkit-flow-into: auto") is "auto"
     6PASS test("-webkit-flow-into: none") is "none"
    77PASS test("-webkit-flow-into: first-flow") is "first-flow"
    88PASS test("-webkit-flow-into: 'first flow'") is ""
    … …  
    1212PASS test("-webkit-flow-into: -1") is ""
    1313PASS test("-webkit-flow-into: 12px") is ""
    14 PASS testComputedStyle("auto") is "auto"
    15 PASS testComputedStyle("") is "auto"
    16 PASS testComputedStyle("'first-flow'") is "auto"
     14PASS testComputedStyle("none") is "none"
     15PASS testComputedStyle("") is "none"
     16PASS testComputedStyle("'first-flow'") is "none"
    1717PASS testComputedStyle("first-flow") is "first-flow"
    18 PASS testComputedStyle("12px") is "auto"
    19 PASS testNotInherited("auto", "auto") is "auto"
    20 PASS testNotInherited("auto", "child-flow") is "child-flow"
    21 PASS testNotInherited("parent-flow", "auto") is "auto"
     18PASS testComputedStyle("12px") is "none"
     19PASS testNotInherited("none", "none") is "none"
     20PASS testNotInherited("none", "child-flow") is "child-flow"
     21PASS testNotInherited("parent-flow", "none") is "none"
    2222PASS testNotInherited("parent-flow", "child-flow") is "child-flow"
    2323PASS successfullyParsed is true

  • trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-expected.txt

    r108147 r109015  
    213213-webkit-user-select: text;
    214214-webkit-writing-mode: horizontal-tb;
    215 -webkit-flow-into: auto;
     215-webkit-flow-into: none;
    216216-webkit-flow-from: none;
    217217-webkit-region-overflow: auto;

  • trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r108147 r109015  
    212212    -webkit-user-select: text
    213213    -webkit-writing-mode: horizontal-tb
    214     -webkit-flow-into: auto
     214    -webkit-flow-into: none
    215215    -webkit-flow-from: none
    216216    -webkit-region-overflow: auto

  • trunk/LayoutTests/platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt

    r108147 r109015  
    423423rect: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    424424rect: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
    425 rect: style.getPropertyValue(-webkit-flow-into) : auto
     425rect: style.getPropertyValue(-webkit-flow-into) : none
    426426rect: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
    427427rect: style.getPropertyValue(-webkit-flow-from) : none
    … …  
    941941g: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    942942g: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
    943 g: style.getPropertyValue(-webkit-flow-into) : auto
     943g: style.getPropertyValue(-webkit-flow-into) : none
    944944g: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
    945945g: style.getPropertyValue(-webkit-flow-from) : none

  • trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt

    r108139 r109015  
    213213-webkit-user-select: text;
    214214-webkit-writing-mode: horizontal-tb;
    215 -webkit-flow-into: auto;
     215-webkit-flow-into: none;
    216216-webkit-flow-from: none;
    217217-webkit-region-overflow: auto;

  • trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r108139 r109015  
    212212    -webkit-user-select: text
    213213    -webkit-writing-mode: horizontal-tb
    214     -webkit-flow-into: auto
     214    -webkit-flow-into: none
    215215    -webkit-flow-from: none
    216216    -webkit-region-overflow: auto

  • trunk/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt

    r108139 r109015  
    423423rect: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    424424rect: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
    425 rect: style.getPropertyValue(-webkit-flow-into) : auto
     425rect: style.getPropertyValue(-webkit-flow-into) : none
    426426rect: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
    427427rect: style.getPropertyValue(-webkit-flow-from) : none
    … …  
    941941g: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    942942g: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
    943 g: style.getPropertyValue(-webkit-flow-into) : auto
     943g: style.getPropertyValue(-webkit-flow-into) : none
    944944g: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
    945945g: style.getPropertyValue(-webkit-flow-from) : none

  • trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r108611 r109015  
    211211    -webkit-user-select: text
    212212    -webkit-writing-mode: horizontal-tb
    213     -webkit-flow-into: auto
     213    -webkit-flow-into: none
    214214    -webkit-flow-from: none
    215215    -webkit-region-overflow: auto

  • trunk/LayoutTests/platform/qt/svg/css/getComputedStyle-basic-expected.txt

    r108895 r109015  
    421421rect: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    422422rect: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
    423 rect: style.getPropertyValue(-webkit-flow-into) : auto
     423rect: style.getPropertyValue(-webkit-flow-into) : none
    424424rect: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
    425425rect: style.getPropertyValue(-webkit-flow-from) : none
    … …  
    937937g: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    938938g: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
    939 g: style.getPropertyValue(-webkit-flow-into) : auto
     939g: style.getPropertyValue(-webkit-flow-into) : none
    940940g: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
    941941g: style.getPropertyValue(-webkit-flow-from) : none

  • trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

    r108893 r109015  
    425425rect: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    426426rect: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
    427 rect: style.getPropertyValue(-webkit-flow-into) : auto
     427rect: style.getPropertyValue(-webkit-flow-into) : none
    428428rect: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
    429429rect: style.getPropertyValue(-webkit-flow-from) : none
    … …  
    945945g: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    946946g: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
    947 g: style.getPropertyValue(-webkit-flow-into) : auto
     947g: style.getPropertyValue(-webkit-flow-into) : none
    948948g: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
    949949g: style.getPropertyValue(-webkit-flow-from) : none

  • trunk/Source/WebCore/ChangeLog

    r109014 r109015  
     12012-02-27  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSSRegions]-webkit-flow-into initial value should be none instead of auto
     4        https://bugs.webkit.org/show_bug.cgi?id=79670
     5
     6        Reviewed by Simon Fraser.
     7
     8        No new tests, modified expectations for existing tests.
     9
     10        * css/CSSComputedStyleDeclaration.cpp:
     11        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     12        * css/CSSParser.cpp:
     13        (WebCore::CSSParser::parseFlowThread):
     14        * css/CSSStyleApplyProperty.cpp:
     15        (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
     16
    1172012-02-27  Ojan Vafai  <ojan@chromium.org>
    218

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r108855 r109015  
    22682268        case CSSPropertyWebkitFlowInto:
    22692269            if (style->flowThread().isNull())
    2270                 return cssValuePool->createIdentifierValue(CSSValueAuto);
     2270                return cssValuePool->createIdentifierValue(CSSValueNone);
    22712271            return cssValuePool->createValue(style->flowThread(), CSSPrimitiveValue::CSS_STRING);
    22722272        case CSSPropertyWebkitFlowFrom:

  • trunk/Source/WebCore/css/CSSParser.cpp

    r108855 r109015  
    71047104        return false;
    71057105
    7106     if (value->id == CSSValueAuto) {
     7106    if (value->id == CSSValueNone) {
    71077107        addProperty(propId, cssValuePool()->createIdentifierValue(value->id), important);
    71087108        return true;
    … …  
    71157115        addProperty(propId, cssValuePool()->createValue(inputProperty, CSSPrimitiveValue::CSS_STRING), important);
    71167116    } else
    7117         addProperty(propId, cssValuePool()->createIdentifierValue(CSSValueAuto), important);
     7117        addProperty(propId, cssValuePool()->createIdentifierValue(CSSValueNone), important);
    71187118
    71197119    return true;

  • trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

    r108555 r109015  
    19421942    setPropertyHandler(CSSPropertyWebkitColumnWidth, ApplyPropertyAuto<float, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth, &RenderStyle::hasAutoColumnWidth, &RenderStyle::setHasAutoColumnWidth, ComputeLength>::createHandler());
    19431943    setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler());
    1944     setPropertyHandler(CSSPropertyWebkitFlowInto, ApplyPropertyString<MapAutoToNull, &RenderStyle::flowThread, &RenderStyle::setFlowThread, &RenderStyle::initialFlowThread>::createHandler());
     1944    setPropertyHandler(CSSPropertyWebkitFlowInto, ApplyPropertyString<MapNoneToNull, &RenderStyle::flowThread, &RenderStyle::setFlowThread, &RenderStyle::initialFlowThread>::createHandler());
    19451945    setPropertyHandler(CSSPropertyWebkitHighlight, ApplyPropertyString<MapNoneToNull, &RenderStyle::highlight, &RenderStyle::setHighlight, &RenderStyle::initialHighlight>::createHandler());
    19461946    setPropertyHandler(CSSPropertyWebkitHyphenateCharacter, ApplyPropertyString<MapAutoToNull, &RenderStyle::hyphenationString, &RenderStyle::setHyphenationString, &RenderStyle::initialHyphenationString>::createHandler());
Note: See TracChangeset for help on using the changeset viewer.