Changeset 97454 in webkit


Ignore:
Timestamp:
Oct 14, 2011 2:28:45 AM (13 years ago)
Author:
mihnea@adobe.com
Message:

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

Reviewed by David Hyatt.

  1. -webkit-flow is renamed to -webkit-flow-into
  2. -webkit-flow-into takes <ident> instead of strings

Source/WebCore:

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::validFlowName):
(WebCore::CSSParser::parseFlowThread):

  • 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/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-overflow-auto-overflow-hidden.html:
  • fast/regions/region-overflow-auto-overflow-visible.html:
  • fast/regions/region-overflow-break.html:
  • fast/regions/resources/region-style.css:

(.flowArticle):

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

(test):
(testComputedStyle):
(testNotInherited):

  • 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-parsing-expected.txt:
  • 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:
81 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

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

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

    r97308 r97454  
    198198-webkit-user-select: text;
    199199-webkit-writing-mode: horizontal-tb;
    200 -webkit-flow: auto;
     200-webkit-flow-into: auto;
    201201-webkit-region-overflow: auto;
    202202-webkit-region-break-after: auto;

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

    r97308 r97454  
    197197    -webkit-user-select: text
    198198    -webkit-writing-mode: horizontal-tb
    199     -webkit-flow: auto
     199    -webkit-flow-into: auto
    200200    -webkit-region-overflow: auto
    201201    -webkit-region-break-after: auto

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

    r96975 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r93428 r97454  
    1313
    1414            #flow {
    15                 -webkit-flow: 'article';
     15                -webkit-flow-into: article;
    1616            }
    1717

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

    r97391 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r96620 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r93708 r97454  
    22
    33<style>
    4 .flow { -webkit-flow: "flow"; }
     4.flow { -webkit-flow-into: flow; }
    55#region { content: -webkit-from-flow("flow"); }
    66span { display: inline-block; }

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

    r92969 r97454  
    1313
    1414        #source{
    15             -webkit-flow: "main-thread";
     15            -webkit-flow-into: main-thread;
    1616        }
    1717

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

    r92981 r97454  
    1313
    1414        #source{
    15             -webkit-flow: "main-thread";
     15            -webkit-flow-into: main-thread;
    1616        }
    1717       

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

    r92969 r97454  
    1111    <style type="text/css">
    1212        #source{
    13             -webkit-flow: "main-thread";
     13            -webkit-flow-into: main-thread;
    1414        }
    1515       

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

    r93307 r97454  
    22
    33<style>
    4 .flowA { -webkit-flow: 'flowA'; }
    5 .flowB { -webkit-flow: 'flowB'; }
    6 .flowC { -webkit-flow: 'flowC'; }
     4.flowA { -webkit-flow-into: flowA; }
     5.flowB { -webkit-flow-into: flowB; }
     6.flowC { -webkit-flow-into: flowC; }
    77
    88.regionFlowA { content: -webkit-from-flow('flowA'); }
    99.regionFlowB { content: -webkit-from-flow('flowB'); }
    1010.regionFlowC { content: -webkit-from-flow('flowC'); }
    11 
    12 .index1 { -webkit-content-order: 1; }
    13 .index2 { -webkit-content-order: 2; }
    14 .index3 { -webkit-content-order: 3; }
    1511</style>
    1612
    1713<div class="flowA">
    18     <div class="regionFlowB index1"></div>
     14    <div class="regionFlowB"></div>
    1915</div>
    2016
    2117<div class="flowB">
    22     <div class="regionFlowC index1"></div>
     18    <div class="regionFlowC"></div>
    2319</div>
    2420
    2521<div class="flowC">
    2622    <!-- The following region will initially be invalid. Removing regionFlowC should make it valid again. -->
    27     <div class="regionFlowA index1"></div>
     23    <div class="regionFlowA"></div>
    2824</div>
    2925
    3026<!-- Force the creation of the flows. In the future we might avoid creating flows if there are no reachable regions. -->
    31 <div class="regionFlowA index2"></div>
     27<div class="regionFlowA"></div>
    3228
    3329<script>

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

    r93307 r97454  
    22
    33<style>
    4 .flowA { -webkit-flow: 'flowA'; }
    5 .flowB { -webkit-flow: 'flowB'; }
    6 .flowC { -webkit-flow: 'flowC'; }
     4.flowA { -webkit-flow-into: flowA; }
     5.flowB { -webkit-flow-into: flowB; }
     6.flowC { -webkit-flow-into: flowC; }
    77
    88.regionFlowA { content: -webkit-from-flow('flowA'); }
    99.regionFlowB { content: -webkit-from-flow('flowB'); }
    1010.regionFlowC { content: -webkit-from-flow('flowC'); }
    11 
    12 .index1 { -webkit-content-order: 1; }
    13 .index2 { -webkit-content-order: 2; }
    14 .index3 { -webkit-content-order: 3; }
    1511</style>
    1612
    1713<div class="flowA">
    1814    <!-- The following region should be ignored. Direct circular reference. -->
    19     <div class="regionFlowA index1"></div>
     15    <div class="regionFlowA"></div>
    2016</div>
    2117
    2218<div class="flowB">
    23     <div class="regionFlowC index1"></div>
     19    <div class="regionFlowC"></div>
    2420    <!-- The following region should be ignored. Direct circular reference. -->
    25     <div class="flowC regionFlowC index2"></div>
     21    <div class="flowC regionFlowC"></div>
    2622</div>
    2723
    … …  
    2925    <!-- The following region should be invalid. Circular reference through flowB which already has created a link to this flow
    3026         through the "regionFlowC index1" region. -->
    31     <div class="regionFlowB index1"></div>
    32     <div class="regionFlowA index2"></div>
     27    <div class="regionFlowB"></div>
     28    <div class="regionFlowA"></div>
    3329</div>
    3430
    3531<!-- Force the creation of the flows. In the future we might avoid creating flows if there are no reachable regions. -->
    36 <div class="regionFlowA index3"></div>
    37 <div class="regionFlowB index2"></div>
    38 <div class="regionFlowC index3"></div>
     32<div class="regionFlowA"></div>
     33<div class="regionFlowB"></div>
     34<div class="regionFlowC"></div>

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

    r92993 r97454  
    88    <div style="position:absolute;left:0;top:0;content: -webkit-from-flow('flow'); width:150px;height:200px;"></div>
    99    <div style="position:absolute;left:150px;top:0;content: -webkit-from-flow('flow'); width:150px;height:200px"></div>
    10     <div style="-webkit-flow: 'flow'">
     10    <div style="-webkit-flow-into: flow">
    1111        <div style="height: 250px; background-color: purple;"></div>
    1212        <div style="float: right; background-color: lightyellow; margin: 5px;">

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

    r96431 r97454  
    44 <style>
    55    #content {
    6         -webkit-flow: "flow1";
     6        -webkit-flow-into: flow1;
    77        text-align: justify;
    88        padding: 5px;

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

    r95571 r97454  
    77<style type="text/css">
    88  .article{
    9     -webkit-flow: "thread";
     9    -webkit-flow-into: thread;
    1010    line-height:14px;
    1111  }

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

    r96718 r97454  
    77       
    88        #source{
    9                 -webkit-flow: "body";
     9                -webkit-flow-into: body;
    1010        }
    1111       

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

    r96620 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r96620 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r96620 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r96620 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r96620 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r96620 r97454  
    44 <style>
    55    #content {
    6         -webkit-flow: "flow1";
     6        -webkit-flow-into: flow1;
    77        text-align: justify;
    88        padding: 5px;

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

    r96620 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r97282 r97454  
    44 <style>
    55    #content {
    6         -webkit-flow: "flow1";
     6        -webkit-flow-into: flow1;
    77        text-align: justify;
    88        padding: 5px;

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

    r96620 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r96423 r97454  
    44 <style>
    55    #content {
    6         -webkit-flow: "flow1";
     6        -webkit-flow-into: flow1;
    77        text-align: justify;
    88        padding: 5px;

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

    r96423 r97454  
    44 <style>
    55    #content {
    6         -webkit-flow: "flow1";
     6        -webkit-flow-into: flow1;
    77        text-align: justify;
    88        padding: 5px;

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

    r96423 r97454  
    44 <style>
    55    #content {
    6         -webkit-flow: "flow1";
     6        -webkit-flow-into: flow1;
    77        text-align: justify;
    88        padding: 5px;

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

    r96408 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r97282 r97454  
    44 <style>
    55    #content {
    6         -webkit-flow: "flow1";
     6        -webkit-flow-into: flow1;
    77    }
    88   

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

    r96452 r97454  
    33 <style>
    44    #content {
    5        -webkit-flow: "flow1";
     5       -webkit-flow-into: flow1;
    66    }
    77   

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

    r96452 r97454  
    44 <style>
    55    #content {
    6         -webkit-flow: "flow1";
     6        -webkit-flow-into: flow1;
    77    }
    88   

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

    r97282 r97454  
    44 <style>
    55    #content {
    6        -webkit-flow: "flow1";
     6       -webkit-flow-into: flow1;
    77    }
    88   

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

    r97282 r97454  
    33 <style>
    44    #content {
    5        -webkit-flow: "flow1";
     5       -webkit-flow-into: flow1;
    66    }
    77   

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

    r96452 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r96452 r97454  
    44 <style>
    55    #content {
    6         -webkit-flow: "flow1";
     6        -webkit-flow-into: flow1;
    77        text-align: justify;
    88        padding: 5px;

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

    r96452 r97454  
    33 <style>
    44    #content {
    5        -webkit-flow: "flow1";
     5       -webkit-flow-into: flow1;
    66    }
    77   

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

    r96452 r97454  
    44 <style>
    55    #content {
    6        -webkit-flow: "flow1";
     6       -webkit-flow-into: flow1;
    77    }
    88   

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

    r97282 r97454  
    44 <style>
    55    #content {
    6        -webkit-flow: "flow1";
     6       -webkit-flow-into: flow1;
    77    }
    88   

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

    r97282 r97454  
    33 <style>
    44    #content {
    5        -webkit-flow: "flow1";
     5       -webkit-flow-into: flow1;
    66    }
    77   

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

    r96452 r97454  
    44 <style>
    55    #content {
    6         -webkit-flow: "flow1";
     6        -webkit-flow-into: flow1;
    77        text-align: justify;
    88        padding: 5px;

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

    r97282 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r96675 r97454  
    33<style>
    44#article {
    5     -webkit-flow: "article";
     5    -webkit-flow-into: article;
    66}
    77

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

    r96675 r97454  
    33<style>
    44#article {
    5     -webkit-flow: "article";
     5    -webkit-flow-into: article;
    66}
    77

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

    r96675 r97454  
    33<style>
    44#article {
    5     -webkit-flow: "article";
     5    -webkit-flow-into: article;
    66}
    77

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

    r92969 r97454  
    1818
    1919.flowArticle {
    20     -webkit-flow: "article";
     20    -webkit-flow-into: article;
    2121}
    2222

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

    r90541 r97454  
    1 description('Test parsing of the CSS webkit-flow property.');
     1description('Test parsing of the CSS webkit-flow-into property.');
    22
    33function test(declaration) {
    44    var div = document.createElement("div");
    55    div.setAttribute("style", declaration);
    6     return div.style.webkitFlow;
     6    return div.style.webkitFlowInto;
    77}
    88
    … …  
    1010    var div = document.createElement("div");
    1111    document.body.appendChild(div);
    12     div.style.setProperty("-webkit-flow", value);
    13     var webkitFlowComputedValue = getComputedStyle(div).getPropertyValue("-webkit-flow");
     12    div.style.setProperty("-webkit-flow-into", value);
     13    var webkitFlowComputedValue = getComputedStyle(div).getPropertyValue("-webkit-flow-into");
    1414    document.body.removeChild(div);
    1515    return webkitFlowComputedValue;
    … …  
    1919    var parentDiv = document.createElement("div");
    2020    document.body.appendChild(parentDiv);
    21     parentDiv.style.setProperty("-webkit-flow", parentValue);
     21    parentDiv.style.setProperty("-webkit-flow-into", parentValue);
    2222
    2323    var childDiv = document.createElement("div");
    2424    parentDiv.appendChild(childDiv);
    25     childDiv.style.setProperty("-webkit-flow", childValue);
     25    childDiv.style.setProperty("-webkit-flow-into", childValue);
    2626
    27     var childWebKitFlowComputedValue = getComputedStyle(childDiv).getPropertyValue("-webkit-flow");
     27    var childWebKitFlowComputedValue = getComputedStyle(childDiv).getPropertyValue("-webkit-flow-into");
    2828
    2929    parentDiv.removeChild(childDiv);
    … …  
    3333}
    3434
    35 shouldBeEqualToString('test("-webkit-flow: auto")', "auto");
    36 shouldBeEqualToString('test("-webkit-flow: initial")', "initial");
    37 shouldBeEqualToString('test("-webkit-flow: inherit")', "inherit");
    38 shouldBeEqualToString('test("-webkit-flow: \'first-flow\'")', "first-flow");
    39 shouldBeEqualToString('test("-webkit-flow: \'first flow\'")', "'first flow'");
    40 shouldBeEqualToString('test("-webkit-flow: \'auto\';")', "auto");
    41 shouldBeEqualToString('test("-webkit-flow: \'\'")', "auto");
    42 shouldBeEqualToString('test("-webkit-flow: ;")', "");
    43 shouldBeEqualToString('test("-webkit-flow: 1")', "");
    44 shouldBeEqualToString('test("-webkit-flow: 1.2")', "");
    45 shouldBeEqualToString('test("-webkit-flow: -1")', "");
    46 shouldBeEqualToString('test("-webkit-flow: 12px")', "");
    47 shouldBeEqualToString('test("-webkit-flow: first-flow;")', "");
    48 shouldBeEqualToString('test("-webkit-flow: first flow")', "");
     35shouldBeEqualToString('test("-webkit-flow-into: auto")', "auto");
     36shouldBeEqualToString('test("-webkit-flow-into: first-flow")', "first-flow");
     37shouldBeEqualToString('test("-webkit-flow-into: \'first flow\'")', "");
     38shouldBeEqualToString('test("-webkit-flow-into: ;")', "");
     39shouldBeEqualToString('test("-webkit-flow-into: 1")', "");
     40shouldBeEqualToString('test("-webkit-flow-into: 1.2")', "");
     41shouldBeEqualToString('test("-webkit-flow-into: -1")', "");
     42shouldBeEqualToString('test("-webkit-flow-into: 12px")', "");
    4943
    5044shouldBeEqualToString('testComputedStyle("auto")', "auto");
    5145shouldBeEqualToString('testComputedStyle("")', "auto");
    52 shouldBeEqualToString('testComputedStyle("\'auto\'")', "auto");
    53 shouldBeEqualToString('testComputedStyle("\'first-flow\'")', "first-flow");
    54 shouldBeEqualToString('testComputedStyle("first-flow")', "auto");
    55 shouldBeEqualToString('testComputedStyle("inherited")', "auto");
    56 shouldBeEqualToString('testComputedStyle("initial")', "auto");
     46shouldBeEqualToString('testComputedStyle("\'first-flow\'")', "auto");
     47shouldBeEqualToString('testComputedStyle("first-flow")', "first-flow");
    5748shouldBeEqualToString('testComputedStyle("12px")', "auto");
    5849
    5950shouldBeEqualToString('testNotInherited("auto", "auto")', "auto");
    60 shouldBeEqualToString('testNotInherited("auto", "\'child-flow\'")', "child-flow");
    61 shouldBeEqualToString('testNotInherited("\'parent-flow\'", "auto")', "auto");
    62 shouldBeEqualToString('testNotInherited("\'parent-flow\'", "\'child-flow\'")', "child-flow");
     51shouldBeEqualToString('testNotInherited("auto", "child-flow")', "child-flow");
     52shouldBeEqualToString('testNotInherited("parent-flow", "auto")', "auto");
     53shouldBeEqualToString('testNotInherited("parent-flow", "child-flow")', "child-flow");
    6354
    6455successfullyParsed = true;

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

    r95264 r97454  
    22
    33<style>
    4     #content { -webkit-flow: 'flow'; }
     4    #content { -webkit-flow-into: flow; }
    55    .region { content: -webkit-from-flow("flow"); }
    66    .finished #content, .finished .region { display: none; }

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

    r95648 r97454  
    22<head>
    33<style>
    4     #content { -webkit-flow: 'flow'; }
     4    #content { -webkit-flow-into: flow; }
    55    .region { content: -webkit-from-flow("flow"); border:2px solid black; margin:1em 0}
    66    .finished #content, .finished .region { display: none; }

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

    r95264 r97454  
    44    html { -webkit-writing-mode: horizontal-bt; }
    55
    6     #content { -webkit-flow: 'flow'; }
     6    #content { -webkit-flow-into: flow; }
    77    .region { content: -webkit-from-flow("flow"); }
    88    .finished #content, .finished .region { display: none; }

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

    r95670 r97454  
    22<head>
    33<style>
    4     #content { -webkit-flow: 'flow'; }
     4    #content { -webkit-flow-into: flow; }
    55    .region { content: -webkit-from-flow("flow"); border:2px solid black; margin:1em 0}
    66    .finished #content, .finished .region { display: none; }

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

    r95264 r97454  
    44    html { -webkit-writing-mode: vertical-rl; }
    55   
    6     #content { -webkit-flow: 'flow'; }
     6    #content { -webkit-flow-into: flow; }
    77    .region { content: -webkit-from-flow("flow"); }
    88    .finished #content, .finished .region { display: none; }

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

    r95264 r97454  
    44    html { -webkit-writing-mode: vertical-lr; }
    55   
    6     #content { -webkit-flow: 'flow'; }
     6    #content { -webkit-flow-into: flow; }
    77    .region { content: -webkit-from-flow("flow"); }
    88    .finished #content, .finished .region { display: none; }

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

    r95264 r97454  
    22
    33<style>
    4     #content { -webkit-flow: 'flow'; }
     4    #content { -webkit-flow-into: flow; }
    55    .region { content: -webkit-from-flow("flow"); }
    66    .finished #content, .finished .region { display: none; }

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

    r96975 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r96149 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r96162 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r95855 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r93627 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r95756 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r93627 r97454  
    55 
    66    #content {
    7         -webkit-flow: "flow1";
     7        -webkit-flow-into: flow1;
    88        text-align: justify;
    99        padding: 5px;

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

    r93627 r97454  
    55 
    66    #content {
    7         -webkit-flow: "flow1";
     7        -webkit-flow-into: flow1;
    88        text-align: justify;
    99        padding: 5px;

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

    r93627 r97454  
    33 <style>
    44    #content {
    5         -webkit-flow: "flow1";
     5        -webkit-flow-into: flow1;
    66        text-align: justify;
    77        padding: 5px;

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

    r90541 r97454  
    1 Test parsing of the CSS webkit-flow property.
     1Test parsing of the CSS webkit-flow-into property.
    22
    33On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
    44
    55
    6 PASS test("-webkit-flow: auto") is "auto"
    7 PASS test("-webkit-flow: initial") is "initial"
    8 PASS test("-webkit-flow: inherit") is "inherit"
    9 PASS test("-webkit-flow: 'first-flow'") is "first-flow"
    10 PASS test("-webkit-flow: 'first flow'") is "'first flow'"
    11 PASS test("-webkit-flow: 'auto';") is "auto"
    12 PASS test("-webkit-flow: ''") is "auto"
    13 PASS test("-webkit-flow: ;") is ""
    14 PASS test("-webkit-flow: 1") is ""
    15 PASS test("-webkit-flow: 1.2") is ""
    16 PASS test("-webkit-flow: -1") is ""
    17 PASS test("-webkit-flow: 12px") is ""
    18 PASS test("-webkit-flow: first-flow;") is ""
    19 PASS test("-webkit-flow: first flow") is ""
     6PASS test("-webkit-flow-into: auto") is "auto"
     7PASS test("-webkit-flow-into: first-flow") is "first-flow"
     8PASS test("-webkit-flow-into: 'first flow'") is ""
     9PASS test("-webkit-flow-into: ;") is ""
     10PASS test("-webkit-flow-into: 1") is ""
     11PASS test("-webkit-flow-into: 1.2") is ""
     12PASS test("-webkit-flow-into: -1") is ""
     13PASS test("-webkit-flow-into: 12px") is ""
    2014PASS testComputedStyle("auto") is "auto"
    2115PASS testComputedStyle("") is "auto"
    22 PASS testComputedStyle("'auto'") is "auto"
    23 PASS testComputedStyle("'first-flow'") is "first-flow"
    24 PASS testComputedStyle("first-flow") is "auto"
    25 PASS testComputedStyle("inherited") is "auto"
    26 PASS testComputedStyle("initial") is "auto"
     16PASS testComputedStyle("'first-flow'") is "auto"
     17PASS testComputedStyle("first-flow") is "first-flow"
    2718PASS testComputedStyle("12px") is "auto"
    2819PASS testNotInherited("auto", "auto") is "auto"
    29 PASS testNotInherited("auto", "'child-flow'") is "child-flow"
    30 PASS testNotInherited("'parent-flow'", "auto") is "auto"
    31 PASS testNotInherited("'parent-flow'", "'child-flow'") is "child-flow"
     20PASS testNotInherited("auto", "child-flow") is "child-flow"
     21PASS testNotInherited("parent-flow", "auto") is "auto"
     22PASS testNotInherited("parent-flow", "child-flow") is "child-flow"
    3223PASS successfullyParsed is true
    3324

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

    r92969 r97454  
    33<style>
    44    #DIV1 {
    5         -webkit-flow: 'flowA';
     5        -webkit-flow-into: flowA;
    66        /* force a RenderLayer */
    77        position: absolute;
    88    }
    99    #DIV2 {
    10         -webkit-flow: 'flowB';
     10        -webkit-flow-into: flowB;
    1111        /* Force a composited RenderLayer. */
    1212        -webkit-transform: scale3d(1, 1, 1);
    1313    }
    1414   
    15     #DIV3 { -webkit-flow: 'flowC'; }
     15    #DIV3 { -webkit-flow-into: flowC; }
    1616   
    1717    #DIV5 {

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

    r92969 r97454  
    22
    33<style>
    4 #DIV1, #DIV3 { -webkit-flow:'flowA'; }
    5 #DIV2 { -webkit-flow:'flowB'; }
     4#DIV1, #DIV3 { -webkit-flow-into:flowA; }
     5#DIV2 { -webkit-flow-into:flowB; }
    66
    77#REGION1, #REGION2 {

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

    r92969 r97454  
    22
    33<style>
    4 #DIV1 { -webkit-flow:'flowA'; }
    5 #SPAN2 { -webkit-flow: 'flowB'; }
    6 #DIV3 { -webkit-flow: 'flowC'; }
     4#DIV1 { -webkit-flow-into:flowA; }
     5#SPAN2 { -webkit-flow-into: flowB; }
     6#DIV3 { -webkit-flow-into: flowC; }
    77
    88#REGION1, #REGION2, #REGION3 {
    … …  
    2828    var el = document.createElement("div");
    2929    el.id = name;
    30     el.setAttribute("style", "-webkit-flow:'"+ flow +"'");
     30    el.setAttribute("style", "-webkit-flow-into:"+ flow);
    3131    el.innerHTML = name + " - " + flow;
    3232    if (before)

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

    r93144 r97454  
    2525</head>
    2626<body style="border:5px solid black;" onload="runRepaintTest()">
    27 <div style="-webkit-flow:'thread'">
     27<div style="-webkit-flow-into:thread">
    2828せっかく見つけたすばらしい記事がどこにあったか忘れてしまった経験はありますかならタイトルとアドレスだけでなく、訪問したウェブページのコンテンツからも検索することができます。せっかく見つけたすばらしい記事がどこにあったか忘れてしまった経験はありますか ならタイトルとアドレスだけでなく、訪問したウェブページのコンテンツからも検索することができます。訪問したウェブページのコンテンツからも検索することができます。せっかく見つけたすばらしい記事がどこにあったか忘れてしまった経験はありますか ならタイトルとアドレスだけでなく、訪問
    2929</div>

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

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

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

    r93144 r97454  
    88    }
    99</script>
    10 <div style="-webkit-flow: 'thread'; height: 100px; width: 100px; background-color: red; -webkit-writing-mode: horizontal-bt;">
     10<div style="-webkit-flow-into: thread; height: 100px; width: 100px; background-color: red; -webkit-writing-mode: horizontal-bt;">
    1111    <div style="height: 25px;">
    1212        <div style="height: 100px; background-color: green;"></div>
    1313    </div>
    1414</div>
    15 <div id="target" style="-webkit-flow: 'thread'; height: 50px; width: 100px; background-color: red; margin-top: -100px;"></div>
     15<div id="target" style="-webkit-flow-into: thread; height: 50px; width: 100px; background-color: red; margin-top: -100px;"></div>
    1616<div style="content:-webkit-from-flow('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

    r97370 r97454  
    44<style type="text/css">
    55#content {
    6     -webkit-flow: "flow1";
     6    -webkit-flow-into: flow1;
    77    position:relative;
    88    padding-top:1000px;

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

    r97308 r97454  
    198198-webkit-user-select: text;
    199199-webkit-writing-mode: horizontal-tb;
    200 -webkit-flow: auto;
     200-webkit-flow-into: auto;
    201201-webkit-region-overflow: auto;
    202202-webkit-region-break-after: auto;

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

    r97308 r97454  
    197197    -webkit-user-select: text
    198198    -webkit-writing-mode: horizontal-tb
    199     -webkit-flow: auto
     199    -webkit-flow-into: auto
    200200    -webkit-region-overflow: auto
    201201    -webkit-region-break-after: auto

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

    r97308 r97454  
    393393rect: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    394394rect: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
    395 rect: style.getPropertyValue(-webkit-flow) : auto
    396 rect: style.getPropertyCSSValue(-webkit-flow) : [object CSSPrimitiveValue]
     395rect: style.getPropertyValue(-webkit-flow-into) : auto
     396rect: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
    397397rect: style.getPropertyValue(-webkit-region-overflow) : auto
    398398rect: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue]
    … …  
    871871g: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    872872g: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
    873 g: style.getPropertyValue(-webkit-flow) : auto
    874 g: style.getPropertyCSSValue(-webkit-flow) : [object CSSPrimitiveValue]
     873g: style.getPropertyValue(-webkit-flow-into) : auto
     874g: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
    875875g: style.getPropertyValue(-webkit-region-overflow) : auto
    876876g: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue]

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

    r97308 r97454  
    393393rect: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    394394rect: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
    395 rect: style.getPropertyValue(-webkit-flow) : auto
    396 rect: style.getPropertyCSSValue(-webkit-flow) : [object CSSPrimitiveValue]
     395rect: style.getPropertyValue(-webkit-flow-into) : auto
     396rect: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
    397397rect: style.getPropertyValue(-webkit-region-overflow) : auto
    398398rect: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue]
    … …  
    871871g: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    872872g: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
    873 g: style.getPropertyValue(-webkit-flow) : auto
    874 g: style.getPropertyCSSValue(-webkit-flow) : [object CSSPrimitiveValue]
     873g: style.getPropertyValue(-webkit-flow-into) : auto
     874g: style.getPropertyCSSValue(-webkit-flow-into) : [object CSSPrimitiveValue]
    875875g: style.getPropertyValue(-webkit-region-overflow) : auto
    876876g: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue]

  • trunk/Source/WebCore/ChangeLog

    r97453 r97454  
     12011-10-14  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSS Regions] Change -webkit-flow to -webkit-flow-into
     4        https://bugs.webkit.org/show_bug.cgi?id=70014
     5
     6        Reviewed by David Hyatt.
     7
     8        1. -webkit-flow is renamed to -webkit-flow-into
     9        2. -webkit-flow-into takes <ident> instead of strings
     10
     11        * css/CSSComputedStyleDeclaration.cpp:
     12        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     13        * css/CSSParser.cpp:
     14        (WebCore::CSSParser::parseValue):
     15        (WebCore::validFlowName):
     16        (WebCore::CSSParser::parseFlowThread):
     17        * css/CSSPropertyNames.in:
     18        * css/CSSStyleSelector.cpp:
     19        (WebCore::CSSStyleSelector::applyProperty):
     20
    1212011-10-12  Hans Wennborg  <hans@chromium.org>
    222

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

    r97308 r97454  
    275275    CSSPropertyWebkitUserSelect,
    276276    CSSPropertyWebkitWritingMode,
    277     CSSPropertyWebkitFlow,
     277    CSSPropertyWebkitFlowInto,
    278278    CSSPropertyWebkitRegionOverflow,
    279279    CSSPropertyWebkitRegionBreakAfter,
    … …  
    19841984        case CSSPropertyCounterReset:
    19851985            return counterToCSSValue(style.get(), propertyID, primitiveValueCache);
    1986         case CSSPropertyWebkitFlow:
     1986        case CSSPropertyWebkitFlowInto:
    19871987            if (style->flowThread().isNull())
    19881988                return primitiveValueCache->createIdentifierValue(CSSValueAuto);

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

    r97308 r97454  
    16411641            validPrimitive = validUnit(value, FTime | FInteger | FNonNeg, m_strict);
    16421642        break;
    1643     case CSSPropertyWebkitFlow:
     1643    case CSSPropertyWebkitFlowInto:
    16441644        return parseFlowThread(propId, important);
    16451645    case CSSPropertyWebkitRegionOverflow:
    … …  
    65086508#endif
    65096509
    6510 // auto | <flow_name>
     6510static bool validFlowName(const String& flowName)
     6511{
     6512    if (equalIgnoringCase(flowName, "auto")
     6513        || equalIgnoringCase(flowName, "default")
     6514        || equalIgnoringCase(flowName, "inherit")
     6515        || equalIgnoringCase(flowName, "initial")
     6516        || equalIgnoringCase(flowName, "none"))
     6517        return false;
     6518    return true;
     6519}
     6520
     6521// auto | <ident>
    65116522bool CSSParser::parseFlowThread(int propId, bool important)
    65126523{
    6513     ASSERT(propId == CSSPropertyWebkitFlow);
     6524    ASSERT(propId == CSSPropertyWebkitFlowInto);
    65146525
    65156526    if (m_valueList->size() != 1)
    … …  
    65186529    CSSParserValue* value = m_valueList->current();
    65196530    if (!value)
     6531        return false;
     6532
     6533    if (value->unit != CSSPrimitiveValue::CSS_IDENT)
    65206534        return false;
    65216535
    … …  
    65256539    }
    65266540
    6527     if (!value->id && value->unit == CSSPrimitiveValue::CSS_STRING) {
    6528         String inputProperty = String(value->string);
    6529         if (!inputProperty.isEmpty())
    6530             addProperty(propId, primitiveValueCache()->createValue(inputProperty, CSSPrimitiveValue::CSS_STRING), important);
    6531         else
    6532             addProperty(propId, primitiveValueCache()->createIdentifierValue(CSSValueAuto), important);
    6533         return true;
    6534     }
    6535 
    6536     return false;
     6541    String inputProperty = String(value->string);
     6542    if (!inputProperty.isEmpty()) {
     6543        if (!validFlowName(inputProperty))
     6544            return false;
     6545        addProperty(propId, primitiveValueCache()->createValue(inputProperty, CSSPrimitiveValue::CSS_STRING), important);
     6546    } else
     6547        addProperty(propId, primitiveValueCache()->createIdentifierValue(CSSValueAuto), important);
     6548
     6549    return true;
    65376550}
    65386551

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

    r97308 r97454  
    349349-webkit-user-modify
    350350-webkit-user-select
    351 -webkit-flow
     351-webkit-flow-into
    352352-webkit-region-overflow
    353353-webkit-wrap-shape

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

    r97314 r97454  
    34163416        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(marqueeBehavior, MarqueeBehavior)     
    34173417        return;
    3418     case CSSPropertyWebkitFlow:
     3418    case CSSPropertyWebkitFlowInto:
    34193419        if (isInitial)
    3420             HANDLE_INITIAL_COND(CSSPropertyWebkitFlow, FlowThread);
     3420            HANDLE_INITIAL_COND(CSSPropertyWebkitFlowInto, FlowThread);
    34213421        if (isInherit) {
    34223422            m_style->setFlowThread(nullAtom);
Note: See TracChangeset for help on using the changeset viewer.