Changeset 119255 in webkit


Ignore:
Timestamp:
Jun 1, 2012 11:10:56 AM (12 years ago)
Author:
tony@chromium.org
Message:

rename -webkit-flex-order to -webkit-order
https://bugs.webkit.org/show_bug.cgi?id=88104

Reviewed by Ojan Vafai.

Source/WebCore:

This recently changed in the spec:
http://dev.w3.org/csswg/css3-flexbox/#order-property

No new tests, just updated existing results.

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore):
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):

  • css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty):

  • css/CSSPropertyNames.in:
  • css/StyleBuilder.cpp:

(WebCore::StyleBuilder::StyleBuilder):

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::collectMatchingRulesForList):

  • rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::OrderIterator::OrderIterator):
(WebCore::RenderFlexibleBox::OrderIterator::next):
(WebCore::RenderFlexibleBox::layoutBlock):
(WebCore::RenderFlexibleBox::repositionLogicalHeightDependentFlexItems):
(WebCore::RenderFlexibleBox::layoutFlexItems):
(WebCore::RenderFlexibleBox::computeMainAxisPreferredSizes):
(WebCore::RenderFlexibleBox::computeNextFlexLine):
(WebCore::RenderFlexibleBox::packFlexLines):
(WebCore::RenderFlexibleBox::alignChildren):
(WebCore::RenderFlexibleBox::flipForRightToLeftColumn):
(WebCore::RenderFlexibleBox::flipForWrapReverse):

  • rendering/RenderFlexibleBox.h:
  • rendering/style/RenderStyle.h:
  • rendering/style/StyleFlexibleBoxData.cpp:

(WebCore::StyleFlexibleBoxData::StyleFlexibleBoxData):
(WebCore::StyleFlexibleBoxData::operator==):

  • rendering/style/StyleFlexibleBoxData.h:

(StyleFlexibleBoxData):

  • rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):

  • rendering/style/StyleRareNonInheritedData.h:

(StyleRareNonInheritedData):

LayoutTests:

Just a find and replace for the new property name.

  • css3/flexbox/css-properties-expected.txt:
  • css3/flexbox/css-properties.html:
  • css3/flexbox/flex-order.html:
  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/chromium-linux-x86/svg/css/getComputedStyle-basic-expected.txt:
  • platform/chromium-linux/svg/css/getComputedStyle-basic-expected.txt:
  • platform/chromium-mac-leopard/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/chromium-mac-leopard/svg/css/getComputedStyle-basic-expected.txt:
  • platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt:
  • platform/chromium-mac/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/chromium-mac/svg/css/getComputedStyle-basic-expected.txt:
  • platform/chromium-win-vista/svg/css/getComputedStyle-basic-expected.txt:
  • platform/chromium-win-xp/svg/css/getComputedStyle-basic-expected.txt:
  • platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt:
  • platform/gtk/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/gtk/svg/css/getComputedStyle-basic-expected.txt:
  • platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/mac/svg/css/getComputedStyle-basic-expected.txt:
  • platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/qt/svg/css/getComputedStyle-basic-expected.txt:
  • platform/win/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
43 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r119254 r119255  
     12012-06-01  Tony Chang  <tony@chromium.org>
     2
     3        rename -webkit-flex-order to -webkit-order
     4        https://bugs.webkit.org/show_bug.cgi?id=88104
     5
     6        Reviewed by Ojan Vafai.
     7
     8        Just a find and replace for the new property name.
     9
     10        * css3/flexbox/css-properties-expected.txt:
     11        * css3/flexbox/css-properties.html:
     12        * css3/flexbox/flex-order.html:
     13        * fast/css/getComputedStyle/computed-style-expected.txt:
     14        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     15        * platform/chromium-linux-x86/svg/css/getComputedStyle-basic-expected.txt:
     16        * platform/chromium-linux/svg/css/getComputedStyle-basic-expected.txt:
     17        * platform/chromium-mac-leopard/fast/css/getComputedStyle/computed-style-expected.txt:
     18        * platform/chromium-mac-leopard/svg/css/getComputedStyle-basic-expected.txt:
     19        * platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt:
     20        * platform/chromium-mac/fast/css/getComputedStyle/computed-style-expected.txt:
     21        * platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     22        * platform/chromium-mac/svg/css/getComputedStyle-basic-expected.txt:
     23        * platform/chromium-win-vista/svg/css/getComputedStyle-basic-expected.txt:
     24        * platform/chromium-win-xp/svg/css/getComputedStyle-basic-expected.txt:
     25        * platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
     26        * platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     27        * platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt:
     28        * platform/gtk/fast/css/getComputedStyle/computed-style-expected.txt:
     29        * platform/gtk/svg/css/getComputedStyle-basic-expected.txt:
     30        * platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
     31        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     32        * platform/mac/svg/css/getComputedStyle-basic-expected.txt:
     33        * platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     34        * platform/qt/svg/css/getComputedStyle-basic-expected.txt:
     35        * platform/win/fast/css/getComputedStyle/computed-style-expected.txt:
     36        * platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     37        * svg/css/getComputedStyle-basic-expected.txt:
     38
    1392012-06-01  Florin Malita  <fmalita@chromium.org>
    240
  • trunk/LayoutTests/css3/flexbox/css-properties-expected.txt

    r119131 r119255  
    99PASS flexbox.style.display is "-webkit-inline-flex"
    1010PASS flexbox.style.display is "block"
    11 PASS flexitem.style.webkitFlexOrder is ""
    12 PASS flexitem.style.webkitFlexOrder is "2"
    13 PASS flexitem.style.webkitFlexOrder is "-1"
    14 PASS flexitem.style.webkitFlexOrder is "0"
    15 PASS flexitem.style.webkitFlexOrder is "0"
    16 PASS flexitem.style.webkitFlexOrder is "0"
    17 PASS flexitem.style.webkitFlexOrder is ""
     11PASS flexitem.style.webkitOrder is ""
     12PASS flexitem.style.webkitOrder is "2"
     13PASS flexitem.style.webkitOrder is "-1"
     14PASS flexitem.style.webkitOrder is "0"
     15PASS flexitem.style.webkitOrder is "0"
     16PASS flexitem.style.webkitOrder is "0"
     17PASS flexitem.style.webkitOrder is ""
    1818PASS flexbox.style.webkitFlexPack is ""
    1919PASS window.getComputedStyle(flexbox, null).webkitFlexPack is "start"
  • trunk/LayoutTests/css3/flexbox/css-properties.html

    r119131 r119255  
    3030
    3131var flexitem = document.getElementById("flexitem");
    32 shouldBeEqualToString('flexitem.style.webkitFlexOrder', '');
    33 
    34 flexitem.style.webkitFlexOrder = 2;
    35 shouldBeEqualToString('flexitem.style.webkitFlexOrder', '2');
    36 
    37 flexitem.style.webkitFlexOrder = -1;
    38 shouldBeEqualToString('flexitem.style.webkitFlexOrder', '-1');
    39 
    40 flexitem.style.webkitFlexOrder = 0;
    41 shouldBeEqualToString('flexitem.style.webkitFlexOrder', '0');
    42 
    43 // -webkit-flex-order must be an integer.
    44 flexitem.style.webkitFlexOrder = 1.5;
    45 shouldBeEqualToString('flexitem.style.webkitFlexOrder', '0');
    46 
    47 flexitem.style.webkitFlexOrder = "test";
    48 shouldBeEqualToString('flexitem.style.webkitFlexOrder', '0');
    49 
    50 flexitem.style.webkitFlexOrder = '';
    51 shouldBeEqualToString('flexitem.style.webkitFlexOrder', '');
     32shouldBeEqualToString('flexitem.style.webkitOrder', '');
     33
     34flexitem.style.webkitOrder = 2;
     35shouldBeEqualToString('flexitem.style.webkitOrder', '2');
     36
     37flexitem.style.webkitOrder = -1;
     38shouldBeEqualToString('flexitem.style.webkitOrder', '-1');
     39
     40flexitem.style.webkitOrder = 0;
     41shouldBeEqualToString('flexitem.style.webkitOrder', '0');
     42
     43// -webkit-order must be an integer.
     44flexitem.style.webkitOrder = 1.5;
     45shouldBeEqualToString('flexitem.style.webkitOrder', '0');
     46
     47flexitem.style.webkitOrder = "test";
     48shouldBeEqualToString('flexitem.style.webkitOrder', '0');
     49
     50flexitem.style.webkitOrder = '';
     51shouldBeEqualToString('flexitem.style.webkitOrder', '');
    5252
    5353
  • trunk/LayoutTests/css3/flexbox/flex-order.html

    r117385 r119255  
    3434
    3535<div style="display: -webkit-flex" class="horizontal-box">
    36   <div class="first"  style="-webkit-flex: 1; -webkit-flex-order: 0"></div>
     36  <div class="first"  style="-webkit-flex: 1; -webkit-order: 0"></div>
    3737  <div class="second" style="-webkit-flex: 1;"></div>
    38   <div class="third"  style="-webkit-flex: 1; -webkit-flex-order: 3"></div>
    39   <div class="fourth" style="-webkit-flex: 1; -webkit-flex-order: 20"></div>
     38  <div class="third"  style="-webkit-flex: 1; -webkit-order: 3"></div>
     39  <div class="fourth" style="-webkit-flex: 1; -webkit-order: 20"></div>
    4040</div>
    4141
    4242<div style="display: -webkit-flex" class="horizontal-box">
    43   <div class="fourth" style="-webkit-flex: 1; -webkit-flex-order: 4"></div>
    44   <div class="third"  style="-webkit-flex: 1; -webkit-flex-order: 3"></div>
    45   <div class="second" style="-webkit-flex: 1; -webkit-flex-order: 2"></div>
    46   <div class="first"  style="-webkit-flex: 1; -webkit-flex-order: 1"></div>
     43  <div class="fourth" style="-webkit-flex: 1; -webkit-order: 4"></div>
     44  <div class="third"  style="-webkit-flex: 1; -webkit-order: 3"></div>
     45  <div class="second" style="-webkit-flex: 1; -webkit-order: 2"></div>
     46  <div class="first"  style="-webkit-flex: 1; -webkit-order: 1"></div>
    4747</div>
    4848
    4949<!-- The example from the spec. -->
    5050<div style="display: -webkit-flex" class="horizontal-box">
    51   <div class="third"  style="-webkit-flex: 1; -webkit-flex-order: 1"></div>
     51  <div class="third"  style="-webkit-flex: 1; -webkit-order: 1"></div>
    5252  <div class="first"  style="-webkit-flex: 1"></div>
    53   <div class="fourth" style="-webkit-flex: 1; -webkit-flex-order: 1"></div>
    54   <div class="second" style="-webkit-flex: 1; -webkit-flex-order: 0"></div>
     53  <div class="fourth" style="-webkit-flex: 1; -webkit-order: 1"></div>
     54  <div class="second" style="-webkit-flex: 1; -webkit-order: 0"></div>
    5555</div>
    5656
    5757<div style="display: -webkit-flex" class="horizontal-box">
    58   <div class="fourth" style="-webkit-flex: 1; -webkit-flex-order: 2"></div>
     58  <div class="fourth" style="-webkit-flex: 1; -webkit-order: 2"></div>
    5959  <div class="second" style="-webkit-flex: 1"></div>
    6060  <div class="third"  style="-webkit-flex: 1"></div>
    61   <div class="first"  style="-webkit-flex: 1; -webkit-flex-order: -10"></div>
     61  <div class="first"  style="-webkit-flex: 1; -webkit-order: -10"></div>
    6262</div>
    6363
    6464<div style="display: -webkit-flex" class="horizontal-box">
    65   <div class="fourth" style="-webkit-flex: 1; -webkit-flex-order: 2000000000"></div>
    66   <div class="second" style="-webkit-flex: 1; -webkit-flex-order: 1000000000"></div>
    67   <div class="third"  style="-webkit-flex: 1; -webkit-flex-order: 1000000000"></div>
    68   <div class="first"  style="-webkit-flex: 1; -webkit-flex-order: -1000000000"></div>
     65  <div class="fourth" style="-webkit-flex: 1; -webkit-order: 2000000000"></div>
     66  <div class="second" style="-webkit-flex: 1; -webkit-order: 1000000000"></div>
     67  <div class="third"  style="-webkit-flex: 1; -webkit-order: 1000000000"></div>
     68  <div class="first"  style="-webkit-flex: 1; -webkit-order: -1000000000"></div>
    6969</div>
    7070
    7171<!-- Floating numbers are ignored and we use the default of 1 instead. -->
    7272<div style="display: -webkit-flex" class="horizontal-box">
    73   <div class="second" style="-webkit-flex: 1; -webkit-flex-order: 2.5"></div>
    74   <div class="fourth" style="-webkit-flex: 1; -webkit-flex-order: 2"></div>
    75   <div class="first"  style="-webkit-flex: 1; -webkit-flex-order: -1"></div>
     73  <div class="second" style="-webkit-flex: 1; -webkit-order: 2.5"></div>
     74  <div class="fourth" style="-webkit-flex: 1; -webkit-order: 2"></div>
     75  <div class="first"  style="-webkit-flex: 1; -webkit-order: -1"></div>
    7676  <div class="third"  style="-webkit-flex: 1"></div>
    7777</div>
    7878
    7979<div style="display: -webkit-flex" class="horizontal-box">
    80   <div class="second" style="-webkit-flex: 1; -webkit-flex-order: 0"></div>
    81   <div class="first" style="-webkit-flex: 1; -webkit-flex-order: -1"></div>
    82   <div class="fourth"  style="-webkit-flex: 1; -webkit-flex-order: 1"></div>
     80  <div class="second" style="-webkit-flex: 1; -webkit-order: 0"></div>
     81  <div class="first" style="-webkit-flex: 1; -webkit-order: -1"></div>
     82  <div class="fourth"  style="-webkit-flex: 1; -webkit-order: 1"></div>
    8383  <div class="third"  style="-webkit-flex: 1"></div>
    8484</div>
     
    8787     -2,147,483,646 (int min + 2) to 2,147,483,647. -->
    8888<div style="display: -webkit-flex" class="horizontal-box">
    89   <div class="third"  style="-webkit-flex: 1; -webkit-flex-order: 4000000000"></div>
    90   <div class="fourth" style="-webkit-flex: 1; -webkit-flex-order: 3000000000"></div>
     89  <div class="third"  style="-webkit-flex: 1; -webkit-order: 4000000000"></div>
     90  <div class="fourth" style="-webkit-flex: 1; -webkit-order: 3000000000"></div>
    9191  <div class="first"  style="-webkit-flex: 1;"></div>
    92   <div class="second" style="-webkit-flex: 1; -webkit-flex-order: 2147483646"></div>
     92  <div class="second" style="-webkit-flex: 1; -webkit-order: 2147483646"></div>
    9393</div>
    9494
    9595<div style="display: -webkit-flex" class="horizontal-box">
    96   <div class="second" style="-webkit-flex: 1; -webkit-flex-order: 4000000000"></div>
    97   <div class="third"  style="-webkit-flex: 1; -webkit-flex-order: 3000000000"></div>
     96  <div class="second" style="-webkit-flex: 1; -webkit-order: 4000000000"></div>
     97  <div class="third"  style="-webkit-flex: 1; -webkit-order: 3000000000"></div>
    9898  <div class="first"  style="-webkit-flex: 1;"></div>
    99   <div class="fourth" style="-webkit-flex: 1; -webkit-flex-order: 2147483647"></div>
     99  <div class="fourth" style="-webkit-flex: 1; -webkit-order: 2147483647"></div>
    100100</div>
    101101
    102102<div style="display: -webkit-flex" class="horizontal-box">
    103   <div class="third"  style="-webkit-flex: 1; -webkit-flex-order: -2147483645"></div>
    104   <div class="first"  style="-webkit-flex: 1; -webkit-flex-order: -2147483646"></div>
    105   <div class="second" style="-webkit-flex: 1; -webkit-flex-order: -2147483647"></div>
     103  <div class="third"  style="-webkit-flex: 1; -webkit-order: -2147483645"></div>
     104  <div class="first"  style="-webkit-flex: 1; -webkit-order: -2147483646"></div>
     105  <div class="second" style="-webkit-flex: 1; -webkit-order: -2147483647"></div>
    106106  <div class="fourth" style="-webkit-flex: 1;"></div>
    107107</div>
  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt

    r119191 r119255  
    149149-webkit-align-self: stretch;
    150150-webkit-flex: 1 1 auto;
    151 -webkit-flex-order: 0;
    152151-webkit-flex-pack: start;
    153152-webkit-flex-direction: row;
     
    194193-webkit-mask-size: auto;
    195194-webkit-nbsp-mode: normal;
     195-webkit-order: 0;
    196196-webkit-perspective: none;
    197197-webkit-perspective-origin: 392px 288px;
  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r119191 r119255  
    147147    -webkit-align-self: stretch
    148148    -webkit-flex: 1 1 auto
    149     -webkit-flex-order: 0
    150149    -webkit-flex-pack: start
    151150    -webkit-flex-direction: row
     
    192191    -webkit-mask-size: auto
    193192    -webkit-nbsp-mode: normal
     193    -webkit-order: 0
    194194    -webkit-perspective: none
    195195    -webkit-perspective-origin: 50% 50%
  • trunk/LayoutTests/platform/chromium-linux-x86/svg/css/getComputedStyle-basic-expected.txt

    r119191 r119255  
    295295rect: style.getPropertyValue(-webkit-flex) : 1 1 auto
    296296rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-order) : 0
    298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    299297rect: style.getPropertyValue(-webkit-flex-pack) : start
    300298rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    385383rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    386384rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     385rect: style.getPropertyValue(-webkit-order) : 0
     386rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    387387rect: style.getPropertyValue(-webkit-perspective) : none
    388388rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    829829g: style.getPropertyValue(-webkit-flex) : 1 1 auto
    830830g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    831 g: style.getPropertyValue(-webkit-flex-order) : 0
    832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    833831g: style.getPropertyValue(-webkit-flex-pack) : start
    834832g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    919917g: style.getPropertyValue(-webkit-nbsp-mode) : normal
    920918g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     919g: style.getPropertyValue(-webkit-order) : 0
     920g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    921921g: style.getPropertyValue(-webkit-perspective) : none
    922922g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
  • trunk/LayoutTests/platform/chromium-linux/svg/css/getComputedStyle-basic-expected.txt

    r119191 r119255  
    295295rect: style.getPropertyValue(-webkit-flex) : 1 1 auto
    296296rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-order) : 0
    298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    299297rect: style.getPropertyValue(-webkit-flex-pack) : start
    300298rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    385383rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    386384rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     385rect: style.getPropertyValue(-webkit-order) : 0
     386rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    387387rect: style.getPropertyValue(-webkit-perspective) : none
    388388rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    829829g: style.getPropertyValue(-webkit-flex) : 1 1 auto
    830830g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    831 g: style.getPropertyValue(-webkit-flex-order) : 0
    832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    833831g: style.getPropertyValue(-webkit-flex-pack) : start
    834832g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    919917g: style.getPropertyValue(-webkit-nbsp-mode) : normal
    920918g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     919g: style.getPropertyValue(-webkit-order) : 0
     920g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    921921g: style.getPropertyValue(-webkit-perspective) : none
    922922g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
  • trunk/LayoutTests/platform/chromium-mac-leopard/fast/css/getComputedStyle/computed-style-expected.txt

    r119191 r119255  
    149149-webkit-align-self: stretch;
    150150-webkit-flex: 1 1 auto;
    151 -webkit-flex-order: 0;
    152151-webkit-flex-pack: start;
    153152-webkit-flex-direction: row;
     
    194193-webkit-mask-size: auto;
    195194-webkit-nbsp-mode: normal;
     195-webkit-order: 0;
    196196-webkit-perspective: none;
    197197-webkit-perspective-origin: 392px 288px;
  • trunk/LayoutTests/platform/chromium-mac-leopard/svg/css/getComputedStyle-basic-expected.txt

    r119191 r119255  
    295295rect: style.getPropertyValue(-webkit-flex) : 1 1 auto
    296296rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-order) : 0
    298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    299297rect: style.getPropertyValue(-webkit-flex-pack) : start
    300298rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    385383rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    386384rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     385rect: style.getPropertyValue(-webkit-order) : 0
     386rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    387387rect: style.getPropertyValue(-webkit-perspective) : none
    388388rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    829829g: style.getPropertyValue(-webkit-flex) : 1 1 auto
    830830g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    831 g: style.getPropertyValue(-webkit-flex-order) : 0
    832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    833831g: style.getPropertyValue(-webkit-flex-pack) : start
    834832g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    919917g: style.getPropertyValue(-webkit-nbsp-mode) : normal
    920918g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     919g: style.getPropertyValue(-webkit-order) : 0
     920g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    921921g: style.getPropertyValue(-webkit-perspective) : none
    922922g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
  • trunk/LayoutTests/platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt

    r119191 r119255  
    295295rect: style.getPropertyValue(-webkit-flex) : 1 1 auto
    296296rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-order) : 0
    298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    299297rect: style.getPropertyValue(-webkit-flex-pack) : start
    300298rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    385383rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    386384rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     385rect: style.getPropertyValue(-webkit-order) : 0
     386rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    387387rect: style.getPropertyValue(-webkit-perspective) : none
    388388rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    829829g: style.getPropertyValue(-webkit-flex) : 1 1 auto
    830830g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    831 g: style.getPropertyValue(-webkit-flex-order) : 0
    832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    833831g: style.getPropertyValue(-webkit-flex-pack) : start
    834832g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    919917g: style.getPropertyValue(-webkit-nbsp-mode) : normal
    920918g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     919g: style.getPropertyValue(-webkit-order) : 0
     920g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    921921g: style.getPropertyValue(-webkit-perspective) : none
    922922g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
  • trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-expected.txt

    r119191 r119255  
    149149-webkit-align-self: stretch;
    150150-webkit-flex: 1 1 auto;
    151 -webkit-flex-order: 0;
    152151-webkit-flex-pack: start;
    153152-webkit-flex-direction: row;
     
    194193-webkit-mask-size: auto;
    195194-webkit-nbsp-mode: normal;
     195-webkit-order: 0;
    196196-webkit-perspective: none;
    197197-webkit-perspective-origin: 392px 288px;
  • trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r119191 r119255  
    148148    -webkit-align-self: stretch
    149149    -webkit-flex: 1 1 auto
    150     -webkit-flex-order: 0
    151150    -webkit-flex-pack: start
    152151    -webkit-flex-direction: row
     
    193192    -webkit-mask-size: auto
    194193    -webkit-nbsp-mode: normal
     194    -webkit-order: 0
    195195    -webkit-perspective: none
    196196    -webkit-perspective-origin: 50% 50%
  • trunk/LayoutTests/platform/chromium-mac/svg/css/getComputedStyle-basic-expected.txt

    r119191 r119255  
    295295rect: style.getPropertyValue(-webkit-flex) : 1 1 auto
    296296rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-order) : 0
    298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    299297rect: style.getPropertyValue(-webkit-flex-pack) : start
    300298rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    385383rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    386384rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     385rect: style.getPropertyValue(-webkit-order) : 0
     386rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    387387rect: style.getPropertyValue(-webkit-perspective) : none
    388388rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    829829g: style.getPropertyValue(-webkit-flex) : 1 1 auto
    830830g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    831 g: style.getPropertyValue(-webkit-flex-order) : 0
    832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    833831g: style.getPropertyValue(-webkit-flex-pack) : start
    834832g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    919917g: style.getPropertyValue(-webkit-nbsp-mode) : normal
    920918g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     919g: style.getPropertyValue(-webkit-order) : 0
     920g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    921921g: style.getPropertyValue(-webkit-perspective) : none
    922922g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
  • trunk/LayoutTests/platform/chromium-win-vista/svg/css/getComputedStyle-basic-expected.txt

    r119191 r119255  
    295295rect: style.getPropertyValue(-webkit-flex) : 1 1 auto
    296296rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-order) : 0
    298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    299297rect: style.getPropertyValue(-webkit-flex-pack) : start
    300298rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    385383rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    386384rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     385rect: style.getPropertyValue(-webkit-order) : 0
     386rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    387387rect: style.getPropertyValue(-webkit-perspective) : none
    388388rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    829829g: style.getPropertyValue(-webkit-flex) : 1 1 auto
    830830g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    831 g: style.getPropertyValue(-webkit-flex-order) : 0
    832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    833831g: style.getPropertyValue(-webkit-flex-pack) : start
    834832g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    919917g: style.getPropertyValue(-webkit-nbsp-mode) : normal
    920918g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     919g: style.getPropertyValue(-webkit-order) : 0
     920g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    921921g: style.getPropertyValue(-webkit-perspective) : none
    922922g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
  • trunk/LayoutTests/platform/chromium-win-xp/svg/css/getComputedStyle-basic-expected.txt

    r119191 r119255  
    295295rect: style.getPropertyValue(-webkit-flex) : 1 1 auto
    296296rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-order) : 0
    298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    299297rect: style.getPropertyValue(-webkit-flex-pack) : start
    300298rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    385383rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    386384rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     385rect: style.getPropertyValue(-webkit-order) : 0
     386rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    387387rect: style.getPropertyValue(-webkit-perspective) : none
    388388rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    829829g: style.getPropertyValue(-webkit-flex) : 1 1 auto
    830830g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    831 g: style.getPropertyValue(-webkit-flex-order) : 0
    832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    833831g: style.getPropertyValue(-webkit-flex-pack) : start
    834832g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    919917g: style.getPropertyValue(-webkit-nbsp-mode) : normal
    920918g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     919g: style.getPropertyValue(-webkit-order) : 0
     920g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    921921g: style.getPropertyValue(-webkit-perspective) : none
    922922g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
  • trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt

    r119191 r119255  
    149149-webkit-align-self: stretch;
    150150-webkit-flex: 1 1 auto;
    151 -webkit-flex-order: 0;
    152151-webkit-flex-pack: start;
    153152-webkit-flex-direction: row;
     
    194193-webkit-mask-size: auto;
    195194-webkit-nbsp-mode: normal;
     195-webkit-order: 0;
    196196-webkit-perspective: none;
    197197-webkit-perspective-origin: 392px 288px;
  • trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r119191 r119255  
    148148    -webkit-align-self: stretch
    149149    -webkit-flex: 1 1 auto
    150     -webkit-flex-order: 0
    151150    -webkit-flex-pack: start
    152151    -webkit-flex-direction: row
     
    193192    -webkit-mask-size: auto
    194193    -webkit-nbsp-mode: normal
     194    -webkit-order: 0
    195195    -webkit-perspective: none
    196196    -webkit-perspective-origin: 50% 50%
  • trunk/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt

    r119191 r119255  
    295295rect: style.getPropertyValue(-webkit-flex) : 1 1 auto
    296296rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-order) : 0
    298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    299297rect: style.getPropertyValue(-webkit-flex-pack) : start
    300298rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    385383rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    386384rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     385rect: style.getPropertyValue(-webkit-order) : 0
     386rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    387387rect: style.getPropertyValue(-webkit-perspective) : none
    388388rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    829829g: style.getPropertyValue(-webkit-flex) : 1 1 auto
    830830g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    831 g: style.getPropertyValue(-webkit-flex-order) : 0
    832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    833831g: style.getPropertyValue(-webkit-flex-pack) : start
    834832g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    919917g: style.getPropertyValue(-webkit-nbsp-mode) : normal
    920918g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     919g: style.getPropertyValue(-webkit-order) : 0
     920g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    921921g: style.getPropertyValue(-webkit-perspective) : none
    922922g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
  • trunk/LayoutTests/platform/gtk/fast/css/getComputedStyle/computed-style-expected.txt

    r119191 r119255  
    148148-webkit-align-self: stretch;
    149149-webkit-flex: 1 1 auto;
    150 -webkit-flex-order: 0;
    151150-webkit-flex-pack: start;
    152151-webkit-flex-direction: row;
     
    193192-webkit-mask-size: auto;
    194193-webkit-nbsp-mode: normal;
     194-webkit-order: 0;
    195195-webkit-perspective: none;
    196196-webkit-perspective-origin: 392px 288px;
  • trunk/LayoutTests/platform/gtk/svg/css/getComputedStyle-basic-expected.txt

    r119191 r119255  
    293293rect: style.getPropertyValue(-webkit-flex) : 1 1 auto
    294294rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    295 rect: style.getPropertyValue(-webkit-flex-order) : 0
    296 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    297295rect: style.getPropertyValue(-webkit-flex-pack) : start
    298296rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    383381rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    384382rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     383rect: style.getPropertyValue(-webkit-order) : 0
     384rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    385385rect: style.getPropertyValue(-webkit-perspective) : none
    386386rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    825825g: style.getPropertyValue(-webkit-flex) : 1 1 auto
    826826g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    827 g: style.getPropertyValue(-webkit-flex-order) : 0
    828 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    829827g: style.getPropertyValue(-webkit-flex-pack) : start
    830828g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    915913g: style.getPropertyValue(-webkit-nbsp-mode) : normal
    916914g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     915g: style.getPropertyValue(-webkit-order) : 0
     916g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    917917g: style.getPropertyValue(-webkit-perspective) : none
    918918g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
  • trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt

    r119191 r119255  
    149149-webkit-align-self: stretch;
    150150-webkit-flex: 1 1 auto;
    151 -webkit-flex-order: 0;
    152151-webkit-flex-pack: start;
    153152-webkit-flex-direction: row;
     
    194193-webkit-mask-size: auto;
    195194-webkit-nbsp-mode: normal;
     195-webkit-order: 0;
    196196-webkit-perspective: none;
    197197-webkit-perspective-origin: 392px 288px;
  • trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r119191 r119255  
    148148    -webkit-align-self: stretch
    149149    -webkit-flex: 1 1 auto
    150     -webkit-flex-order: 0
    151150    -webkit-flex-pack: start
    152151    -webkit-flex-direction: row
     
    193192    -webkit-mask-size: auto
    194193    -webkit-nbsp-mode: normal
     194    -webkit-order: 0
    195195    -webkit-perspective: none
    196196    -webkit-perspective-origin: 50% 50%
  • trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt

    r119191 r119255  
    295295rect: style.getPropertyValue(-webkit-flex) : 1 1 auto
    296296rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-order) : 0
    298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    299297rect: style.getPropertyValue(-webkit-flex-pack) : start
    300298rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    385383rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    386384rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     385rect: style.getPropertyValue(-webkit-order) : 0
     386rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    387387rect: style.getPropertyValue(-webkit-perspective) : none
    388388rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    829829g: style.getPropertyValue(-webkit-flex) : 1 1 auto
    830830g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    831 g: style.getPropertyValue(-webkit-flex-order) : 0
    832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    833831g: style.getPropertyValue(-webkit-flex-pack) : start
    834832g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
  • trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r119191 r119255  
    148148    -webkit-align-self: stretch
    149149    -webkit-flex: 1 1 auto
    150     -webkit-flex-order: 0
    151150    -webkit-flex-pack: start
    152151    -webkit-flex-direction: row
     
    193192    -webkit-mask-size: auto
    194193    -webkit-nbsp-mode: normal
     194    -webkit-order: 0
    195195    -webkit-perspective: none
    196196    -webkit-perspective-origin: 50% 50%
  • trunk/LayoutTests/platform/qt/svg/css/getComputedStyle-basic-expected.txt

    r119191 r119255  
    295295rect: style.getPropertyValue(-webkit-flex) : 1 1 auto
    296296rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    297 rect: style.getPropertyValue(-webkit-flex-order) : 0
    298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    299297rect: style.getPropertyValue(-webkit-flex-pack) : start
    300298rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    385383rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    386384rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     385rect: style.getPropertyValue(-webkit-order) : 0
     386rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    387387rect: style.getPropertyValue(-webkit-perspective) : none
    388388rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    829829g: style.getPropertyValue(-webkit-flex) : 1 1 auto
    830830g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    831 g: style.getPropertyValue(-webkit-flex-order) : 0
    832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    833831g: style.getPropertyValue(-webkit-flex-pack) : start
    834832g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
  • trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-expected.txt

    r119191 r119255  
    149149-webkit-align-self: stretch;
    150150-webkit-flex: 1 1 auto;
    151 -webkit-flex-order: 0;
    152151-webkit-flex-pack: start;
    153152-webkit-flex-direction: row;
     
    194193-webkit-mask-size: auto;
    195194-webkit-nbsp-mode: normal;
     195-webkit-order: 0;
    196196-webkit-perspective: none;
    197197-webkit-perspective-origin: 392px 288px;
  • trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r119191 r119255  
    148148    -webkit-align-self: stretch
    149149    -webkit-flex: 1 1 auto
    150     -webkit-flex-order: 0
    151150    -webkit-flex-pack: start
    152151    -webkit-flex-direction: row
     
    193192    -webkit-mask-size: auto
    194193    -webkit-nbsp-mode: normal
     194    -webkit-order: 0
    195195    -webkit-perspective: none
    196196    -webkit-perspective-origin: 50% 50%
  • trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

    r119191 r119255  
    291291rect: style.getPropertyValue(-webkit-flex) : 1 1 auto
    292292rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    293 rect: style.getPropertyValue(-webkit-flex-order) : 0
    294 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    295293rect: style.getPropertyValue(-webkit-flex-pack) : start
    296294rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
     
    381379rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
    382380rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
     381rect: style.getPropertyValue(-webkit-order) : 0
     382rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
    383383rect: style.getPropertyValue(-webkit-perspective) : none
    384384rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
     
    821821g: style.getPropertyValue(-webkit-flex) : 1 1 auto
    822822g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList]
    823 g: style.getPropertyValue(-webkit-flex-order) : 0
    824 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]
    825823g: style.getPropertyValue(-webkit-flex-pack) : start
    826824g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue]
  • trunk/Source/WebCore/ChangeLog

    r119252 r119255  
     12012-06-01  Tony Chang  <tony@chromium.org>
     2
     3        rename -webkit-flex-order to -webkit-order
     4        https://bugs.webkit.org/show_bug.cgi?id=88104
     5
     6        Reviewed by Ojan Vafai.
     7
     8        This recently changed in the spec:
     9        http://dev.w3.org/csswg/css3-flexbox/#order-property
     10
     11        No new tests, just updated existing results.
     12
     13        * css/CSSComputedStyleDeclaration.cpp:
     14        (WebCore):
     15        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     16        * css/CSSParser.cpp:
     17        (WebCore::CSSParser::parseValue):
     18        * css/CSSProperty.cpp:
     19        (WebCore::CSSProperty::isInheritedProperty):
     20        * css/CSSPropertyNames.in:
     21        * css/StyleBuilder.cpp:
     22        (WebCore::StyleBuilder::StyleBuilder):
     23        * css/StyleResolver.cpp:
     24        (WebCore::StyleResolver::collectMatchingRulesForList):
     25        * rendering/RenderFlexibleBox.cpp:
     26        (WebCore::RenderFlexibleBox::OrderIterator::OrderIterator):
     27        (WebCore::RenderFlexibleBox::OrderIterator::next):
     28        (WebCore::RenderFlexibleBox::layoutBlock):
     29        (WebCore::RenderFlexibleBox::repositionLogicalHeightDependentFlexItems):
     30        (WebCore::RenderFlexibleBox::layoutFlexItems):
     31        (WebCore::RenderFlexibleBox::computeMainAxisPreferredSizes):
     32        (WebCore::RenderFlexibleBox::computeNextFlexLine):
     33        (WebCore::RenderFlexibleBox::packFlexLines):
     34        (WebCore::RenderFlexibleBox::alignChildren):
     35        (WebCore::RenderFlexibleBox::flipForRightToLeftColumn):
     36        (WebCore::RenderFlexibleBox::flipForWrapReverse):
     37        * rendering/RenderFlexibleBox.h:
     38        * rendering/style/RenderStyle.h:
     39        * rendering/style/StyleFlexibleBoxData.cpp:
     40        (WebCore::StyleFlexibleBoxData::StyleFlexibleBoxData):
     41        (WebCore::StyleFlexibleBoxData::operator==):
     42        * rendering/style/StyleFlexibleBoxData.h:
     43        (StyleFlexibleBoxData):
     44        * rendering/style/StyleRareNonInheritedData.cpp:
     45        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
     46        (WebCore::StyleRareNonInheritedData::operator==):
     47        * rendering/style/StyleRareNonInheritedData.h:
     48        (StyleRareNonInheritedData):
     49
    1502012-06-01  Zeno Albisser  <zeno@webkit.org>
    251
  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r119131 r119255  
    232232    CSSPropertyWebkitAlignSelf,
    233233    CSSPropertyWebkitFlex,
    234     CSSPropertyWebkitFlexOrder,
    235234    CSSPropertyWebkitFlexPack,
    236235    CSSPropertyWebkitFlexDirection,
     
    280279    CSSPropertyWebkitMaskSize,
    281280    CSSPropertyWebkitNbspMode,
     281    CSSPropertyWebkitOrder,
    282282#if ENABLE(OVERFLOW_SCROLLING)
    283283    CSSPropertyWebkitOverflowScrolling,
     
    16511651            return list.release();
    16521652        }
    1653         case CSSPropertyWebkitFlexOrder:
    1654             return cssValuePool().createValue(style->flexOrder(), CSSPrimitiveValue::CSS_NUMBER);
     1653        case CSSPropertyWebkitOrder:
     1654            return cssValuePool().createValue(style->order(), CSSPrimitiveValue::CSS_NUMBER);
    16551655        case CSSPropertyWebkitFlexPack:
    16561656            return cssValuePool().createValue(style->flexPack());
  • trunk/Source/WebCore/css/CSSParser.cpp

    r119191 r119255  
    20962096            parsedValue = parseFlex(m_valueList.get());
    20972097        break;
    2098     case CSSPropertyWebkitFlexOrder:
     2098    case CSSPropertyWebkitOrder:
    20992099        if (validUnit(value, FInteger, CSSStrictMode)) {
    21002100            // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set.
  • trunk/Source/WebCore/css/CSSProperty.cpp

    r119131 r119255  
    543543    case CSSPropertyWebkitAlignSelf:
    544544    case CSSPropertyWebkitFlex:
    545     case CSSPropertyWebkitFlexOrder:
    546545    case CSSPropertyWebkitFlexPack:
    547546    case CSSPropertyWebkitFlexDirection:
     
    597596    case CSSPropertyWebkitMinLogicalWidth:
    598597    case CSSPropertyWebkitMinLogicalHeight:
     598    case CSSPropertyWebkitOrder:
    599599    case CSSPropertyWebkitPaddingAfter:
    600600    case CSSPropertyWebkitPaddingBefore:
  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r119131 r119255  
    265265-webkit-flex-flow
    266266-webkit-flex-line-pack
    267 -webkit-flex-order
    268267-webkit-flex-pack
    269268-webkit-flex-wrap
     
    329328-webkit-min-logical-height
    330329-webkit-nbsp-mode
     330-webkit-order
    331331-webkit-padding-after
    332332-webkit-padding-before
  • trunk/Source/WebCore/css/StyleBuilder.cpp

    r119191 r119255  
    19431943    setPropertyHandler(CSSPropertyWebkitFlexFlow, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitFlexDirection, CSSPropertyWebkitFlexWrap>::createHandler());
    19441944    setPropertyHandler(CSSPropertyWebkitFlexLinePack, ApplyPropertyDefault<EFlexLinePack, &RenderStyle::flexLinePack, EFlexLinePack, &RenderStyle::setFlexLinePack, EFlexLinePack, &RenderStyle::initialFlexLinePack>::createHandler());
    1945     setPropertyHandler(CSSPropertyWebkitFlexOrder, ApplyPropertyDefault<int, &RenderStyle::flexOrder, int, &RenderStyle::setFlexOrder, int, &RenderStyle::initialFlexOrder>::createHandler());
    19461945    setPropertyHandler(CSSPropertyWebkitFlexPack, ApplyPropertyDefault<EFlexPack, &RenderStyle::flexPack, EFlexPack, &RenderStyle::setFlexPack, EFlexPack, &RenderStyle::initialFlexPack>::createHandler());
    19471946    setPropertyHandler(CSSPropertyWebkitFlexWrap, ApplyPropertyDefault<EFlexWrap, &RenderStyle::flexWrap, EFlexWrap, &RenderStyle::setFlexWrap, EFlexWrap, &RenderStyle::initialFlexWrap>::createHandler());
     
    19911990    setPropertyHandler(CSSPropertyWebkitMatchNearestMailBlockquoteColor, ApplyPropertyDefault<EMatchNearestMailBlockquoteColor, &RenderStyle::matchNearestMailBlockquoteColor, EMatchNearestMailBlockquoteColor, &RenderStyle::setMatchNearestMailBlockquoteColor, EMatchNearestMailBlockquoteColor, &RenderStyle::initialMatchNearestMailBlockquoteColor>::createHandler());
    19921991    setPropertyHandler(CSSPropertyWebkitNbspMode, ApplyPropertyDefault<ENBSPMode, &RenderStyle::nbspMode, ENBSPMode, &RenderStyle::setNBSPMode, ENBSPMode, &RenderStyle::initialNBSPMode>::createHandler());
     1992    setPropertyHandler(CSSPropertyWebkitOrder, ApplyPropertyDefault<int, &RenderStyle::order, int, &RenderStyle::setOrder, int, &RenderStyle::initialOrder>::createHandler());
    19931993    setPropertyHandler(CSSPropertyWebkitPerspectiveOrigin, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitPerspectiveOriginX, CSSPropertyWebkitPerspectiveOriginY>::createHandler());
    19941994    setPropertyHandler(CSSPropertyWebkitPerspectiveOriginX, ApplyPropertyLength<&RenderStyle::perspectiveOriginX, &RenderStyle::setPerspectiveOriginX, &RenderStyle::initialPerspectiveOriginX>::createHandler());
  • trunk/Source/WebCore/css/StyleResolver.cpp

    r119226 r119255  
    41284128    case CSSPropertyWebkitFlexFlow:
    41294129    case CSSPropertyWebkitFlexLinePack:
    4130     case CSSPropertyWebkitFlexOrder:
    41314130    case CSSPropertyWebkitFlexPack:
    41324131    case CSSPropertyWebkitFlexWrap:
     
    41714170    case CSSPropertyWebkitMatchNearestMailBlockquoteColor:
    41724171    case CSSPropertyWebkitNbspMode:
     4172    case CSSPropertyWebkitOrder:
    41734173    case CSSPropertyWebkitPerspectiveOrigin:
    41744174    case CSSPropertyWebkitPerspectiveOriginX:
  • trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

    r119131 r119255  
    4343// we make the two smallest int values invalid flex-order values (in the css parser code we clamp them to
    4444// int min + 2).
    45 struct RenderFlexibleBox::FlexOrderHashTraits : WTF::GenericHashTraits<int> {
     45struct RenderFlexibleBox::OrderHashTraits : WTF::GenericHashTraits<int> {
    4646    static const bool emptyValueIsZero = false;
    4747    static int emptyValue() { return std::numeric_limits<int>::min(); }
     
    5050};
    5151
    52 class RenderFlexibleBox::FlexOrderIterator {
     52class RenderFlexibleBox::OrderIterator {
    5353public:
    54     FlexOrderIterator(RenderFlexibleBox* flexibleBox, const FlexOrderHashSet& flexOrderValues)
     54    OrderIterator(RenderFlexibleBox* flexibleBox, const OrderHashSet& orderValues)
    5555        : m_flexibleBox(flexibleBox)
    5656        , m_currentChild(0)
    5757        , m_orderValuesIterator(0)
    5858    {
    59         copyToVector(flexOrderValues, m_orderValues);
     59        copyToVector(orderValues, m_orderValues);
    6060        std::sort(m_orderValues.begin(), m_orderValues.end());
    6161        first();
     
    8686            } else
    8787                m_currentChild = m_currentChild->nextSiblingBox();
    88         } while (!m_currentChild || m_currentChild->style()->flexOrder() != *m_orderValuesIterator);
     88        } while (!m_currentChild || m_currentChild->style()->order() != *m_orderValuesIterator);
    8989
    9090        return m_currentChild;
     
    265265
    266266    WTF::Vector<LineContext> lineContexts;
    267     FlexOrderHashSet flexOrderValues;
    268     computeMainAxisPreferredSizes(relayoutChildren, flexOrderValues);
    269     FlexOrderIterator flexIterator(this, flexOrderValues);
     267    OrderHashSet orderValues;
     268    computeMainAxisPreferredSizes(relayoutChildren, orderValues);
     269    OrderIterator flexIterator(this, orderValues);
    270270    layoutFlexItems(flexIterator, lineContexts);
    271271
     
    297297}
    298298
    299 void RenderFlexibleBox::repositionLogicalHeightDependentFlexItems(FlexOrderIterator& iterator, WTF::Vector<LineContext>& lineContexts, LayoutUnit& oldClientAfterEdge)
     299void RenderFlexibleBox::repositionLogicalHeightDependentFlexItems(OrderIterator& iterator, WTF::Vector<LineContext>& lineContexts, LayoutUnit& oldClientAfterEdge)
    300300{
    301301    LayoutUnit crossAxisStartEdge = lineContexts.isEmpty() ? ZERO_LAYOUT_UNIT : lineContexts[0].crossAxisOffset;
     
    621621}
    622622
    623 void RenderFlexibleBox::layoutFlexItems(FlexOrderIterator& iterator, WTF::Vector<LineContext>& lineContexts)
     623void RenderFlexibleBox::layoutFlexItems(OrderIterator& iterator, WTF::Vector<LineContext>& lineContexts)
    624624{
    625625    OrderedFlexItemList orderedChildren;
     
    747747}
    748748
    749 void RenderFlexibleBox::computeMainAxisPreferredSizes(bool relayoutChildren, FlexOrderHashSet& flexOrderValues)
     749void RenderFlexibleBox::computeMainAxisPreferredSizes(bool relayoutChildren, OrderHashSet& orderValues)
    750750{
    751751    LayoutUnit flexboxAvailableContentExtent = mainAxisContentExtent();
    752752    RenderView* renderView = view();
    753753    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
    754         flexOrderValues.add(child->style()->flexOrder());
     754        orderValues.add(child->style()->order());
    755755
    756756        if (child->isPositioned())
     
    805805}
    806806
    807 bool RenderFlexibleBox::computeNextFlexLine(FlexOrderIterator& iterator, OrderedFlexItemList& orderedChildren, LayoutUnit& preferredMainAxisExtent, float& totalPositiveFlexibility, float& totalWeightedNegativeFlexibility, LayoutUnit& minMaxAppliedMainAxisExtent)
     807bool RenderFlexibleBox::computeNextFlexLine(OrderIterator& iterator, OrderedFlexItemList& orderedChildren, LayoutUnit& preferredMainAxisExtent, float& totalPositiveFlexibility, float& totalWeightedNegativeFlexibility, LayoutUnit& minMaxAppliedMainAxisExtent)
    808808{
    809809    orderedChildren.clear();
     
    10951095}
    10961096
    1097 void RenderFlexibleBox::packFlexLines(FlexOrderIterator& iterator, WTF::Vector<LineContext>& lineContexts)
     1097void RenderFlexibleBox::packFlexLines(OrderIterator& iterator, WTF::Vector<LineContext>& lineContexts)
    10981098{
    10991099    if (!isMultiline() || style()->flexLinePack() == LinePackStart)
     
    11401140}
    11411141
    1142 void RenderFlexibleBox::alignChildren(FlexOrderIterator& iterator, const WTF::Vector<LineContext>& lineContexts)
     1142void RenderFlexibleBox::alignChildren(OrderIterator& iterator, const WTF::Vector<LineContext>& lineContexts)
    11431143{
    11441144    // Keep track of the space between the baseline edge and the after edge of the box for each line.
     
    12321232}
    12331233
    1234 void RenderFlexibleBox::flipForRightToLeftColumn(FlexOrderIterator& iterator)
     1234void RenderFlexibleBox::flipForRightToLeftColumn(OrderIterator& iterator)
    12351235{
    12361236    if (style()->isLeftToRightDirection() || !isColumnFlow())
     
    12471247}
    12481248
    1249 void RenderFlexibleBox::flipForWrapReverse(FlexOrderIterator& iterator, const WTF::Vector<LineContext>& lineContexts, LayoutUnit crossAxisStartEdge)
     1249void RenderFlexibleBox::flipForWrapReverse(OrderIterator& iterator, const WTF::Vector<LineContext>& lineContexts, LayoutUnit crossAxisStartEdge)
    12501250{
    12511251    LayoutUnit contentExtent = crossAxisContentExtent();
  • trunk/Source/WebCore/rendering/RenderFlexibleBox.h

    r118818 r119255  
    6060    };
    6161
    62     struct FlexOrderHashTraits;
    63     typedef HashSet<int, DefaultHash<int>::Hash, FlexOrderHashTraits> FlexOrderHashSet;
     62    struct OrderHashTraits;
     63    typedef HashSet<int, DefaultHash<int>::Hash, OrderHashTraits> OrderHashSet;
    6464
    65     class FlexOrderIterator;
     65    class OrderIterator;
    6666    typedef WTF::HashMap<const RenderBox*, LayoutUnit> InflexibleFlexItemSize;
    6767    typedef WTF::Vector<RenderBox*> OrderedFlexItemList;
     
    106106    LayoutUnit preferredMainAxisContentExtentForChild(RenderBox* child) const;
    107107
    108     void layoutFlexItems(FlexOrderIterator&, WTF::Vector<LineContext>&);
     108    void layoutFlexItems(OrderIterator&, WTF::Vector<LineContext>&);
    109109    LayoutUnit autoMarginOffsetInMainAxis(const OrderedFlexItemList&, LayoutUnit& availableFreeSpace);
    110110    void updateAutoMarginsInMainAxis(RenderBox* child, LayoutUnit autoMarginOffset);
    111111    bool hasAutoMarginsInCrossAxis(RenderBox* child);
    112112    bool updateAutoMarginsInCrossAxis(RenderBox* child, LayoutUnit availableAlignmentSpace);
    113     void repositionLogicalHeightDependentFlexItems(FlexOrderIterator&, WTF::Vector<LineContext>&, LayoutUnit& oldClientAfterEdge);
     113    void repositionLogicalHeightDependentFlexItems(OrderIterator&, WTF::Vector<LineContext>&, LayoutUnit& oldClientAfterEdge);
    114114
    115115    LayoutUnit availableAlignmentSpaceForChild(LayoutUnit lineCrossAxisExtent, RenderBox*);
    116116    LayoutUnit marginBoxAscentForChild(RenderBox*);
    117117
    118     void computeMainAxisPreferredSizes(bool relayoutChildren, FlexOrderHashSet&);
     118    void computeMainAxisPreferredSizes(bool relayoutChildren, OrderHashSet&);
    119119    LayoutUnit lineBreakLength();
    120120    LayoutUnit adjustChildSizeForMinAndMax(RenderBox*, LayoutUnit childSize, LayoutUnit flexboxAvailableContentExtent);
    121     bool computeNextFlexLine(FlexOrderIterator&, OrderedFlexItemList& orderedChildren, LayoutUnit& preferredMainAxisExtent, float& totalPositiveFlexibility, float& totalWeightedNegativeFlexibility, LayoutUnit& minMaxAppliedMainAxisExtent);
     121    bool computeNextFlexLine(OrderIterator&, OrderedFlexItemList& orderedChildren, LayoutUnit& preferredMainAxisExtent, float& totalPositiveFlexibility, float& totalWeightedNegativeFlexibility, LayoutUnit& minMaxAppliedMainAxisExtent);
    122122    LayoutUnit computeAvailableFreeSpace(LayoutUnit preferredMainAxisExtent);
    123123
     
    129129    void layoutAndPlaceChildren(LayoutUnit& crossAxisOffset, const OrderedFlexItemList&, const WTF::Vector<LayoutUnit>& childSizes, LayoutUnit availableFreeSpace, WTF::Vector<LineContext>&);
    130130    void layoutColumnReverse(const OrderedFlexItemList&, const WTF::Vector<LayoutUnit>& childSizes, LayoutUnit crossAxisOffset, LayoutUnit availableFreeSpace);
    131     void packFlexLines(FlexOrderIterator&, WTF::Vector<LineContext>&);
    132     void alignChildren(FlexOrderIterator&, const WTF::Vector<LineContext>&);
     131    void packFlexLines(OrderIterator&, WTF::Vector<LineContext>&);
     132    void alignChildren(OrderIterator&, const WTF::Vector<LineContext>&);
    133133    void applyStretchAlignmentToChild(RenderBox*, LayoutUnit lineCrossAxisExtent);
    134     void flipForRightToLeftColumn(FlexOrderIterator&);
    135     void flipForWrapReverse(FlexOrderIterator&, const WTF::Vector<LineContext>&, LayoutUnit crossAxisStartEdge);
     134    void flipForRightToLeftColumn(OrderIterator&);
     135    void flipForWrapReverse(OrderIterator&, const WTF::Vector<LineContext>&, LayoutUnit crossAxisStartEdge);
    136136};
    137137
  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r119191 r119255  
    805805    EBoxPack boxPack() const { return static_cast<EBoxPack>(rareNonInheritedData->m_deprecatedFlexibleBox->pack); }
    806806
     807    int order() const { return rareNonInheritedData->m_order; }
    807808    float positiveFlex() const { return rareNonInheritedData->m_flexibleBox->m_positiveFlex; }
    808809    float negativeFlex() const { return rareNonInheritedData->m_flexibleBox->m_negativeFlex; }
    809810    Length flexPreferredSize() const { return rareNonInheritedData->m_flexibleBox->m_preferredSize; }
    810     int flexOrder() const { return rareNonInheritedData->m_flexibleBox->m_flexOrder; }
    811811    EFlexPack flexPack() const { return static_cast<EFlexPack>(rareNonInheritedData->m_flexibleBox->m_flexPack); }
    812812    EAlignItems alignItems() const { return static_cast<EAlignItems>(rareNonInheritedData->m_alignItems); }
     
    12501250    void setNegativeFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_negativeFlex, f); }
    12511251    void setFlexPreferredSize(Length l) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_preferredSize, l); }
    1252     void setFlexOrder(int o) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexOrder, o); }
     1252    void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, o); }
    12531253    void setFlexPack(EFlexPack p) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexPack, p); }
    12541254    void setAlignItems(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignItems, a); }
     
    15841584    static float initialNegativeFlex() { return 1; }
    15851585    static Length initialFlexPreferredSize() { return Length(Auto); }
    1586     static int initialFlexOrder() { return 0; }
     1586    static int initialOrder() { return 0; }
    15871587    static EFlexPack initialFlexPack() { return PackStart; }
    15881588    static EAlignItems initialAlignItems() { return AlignStretch; }
  • trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp

    r119131 r119255  
    3535    , m_negativeFlex(RenderStyle::initialNegativeFlex())
    3636    , m_preferredSize(RenderStyle::initialFlexPreferredSize())
    37     , m_flexOrder(RenderStyle::initialFlexOrder())
    3837    , m_flexPack(RenderStyle::initialFlexPack())
    3938    , m_flexDirection(RenderStyle::initialFlexDirection())
     
    4847    , m_negativeFlex(o.m_negativeFlex)
    4948    , m_preferredSize(o.m_preferredSize)
    50     , m_flexOrder(o.m_flexOrder)
    5149    , m_flexPack(o.m_flexPack)
    5250    , m_flexDirection(o.m_flexDirection)
     
    5957{
    6058    return m_positiveFlex == o.m_positiveFlex && m_negativeFlex == o.m_negativeFlex && m_preferredSize == o.m_preferredSize
    61         && m_flexOrder == o.m_flexOrder && m_flexPack == o.m_flexPack && m_flexDirection == o.m_flexDirection
     59        && m_flexPack == o.m_flexPack && m_flexDirection == o.m_flexDirection
    6260        && m_flexWrap == o.m_flexWrap && m_flexLinePack == o.m_flexLinePack;
    6361}
  • trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.h

    r119131 r119255  
    4949    Length m_preferredSize;
    5050
    51     int m_flexOrder;
    52 
    5351    unsigned m_flexPack : 3; // EFlexPack
    5452    unsigned m_flexDirection : 2; // EFlexDirection
  • trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

    r119131 r119255  
    5151    , m_wrapPadding(RenderStyle::initialWrapPadding())
    5252    , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor())
     53    , m_order(RenderStyle::initialOrder())
    5354    , m_flowThread(RenderStyle::initialFlowThread())
    5455    , m_regionThread(RenderStyle::initialRegionThread())
     
    120121    , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor)
    121122    , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor)
     123    , m_order(o.m_order)
    122124    , m_flowThread(o.m_flowThread)
    123125    , m_regionThread(o.m_regionThread)
     
    195197        && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor
    196198        && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor
     199        && m_order == o.m_order
    197200        && m_flowThread == o.m_flowThread
    198201        && m_regionThread == o.m_regionThread
  • trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h

    r119131 r119255  
    147147    Color m_visitedLinkBorderBottomColor;
    148148
     149    int m_order;
     150
    149151    AtomicString m_flowThread;
    150152    AtomicString m_regionThread;
Note: See TracChangeset for help on using the changeset viewer.