OLD | NEW |
1 # Copyright (C) 2011 Google Inc. All rights reserved. | 1 # Copyright (C) 2011 Google Inc. All rights reserved. |
2 # | 2 # |
3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
5 # met: | 5 # met: |
6 # | 6 # |
7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
(...skipping 26 matching lines...) Expand all Loading... |
37 unsigned pack: 3; // EBoxAlignment | 37 unsigned pack: 3; // EBoxAlignment |
38 - unsigned orient: 1; // EBoxOrient | 38 - unsigned orient: 1; // EBoxOrient |
39 unsigned lines : 1; // EBoxLines | 39 unsigned lines : 1; // EBoxLines |
40 | 40 |
41 private: | 41 private: |
42 diff --git a/WebCore/layout/style/StyleRareInheritedData.cpp b/WebCore/layout/st
yle/StyleRareInheritedData.cpp | 42 diff --git a/WebCore/layout/style/StyleRareInheritedData.cpp b/WebCore/layout/st
yle/StyleRareInheritedData.cpp |
43 index ce21720..324929e 100644 | 43 index ce21720..324929e 100644 |
44 --- a/WebCore/layout/style/StyleRareInheritedData.cpp | 44 --- a/WebCore/layout/style/StyleRareInheritedData.cpp |
45 +++ b/WebCore/layout/style/StyleRareInheritedData.cpp | 45 +++ b/WebCore/layout/style/StyleRareInheritedData.cpp |
46 @@ -39,6 +39,7 @@ StyleRareInheritedData::StyleRareInheritedData() | 46 @@ -39,6 +39,7 @@ StyleRareInheritedData::StyleRareInheritedData() |
47 , textSizeAdjust(LayoutStyle::initialTextSizeAdjust()) | 47 , textSizeAdjust(ComputedStyle::initialTextSizeAdjust()) |
48 , resize(LayoutStyle::initialResize()) | 48 , resize(ComputedStyle::initialResize()) |
49 , userSelect(LayoutStyle::initialUserSelect()) | 49 , userSelect(ComputedStyle::initialUserSelect()) |
50 + , boxOrient(LayoutStyle::initialBoxOrient()) | 50 + , boxOrient(ComputedStyle::initialBoxOrient()) |
51 { | 51 { |
52 } | 52 } |
53 | 53 |
54 @@ -58,6 +59,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRare
InheritedData& o) | 54 @@ -58,6 +59,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRare
InheritedData& o) |
55 , textSizeAdjust(o.textSizeAdjust) | 55 , textSizeAdjust(o.textSizeAdjust) |
56 , resize(o.resize) | 56 , resize(o.resize) |
57 , userSelect(o.userSelect) | 57 , userSelect(o.userSelect) |
58 + , boxOrient(o.boxOrient) | 58 + , boxOrient(o.boxOrient) |
59 { | 59 { |
60 } | 60 } |
(...skipping 10 matching lines...) Expand all Loading... |
71 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData&
o) const | 71 bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData&
o) const |
72 diff --git a/LayoutTests/platform/mac/fast/flexbox/box-orient-button-expected.ch
ecksum b/LayoutTests/platform/mac/fast/flexbox/box-orient-button-expected.checks
um | 72 diff --git a/LayoutTests/platform/mac/fast/flexbox/box-orient-button-expected.ch
ecksum b/LayoutTests/platform/mac/fast/flexbox/box-orient-button-expected.checks
um |
73 new file mode 100644 | 73 new file mode 100644 |
74 index 0000000..6db26bd | 74 index 0000000..6db26bd |
75 --- /dev/null | 75 --- /dev/null |
76 +++ b/LayoutTests/platform/mac/fast/flexbox/box-orient-button-expected.checksum | 76 +++ b/LayoutTests/platform/mac/fast/flexbox/box-orient-button-expected.checksum |
77 @@ -0,0 +1 @@ | 77 @@ -0,0 +1 @@ |
78 +61a373ee739673a9dcd7bac62b9f182e | 78 +61a373ee739673a9dcd7bac62b9f182e |
79 \ No newline at end of file | 79 \ No newline at end of file |
80 ''' | 80 ''' |
OLD | NEW |