Skip to content

GitLab

T
tangled
Commit edcaa42b authored by Ian Kilpatrick's avatar Ian Kilpatrick Committed by Commit Bot
Browse files
Options

Remove -webkit-box-flex-group property. 

As above. Removes all relevant code, and layout-tests for this feature.

See intent to deprecate and remove:
https://groups.google.com/a/chromium.org/d/msg/blink-dev/-e92az54B4I/SZdhGR19DgAJ

Bug: 818691
Change-Id: Idd0ca424071aadc7cb5ba9924888452ff1fab340
Reviewed-on: https://chromium-review.googlesource.com/956275
Commit-Queue: Ojan Vafai <ojan@chromium.org>
Reviewed-by: default avatarOjan Vafai <ojan@chromium.org>
Reviewed-by: default avatarEmil A Eklund <eae@chromium.org>
Reviewed-by: default avatarMorten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543134}
parent 39959657
Expand all Show whitespace changes
Inline Side-by-side
Showing with 150 additions and 779 deletions
third_party/WebKit/LayoutTests/fast/css/getComputedStyle/computed-style-listing-expected.txt
View file @ edcaa42b
...@@ -12,7 +12,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE ...@@ -12,7 +12,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
-webkit-box-decoration-break: slice -webkit-box-decoration-break: slice
-webkit-box-direction: normal -webkit-box-direction: normal
-webkit-box-flex: 0 -webkit-box-flex: 0
-webkit-box-flex-group: 1
-webkit-box-ordinal-group: 1 -webkit-box-ordinal-group: 1
-webkit-box-orient: horizontal -webkit-box-orient: horizontal
-webkit-box-pack: start -webkit-box-pack: start
......
third_party/WebKit/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-listing-expected.txt
View file @ edcaa42b
...@@ -12,7 +12,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE ...@@ -12,7 +12,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
-webkit-box-decoration-break: slice -webkit-box-decoration-break: slice
-webkit-box-direction: normal -webkit-box-direction: normal
-webkit-box-flex: 0 -webkit-box-flex: 0
-webkit-box-flex-group: 1
-webkit-box-ordinal-group: 1 -webkit-box-ordinal-group: 1
-webkit-box-orient: horizontal -webkit-box-orient: horizontal
-webkit-box-pack: start -webkit-box-pack: start
......
third_party/WebKit/LayoutTests/fast/deprecated-flexbox/020.html deleted 100644 → 0
View file @ 39959657
<html>
<head>
<style>
div {
display: -moz-box;
display: -webkit-box;
display: box;
}
.first {
-moz-box-flex-group: 1;
-webkit-box-flex-group: 1;
box-flex-group: 1;
background-color: green;
-moz-box-flex: 1;
-webkit-box-flex: 1;
box-flex: 1;
}
.second {
-moz-box-flex-group: 2;
-webkit-box-flex-group: 2;
box-flex-group: 2;
background-color: red;
-moz-box-flex: 1;
-webkit-box-flex: 1;
box-flex: 1;
}
</style>
</head>
<body>
<p>You should see a 100x100 green square below. If you see any red, the test has failed. This test is checking
for box-flex-group support.</p>
<div style="width:100px;height:100px;background-color:red">
<div class="first"></div>
<div class="second"></div>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/ietestcenter/css3/flexbox/flexbox-groups-001-expected.htm deleted 100644 → 0
View file @ 39959657
<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Test: Flex groups with lower numbers flex to fill space first - Reference </title>
<link rel="author" title="Codeaurora" href="http://www.codeaurora.org/" />
<link rel="help" href="http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/"/>
<style type="text/css">
div
{
background: green;
width: 300px;
height: 100px;
position: relative;
}
.child
{
width: 100px;
height: 100px;
background: url('../support/flexbox_100x100_green.png') top left no-repeat green;
position: absolute;
}
.two
{
left: 100px;
}
.three
{
left: 200px;
}
</style>
</head>
<body>
<p>This test passes if there is no red showing.</p>
<div>
<div class="child"></div>
<div class="child two"></div>
<div class="child three"></div>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/ietestcenter/css3/flexbox/flexbox-groups-001.htm deleted 100644 → 0
View file @ 39959657
<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!--
Internet Explorer Test Pages Copyright © 2012 Microsoft Corporation. All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of
conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of
conditions and the following disclaimer in the documentation and/or other materials
provided with the distribution.
Neither the name of the Microsoft Corporation nor the names of its contributors may be
used to endorse or promote products derived from this software without specific prior
written permission.
THIS SOFTWARE IS PROVIDED BY MICROSOFT CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICROSOFT CORPORATION
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Test: Flex groups with lower numbers flex to fill space first</title>
<link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
<link rel="help" href="http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/"/>
<meta name="flags" content="image" />
<meta name="assert" content="box-flex-groups with lower integer values flex before higher groups are allowed to take space"/>
<style type="text/css">
.box
{
display: -ms-box;
display: -moz-box;
display: -o-box;
display: -webkit-box;
display: box;
background: red;
width: 300px;
height: 100px;
}
.child
{
width: 100px;
height: 100px;
-ms-box-flex: 1;
-moz-box-flex: 1;
-o-box-flex: 1;
-webkit-box-flex: 1;
box-flex: 1;
background: green;
}
.one
{
-ms-box-flex-group: 1;
-moz-box-flex-group: 1;
-o-box-flex-group: 1;
-webkit-box-flex-group: 1;
box-flex-group: 1;
background: url('../support/flexbox_200x100g_red.png') top left no-repeat red;
}
.two
{
-ms-box-flex-group: 2;
-moz-box-flex-group: 2;
-o-box-flex-group: 2;
-webkit-box-flex-group: 2;
box-flex-group: 2;
background: url('../support/flexbox_100x100g_red.png') top left no-repeat red;
}
</style>
</head>
<body>
<p>This test passes if there is no red showing.</p>
<div class="box">
<div class="child one"></div>
<div class="child two"></div>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/ietestcenter/css3/flexbox/flexbox-groups-002-expected.htm deleted 100644 → 0
View file @ 39959657
<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Test: Flex groups with lower numbers flex to fill space first (checking zero) - Reference </title>
<link rel="author" title="Codeaurora" href="http://www.codeaurora.org/" />
<link rel="help" href="http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/"/>
<style type="text/css">
div
{
background: green;
width: 300px;
height: 100px;
position: relative;
}
.child
{
width: 100px;
height: 100px;
background: url('../support/flexbox_100x100_green.png') top left no-repeat green;
position: absolute;
}
.two
{
left: 100px;
}
.three
{
left: 200px;
}
</style>
</head>
<body>
<p>This test passes if there is no red showing.</p>
<div>
<div class="child"></div>
<div class="child two"></div>
<div class="child three"></div>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/ietestcenter/css3/flexbox/flexbox-groups-002.htm deleted 100644 → 0
View file @ 39959657
<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!--
Internet Explorer Test Pages Copyright © 2012 Microsoft Corporation. All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of
conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of
conditions and the following disclaimer in the documentation and/or other materials
provided with the distribution.
Neither the name of the Microsoft Corporation nor the names of its contributors may be
used to endorse or promote products derived from this software without specific prior
written permission.
THIS SOFTWARE IS PROVIDED BY MICROSOFT CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICROSOFT CORPORATION
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Test: Flex groups with lower numbers flex to fill space first (checking zero)</title>
<link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
<link rel="help" href="http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/"/>
<meta name="flags" content="image" />
<meta name="assert" content="box-flex-groups with lower integer values flex before higher groups are allowed to take space (zero is valid)"/>
<style type="text/css">
.box
{
display: -ms-box;
display: -moz-box;
display: -o-box;
display: -webkit-box;
display: box;
background: red;
width: 300px;
height: 100px;
}
.child
{
width: 100px;
height: 100px;
-ms-box-flex: 1;
-moz-box-flex: 1;
-o-box-flex: 1;
-webkit-box-flex: 1;
box-flex: 1;
background: green;
background: url('../support/flexbox_100x100g_red.png') top left no-repeat red;
}
.zero
{
-ms-box-flex-group: 0;
-moz-box-flex-group: 0;
-o-box-flex-group: 0;
-webkit-box-flex-group: 0;
box-flex-group: 0;
background: url('../support/flexbox_200x100g_red.png') top left no-repeat red;
}
</style>
</head>
<body>
<p>This test passes if there is no red showing.</p>
<div class="box">
<div class="child one"></div>
<div class="child zero"></div>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/ietestcenter/css3/flexbox/flexbox-groups-003-expected.htm deleted 100644 → 0
View file @ 39959657
<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Test: Flex groups with equal numbers flex to fill space evenly - Reference </title>
<link rel="author" title="Codeaurora" href="http://www.codeaurora.org/" />
<link rel="help" href="http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/"/>
<style type="text/css">
div
{
background: green;
width: 200px;
height: 100px;
position: relative;
}
.child
{
width: 100px;
height: 100px;
background: url('../support/flexbox_100x100_green.png') top left no-repeat green;
position: absolute;
}
.two
{
left: 100px;
}
</style>
</head>
<body>
<p>This test passes if there is no red showing.</p>
<div>
<div class="child"></div>
<div class="child two"></div>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/ietestcenter/css3/flexbox/flexbox-groups-003.htm deleted 100644 → 0
View file @ 39959657
<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!--
Internet Explorer Test Pages Copyright © 2012 Microsoft Corporation. All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of
conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of
conditions and the following disclaimer in the documentation and/or other materials
provided with the distribution.
Neither the name of the Microsoft Corporation nor the names of its contributors may be
used to endorse or promote products derived from this software without specific prior
written permission.
THIS SOFTWARE IS PROVIDED BY MICROSOFT CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICROSOFT CORPORATION
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Test: Flex groups with equal numbers flex to fill space evenly</title>
<link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
<link rel="help" href="http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/"/>
<meta name="flags" content="image" />
<meta name="assert" content="box-flex-groups with equal integer values flex evenly"/>
<style type="text/css">
.box
{
display: -ms-box;
display: -moz-box;
display: -o-box;
display: -webkit-box;
display: box;
background: red;
width: 200px;
height: 100px;
}
.child
{
width: 50px;
height: 100px;
-ms-box-flex: 1;
-moz-box-flex: 1;
-o-box-flex: 1;
-webkit-box-flex: 1;
box-flex: 1;
-ms-box-flex-group: 2;
-moz-box-flex-group: 2;
-o-box-flex-group: 2;
-webkit-box-flex-group: 2;
box-flex-group: 2;
background: url('../support/flexbox_100x100g_red.png') top left no-repeat red;
}
</style>
</head>
<body>
<p>This test passes if there is no red showing.</p>
<div class="box">
<div class="child"></div>
<div class="child"></div>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/ietestcenter/css3/flexbox/flexbox-groups-004-expected.htm deleted 100644 → 0
View file @ 39959657
<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Test: Flex groups can max out and share additional space with others - Reference </title>
<link rel="author" title="Codeaurora" href="http://www.codeaurora.org/" />
<link rel="help" href="http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/"/>
<style type="text/css">
div
{
background: green;
width: 300px;
height: 100px;
position: relative;
}
.child
{
width: 100px;
height: 100px;
background: url('../support/flexbox_100x100_green.png') top left no-repeat green;
position: absolute;
}
.two
{
left: 100px;
}
.three
{
left: 200px;
}
</style>
</head>
<body>
<p>This test passes if there is no red showing.</p>
<div>
<div class="child"></div>
<div class="child two"></div>
<div class="child three"></div>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/ietestcenter/css3/flexbox/flexbox-groups-004.htm deleted 100644 → 0
View file @ 39959657
<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!--
Internet Explorer Test Pages Copyright © 2012 Microsoft Corporation. All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of
conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of
conditions and the following disclaimer in the documentation and/or other materials
provided with the distribution.
Neither the name of the Microsoft Corporation nor the names of its contributors may be
used to endorse or promote products derived from this software without specific prior
written permission.
THIS SOFTWARE IS PROVIDED BY MICROSOFT CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICROSOFT CORPORATION
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Test: Flex groups can max out and share additional space with others</title>
<link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
<link rel="help" href="http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/"/>
<meta name="flags" content="image" />
<meta name="assert" content="box-flex-groups can reach max size and share additional space with other groups"/>
<style type="text/css">
.box
{
display: -ms-box;
display: -moz-box;
display: -o-box;
display: -webkit-box;
display: box;
background: red;
width: 300px;
height: 100px;
}
.child
{
width: 50px;
height: 100px;
-ms-box-flex: 1;
-moz-box-flex: 1;
-o-box-flex: 1;
-webkit-box-flex: 1;
box-flex: 1;
background: green;
}
.one
{
max-width: 200px;
-ms-box-flex-group: 1;
-moz-box-flex-group: 1;
-o-box-flex-group: 1;
-webkit-box-flex-group: 1;
box-flex-group: 1;
background: url('../support/flexbox_200x100g_red.png') top left no-repeat red;
}
.two
{
-ms-box-flex-group: 2;
-moz-box-flex-group: 2;
-o-box-flex-group: 2;
-webkit-box-flex-group: 2;
box-flex-group: 2;
background: url('../support/flexbox_100x100g_red.png') top left no-repeat red;
}
</style>
</head>
<body>
<p>This test passes if there is no red showing.</p>
<div class="box">
<div class="child one"></div>
<div class="child two"></div>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/svg/css/getComputedStyle-listing-expected.txt
View file @ edcaa42b
...@@ -12,7 +12,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE ...@@ -12,7 +12,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
-webkit-box-decoration-break: slice -webkit-box-decoration-break: slice
-webkit-box-direction: normal -webkit-box-direction: normal
-webkit-box-flex: 0 -webkit-box-flex: 0
-webkit-box-flex-group: 1
-webkit-box-ordinal-group: 1 -webkit-box-ordinal-group: 1
-webkit-box-orient: horizontal -webkit-box-orient: horizontal
-webkit-box-pack: start -webkit-box-pack: start
......
third_party/WebKit/LayoutTests/virtual/stable/webexposed/css-properties-as-js-properties-expected.txt
View file @ edcaa42b
...@@ -326,7 +326,6 @@ webkitBoxAlign ...@@ -326,7 +326,6 @@ webkitBoxAlign
webkitBoxDecorationBreak webkitBoxDecorationBreak
webkitBoxDirection webkitBoxDirection
webkitBoxFlex webkitBoxFlex
webkitBoxFlexGroup
webkitBoxOrdinalGroup webkitBoxOrdinalGroup
webkitBoxOrient webkitBoxOrient
webkitBoxPack webkitBoxPack
......
third_party/WebKit/LayoutTests/virtual/stable/webexposed/css-property-listing-expected.txt
View file @ edcaa42b
...@@ -23,7 +23,6 @@ All changes to this list should go through Blink's feature review process: http: ...@@ -23,7 +23,6 @@ All changes to this list should go through Blink's feature review process: http:
-webkit-box-decoration-break -webkit-box-decoration-break
-webkit-box-direction -webkit-box-direction
-webkit-box-flex -webkit-box-flex
-webkit-box-flex-group
-webkit-box-ordinal-group -webkit-box-ordinal-group
-webkit-box-orient -webkit-box-orient
-webkit-box-pack -webkit-box-pack
......
third_party/WebKit/LayoutTests/webexposed/css-properties-as-js-properties-expected.txt
View file @ edcaa42b
...@@ -362,7 +362,6 @@ webkitBoxAlign ...@@ -362,7 +362,6 @@ webkitBoxAlign
webkitBoxDecorationBreak webkitBoxDecorationBreak
webkitBoxDirection webkitBoxDirection
webkitBoxFlex webkitBoxFlex
webkitBoxFlexGroup
webkitBoxOrdinalGroup webkitBoxOrdinalGroup
webkitBoxOrient webkitBoxOrient
webkitBoxPack webkitBoxPack
......
third_party/WebKit/LayoutTests/webexposed/css-property-listing-expected.txt
View file @ edcaa42b
...@@ -23,7 +23,6 @@ All changes to this list should go through Blink's feature review process: http: ...@@ -23,7 +23,6 @@ All changes to this list should go through Blink's feature review process: http:
-webkit-box-decoration-break -webkit-box-decoration-break
-webkit-box-direction -webkit-box-direction
-webkit-box-flex -webkit-box-flex
-webkit-box-flex-group
-webkit-box-ordinal-group -webkit-box-ordinal-group
-webkit-box-orient -webkit-box-orient
-webkit-box-pack -webkit-box-pack
......
third_party/WebKit/Source/core/BUILD.gn
View file @ edcaa42b
...@@ -885,7 +885,6 @@ css_properties("make_core_generated_css_longhand_property_classes") { ...@@ -885,7 +885,6 @@ css_properties("make_core_generated_css_longhand_property_classes") {
"$blink_core_output_dir/css/properties/longhands/webkit_box_decoration_break.h", "$blink_core_output_dir/css/properties/longhands/webkit_box_decoration_break.h",
"$blink_core_output_dir/css/properties/longhands/webkit_box_direction.h", "$blink_core_output_dir/css/properties/longhands/webkit_box_direction.h",
"$blink_core_output_dir/css/properties/longhands/webkit_box_flex.h", "$blink_core_output_dir/css/properties/longhands/webkit_box_flex.h",
"$blink_core_output_dir/css/properties/longhands/webkit_box_flex_group.h",
"$blink_core_output_dir/css/properties/longhands/webkit_box_ordinal_group.h", "$blink_core_output_dir/css/properties/longhands/webkit_box_ordinal_group.h",
"$blink_core_output_dir/css/properties/longhands/webkit_box_orient.h", "$blink_core_output_dir/css/properties/longhands/webkit_box_orient.h",
"$blink_core_output_dir/css/properties/longhands/webkit_box_pack.h", "$blink_core_output_dir/css/properties/longhands/webkit_box_pack.h",
......
third_party/WebKit/Source/core/css/BUILD.gn
View file @ edcaa42b
...@@ -734,7 +734,6 @@ blink_core_sources("css") { ...@@ -734,7 +734,6 @@ blink_core_sources("css") {
"properties/longhands/WebkitBoxDecorationBreakCustom.cpp", "properties/longhands/WebkitBoxDecorationBreakCustom.cpp",
"properties/longhands/WebkitBoxDirectionCustom.cpp", "properties/longhands/WebkitBoxDirectionCustom.cpp",
"properties/longhands/WebkitBoxFlexCustom.cpp", "properties/longhands/WebkitBoxFlexCustom.cpp",
"properties/longhands/WebkitBoxFlexGroupCustom.cpp",
"properties/longhands/WebkitBoxOrdinalGroupCustom.cpp", "properties/longhands/WebkitBoxOrdinalGroupCustom.cpp",
"properties/longhands/WebkitBoxOrientCustom.cpp", "properties/longhands/WebkitBoxOrientCustom.cpp",
"properties/longhands/WebkitBoxPackCustom.cpp", "properties/longhands/WebkitBoxPackCustom.cpp",
......
third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
View file @ edcaa42b
...@@ -119,17 +119,17 @@ const CSSPropertyID kComputedPropertyArray[] = { ...@@ -119,17 +119,17 @@ const CSSPropertyID kComputedPropertyArray[] = {
CSSPropertyWebkitBorderHorizontalSpacing, CSSPropertyWebkitBorderImage, CSSPropertyWebkitBorderHorizontalSpacing, CSSPropertyWebkitBorderImage,
CSSPropertyWebkitBorderVerticalSpacing, CSSPropertyWebkitBoxAlign, CSSPropertyWebkitBorderVerticalSpacing, CSSPropertyWebkitBoxAlign,
CSSPropertyWebkitBoxDecorationBreak, CSSPropertyWebkitBoxDirection, CSSPropertyWebkitBoxDecorationBreak, CSSPropertyWebkitBoxDirection,
CSSPropertyWebkitBoxFlex, CSSPropertyWebkitBoxFlexGroup, CSSPropertyWebkitBoxFlex, CSSPropertyWebkitBoxOrdinalGroup,
CSSPropertyWebkitBoxOrdinalGroup, CSSPropertyWebkitBoxOrient, CSSPropertyWebkitBoxOrient, CSSPropertyWebkitBoxPack,
CSSPropertyWebkitBoxPack, CSSPropertyWebkitBoxReflect, CSSPropertyWebkitBoxReflect, CSSPropertyColumnCount, CSSPropertyColumnGap,
CSSPropertyColumnCount, CSSPropertyColumnGap, CSSPropertyColumnRuleColor, CSSPropertyColumnRuleColor, CSSPropertyColumnRuleStyle,
CSSPropertyColumnRuleStyle, CSSPropertyColumnRuleWidth, CSSPropertyColumnRuleWidth, CSSPropertyColumnSpan, CSSPropertyColumnWidth,
CSSPropertyColumnSpan, CSSPropertyColumnWidth, CSSPropertyBackdropFilter, CSSPropertyBackdropFilter, CSSPropertyAlignContent, CSSPropertyAlignItems,
CSSPropertyAlignContent, CSSPropertyAlignItems, CSSPropertyAlignSelf, CSSPropertyAlignSelf, CSSPropertyFlexBasis, CSSPropertyFlexGrow,
CSSPropertyFlexBasis, CSSPropertyFlexGrow, CSSPropertyFlexShrink, CSSPropertyFlexShrink, CSSPropertyFlexDirection, CSSPropertyFlexWrap,
CSSPropertyFlexDirection, CSSPropertyFlexWrap, CSSPropertyJustifyContent, CSSPropertyJustifyContent, CSSPropertyWebkitFontSmoothing,
CSSPropertyWebkitFontSmoothing, CSSPropertyGridAutoColumns, CSSPropertyGridAutoColumns, CSSPropertyGridAutoFlow,
CSSPropertyGridAutoFlow, CSSPropertyGridAutoRows, CSSPropertyGridColumnEnd, CSSPropertyGridAutoRows, CSSPropertyGridColumnEnd,
CSSPropertyGridColumnStart, CSSPropertyGridTemplateAreas, CSSPropertyGridColumnStart, CSSPropertyGridTemplateAreas,
CSSPropertyGridTemplateColumns, CSSPropertyGridTemplateRows, CSSPropertyGridTemplateColumns, CSSPropertyGridTemplateRows,
CSSPropertyGridRowEnd, CSSPropertyGridRowStart, CSSPropertyRowGap, CSSPropertyGridRowEnd, CSSPropertyGridRowStart, CSSPropertyRowGap,
......
third_party/WebKit/Source/core/css/CSSProperties.json5
View file @ edcaa42b
...@@ -3034,14 +3034,6 @@ ...@@ -3034,14 +3034,6 @@
default_value: "0.0f", default_value: "0.0f",
type_name: "float", type_name: "float",
}, },
{
name: "-webkit-box-flex-group",
property_methods: ["ParseSingleValue", "CSSValueFromComputedStyleInternal"],
field_group: "*",
field_template: "primitive",
default_value: "1",
type_name: "unsigned",
},
{ {
name: "-webkit-box-ordinal-group", name: "-webkit-box-ordinal-group",
property_methods: ["ParseSingleValue", "CSSValueFromComputedStyleInternal"], property_methods: ["ParseSingleValue", "CSSValueFromComputedStyleInternal"],
......
third_party/WebKit/Source/core/css/CSSPropertiesRanking.json5
View file @ edcaa42b
...@@ -368,7 +368,6 @@ ...@@ -368,7 +368,6 @@
"color-interpolation", "color-interpolation",
"webkit-mask-clip", "webkit-mask-clip",
"marker", "marker",
"webkit-box-flex-group",
"justify-items", "justify-items",
"text-underline-position", "text-underline-position",
"marker-end", "marker-end",
......
third_party/WebKit/Source/core/css/ComputedStyleDiffFunctions.json5
View file @ edcaa42b
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
"GridAutoRepeatColumns", "GridAutoRepeatRows", "GridAutoRepeatColumnsInsertionPoint", "GridAutoRepeatColumns", "GridAutoRepeatRows", "GridAutoRepeatColumnsInsertionPoint",
"GridAutoRepeatRowsInsertionPoint", "grid-auto-flow", "GridAutoRepeatColumnsType", "GridAutoRepeatRowsInsertionPoint", "grid-auto-flow", "GridAutoRepeatColumnsType",
"GridAutoRepeatRowsType", "-webkit-box-flex", "GridAutoRepeatRowsType", "-webkit-box-flex",
"-webkit-box-ordinal-group", "-webkit-box-flex-group", "flex-basis", "-webkit-box-ordinal-group", "flex-basis",
"flex-shrink", "flex-grow", "flex-direction", "flex-wrap", "-webkit-box-align", "flex-shrink", "flex-grow", "flex-direction", "flex-wrap", "-webkit-box-align",
"-webkit-box-pack", "-webkit-box-orient", "-webkit-box-pack", "-webkit-box-orient",
"grid-row-start", "grid-row-end", "grid-column-start", "grid-column-end", "grid-row-start", "grid-row-end", "grid-column-start", "grid-column-end",
......
third_party/WebKit/Source/core/css/parser/CSSProtoConverter.cpp
View file @ edcaa42b
...@@ -980,7 +980,6 @@ const std::string Converter::kPropertyLookupTable[] = { ...@@ -980,7 +980,6 @@ const std::string Converter::kPropertyLookupTable[] = {
"image-orientation", "image-orientation",
"animation-duration", "animation-duration",
"-webkit-columns", "-webkit-columns",
"-webkit-box-flex-group",
"-webkit-animation-delay", "-webkit-animation-delay",
"-epub-text-emphasis", "-epub-text-emphasis",
"flex-shrink", "flex-shrink",
......
third_party/WebKit/Source/core/css/properties/longhands/WebkitBoxFlexGroupCustom.cpp deleted 100644 → 0
View file @ 39959657
// Copyright 2017 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "core/css/properties/longhands/webkit_box_flex_group.h"
#include "core/css/parser/CSSPropertyParserHelpers.h"
#include "core/style/ComputedStyle.h"
namespace blink {
namespace CSSLonghand {
const CSSValue* WebkitBoxFlexGroup::ParseSingleValue(
CSSParserTokenRange& range,
const CSSParserContext& context,
const CSSParserLocalContext&) const {
return CSSPropertyParserHelpers::ConsumeInteger(range, 0);
}
const CSSValue* WebkitBoxFlexGroup::CSSValueFromComputedStyleInternal(
const ComputedStyle& style,
const SVGComputedStyle&,
const LayoutObject*,
Node*,
bool allow_visited_style) const {
return CSSPrimitiveValue::Create(style.BoxFlexGroup(),
CSSPrimitiveValue::UnitType::kNumber);
}
} // namespace CSSLonghand
} // namespace blink
third_party/WebKit/Source/core/frame/UseCounter.cpp
View file @ edcaa42b
...@@ -437,8 +437,7 @@ int UseCounter::MapCSSPropertyIdToCSSSampleIdForHistogram( ...@@ -437,8 +437,7 @@ int UseCounter::MapCSSPropertyIdToCSSSampleIdForHistogram(
return 204; return 204;
case CSSPropertyWebkitBoxFlex: case CSSPropertyWebkitBoxFlex:
return 205; return 205;
case CSSPropertyWebkitBoxFlexGroup: // CSSPropertyWebkitBoxFlexGroup was 206
return 206;
// CSSPropertyWebkitBoxLines was 207 // CSSPropertyWebkitBoxLines was 207
case CSSPropertyWebkitBoxOrdinalGroup: case CSSPropertyWebkitBoxOrdinalGroup:
return 208; return 208;
......
third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.h
View file @ edcaa42b
...@@ -53,7 +53,7 @@ class LayoutDeprecatedFlexibleBox final : public LayoutBlock { ...@@ -53,7 +53,7 @@ class LayoutDeprecatedFlexibleBox final : public LayoutBlock {
LayoutUnit& min_logical_width, LayoutUnit& min_logical_width,
LayoutUnit& max_logical_width) const override; LayoutUnit& max_logical_width) const override;
LayoutUnit AllowedChildFlex(LayoutBox* child, bool expanding, unsigned group); LayoutUnit AllowedChildFlex(LayoutBox* child, bool expanding);
bool IsVertical() const { bool IsVertical() const {
return Style()->BoxOrient() == EBoxOrient::kVertical; return Style()->BoxOrient() == EBoxOrient::kVertical;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment