Changeset 97701 in webkit


Ignore:
Timestamp:
Oct 17, 2011 7:17:25 PM (13 years ago)
Author:
mihnea@adobe.com
Message:

[CSS Regions]Change content:-webkit-from-flow to -webkit-flow-from
​https://bugs.webkit.org/show_bug.cgi?id=70104

Reviewed by David Hyatt.

  1. -webkit-flow-from is now a property instead of being an addition to content property.
  2. -webkit-flow-from takes an identifier instead of string.

Source/WebCore:

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseContent):
(WebCore::CSSParser::parseRegionThread):

  • css/CSSParser.h:
  • css/CSSPrimitiveValue.cpp:

(WebCore::isValidCSSUnitTypeForDoubleConversion):
(WebCore::CSSPrimitiveValue::cleanup):
(WebCore::CSSPrimitiveValue::getStringValue):
(WebCore::CSSPrimitiveValue::cssText):

  • css/CSSPrimitiveValue.h:
  • css/CSSPropertyNames.in:
  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):

LayoutTests:

  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • fast/regions/bottom-overflow-out-of-first-region.html:
  • fast/regions/content-flowed-into-regions-no-scroll.html:
  • fast/regions/content-webkit-from-flow-parsing-expected.txt:
  • fast/regions/float-pushed-width-change.html:
  • fast/regions/floats-basic-in-variable-width-regions.html:
  • fast/regions/flow-anonymous-children.html:
  • fast/regions/flow-content-basic-vertical-rl.html:
  • fast/regions/flow-content-basic-vertical.html:
  • fast/regions/flow-content-basic.html:
  • fast/regions/flows-dependency-dynamic-remove.html:
  • fast/regions/flows-dependency-same-flow.html:
  • fast/regions/hit-test-float.html:
  • fast/regions/multiple-directionality-changes-in-variable-width-regions.html:
  • fast/regions/no-split-line-box.html:
  • fast/regions/outline-sides-in-region.html:
  • fast/regions/overflow-in-uniform-regions-dynamic.html:
  • fast/regions/overflow-in-uniform-regions.html:
  • fast/regions/overflow-in-variable-width-regions.html:
  • fast/regions/overflow-moving-below-floats-in-variable-width-regions.html:
  • fast/regions/overflow-not-moving-below-floats-in-variable-width-regions.html:
  • fast/regions/overflow-rtl-in-variable-width-regions.html:
  • fast/regions/overflow-size-change-in-variable-width-regions.html:
  • fast/regions/overflow-size-change-with-stacking-context-rtl.html:
  • fast/regions/overflow-size-change-with-stacking-context.html:
  • fast/regions/percentage-margins-mixed-ltr-dominant-regions.html:
  • fast/regions/percentage-margins-mixed-rtl-dominant-regions.html:
  • fast/regions/percentage-margins-rtl-variable-width-regions.html:
  • fast/regions/percentage-margins-variable-width-regions.html:
  • fast/regions/position-writing-modes-in-variable-width-regions.html:
  • fast/regions/positioned-objects-block-static-in-regions.html:
  • fast/regions/positioned-objects-block-static-in-rtl-regions.html:
  • fast/regions/positioned-objects-block-static-spanning-regions-rtl.html:
  • fast/regions/positioned-objects-block-static-spanning-regions.html:
  • fast/regions/positioned-objects-in-regions.html:
  • fast/regions/positioned-objects-in-rtl-regions.html:
  • fast/regions/positioned-objects-inline-static-in-regions.html:
  • fast/regions/positioned-objects-inline-static-in-rtl-regions.html:
  • fast/regions/positioned-objects-inline-static-spanning-regions-rtl.html:
  • fast/regions/positioned-objects-inline-static-spanning-regions.html:
  • fast/regions/positioned-objects-perpendicular-flows-in-regions.html:
  • fast/regions/positioned-objects-spanning-regions.html:
  • fast/regions/region-element-dynamic-attach-flow.html:
  • fast/regions/region-element-dynamic-detach-flow.html:
  • fast/regions/region-overflow-auto-overflow-hidden.html:
  • fast/regions/region-overflow-auto-overflow-visible.html:
  • fast/regions/region-overflow-break.html:
  • fast/regions/render-region-renderer.html:
  • fast/regions/resources/region-style.css:

(.regionArticle):

  • fast/regions/script-tests/content-webkit-from-flow-parsing.js:

(testCSSText):
(testComputedStyle):

  • fast/regions/script-tests/region-element-display-restriction.js:

(createRegionElement):

  • fast/regions/text-region-breaks.html:
  • fast/regions/text-region-split-after-resize.html:
  • fast/regions/text-region-split-horizontal-bt.html:
  • fast/regions/text-region-split-small-pagination.html:
  • fast/regions/text-region-split-vertical-rl.html:
  • fast/regions/text-region-split-vertical.html:
  • fast/regions/text-region-split.html:
  • fast/regions/top-overflow-out-of-second-region.html:
  • fast/regions/webkit-flow-double-pagination-float-push.html:
  • fast/regions/webkit-flow-float-pushed-to-last-region.html:
  • fast/regions/webkit-flow-float-unable-to-push.html:
  • fast/regions/webkit-flow-floats-inside-regions-bounds.html:
  • fast/regions/webkit-flow-inlines-dynamic.html:
  • fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical-rl.html:
  • fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical.html:
  • fast/regions/webkit-flow-inlines-inside-regions-bounds.html:
  • fast/regions/webkit-flow-renderer-layer.html:
  • fast/regions/webkit-flow-renderer-nested.html:
  • fast/regions/webkit-flow-renderer.html:
  • fast/repaint/japanese-rl-selection-repaint-in-regions.html:
  • fast/repaint/line-flow-with-floats-in-regions.html:
  • fast/repaint/overflow-flipped-writing-mode-block-in-regions.html:
  • fast/repaint/region-painting-via-layout.html:
  • 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:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
88 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r97700 r97701  
     12011-10-17  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSS Regions]Change content:-webkit-from-flow to -webkit-flow-from
     4        https://bugs.webkit.org/show_bug.cgi?id=70104
     5
     6        Reviewed by David Hyatt.
     7
     8        1. -webkit-flow-from is now a property instead of being an addition to content property.
     9        2. -webkit-flow-from takes an identifier instead of string.
     10
     11        * fast/css/getComputedStyle/computed-style-expected.txt:
     12        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     13        * fast/regions/bottom-overflow-out-of-first-region.html:
     14        * fast/regions/content-flowed-into-regions-no-scroll.html:
     15        * fast/regions/content-webkit-from-flow-parsing-expected.txt:
     16        * fast/regions/float-pushed-width-change.html:
     17        * fast/regions/floats-basic-in-variable-width-regions.html:
     18        * fast/regions/flow-anonymous-children.html:
     19        * fast/regions/flow-content-basic-vertical-rl.html:
     20        * fast/regions/flow-content-basic-vertical.html:
     21        * fast/regions/flow-content-basic.html:
     22        * fast/regions/flows-dependency-dynamic-remove.html:
     23        * fast/regions/flows-dependency-same-flow.html:
     24        * fast/regions/hit-test-float.html:
     25        * fast/regions/multiple-directionality-changes-in-variable-width-regions.html:
     26        * fast/regions/no-split-line-box.html:
     27        * fast/regions/outline-sides-in-region.html:
     28        * fast/regions/overflow-in-uniform-regions-dynamic.html:
     29        * fast/regions/overflow-in-uniform-regions.html:
     30        * fast/regions/overflow-in-variable-width-regions.html:
     31        * fast/regions/overflow-moving-below-floats-in-variable-width-regions.html:
     32        * fast/regions/overflow-not-moving-below-floats-in-variable-width-regions.html:
     33        * fast/regions/overflow-rtl-in-variable-width-regions.html:
     34        * fast/regions/overflow-size-change-in-variable-width-regions.html:
     35        * fast/regions/overflow-size-change-with-stacking-context-rtl.html:
     36        * fast/regions/overflow-size-change-with-stacking-context.html:
     37        * fast/regions/percentage-margins-mixed-ltr-dominant-regions.html:
     38        * fast/regions/percentage-margins-mixed-rtl-dominant-regions.html:
     39        * fast/regions/percentage-margins-rtl-variable-width-regions.html:
     40        * fast/regions/percentage-margins-variable-width-regions.html:
     41        * fast/regions/position-writing-modes-in-variable-width-regions.html:
     42        * fast/regions/positioned-objects-block-static-in-regions.html:
     43        * fast/regions/positioned-objects-block-static-in-rtl-regions.html:
     44        * fast/regions/positioned-objects-block-static-spanning-regions-rtl.html:
     45        * fast/regions/positioned-objects-block-static-spanning-regions.html:
     46        * fast/regions/positioned-objects-in-regions.html:
     47        * fast/regions/positioned-objects-in-rtl-regions.html:
     48        * fast/regions/positioned-objects-inline-static-in-regions.html:
     49        * fast/regions/positioned-objects-inline-static-in-rtl-regions.html:
     50        * fast/regions/positioned-objects-inline-static-spanning-regions-rtl.html:
     51        * fast/regions/positioned-objects-inline-static-spanning-regions.html:
     52        * fast/regions/positioned-objects-perpendicular-flows-in-regions.html:
     53        * fast/regions/positioned-objects-spanning-regions.html:
     54        * fast/regions/region-element-dynamic-attach-flow.html:
     55        * fast/regions/region-element-dynamic-detach-flow.html:
     56        * fast/regions/region-overflow-auto-overflow-hidden.html:
     57        * fast/regions/region-overflow-auto-overflow-visible.html:
     58        * fast/regions/region-overflow-break.html:
     59        * fast/regions/render-region-renderer.html:
     60        * fast/regions/resources/region-style.css:
     61        (.regionArticle):
     62        * fast/regions/script-tests/content-webkit-from-flow-parsing.js:
     63        (testCSSText):
     64        (testComputedStyle):
     65        * fast/regions/script-tests/region-element-display-restriction.js:
     66        (createRegionElement):
     67        * fast/regions/text-region-breaks.html:
     68        * fast/regions/text-region-split-after-resize.html:
     69        * fast/regions/text-region-split-horizontal-bt.html:
     70        * fast/regions/text-region-split-small-pagination.html:
     71        * fast/regions/text-region-split-vertical-rl.html:
     72        * fast/regions/text-region-split-vertical.html:
     73        * fast/regions/text-region-split.html:
     74        * fast/regions/top-overflow-out-of-second-region.html:
     75        * fast/regions/webkit-flow-double-pagination-float-push.html:
     76        * fast/regions/webkit-flow-float-pushed-to-last-region.html:
     77        * fast/regions/webkit-flow-float-unable-to-push.html:
     78        * fast/regions/webkit-flow-floats-inside-regions-bounds.html:
     79        * fast/regions/webkit-flow-inlines-dynamic.html:
     80        * fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical-rl.html:
     81        * fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical.html:
     82        * fast/regions/webkit-flow-inlines-inside-regions-bounds.html:
     83        * fast/regions/webkit-flow-renderer-layer.html:
     84        * fast/regions/webkit-flow-renderer-nested.html:
     85        * fast/regions/webkit-flow-renderer.html:
     86        * fast/repaint/japanese-rl-selection-repaint-in-regions.html:
     87        * fast/repaint/line-flow-with-floats-in-regions.html:
     88        * fast/repaint/overflow-flipped-writing-mode-block-in-regions.html:
     89        * fast/repaint/region-painting-via-layout.html:
     90        * platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
     91        * platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     92        * platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt:
     93        * svg/css/getComputedStyle-basic-expected.txt:
     94
    1952011-10-17  Dirk Pranke  <dpranke@chromium.org>
    296

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

    r97454 r97701  
    199199-webkit-writing-mode: horizontal-tb;
    200200-webkit-flow-into: auto;
     201-webkit-flow-from: none;
    201202-webkit-region-overflow: auto;
    202203-webkit-region-break-after: auto;

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

    r97454 r97701  
    198198    -webkit-writing-mode: horizontal-tb
    199199    -webkit-flow-into: auto
     200    -webkit-flow-from: none
    200201    -webkit-region-overflow: auto
    201202    -webkit-region-break-after: auto

  • trunk/LayoutTests/fast/regions/bottom-overflow-out-of-first-region.html

    r97454 r97701  
    2121    #region1, #region2, #region3 {
    2222        border: 1px solid black;
    23         content: -webkit-from-flow("flow1");
     23        -webkit-flow-from: flow1;
    2424    }
    2525

  • trunk/LayoutTests/fast/regions/content-flowed-into-regions-no-scroll.html

    r97454 r97701  
    1717
    1818            #region {
    19                 content: -webkit-from-flow('article');
     19                -webkit-flow-from: article;
    2020                overflow: hidden;
    2121            }

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

    r90935 r97701  
    1 Tests being able to set content to -webkit-from-flow
     1Tests parsing of -webkit-flow-from property
    22
    33On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
    44
    55
    6 PASS testCSSText("content: -webkit-from-flow('first-flow')") is "-webkit-from-flow(first-flow)"
    7 PASS testCSSText("content: -webkit-from-flow('first flow')") is "-webkit-from-flow('first flow')"
    8 PASS testCSSText("content: -webkit-from-flow('auto')") is "-webkit-from-flow(auto)"
    9 PASS testCSSText("content: -webkit-from-flow(auto)") is ""
    10 PASS testCSSText("content: -webkit-from-flow(initial)") is ""
    11 PASS testCSSText("content: -webkit-from-flow(inherit)") is ""
    12 PASS testCSSText("content: -webkit-from-flow()") is ""
    13 PASS testCSSText("content: -webkit-from-flow('')") is "-webkit-from-flow('')"
    14 PASS testCSSText("content: ;") is ""
    15 PASS testCSSText("content: -webkit-from-flow(1)") is ""
    16 PASS testCSSText("content: -webkit-from-flow(1.2)") is ""
    17 PASS testCSSText("content: -webkit-from-flow(-1)") is ""
    18 PASS testCSSText("content: -webkit-from-flow(12px)") is ""
    19 PASS testCSSText("content: -webkit-from-flow(first flow)") is ""
    20 PASS testCSSText("content: -webkit-from-flow(first-flow)") is ""
    21 PASS testComputedStyle("-webkit-from-flow('first-flow')") is "first-flow"
    22 PASS testComputedStyle("-webkit-from-flow('first flow')") is "'first flow'"
    23 PASS testComputedStyle("-webkit-from-flow('auto')") is "auto"
    24 PASS testComputedStyle("-webkit-from-flow(auto)") is ""
    25 PASS testComputedStyle("-webkit-from-flow(initial)") is ""
    26 PASS testComputedStyle("-webkit-from-flow(inherit)") is ""
    27 PASS testComputedStyle("-webkit-from-flow()") is ""
    28 PASS testComputedStyle("-webkit-from-flow(1)") is ""
    29 PASS testComputedStyle("-webkit-from-flow(1.2)") is ""
    30 PASS testComputedStyle("-webkit-from-flow(-1)") is ""
    31 PASS testComputedStyle("-webkit-from-flow(12px)") is ""
    32 PASS testComputedStyle("-webkit-from-flow('')") is "''"
    33 PASS testComputedStyle("-webkit-from-flow(first flow)") is ""
    34 PASS testComputedStyle("-webkit-from-flow(first-flow)") is ""
     6PASS testCSSText("-webkit-flow-from: first-flow") is "first-flow"
     7PASS testCSSText("-webkit-flow-from: none") is "none"
     8PASS testCSSText("-webkit-flow-from: ") is ""
     9PASS testCSSText("-webkit-flow-from: 'first-flow'") is ""
     10PASS testCSSText("-webkit-flow-from: 1") is ""
     11PASS testCSSText("-webkit-flow-from: 1.2") is ""
     12PASS testCSSText("-webkit-flow-from: -1") is ""
     13PASS testCSSText("-webkit-flow-from: 12px") is ""
     14PASS testCSSText("-webkit-from-flow: first flow") is ""
     15PASS testComputedStyle("first-flow") is "first-flow"
     16PASS testComputedStyle("'first flow'") is "none"
     17PASS testComputedStyle("none") is "none"
     18PASS testComputedStyle("initial") is "none"
     19PASS testComputedStyle("inherit") is "none"
     20PASS testComputedStyle("1") is "none"
     21PASS testComputedStyle("1.2") is "none"
     22PASS testComputedStyle("-1") is "none"
     23PASS testComputedStyle("12px") is "none"
    3524PASS successfullyParsed is true
    3625

  • trunk/LayoutTests/fast/regions/float-pushed-width-change.html

    r97454 r97701  
    2424    #region1, #region2, #region3 {
    2525        border: 1px solid black;
    26         content: -webkit-from-flow("flow1");
     26        -webkit-flow-from: flow1;
    2727    }
    2828

  • trunk/LayoutTests/fast/regions/floats-basic-in-variable-width-regions.html

    r97454 r97701  
    2020    #region1, #region2, #region3 {
    2121        border: 1px solid black;
    22         content: -webkit-from-flow("flow1");
     22        -webkit-flow-from: flow1;
    2323    }
    2424

  • trunk/LayoutTests/fast/regions/flow-anonymous-children.html

    r97454 r97701  
    33<style>
    44.flow { -webkit-flow-into: flow; }
    5 #region { content: -webkit-from-flow("flow"); }
     5#region { -webkit-flow-from: flow; }
    66span { display: inline-block; }
    77</style>

  • trunk/LayoutTests/fast/regions/flow-content-basic-vertical-rl.html

    r97454 r97701  
    1616        }
    1717
    18         .region { width: 100px; height:300px; content: -webkit-from-flow("main-thread"); border:1px solid black; padding:5px }
     18        .region { width: 100px; height:300px; -webkit-flow-from: main-thread; border:1px solid black; padding:5px }
    1919
    2020        .pass{

  • trunk/LayoutTests/fast/regions/flow-content-basic-vertical.html

    r97454 r97701  
    1717       
    1818        .region{
    19             content: -webkit-from-flow("main-thread");
     19            -webkit-flow-from: main-thread;
    2020            width:100px;
    2121            height:300px;

  • trunk/LayoutTests/fast/regions/flow-content-basic.html

    r97454 r97701  
    1515       
    1616        .region{
    17             content: -webkit-from-flow("main-thread");
     17            -webkit-flow-from: main-thread;
    1818            height:100px;
    1919            width:300px;

  • trunk/LayoutTests/fast/regions/flows-dependency-dynamic-remove.html

    r97454 r97701  
    66.flowC { -webkit-flow-into: flowC; }
    77
    8 .regionFlowA { content: -webkit-from-flow('flowA'); }
    9 .regionFlowB { content: -webkit-from-flow('flowB'); }
    10 .regionFlowC { content: -webkit-from-flow('flowC'); }
     8.regionFlowA { -webkit-flow-from: flowA; }
     9.regionFlowB { -webkit-flow-from: flowB; }
     10.regionFlowC { -webkit-flow-from: flowC; }
    1111</style>
    1212

  • trunk/LayoutTests/fast/regions/flows-dependency-same-flow.html

    r97454 r97701  
    66.flowC { -webkit-flow-into: flowC; }
    77
    8 .regionFlowA { content: -webkit-from-flow('flowA'); }
    9 .regionFlowB { content: -webkit-from-flow('flowB'); }
    10 .regionFlowC { content: -webkit-from-flow('flowC'); }
     8.regionFlowA { -webkit-flow-from: flowA; }
     9.regionFlowB { -webkit-flow-from: flowB; }
     10.regionFlowC { -webkit-flow-from: flowC; }
    1111</style>
    1212

  • trunk/LayoutTests/fast/regions/hit-test-float.html

    r97454 r97701  
    66</p>
    77<div style="position:relative; margin: 100px; width: 300px; height: 200px; outline: solid black;">
    8     <div style="position:absolute;left:0;top:0;content: -webkit-from-flow('flow'); width:150px;height:200px;"></div>
    9     <div style="position:absolute;left:150px;top:0;content: -webkit-from-flow('flow'); width:150px;height:200px"></div>
     8    <div style="position:absolute;left:0;top:0; -webkit-flow-from: flow; width:150px;height:200px;"></div>
     9    <div style="position:absolute;left:150px;top:0; -webkit-flow-from: flow; width:150px;height:200px"></div>
    1010    <div style="-webkit-flow-into: flow">
    1111        <div style="height: 250px; background-color: purple;"></div>

  • trunk/LayoutTests/fast/regions/multiple-directionality-changes-in-variable-width-regions.html

    r97454 r97701  
    2626    #region1, #region2, #region3 {
    2727        border: 1px solid black;
    28         content: -webkit-from-flow("flow1");
     28        -webkit-flow-from: flow1;
    2929    }
    3030

  • trunk/LayoutTests/fast/regions/no-split-line-box.html

    r97454 r97701  
    1111  }
    1212  .region{
    13     content:-webkit-from-flow("thread");
     13    -webkit-flow-from: thread;
    1414    width:4em;
    1515    height:35px;  /*2.5x line height*/

  • trunk/LayoutTests/fast/regions/outline-sides-in-region.html

    r97454 r97701  
    1111       
    1212        #region{
    13                 content:-webkit-from-flow("body");
     13                -webkit-flow-from: body;
    1414        }
    1515        div{

  • trunk/LayoutTests/fast/regions/overflow-in-uniform-regions-dynamic.html

    r97454 r97701  
    2020    #region1, #region2, #region3 {
    2121        border: 1px solid black;
    22         content: -webkit-from-flow("flow1");
     22        -webkit-flow-from: flow1;
    2323    }
    2424

  • trunk/LayoutTests/fast/regions/overflow-in-uniform-regions.html

    r97454 r97701  
    2020    #region1, #region2, #region3 {
    2121        border: 1px solid black;
    22         content: -webkit-from-flow("flow1");
     22        -webkit-flow-from: flow1;
    2323    }
    2424

  • trunk/LayoutTests/fast/regions/overflow-in-variable-width-regions.html

    r97454 r97701  
    2020    #region1, #region2, #region3 {
    2121        border: 1px solid black;
    22         content: -webkit-from-flow("flow1");
     22        -webkit-flow-from: flow1;
    2323    }
    2424

  • trunk/LayoutTests/fast/regions/overflow-moving-below-floats-in-variable-width-regions.html

    r97454 r97701  
    2121    #region1, #region2, #region3 {
    2222        border: 1px solid black;
    23         content: -webkit-from-flow("flow1");
     23        -webkit-flow-from: flow1;
    2424    }
    2525

  • trunk/LayoutTests/fast/regions/overflow-not-moving-below-floats-in-variable-width-regions.html

    r97454 r97701  
    2121    #region1, #region2, #region3 {
    2222        border: 1px solid black;
    23         content: -webkit-from-flow("flow1");
     23        -webkit-flow-from: flow1;
    2424    }
    2525

  • trunk/LayoutTests/fast/regions/overflow-rtl-in-variable-width-regions.html

    r97454 r97701  
    2222    #region1, #region2, #region3 {
    2323        border: 1px solid black;
    24         content: -webkit-from-flow("flow1");
     24        -webkit-flow-from: flow1;
    2525    }
    2626

  • trunk/LayoutTests/fast/regions/overflow-size-change-in-variable-width-regions.html

    r97454 r97701  
    2222    #region1, #region2, #region3 {
    2323        border: 1px solid black;
    24         content: -webkit-from-flow("flow1");
     24        -webkit-flow-from: flow1;
    2525    }
    2626

  • trunk/LayoutTests/fast/regions/overflow-size-change-with-stacking-context-rtl.html

    r97454 r97701  
    2525    #region1, #region2, #region3 {
    2626        border: 1px solid black;
    27         content: -webkit-from-flow("flow1");
     27        -webkit-flow-from: flow1;
    2828    }
    2929

  • trunk/LayoutTests/fast/regions/overflow-size-change-with-stacking-context.html

    r97454 r97701  
    2424    #region1, #region2, #region3 {
    2525        border: 1px solid black;
    26         content: -webkit-from-flow("flow1");
     26        -webkit-flow-from: flow1;
    2727    }
    2828

  • trunk/LayoutTests/fast/regions/percentage-margins-mixed-ltr-dominant-regions.html

    r97454 r97701  
    2222    #region1, #region2, #region3 {
    2323        border: 1px solid black;
    24         content: -webkit-from-flow("flow1");
     24        -webkit-flow-from: flow1;
    2525    }
    2626

  • trunk/LayoutTests/fast/regions/percentage-margins-mixed-rtl-dominant-regions.html

    r97454 r97701  
    2222    #region1, #region2, #region3 {
    2323        border: 1px solid black;
    24         content: -webkit-from-flow("flow1");
     24        -webkit-flow-from: flow1;
    2525    }
    2626

  • trunk/LayoutTests/fast/regions/percentage-margins-rtl-variable-width-regions.html

    r97454 r97701  
    2121    #region1, #region2, #region3 {
    2222        border: 1px solid black;
    23         content: -webkit-from-flow("flow1");
     23        -webkit-flow-from: flow1;
    2424    }
    2525

  • trunk/LayoutTests/fast/regions/percentage-margins-variable-width-regions.html

    r97454 r97701  
    2020    #region1, #region2, #region3 {
    2121        border: 1px solid black;
    22         content: -webkit-from-flow("flow1");
     22        -webkit-flow-from: flow1;
    2323    }
    2424

  • trunk/LayoutTests/fast/regions/position-writing-modes-in-variable-width-regions.html

    r97454 r97701  
    1414   
    1515    #region1, #region2 {
    16         content: -webkit-from-flow("flow1");
     16        -webkit-flow-from: flow1;
    1717    }
    1818

  • trunk/LayoutTests/fast/regions/positioned-objects-block-static-in-regions.html

    r97454 r97701  
    2020    #region1, #region2, #region3 {
    2121        border: 1px solid black;
    22         content: -webkit-from-flow("flow1");
     22        -webkit-flow-from: flow1;
    2323    }
    2424

  • trunk/LayoutTests/fast/regions/positioned-objects-block-static-in-rtl-regions.html

    r97454 r97701  
    2121    #region1, #region2, #region3 {
    2222        border: 1px solid black;
    23         content: -webkit-from-flow("flow1");
     23        -webkit-flow-from: flow1;
    2424    }
    2525

  • trunk/LayoutTests/fast/regions/positioned-objects-block-static-spanning-regions-rtl.html

    r97454 r97701  
    2424    #region1, #region2, #region3 {
    2525        border: 1px solid black;
    26         content: -webkit-from-flow("flow1");
     26        -webkit-flow-from: flow1;
    2727    }
    2828

  • trunk/LayoutTests/fast/regions/positioned-objects-block-static-spanning-regions.html

    r97454 r97701  
    2323    #region1, #region2, #region3 {
    2424        border: 1px solid black;
    25         content: -webkit-from-flow("flow1");
     25        -webkit-flow-from: flow1;
    2626    }
    2727

  • trunk/LayoutTests/fast/regions/positioned-objects-in-regions.html

    r97454 r97701  
    2323    #region1, #region2, #region3 {
    2424        border: 1px solid black;
    25         content: -webkit-from-flow("flow1");
     25        -webkit-flow-from: flow1;
    2626    }
    2727

  • trunk/LayoutTests/fast/regions/positioned-objects-in-rtl-regions.html

    r97454 r97701  
    2424    #region1, #region2, #region3 {
    2525        border: 1px solid black;
    26         content: -webkit-from-flow("flow1");
     26        -webkit-flow-from: flow1;
    2727    }
    2828

  • trunk/LayoutTests/fast/regions/positioned-objects-inline-static-in-regions.html

    r97454 r97701  
    2121    #region1, #region2, #region3 {
    2222        border: 1px solid black;
    23         content: -webkit-from-flow("flow1");
     23        -webkit-flow-from: flow1;
    2424    }
    2525

  • trunk/LayoutTests/fast/regions/positioned-objects-inline-static-in-rtl-regions.html

    r97454 r97701  
    2222    #region1, #region2, #region3 {
    2323        border: 1px solid black;
    24         content: -webkit-from-flow("flow1");
     24        -webkit-flow-from: flow1;
    2525    }
    2626

  • trunk/LayoutTests/fast/regions/positioned-objects-inline-static-spanning-regions-rtl.html

    r97454 r97701  
    2424    #region1, #region2, #region3 {
    2525        border: 1px solid black;
    26         content: -webkit-from-flow("flow1");
     26        -webkit-flow-from: flow1;
    2727    }
    2828

  • trunk/LayoutTests/fast/regions/positioned-objects-inline-static-spanning-regions.html

    r97454 r97701  
    2323    #region1, #region2, #region3 {
    2424        border: 1px solid black;
    25         content: -webkit-from-flow("flow1");
     25        -webkit-flow-from: flow1;
    2626    }
    2727

  • trunk/LayoutTests/fast/regions/positioned-objects-perpendicular-flows-in-regions.html

    r97454 r97701  
    2525    #region1, #region2, #region3 {
    2626        border: 1px solid black;
    27         content: -webkit-from-flow("flow1");
     27        -webkit-flow-from: flow1;
    2828    }
    2929

  • trunk/LayoutTests/fast/regions/positioned-objects-spanning-regions.html

    r97454 r97701  
    2323    #region1, #region2, #region3 {
    2424        border: 1px solid black;
    25         content: -webkit-from-flow("flow1");
     25        -webkit-flow-from: flow1;
    2626    }
    2727

  • trunk/LayoutTests/fast/regions/region-element-dynamic-attach-flow.html

    r91955 r97701  
    55            .region
    66            {
    7                 content: -webkit-from-flow('no_flow');
     7                -webkit-flow-from: no_flow;
    88            }
    99        </style>

  • trunk/LayoutTests/fast/regions/region-element-dynamic-detach-flow.html

    r91955 r97701  
    55            .region
    66            {
    7                 content: -webkit-from-flow("no-flow");
     7                -webkit-flow-from: no-flow;
    88            }
    99        </style>

  • trunk/LayoutTests/fast/regions/region-overflow-auto-overflow-hidden.html

    r97454 r97701  
    77
    88#region_1, #region_2 {
    9     content: -webkit-from-flow("article");
     9    -webkit-flow-from: article;
    1010    -webkit-region-overflow: auto;
    1111    overflow:hidden;

  • trunk/LayoutTests/fast/regions/region-overflow-auto-overflow-visible.html

    r97454 r97701  
    77
    88#region_1, #region_2 {
    9     content: -webkit-from-flow("article");
     9    -webkit-flow-from: article;
    1010    -webkit-region-overflow: auto;
    1111    overflow:visible;

  • trunk/LayoutTests/fast/regions/region-overflow-break.html

    r97454 r97701  
    77
    88#region_1, #region_2 {
    9     content: -webkit-from-flow("article");
     9    -webkit-flow-from: article;
    1010    -webkit-region-overflow: break;
    1111    display:inline-block;

  • trunk/LayoutTests/fast/regions/render-region-renderer.html

    r91955 r97701  
    55    .region
    66    {
    7         content: -webkit-from-flow("no-flow");
     7        -webkit-flow-from: no-flow;
    88    }
    99

  • trunk/LayoutTests/fast/regions/resources/region-style.css

    r97454 r97701  
    2222
    2323.regionArticle {
    24     content: -webkit-from-flow("article");
     24    -webkit-flow-from: article;
    2525}
    2626

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

    r90935 r97701  
    1 description('Tests being able to set content to -webkit-from-flow');
    2 
     1description('Tests parsing of -webkit-flow-from property');
     2 
    33function testCSSText(declaration) {
    4     var div = document.createElement("div");
    5     div.setAttribute("style", declaration);
    6     return div.style.content;
     4 var div = document.createElement("div");
     5 div.setAttribute("style", declaration);
     6 return div.style.webkitFlowFrom;
    77}
    88
    99function testComputedStyle(declaration) {
    10     var div = document.createElement("div");
    11     document.body.appendChild(div);
    12     div.style.setProperty("content", declaration);
     10 var div = document.createElement("div");
     11 document.body.appendChild(div);
     12 div.style.setProperty("-webkit-flow-from", declaration);
    1313
    14     var contentComputedValue = getComputedStyle(div).getPropertyValue("content");
    15     document.body.removeChild(div);
    16     return contentComputedValue;
     14 var contentComputedValue = getComputedStyle(div).getPropertyValue("-webkit-flow-from");
     15 document.body.removeChild(div);
     16 return contentComputedValue;
    1717}
    1818
    19 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(\'first-flow\')")', "-webkit-from-flow(first-flow)");
    20 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(\'first flow\')")', "-webkit-from-flow('first flow')");
    21 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(\'auto\')")', "-webkit-from-flow(auto)");
    22 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(auto)")', "");
    23 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(initial)")', "");
    24 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(inherit)")', "");
    25 shouldBeEqualToString('testCSSText("content: -webkit-from-flow()")', "");
    26 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(\'\')")', "-webkit-from-flow('')");
    27 shouldBeEqualToString('testCSSText("content: ;")', "");
    28 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(1)")', "");
    29 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(1.2)")', "");
    30 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(-1)")', "");
    31 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(12px)")', "");
    32 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(first flow)")', "");
    33 shouldBeEqualToString('testCSSText("content: -webkit-from-flow(first-flow)")', "");
     19shouldBeEqualToString('testCSSText("-webkit-flow-from: first-flow")', "first-flow");
     20shouldBeEqualToString('testCSSText("-webkit-flow-from: none")', "none");
     21shouldBeEqualToString('testCSSText("-webkit-flow-from: ")', "");
     22shouldBeEqualToString('testCSSText("-webkit-flow-from: \'first-flow\'")', "");
     23shouldBeEqualToString('testCSSText("-webkit-flow-from: 1")', "");
     24shouldBeEqualToString('testCSSText("-webkit-flow-from: 1.2")', "");
     25shouldBeEqualToString('testCSSText("-webkit-flow-from: -1")', "");
     26shouldBeEqualToString('testCSSText("-webkit-flow-from: 12px")', "");
     27shouldBeEqualToString('testCSSText("-webkit-from-flow: first flow")', "");
    3428
    35 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(\'first-flow\')")', "first-flow");
    36 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(\'first flow\')")', "'first flow'");
    37 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(\'auto\')")', "auto");
    38 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(auto)")', "");
    39 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(initial)")', "");
    40 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(inherit)")', "");
    41 shouldBeEqualToString('testComputedStyle("-webkit-from-flow()")', "");
    42 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(1)")', "");
    43 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(1.2)")', "");
    44 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(-1)")', "");
    45 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(12px)")', "");
    46 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(\'\')")', "''");
    47 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(first flow)")', "");
    48 shouldBeEqualToString('testComputedStyle("-webkit-from-flow(first-flow)")', "");
     29shouldBeEqualToString('testComputedStyle("first-flow")', "first-flow");
     30shouldBeEqualToString('testComputedStyle("\'first flow\'")', "none");
     31shouldBeEqualToString('testComputedStyle("none")', "none");
     32shouldBeEqualToString('testComputedStyle("initial")', "none");
     33shouldBeEqualToString('testComputedStyle("inherit")', "none");
     34shouldBeEqualToString('testComputedStyle("1")', "none");
     35shouldBeEqualToString('testComputedStyle("1.2")', "none");
     36shouldBeEqualToString('testComputedStyle("-1")', "none");
     37shouldBeEqualToString('testComputedStyle("12px")', "none");
    4938
    5039successfullyParsed = true;

  • trunk/LayoutTests/fast/regions/script-tests/region-element-display-restriction.js

    r91955 r97701  
    1010
    1111    // Transform the element into a region.
    12     element.style.setProperty("content", "-webkit-from-flow('no-flow')");
     12    element.style.setProperty("-webkit-flow-from", "no-flow");
    1313
    1414    // The region element was created if the length of inner text is 0.

  • trunk/LayoutTests/fast/regions/text-region-breaks.html

    r97454 r97701  
    33<style>
    44    #content { -webkit-flow-into: flow; }
    5     .region { content: -webkit-from-flow("flow"); }
     5    .region { -webkit-flow-from: flow; }
    66    .finished #content, .finished .region { display: none; }
    77

  • trunk/LayoutTests/fast/regions/text-region-split-after-resize.html

    r97454 r97701  
    33<style>
    44    #content { -webkit-flow-into: flow; }
    5     .region { content: -webkit-from-flow("flow"); border:2px solid black; margin:1em 0}
     5    .region { -webkit-flow-from: flow; border:2px solid black; margin:1em 0}
    66    .finished #content, .finished .region { display: none; }
    77

  • trunk/LayoutTests/fast/regions/text-region-split-horizontal-bt.html

    r97454 r97701  
    55
    66    #content { -webkit-flow-into: flow; }
    7     .region { content: -webkit-from-flow("flow"); }
     7    .region { -webkit-flow-from: flow; }
    88    .finished #content, .finished .region { display: none; }
    99

  • trunk/LayoutTests/fast/regions/text-region-split-small-pagination.html

    r97454 r97701  
    33<style>
    44    #content { -webkit-flow-into: flow; }
    5     .region { content: -webkit-from-flow("flow"); border:2px solid black; margin:1em 0}
     5    .region { -webkit-flow-from: flow; border:2px solid black; margin:1em 0}
    66    .finished #content, .finished .region { display: none; }
    77

  • trunk/LayoutTests/fast/regions/text-region-split-vertical-rl.html

    r97454 r97701  
    55   
    66    #content { -webkit-flow-into: flow; }
    7     .region { content: -webkit-from-flow("flow"); }
     7    .region { -webkit-flow-from: flow; }
    88    .finished #content, .finished .region { display: none; }
    99

  • trunk/LayoutTests/fast/regions/text-region-split-vertical.html

    r97454 r97701  
    55   
    66    #content { -webkit-flow-into: flow; }
    7     .region { content: -webkit-from-flow("flow"); }
     7    .region { -webkit-flow-from: flow; }
    88    .finished #content, .finished .region { display: none; }
    99   

  • trunk/LayoutTests/fast/regions/text-region-split.html

    r97454 r97701  
    33<style>
    44    #content { -webkit-flow-into: flow; }
    5     .region { content: -webkit-from-flow("flow"); }
     5    .region { -webkit-flow-from: flow; }
    66    .finished #content, .finished .region { display: none; }
    77

  • trunk/LayoutTests/fast/regions/top-overflow-out-of-second-region.html

    r97454 r97701  
    2121    #region1, #region2, #region3 {
    2222        border: 1px solid black;
    23         content: -webkit-from-flow("flow1");
     23        -webkit-flow-from: flow1;
    2424    }
    2525

  • trunk/LayoutTests/fast/regions/webkit-flow-double-pagination-float-push.html

    r97454 r97701  
    3333    #region1, #region2, #region3 {
    3434        border: 1px solid black;
    35         content: -webkit-from-flow("flow1");
     35        -webkit-flow-from: flow1;
    3636    }
    3737

  • trunk/LayoutTests/fast/regions/webkit-flow-float-pushed-to-last-region.html

    r97454 r97701  
    2626    #region1, #region2, #region3 {
    2727        border: 1px solid black;
    28         content: -webkit-from-flow("flow1");
     28        -webkit-flow-from: flow1;
    2929    }
    3030

  • trunk/LayoutTests/fast/regions/webkit-flow-float-unable-to-push.html

    r97454 r97701  
    2626    #region1, #region2, #region3 {
    2727        border: 1px solid black;
    28         content: -webkit-from-flow("flow1");
     28        -webkit-flow-from: flow1;
    2929    }
    3030

  • trunk/LayoutTests/fast/regions/webkit-flow-floats-inside-regions-bounds.html

    r97454 r97701  
    2626    #region1, #region2, #region3 {
    2727        border: 1px solid black;
    28         content: -webkit-from-flow("flow1");
     28        -webkit-flow-from: flow1;
    2929    }
    3030

  • trunk/LayoutTests/fast/regions/webkit-flow-inlines-dynamic.html

    r97454 r97701  
    1919    #region1, #region2, #region3 {
    2020        border: 1px solid black;
    21         content: -webkit-from-flow("flow1");
     21        -webkit-flow-from: flow1;
    2222    }
    2323

  • trunk/LayoutTests/fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical-rl.html

    r97454 r97701  
    2121    #region1, #region2, #region3 {
    2222        border: 1px solid black;
    23         content: -webkit-from-flow("flow1");
     23        -webkit-flow-from: flow1;
    2424    }
    2525

  • trunk/LayoutTests/fast/regions/webkit-flow-inlines-inside-regions-bounds-vertical.html

    r97454 r97701  
    2121    #region1, #region2, #region3 {
    2222        border: 1px solid black;
    23         content: -webkit-from-flow("flow1");
     23        -webkit-flow-from: flow1;
    2424    }
    2525

  • trunk/LayoutTests/fast/regions/webkit-flow-inlines-inside-regions-bounds.html

    r97454 r97701  
    1919    #region1, #region2, #region3 {
    2020        border: 1px solid black;
    21         content: -webkit-from-flow("flow1");
     21        -webkit-flow-from: flow1;
    2222    }
    2323

  • trunk/LayoutTests/fast/regions/webkit-flow-renderer-layer.html

    r97454 r97701  
    2424        height: 100px;
    2525    }
    26     #REGION1 { content: -webkit-from-flow('flowA'); }
    27     #REGION2 { content: -webkit-from-flow('flowB'); }
    28     #REGION3 { content: -webkit-from-flow('flowC'); }
     26    #REGION1 { -webkit-flow-from: flowA; }
     27    #REGION2 { -webkit-flow-from: flowB; }
     28    #REGION3 { -webkit-flow-from: flowC; }
    2929</style>
    3030

  • trunk/LayoutTests/fast/regions/webkit-flow-renderer-nested.html

    r97454 r97701  
    99    height: 100px;
    1010}
    11 #REGION1 { content: -webkit-from-flow('flowA'); }
    12 #REGION2 { content: -webkit-from-flow('flowB'); }
     11#REGION1 { -webkit-flow-from: flowA; }
     12#REGION2 { -webkit-flow-from: flowB; }
    1313</style>
    1414

  • trunk/LayoutTests/fast/regions/webkit-flow-renderer.html

    r97454 r97701  
    1010    height: 100px;
    1111}
    12 #REGION1 { content: -webkit-from-flow('flowA'); }
    13 #REGION2 { content: -webkit-from-flow('flowB'); }
    14 #REGION3 { content: -webkit-from-flow('flowC'); }
     12#REGION1 { -webkit-flow-from: flowA; }
     13#REGION2 { -webkit-flow-from: flowB; }
     14#REGION3 { -webkit-flow-from: flowC; }
    1515</style>
    1616

  • trunk/LayoutTests/fast/repaint/japanese-rl-selection-repaint-in-regions.html

    r97454 r97701  
    2828せっかく見つけたすばらしい記事がどこにあったか忘れてしまった経験はありますかならタイトルとアドレスだけでなく、訪問したウェブページのコンテンツからも検索することができます。せっかく見つけたすばらしい記事がどこにあったか忘れてしまった経験はありますか ならタイトルとアドレスだけでなく、訪問したウェブページのコンテンツからも検索することができます。訪問したウェブページのコンテンツからも検索することができます。せっかく見つけたすばらしい記事がどこにあったか忘れてしまった経験はありますか ならタイトルとアドレスだけでなく、訪問
    2929</div>
    30 <div style="content:-webkit-from-flow('thread'); position:absolute;right:100px; top:100px; border:2px solid black; width:400px; height:400px"></div>
     30<div style="-webkit-flow-from: thread; position:absolute;right:100px; top:100px; border:2px solid black; width:400px; height:400px"></div>
    3131</body>

  • trunk/LayoutTests/fast/repaint/line-flow-with-floats-in-regions.html

    r97454 r97701  
    88    </script>
    99    <iframe onload="loaded()" id="iframe" src="resources/line-flow-with-floats.html" style="border: none; width: 500px; height: 600px; -webkit-flow-into:thread"></iframe>
    10     <div style="position:absolute;left:100px;top:0;width:500px;height:600px;content:-webkit-from-flow('thread')"></div>
     10    <div style="position:absolute;left:100px;top:0;width:500px;height:600px;-webkit-flow-from: thread"></div>
    1111</body>

  • trunk/LayoutTests/fast/repaint/overflow-flipped-writing-mode-block-in-regions.html

    r97454 r97701  
    1414</div>
    1515<div id="target" style="-webkit-flow-into: thread; height: 50px; width: 100px; background-color: red; margin-top: -100px;"></div>
    16 <div style="content:-webkit-from-flow('thread'); width:100px;height:400px; border:2px solid black; position:absolute; left:100px; top:100px"></div>
     16<div style="-webkit-flow-from: thread; width:100px;height:400px; border:2px solid black; position:absolute; left:100px; top:100px"></div>

  • trunk/LayoutTests/fast/repaint/region-painting-via-layout.html

    r97454 r97701  
    1212
    1313#region1, #region2, #region3 {
    14     content: -webkit-from-flow("flow1");
     14    -webkit-flow-from: flow1;
    1515}
    1616

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

    r97454 r97701  
    199199-webkit-writing-mode: horizontal-tb;
    200200-webkit-flow-into: auto;
     201-webkit-flow-from: none;
    201202-webkit-region-overflow: auto;
    202203-webkit-region-break-after: auto;

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

    r97454 r97701  
    198198    -webkit-writing-mode: horizontal-tb
    199199    -webkit-flow-into: auto
     200    -webkit-flow-from: none
    200201    -webkit-region-overflow: auto
    201202    -webkit-region-break-after: auto

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

    r97454 r97701  
    395395rect: style.getPropertyValue(-webkit-flow-into) : auto
    396396rect: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
     397rect: style.getPropertyValue(-webkit-flow-from) : none
     398rect: style.getPropertyCSSValue(-webkit-flow-from) : [object CSSPrimitiveValue]
    397399rect: style.getPropertyValue(-webkit-region-overflow) : auto
    398400rect: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue]
    … …  
    873875g: style.getPropertyValue(-webkit-flow-into) : auto
    874876g: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
     877g: style.getPropertyValue(-webkit-flow-from) : none
     878g: style.getPropertyCSSValue(-webkit-flow-from) : [object CSSPrimitiveValue]
    875879g: style.getPropertyValue(-webkit-region-overflow) : auto
    876880g: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue]

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

    r97454 r97701  
    395395rect: style.getPropertyValue(-webkit-flow-into) : auto
    396396rect: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
     397rect: style.getPropertyValue(-webkit-flow-from) : none
     398rect: style.getPropertyCSSValue(-webkit-flow-from) : [object CSSPrimitiveValue]
    397399rect: style.getPropertyValue(-webkit-region-overflow) : auto
    398400rect: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue]
    … …  
    873875g: style.getPropertyValue(-webkit-flow-into) : auto
    874876g: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
     877g: style.getPropertyValue(-webkit-flow-from) : none
     878g: style.getPropertyCSSValue(-webkit-flow-from) : [object CSSPrimitiveValue]
    875879g: style.getPropertyValue(-webkit-region-overflow) : auto
    876880g: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue]

  • trunk/Source/WebCore/ChangeLog

    r97697 r97701  
     12011-10-17  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSS Regions]Change content:-webkit-from-flow to -webkit-flow-from
     4        https://bugs.webkit.org/show_bug.cgi?id=70104
     5
     6        Reviewed by David Hyatt.
     7
     8        1. -webkit-flow-from is now a property instead of being an addition to content property.
     9        2. -webkit-flow-from takes an identifier instead of string.
     10
     11        * css/CSSComputedStyleDeclaration.cpp:
     12        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     13        * css/CSSParser.cpp:
     14        (WebCore::CSSParser::parseValue):
     15        (WebCore::CSSParser::parseContent):
     16        (WebCore::CSSParser::parseRegionThread):
     17        * css/CSSParser.h:
     18        * css/CSSPrimitiveValue.cpp:
     19        (WebCore::isValidCSSUnitTypeForDoubleConversion):
     20        (WebCore::CSSPrimitiveValue::cleanup):
     21        (WebCore::CSSPrimitiveValue::getStringValue):
     22        (WebCore::CSSPrimitiveValue::cssText):
     23        * css/CSSPrimitiveValue.h:
     24        * css/CSSPropertyNames.in:
     25        * css/CSSStyleSelector.cpp:
     26        (WebCore::CSSStyleSelector::applyProperty):
     27
    1282011-10-17  Kentaro Hara  <haraken@chromium.org>
    229

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

    r97502 r97701  
    276276    CSSPropertyWebkitWritingMode,
    277277    CSSPropertyWebkitFlowInto,
     278    CSSPropertyWebkitFlowFrom,
    278279    CSSPropertyWebkitRegionOverflow,
    279280    CSSPropertyWebkitRegionBreakAfter,
    … …  
    19881989                return primitiveValueCache->createIdentifierValue(CSSValueAuto);
    19891990            return primitiveValueCache->createValue(style->flowThread(), CSSPrimitiveValue::CSS_STRING);
     1991        case CSSPropertyWebkitFlowFrom:
     1992            if (style->regionThread().isNull())
     1993                return primitiveValueCache->createIdentifierValue(CSSValueNone);
     1994            return primitiveValueCache->createValue(style->regionThread(), CSSPrimitiveValue::CSS_STRING);
    19901995        case CSSPropertyWebkitRegionOverflow:
    19911996            return primitiveValueCache->createValue(style->regionOverflow());

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

    r97687 r97701  
    16421642    case CSSPropertyWebkitFlowInto:
    16431643        return parseFlowThread(propId, important);
     1644    case CSSPropertyWebkitFlowFrom:
     1645        return parseRegionThread(propId, important);
    16441646    case CSSPropertyWebkitRegionOverflow:
    16451647        if (id == CSSValueAuto || id == CSSValueBreak)
    … …  
    27182720            } else if (isGeneratedImageValue(val)) {
    27192721                if (!parseGeneratedImage(parsedValue))
    2720                     return false;
    2721             } else if (equalIgnoringCase(val->function->name, "-webkit-from-flow(")) {
    2722                 parsedValue = parseFromFlowContent(args);
    2723                 if (!parsedValue)
    27242722                    return false;
    27252723            } else
    … …  
    65496547}
    65506548
    6551 // The region name is now specified as an argument to the content property:
    6552 // content: from-flow(flow_thread_name)
    6553 PassRefPtr<CSSValue> CSSParser::parseFromFlowContent(CSSParserValueList* args)
    6554 {
    6555     // It should be only one name for the region thread.
    6556     if (args->size() != 1)
    6557         return 0;
    6558 
    6559     CSSParserValue* argFlowThreadName = args->current();
    6560 
    6561     if (argFlowThreadName->unit != CSSPrimitiveValue::CSS_STRING)
    6562         return 0;
    6563 
    6564     return CSSPrimitiveValue::create(argFlowThreadName->string, CSSPrimitiveValue::CSS_FROM_FLOW);
     6549// -webkit-flow-from: none | <ident>
     6550bool CSSParser::parseRegionThread(int propId, bool important)
     6551{
     6552    ASSERT(propId == CSSPropertyWebkitFlowFrom);
     6553
     6554    if (m_valueList->size() != 1)
     6555        return false;
     6556
     6557    CSSParserValue* value = m_valueList->current();
     6558    if (!value)
     6559        return false;
     6560
     6561    if (value->unit != CSSPrimitiveValue::CSS_IDENT)
     6562        return false;
     6563
     6564    if (value->id == CSSValueNone)
     6565        addProperty(propId, primitiveValueCache()->createIdentifierValue(value->id), important);
     6566    else {
     6567        String inputProperty = String(value->string);
     6568        if (!inputProperty.isEmpty()) {
     6569            if (!validFlowName(inputProperty))
     6570                return false;
     6571            addProperty(propId, primitiveValueCache()->createValue(inputProperty, CSSPrimitiveValue::CSS_STRING), important);
     6572        } else
     6573            addProperty(propId, primitiveValueCache()->createIdentifierValue(CSSValueNone), important);
     6574    }
     6575
     6576    return true;
    65656577}
    65666578

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

    r97511 r97701  
    201201
    202202    bool parseFlowThread(int propId, bool important);
    203     PassRefPtr<CSSValue> parseFromFlowContent(CSSParserValueList*);
     203    bool parseRegionThread(int propId, bool important);
    204204
    205205    int yyparse();

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

    r97583 r97701  
    7878    case CSSPrimitiveValue:: CSS_COUNTER_NAME:
    7979    case CSSPrimitiveValue:: CSS_DASHBOARD_REGION:
    80     case CSSPrimitiveValue:: CSS_FROM_FLOW:
    8180    case CSSPrimitiveValue:: CSS_IDENT:
    8281    case CSSPrimitiveValue:: CSS_PAIR:
    … …  
    294293        case CSS_URI:
    295294        case CSS_ATTR:
    296         case CSS_FROM_FLOW:
    297295        case CSS_PARSER_HEXCOLOR:
    298296            if (m_value.string)
    … …  
    584582        case CSS_ATTR:
    585583        case CSS_URI:
    586         case CSS_FROM_FLOW:
    587584            return m_value.string;
    588585        case CSS_IDENT:
    … …  
    602599        case CSS_ATTR:
    603600        case CSS_URI:
    604         case CSS_FROM_FLOW:
    605601             return m_value.string;
    606602        case CSS_IDENT:
    … …  
    776772        case CSS_STRING:
    777773            text = quoteCSSStringIfNeeded(m_value.string);
    778             break;
    779         case CSS_FROM_FLOW:
    780             text = "-webkit-from-flow(" + quoteCSSStringIfNeeded(m_value.string) + ")";
    781774            break;
    782775        case CSS_URI:

  • trunk/Source/WebCore/css/CSSPrimitiveValue.h

    r97583 r97701  
    9999        // This is used internally for counter names (as opposed to counter values)
    100100        CSS_COUNTER_NAME = 109,
    101         CSS_FROM_FLOW = 110,
    102101
    103102        // This is used by the CSS Exclusions draft
    104         CSS_SHAPE = 111,
     103        CSS_SHAPE = 110,
    105104       
    106105        // Used by border images.
    107         CSS_QUAD = 112
     106        CSS_QUAD = 111
    108107    };
    109108   

  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r97454 r97701  
    350350-webkit-user-select
    351351-webkit-flow-into
     352-webkit-flow-from
    352353-webkit-region-overflow
    353354-webkit-wrap-shape

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

    r97670 r97701  
    26952695            return;
    26962696
    2697         CSSValueListInspector inspector = value;
    2698         if (inspector.length() == 1 && inspector.first()->isPrimitiveValue()) {
    2699             CSSPrimitiveValue* contentValue = static_cast<CSSPrimitiveValue*>(inspector.first());
    2700             if (contentValue->primitiveType() == CSSPrimitiveValue::CSS_FROM_FLOW) {
    2701                 m_style->setRegionThread(contentValue->getStringValue().impl());
    2702                 return;
    2703             }
    2704         }
    2705 
    27062697        bool didSet = false;
    27072698        for (CSSValueListIterator i = value; i.hasMore(); i.advance()) {
    … …  
    33683359        return;
    33693360    case CSSPropertyWebkitFlowInto:
    3370         if (isInitial)
    3371             HANDLE_INITIAL_COND(CSSPropertyWebkitFlowInto, FlowThread);
    3372         if (isInherit) {
    3373             m_style->setFlowThread(nullAtom);
    3374             return;
    3375         }
     3361        HANDLE_INHERIT_AND_INITIAL(flowThread, FlowThread);
    33763362        if (primitiveValue->getIdent() == CSSValueAuto)
    33773363            m_style->setFlowThread(nullAtom);
    33783364        else
    33793365            m_style->setFlowThread(primitiveValue->getStringValue());
     3366        return;
     3367    case CSSPropertyWebkitFlowFrom:
     3368        HANDLE_INHERIT_AND_INITIAL(regionThread, RegionThread);
     3369        if (primitiveValue->getIdent() == CSSValueNone)
     3370            m_style->setRegionThread(nullAtom);
     3371        else
     3372            m_style->setRegionThread(primitiveValue->getStringValue());
    33803373        return;
    33813374    case CSSPropertyWebkitRegionOverflow:
Note: See TracChangeset for help on using the changeset viewer.