Remove -webkit-aspect-ratio.
This property is parsed and stored on RenderStyle, but it's not
used anywhere, i.e. it has no effect.
If we later decide that we want this after all, we can re-implement
it as 'aspect-ratio' behind a flag.
Review URL: https://codereview.chromium.org/647723002
git-svn-id: svn://svn.chromium.org/blink/trunk@183652 bbb929c8-8fbe-4397-9dbb-9b2b20218538
diff --git a/third_party/WebKit/LayoutTests/css3/calc/number-parsing.html b/third_party/WebKit/LayoutTests/css3/calc/number-parsing.html
index bf70d62..021c755 100644
--- a/third_party/WebKit/LayoutTests/css3/calc/number-parsing.html
+++ b/third_party/WebKit/LayoutTests/css3/calc/number-parsing.html
@@ -21,7 +21,6 @@
assertParsedValue('grid-row-start', 'calc(1 / 2) test', null);
assertParsedValue('font-weight', 'calc(100 + 200)', null);
assertParsedValue('flex', 'calc(1 + 2) calc(3 + 4)', '3 7 0%');
- assertParsedValue('-webkit-aspect-ratio', 'calc(1 + 2)/calc(3 + 4)', '3/7');
assertParsedValue('-webkit-filter', 'saturate(calc(4 / 2))', 'saturate(2)');
assertParsedValue('-webkit-filter', 'invert(calc(4 / 2))', null);
assertParsedValue('-webkit-filter', 'invert(calc(2 / 4))', 'invert(0.5)');
diff --git a/third_party/WebKit/LayoutTests/fast/css/aspect-ratio-inheritance-expected.txt b/third_party/WebKit/LayoutTests/fast/css/aspect-ratio-inheritance-expected.txt
deleted file mode 100644
index 3232e504a9..0000000
--- a/third_party/WebKit/LayoutTests/fast/css/aspect-ratio-inheritance-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-PASS testComputedValue("aspectRatioTest", "1 / 4", "-webkit-aspect-ratio") is "1/4"
-PASS testComputedValue("aspectRatioTest", "inherit", "-webkit-aspect-ratio") is "1/2"
-PASS testComputedValue("aspectRatioTest", "none", "-webkit-aspect-ratio") is "none"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/third_party/WebKit/LayoutTests/fast/css/aspect-ratio-inheritance.html b/third_party/WebKit/LayoutTests/fast/css/aspect-ratio-inheritance.html
deleted file mode 100644
index b5e0b3a..0000000
--- a/third_party/WebKit/LayoutTests/fast/css/aspect-ratio-inheritance.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<script src="../../resources/js-test.js"></script>
-<div style="-webkit-aspect-ratio: 1 / 2;">
- <div id="aspectRatioTest"></div>
-</div>
-<script>
- function testComputedValue(elementId, value, styleAttribute)
- {
- var div = document.getElementById(elementId);
- div.style[styleAttribute] = value;
- var computedValue = window.getComputedStyle(div)[styleAttribute];
- return computedValue;
- }
- shouldBeEqualToString('testComputedValue("aspectRatioTest", "1 / 4", "-webkit-aspect-ratio")', '1/4');
- shouldBeEqualToString('testComputedValue("aspectRatioTest", "inherit", "-webkit-aspect-ratio")', '1/2');
- shouldBeEqualToString('testComputedValue("aspectRatioTest", "none", "-webkit-aspect-ratio")', 'none');
-</script>
diff --git a/third_party/WebKit/LayoutTests/fast/css/aspect-ratio-parsing-tests-expected.txt b/third_party/WebKit/LayoutTests/fast/css/aspect-ratio-parsing-tests-expected.txt
deleted file mode 100644
index 4f9c7ce..0000000
--- a/third_party/WebKit/LayoutTests/fast/css/aspect-ratio-parsing-tests-expected.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-CSS Aspect Ratio Parsing Test
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testParsing("aspectRatioTest", "2/1", "-webkit-aspect-ratio") is "2/1"
-PASS testParsing("aspectRatioTest", "1/1", "-webkit-aspect-ratio") is "1/1"
-PASS testParsing("aspectRatioTest", "1/4", "-webkit-aspect-ratio") is "1/4"
-PASS testParsing("aspectRatioTest", "1 / 2", "-webkit-aspect-ratio") is "1/2"
-PASS testParsing("aspectRatioTest", "1.2 / 2", "-webkit-aspect-ratio") is "1.2/2"
-PASS testParsing("aspectRatioTest", "2 / 0.5", "-webkit-aspect-ratio") is "2/0.5"
-PASS testParsing("aspectRatioTest", "inherit", "-webkit-aspect-ratio") is "inherit"
-PASS testParsing("aspectRatioTest", "none", "-webkit-aspect-ratio") is "none"
-PASS testParsing("aspectRatioTest", "1 2", "-webkit-aspect-ratio") is "none"
-PASS testParsing("aspectRatioTest", "a/1", "-webkit-aspect-ratio") is "none"
-PASS testParsing("aspectRatioTest", "1/a", "-webkit-aspect-ratio") is "none"
-PASS testParsing("aspectRatioTest", "abc123", "-webkit-aspect-ratio") is "none"
-PASS testParsing("aspectRatioTest", "1", "-webkit-aspect-ratio") is "none"
-PASS testParsing("aspectRatioTest", "1 / 0", "-webkit-aspect-ratio") is "none"
-PASS testParsing("aspectRatioTest", "0 / 1", "-webkit-aspect-ratio") is "none"
-PASS testParsing("aspectRatioTest", "0 / 0", "-webkit-aspect-ratio") is "none"
-PASS testParsing("aspectRatioTest", "-1 / 8", "-webkit-aspect-ratio") is "none"
-PASS testParsing("aspectRatioTest", "1 / -9", "-webkit-aspect-ratio") is "none"
-PASS testParsing("aspectRatioTest", "-1 / -4", "-webkit-aspect-ratio") is "none"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/third_party/WebKit/LayoutTests/fast/css/aspect-ratio-parsing-tests.html b/third_party/WebKit/LayoutTests/fast/css/aspect-ratio-parsing-tests.html
deleted file mode 100644
index 8092734..0000000
--- a/third_party/WebKit/LayoutTests/fast/css/aspect-ratio-parsing-tests.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
- <head>
- <script src="../../resources/js-test.js"></script>
- </head>
- <body>
- <p id="description"></p>
- <div id="console"></div>
- <div id="aspectRatioTest"></div>
- <script>
- description('CSS Aspect Ratio Parsing Test');
- function testParsing(elementId, value, styleAttribute)
- {
- var div = document.getElementById(elementId);
- div.style[styleAttribute] = value;
- return div.style[styleAttribute];
- }
-
- shouldBeEqualToString('testParsing("aspectRatioTest", "2/1", "-webkit-aspect-ratio")', '2/1');
- shouldBeEqualToString('testParsing("aspectRatioTest", "1/1", "-webkit-aspect-ratio")', '1/1');
- shouldBeEqualToString('testParsing("aspectRatioTest", "1/4", "-webkit-aspect-ratio")', '1/4');
- shouldBeEqualToString('testParsing("aspectRatioTest", "1 / 2", "-webkit-aspect-ratio")', '1/2');
- shouldBeEqualToString('testParsing("aspectRatioTest", "1.2 / 2", "-webkit-aspect-ratio")', '1.2/2');
- shouldBeEqualToString('testParsing("aspectRatioTest", "2 / 0.5", "-webkit-aspect-ratio")', '2/0.5');
- shouldBeEqualToString('testParsing("aspectRatioTest", "inherit", "-webkit-aspect-ratio")', 'inherit');
- shouldBeEqualToString('testParsing("aspectRatioTest", "none", "-webkit-aspect-ratio")', 'none');
-
- // The following are invalid and should get ignored.
- shouldBeEqualToString('testParsing("aspectRatioTest", "1 2", "-webkit-aspect-ratio")', 'none');
- shouldBeEqualToString('testParsing("aspectRatioTest", "a/1", "-webkit-aspect-ratio")', 'none');
- shouldBeEqualToString('testParsing("aspectRatioTest", "1/a", "-webkit-aspect-ratio")', 'none');
- shouldBeEqualToString('testParsing("aspectRatioTest", "abc123", "-webkit-aspect-ratio")', 'none');
- shouldBeEqualToString('testParsing("aspectRatioTest", "1", "-webkit-aspect-ratio")', 'none');
- shouldBeEqualToString('testParsing("aspectRatioTest", "1 / 0", "-webkit-aspect-ratio")', 'none');
- shouldBeEqualToString('testParsing("aspectRatioTest", "0 / 1", "-webkit-aspect-ratio")', 'none');
- shouldBeEqualToString('testParsing("aspectRatioTest", "0 / 0", "-webkit-aspect-ratio")', 'none');
- shouldBeEqualToString('testParsing("aspectRatioTest", "-1 / 8", "-webkit-aspect-ratio")', 'none');
- shouldBeEqualToString('testParsing("aspectRatioTest", "1 / -9", "-webkit-aspect-ratio")', 'none');
- shouldBeEqualToString('testParsing("aspectRatioTest", "-1 / -4", "-webkit-aspect-ratio")', 'none');
- </script>
- </body>
-</html>
diff --git a/third_party/WebKit/LayoutTests/virtual/stable/webexposed/css-properties-as-js-properties-expected.txt b/third_party/WebKit/LayoutTests/virtual/stable/webexposed/css-properties-as-js-properties-expected.txt
index a1aad024..d3b8fdf 100644
--- a/third_party/WebKit/LayoutTests/virtual/stable/webexposed/css-properties-as-js-properties-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/stable/webexposed/css-properties-as-js-properties-expected.txt
@@ -218,7 +218,6 @@
webkitAnimationTimingFunction
webkitAppRegion
webkitAppearance
-webkitAspectRatio
webkitBackfaceVisibility
webkitBackgroundClip
webkitBackgroundComposite
diff --git a/third_party/WebKit/LayoutTests/webexposed/css-properties-as-js-properties-expected.txt b/third_party/WebKit/LayoutTests/webexposed/css-properties-as-js-properties-expected.txt
index 63c26b0..3a7b7182 100644
--- a/third_party/WebKit/LayoutTests/webexposed/css-properties-as-js-properties-expected.txt
+++ b/third_party/WebKit/LayoutTests/webexposed/css-properties-as-js-properties-expected.txt
@@ -256,7 +256,6 @@
webkitAnimationTimingFunction
webkitAppRegion
webkitAppearance
-webkitAspectRatio
webkitBackfaceVisibility
webkitBackgroundClip
webkitBackgroundComposite
diff --git a/third_party/WebKit/Source/core/core.gypi b/third_party/WebKit/Source/core/core.gypi
index 1736ef9..3a0b119 100644
--- a/third_party/WebKit/Source/core/core.gypi
+++ b/third_party/WebKit/Source/core/core.gypi
@@ -721,8 +721,6 @@
'css/BasicShapeFunctions.cpp',
'css/BinaryDataFontFaceSource.cpp',
'css/BinaryDataFontFaceSource.h',
- 'css/CSSAspectRatioValue.cpp',
- 'css/CSSAspectRatioValue.h',
'css/CSSBasicShapes.cpp',
'css/CSSBorderImage.cpp',
'css/CSSBorderImage.h',
diff --git a/third_party/WebKit/Source/core/css/CSSAspectRatioValue.cpp b/third_party/WebKit/Source/core/css/CSSAspectRatioValue.cpp
deleted file mode 100644
index 1bc8a600..0000000
--- a/third_party/WebKit/Source/core/css/CSSAspectRatioValue.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") 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 APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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.
- */
-
-#include "config.h"
-#include "core/css/CSSAspectRatioValue.h"
-
-namespace blink {
-
-String CSSAspectRatioValue::customCSSText() const
-{
- return String::number(m_numeratorValue) + '/' + String::number(m_denominatorValue);
-}
-
-bool CSSAspectRatioValue::equals(const CSSAspectRatioValue& other) const
-{
- return m_numeratorValue == other.m_numeratorValue && m_denominatorValue == other.m_denominatorValue;
-}
-
-}
diff --git a/third_party/WebKit/Source/core/css/CSSAspectRatioValue.h b/third_party/WebKit/Source/core/css/CSSAspectRatioValue.h
deleted file mode 100644
index d58a643..0000000
--- a/third_party/WebKit/Source/core/css/CSSAspectRatioValue.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") 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 APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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.
- */
-
-#ifndef CSSAspectRatioValue_h
-#define CSSAspectRatioValue_h
-
-#include "core/css/CSSValue.h"
-
-namespace blink {
-
-class CSSAspectRatioValue : public CSSValue {
-public:
- static PassRefPtrWillBeRawPtr<CSSAspectRatioValue> create(float numeratorValue, float denominatorValue)
- {
- return adoptRefWillBeNoop(new CSSAspectRatioValue(numeratorValue, denominatorValue));
- }
-
- String customCSSText() const;
-
- float numeratorValue() const { return m_numeratorValue; }
- float denominatorValue() const { return m_denominatorValue; }
-
- bool equals(const CSSAspectRatioValue&) const;
-
- void traceAfterDispatch(Visitor* visitor) { CSSValue::traceAfterDispatch(visitor); }
-
-private:
- CSSAspectRatioValue(float numeratorValue, float denominatorValue)
- : CSSValue(AspectRatioClass)
- , m_numeratorValue(numeratorValue)
- , m_denominatorValue(denominatorValue)
- {
- }
-
- float m_numeratorValue;
- float m_denominatorValue;
-};
-
-DEFINE_CSS_VALUE_TYPE_CASTS(CSSAspectRatioValue, isAspectRatioValue());
-
-}
-
-#endif
diff --git a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
index f6325b8..5d1223d 100644
--- a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -29,7 +29,6 @@
#include "core/StylePropertyShorthand.h"
#include "core/animation/DocumentAnimations.h"
#include "core/css/BasicShapeFunctions.h"
-#include "core/css/CSSAspectRatioValue.h"
#include "core/css/CSSBorderImage.h"
#include "core/css/CSSFilterValue.h"
#include "core/css/CSSFontFeatureValue.h"
@@ -2443,10 +2442,6 @@
}
case CSSPropertyWebkitAppearance:
return cssValuePool().createValue(style->appearance());
- case CSSPropertyWebkitAspectRatio:
- if (!style->hasAspectRatio())
- return cssValuePool().createIdentifierValue(CSSValueNone);
- return CSSAspectRatioValue::create(style->aspectRatioNumerator(), style->aspectRatioDenominator());
case CSSPropertyBackfaceVisibility:
case CSSPropertyWebkitBackfaceVisibility:
return cssValuePool().createIdentifierValue((style->backfaceVisibility() == BackfaceVisibilityHidden) ? CSSValueHidden : CSSValueVisible);
diff --git a/third_party/WebKit/Source/core/css/CSSProperties.in b/third_party/WebKit/Source/core/css/CSSProperties.in
index e12df41b..e17fb5ee 100644
--- a/third_party/WebKit/Source/core/css/CSSProperties.in
+++ b/third_party/WebKit/Source/core/css/CSSProperties.in
@@ -293,7 +293,6 @@
-webkit-animation-timing-function custom_all
-webkit-appearance type_name=ControlPart
-webkit-app-region custom_all
--webkit-aspect-ratio inherited, custom_all
-webkit-backface-visibility use_handlers_for=CSSPropertyBackfaceVisibility
-webkit-background-clip use_handlers_for=CSSPropertyBackgroundClip
-webkit-background-composite custom_all
diff --git a/third_party/WebKit/Source/core/css/CSSValue.cpp b/third_party/WebKit/Source/core/css/CSSValue.cpp
index 0929a67..c04db5a 100644
--- a/third_party/WebKit/Source/core/css/CSSValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSValue.cpp
@@ -27,7 +27,6 @@
#include "config.h"
#include "core/css/CSSValue.h"
-#include "core/css/CSSAspectRatioValue.h"
#include "core/css/CSSBorderImageSliceValue.h"
#include "core/css/CSSCalculationValue.h"
#include "core/css/CSSCanvasValue.h"
@@ -154,8 +153,6 @@
if (m_classType == other.m_classType) {
switch (m_classType) {
- case AspectRatioClass:
- return compareCSSValues<CSSAspectRatioValue>(*this, other);
case BorderImageSliceClass:
return compareCSSValues<CSSBorderImageSliceValue>(*this, other);
case CanvasClass:
@@ -232,8 +229,6 @@
ASSERT(!isCSSOMSafe() || isSubtypeExposedToCSSOM());
switch (classType()) {
- case AspectRatioClass:
- return toCSSAspectRatioValue(this)->customCSSText();
case BorderImageSliceClass:
return toCSSBorderImageSliceValue(this)->customCSSText();
case CanvasClass:
@@ -305,9 +300,6 @@
ASSERT(!isCSSOMSafe() || isSubtypeExposedToCSSOM());
switch (classType()) {
- case AspectRatioClass:
- delete toCSSAspectRatioValue(this);
- return;
case BorderImageSliceClass:
delete toCSSBorderImageSliceValue(this);
return;
@@ -406,9 +398,6 @@
ASSERT(!isCSSOMSafe() || isSubtypeExposedToCSSOM());
switch (classType()) {
- case AspectRatioClass:
- toCSSAspectRatioValue(this)->~CSSAspectRatioValue();
- return;
case BorderImageSliceClass:
toCSSBorderImageSliceValue(this)->~CSSBorderImageSliceValue();
return;
@@ -507,9 +496,6 @@
ASSERT(!isCSSOMSafe() || isSubtypeExposedToCSSOM());
switch (classType()) {
- case AspectRatioClass:
- toCSSAspectRatioValue(this)->traceAfterDispatch(visitor);
- return;
case BorderImageSliceClass:
toCSSBorderImageSliceValue(this)->traceAfterDispatch(visitor);
return;
diff --git a/third_party/WebKit/Source/core/css/CSSValue.h b/third_party/WebKit/Source/core/css/CSSValue.h
index f9f85e3..1355dad3 100644
--- a/third_party/WebKit/Source/core/css/CSSValue.h
+++ b/third_party/WebKit/Source/core/css/CSSValue.h
@@ -74,7 +74,6 @@
bool isBaseValueList() const { return m_classType == ValueListClass; }
- bool isAspectRatioValue() const { return m_classType == AspectRatioClass; }
bool isBorderImageSliceValue() const { return m_classType == BorderImageSliceClass; }
bool isCanvasValue() const { return m_classType == CanvasClass; }
bool isCursorImageValue() const { return m_classType == CursorImageClass; }
@@ -143,7 +142,6 @@
StepsTimingFunctionClass,
// Other class types.
- AspectRatioClass,
BorderImageSliceClass,
FontFeatureClass,
FontClass,
diff --git a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
index 1e803c4..fd3d0c4 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
@@ -34,7 +34,6 @@
#include "core/MediaFeatureNames.h"
#include "core/MediaFeatures.h"
#include "core/MediaTypeNames.h"
-#include "core/css/CSSAspectRatioValue.h"
#include "core/css/CSSHelper.h"
#include "core/css/CSSPrimitiveValue.h"
#include "core/css/CSSToLengthConversionData.h"
diff --git a/third_party/WebKit/Source/core/css/MediaQueryExp.cpp b/third_party/WebKit/Source/core/css/MediaQueryExp.cpp
index 5aa3d4f..e10a2a5 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryExp.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQueryExp.cpp
@@ -30,7 +30,6 @@
#include "config.h"
#include "core/css/MediaQueryExp.h"
-#include "core/css/CSSAspectRatioValue.h"
#include "core/css/CSSPrimitiveValue.h"
#include "core/css/parser/CSSParserValues.h"
#include "core/html/parser/HTMLParserIdioms.h"
diff --git a/third_party/WebKit/Source/core/css/StylePropertySet.cpp b/third_party/WebKit/Source/core/css/StylePropertySet.cpp
index 8ed35459..ac1e35d 100644
--- a/third_party/WebKit/Source/core/css/StylePropertySet.cpp
+++ b/third_party/WebKit/Source/core/css/StylePropertySet.cpp
@@ -392,7 +392,6 @@
static const CSSPropertyID staticBlockProperties[] = {
CSSPropertyOrphans,
CSSPropertyOverflow, // This can be also be applied to replaced elements
- CSSPropertyWebkitAspectRatio,
CSSPropertyWebkitColumnCount,
CSSPropertyWebkitColumnGap,
CSSPropertyWebkitColumnRuleColor,
diff --git a/third_party/WebKit/Source/core/css/parser/BisonCSSParser-in.cpp b/third_party/WebKit/Source/core/css/parser/BisonCSSParser-in.cpp
index 7ac2e3a0..b2cba11 100644
--- a/third_party/WebKit/Source/core/css/parser/BisonCSSParser-in.cpp
+++ b/third_party/WebKit/Source/core/css/parser/BisonCSSParser-in.cpp
@@ -30,7 +30,6 @@
#include "core/CSSValueKeywords.h"
#include "core/MediaTypeNames.h"
#include "core/StylePropertyShorthand.h"
-#include "core/css/CSSAspectRatioValue.h"
#include "core/css/CSSBasicShapes.h"
#include "core/css/CSSBorderImage.h"
#include "core/css/CSSCanvasValue.h"
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
index bba01bf0..ce1cf8d 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -30,7 +30,6 @@
// FIXME: Way too many!
#include "core/CSSValueKeywords.h"
#include "core/StylePropertyShorthand.h"
-#include "core/css/CSSAspectRatioValue.h"
#include "core/css/CSSBasicShapes.h"
#include "core/css/CSSBorderImage.h"
#include "core/css/CSSCanvasValue.h"
@@ -1010,9 +1009,6 @@
case CSSPropertyTabSize:
validPrimitive = validUnit(value, FInteger | FNonNeg);
break;
- case CSSPropertyWebkitAspectRatio:
- parsedValue = parseAspectRatio();
- break;
case CSSPropertyBorderRadius:
case CSSPropertyWebkitBorderRadius:
return parseBorderRadius(propId, important);
@@ -6118,34 +6114,6 @@
return true;
}
-PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseAspectRatio()
-{
- unsigned num = m_valueList->size();
- if (num == 1 && m_valueList->valueAt(0)->id == CSSValueNone) {
- m_valueList->next();
- return cssValuePool().createIdentifierValue(CSSValueNone);
- }
-
- if (num != 3)
- return nullptr;
-
- CSSParserValue* lvalue = m_valueList->current();
- CSSParserValue* op = m_valueList->next();
- CSSParserValue* rvalue = m_valueList->next();
- m_valueList->next();
-
- if (!isForwardSlashOperator(op))
- return nullptr;
-
- if (!validUnit(lvalue, FNumber | FNonNeg) || !validUnit(rvalue, FNumber | FNonNeg))
- return nullptr;
-
- if (!lvalue->fValue || !rvalue->fValue)
- return nullptr;
-
- return CSSAspectRatioValue::create(narrowPrecisionToFloat(lvalue->fValue), narrowPrecisionToFloat(rvalue->fValue));
-}
-
PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseCounter(int defaultValue)
{
RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
index bb89af1..803be97 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
@@ -203,8 +203,6 @@
bool parseBorderImageOutset(RefPtrWillBeRawPtr<CSSPrimitiveValue>&);
bool parseBorderRadius(CSSPropertyID, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseAspectRatio();
-
PassRefPtrWillBeRawPtr<CSSValue> parseReflect();
bool parseFlex(CSSParserValueList* args, bool important);
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
index 3749e4e2..61f9469 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -43,7 +43,6 @@
#include "core/StyleBuilderFunctions.h"
#include "core/StylePropertyShorthand.h"
#include "core/css/BasicShapeFunctions.h"
-#include "core/css/CSSAspectRatioValue.h"
#include "core/css/CSSCursorImageValue.h"
#include "core/css/CSSFontValue.h"
#include "core/css/CSSGradientValue.h"
@@ -619,34 +618,6 @@
}
}
-void StyleBuilderFunctions::applyInitialCSSPropertyWebkitAspectRatio(StyleResolverState& state)
-{
- state.style()->setHasAspectRatio(RenderStyle::initialHasAspectRatio());
- state.style()->setAspectRatioDenominator(RenderStyle::initialAspectRatioDenominator());
- state.style()->setAspectRatioNumerator(RenderStyle::initialAspectRatioNumerator());
-}
-
-void StyleBuilderFunctions::applyInheritCSSPropertyWebkitAspectRatio(StyleResolverState& state)
-{
- if (!state.parentStyle()->hasAspectRatio())
- return;
- state.style()->setHasAspectRatio(true);
- state.style()->setAspectRatioDenominator(state.parentStyle()->aspectRatioDenominator());
- state.style()->setAspectRatioNumerator(state.parentStyle()->aspectRatioNumerator());
-}
-
-void StyleBuilderFunctions::applyValueCSSPropertyWebkitAspectRatio(StyleResolverState& state, CSSValue* value)
-{
- if (!value->isAspectRatioValue()) {
- state.style()->setHasAspectRatio(false);
- return;
- }
- CSSAspectRatioValue* aspectRatioValue = toCSSAspectRatioValue(value);
- state.style()->setHasAspectRatio(true);
- state.style()->setAspectRatioDenominator(aspectRatioValue->denominatorValue());
- state.style()->setAspectRatioNumerator(aspectRatioValue->numeratorValue());
-}
-
void StyleBuilderFunctions::applyValueCSSPropertyWebkitBorderImage(StyleResolverState& state, CSSValue* value)
{
NinePieceImage image;
diff --git a/third_party/WebKit/Source/core/frame/UseCounter.cpp b/third_party/WebKit/Source/core/frame/UseCounter.cpp
index b21ec808..02c31a8b 100644
--- a/third_party/WebKit/Source/core/frame/UseCounter.cpp
+++ b/third_party/WebKit/Source/core/frame/UseCounter.cpp
@@ -218,7 +218,7 @@
case CSSPropertyWebkitAnimationPlayState: return 173;
case CSSPropertyWebkitAnimationTimingFunction: return 174;
case CSSPropertyWebkitAppearance: return 175;
- case CSSPropertyWebkitAspectRatio: return 176;
+ // CSSPropertyWebkitAspectRatio was 176
case CSSPropertyWebkitBackfaceVisibility: return 177;
case CSSPropertyWebkitBackgroundClip: return 178;
case CSSPropertyWebkitBackgroundComposite: return 179;
diff --git a/third_party/WebKit/Source/core/rendering/RenderFlexibleBox.cpp b/third_party/WebKit/Source/core/rendering/RenderFlexibleBox.cpp
index faff63c..53133d3 100644
--- a/third_party/WebKit/Source/core/rendering/RenderFlexibleBox.cpp
+++ b/third_party/WebKit/Source/core/rendering/RenderFlexibleBox.cpp
@@ -604,7 +604,7 @@
{
child.clearOverrideSize();
- if (child.style()->hasAspectRatio() || child.isImage() || child.isVideo() || child.isCanvas())
+ if (child.isImage() || child.isVideo() || child.isCanvas())
UseCounter::count(document(), UseCounter::AspectRatioFlexItem);
Length flexBasis = flexBasisForChild(child);
diff --git a/third_party/WebKit/Source/core/rendering/style/RenderStyle.h b/third_party/WebKit/Source/core/rendering/style/RenderStyle.h
index 8851b13b8..e6c38d14 100644
--- a/third_party/WebKit/Source/core/rendering/style/RenderStyle.h
+++ b/third_party/WebKit/Source/core/rendering/style/RenderStyle.h
@@ -744,11 +744,6 @@
float opacity() const { return rareNonInheritedData->opacity; }
bool hasOpacity() const { return opacity() < 1.0f; }
ControlPart appearance() const { return static_cast<ControlPart>(rareNonInheritedData->m_appearance); }
- // aspect ratio convenience method
- bool hasAspectRatio() const { return rareNonInheritedData->m_hasAspectRatio; }
- float aspectRatio() const { return aspectRatioNumerator() / aspectRatioDenominator(); }
- float aspectRatioDenominator() const { return rareNonInheritedData->m_aspectRatioDenominator; }
- float aspectRatioNumerator() const { return rareNonInheritedData->m_aspectRatioNumerator; }
EBoxAlignment boxAlign() const { return static_cast<EBoxAlignment>(rareNonInheritedData->m_deprecatedFlexibleBox->align); }
EBoxDirection boxDirection() const { return static_cast<EBoxDirection>(inherited_flags._box_direction); }
float boxFlex() const { return rareNonInheritedData->m_deprecatedFlexibleBox->flex; }
@@ -1199,10 +1194,6 @@
void setEmptyCells(EEmptyCell v) { inherited_flags._empty_cells = v; }
void setCaptionSide(ECaptionSide v) { inherited_flags._caption_side = v; }
- void setHasAspectRatio(bool b) { SET_VAR(rareNonInheritedData, m_hasAspectRatio, b); }
- void setAspectRatioDenominator(float v) { SET_VAR(rareNonInheritedData, m_aspectRatioDenominator, v); }
- void setAspectRatioNumerator(float v) { SET_VAR(rareNonInheritedData, m_aspectRatioNumerator, v); }
-
void setListStyleType(EListStyleType v) { inherited_flags._list_style_type = v; }
void setListStyleImage(PassRefPtr<StyleImage>);
void setListStylePosition(EListStylePosition v) { inherited_flags._list_style_position = v; }
@@ -1654,9 +1645,6 @@
static const AtomicString& initialLocale() { return nullAtom; }
static EResize initialResize() { return RESIZE_NONE; }
static ControlPart initialAppearance() { return NoControlPart; }
- static bool initialHasAspectRatio() { return false; }
- static float initialAspectRatioDenominator() { return 1; }
- static float initialAspectRatioNumerator() { return 1; }
static Order initialRTLOrdering() { return LogicalOrder; }
static float initialTextStrokeWidth() { return 0; }
static unsigned short initialColumnCount() { return 1; }
diff --git a/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.cpp b/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.cpp
index a96d6e2..b48bb00 100644
--- a/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.cpp
+++ b/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.cpp
@@ -34,8 +34,6 @@
StyleRareNonInheritedData::StyleRareNonInheritedData()
: opacity(RenderStyle::initialOpacity())
- , m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator())
- , m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator())
, m_perspective(RenderStyle::initialPerspective())
, m_perspectiveOrigin(RenderStyle::initialPerspectiveOrigin())
, lineClamp(RenderStyle::initialLineClamp())
@@ -80,7 +78,6 @@
, m_runningOpacityAnimationOnCompositor(false)
, m_runningTransformAnimationOnCompositor(false)
, m_runningFilterAnimationOnCompositor(false)
- , m_hasAspectRatio(false)
, m_effectiveBlendMode(RenderStyle::initialBlendMode())
, m_touchAction(RenderStyle::initialTouchAction())
, m_objectFit(RenderStyle::initialObjectFit())
@@ -100,8 +97,6 @@
StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInheritedData& o)
: RefCounted<StyleRareNonInheritedData>()
, opacity(o.opacity)
- , m_aspectRatioDenominator(o.m_aspectRatioDenominator)
- , m_aspectRatioNumerator(o.m_aspectRatioNumerator)
, m_perspective(o.m_perspective)
, m_perspectiveOrigin(o.m_perspectiveOrigin)
, lineClamp(o.lineClamp)
@@ -162,7 +157,6 @@
, m_runningOpacityAnimationOnCompositor(o.m_runningOpacityAnimationOnCompositor)
, m_runningTransformAnimationOnCompositor(o.m_runningTransformAnimationOnCompositor)
, m_runningFilterAnimationOnCompositor(o.m_runningFilterAnimationOnCompositor)
- , m_hasAspectRatio(o.m_hasAspectRatio)
, m_effectiveBlendMode(o.m_effectiveBlendMode)
, m_touchAction(o.m_touchAction)
, m_objectFit(o.m_objectFit)
@@ -188,8 +182,6 @@
bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) const
{
return opacity == o.opacity
- && m_aspectRatioDenominator == o.m_aspectRatioDenominator
- && m_aspectRatioNumerator == o.m_aspectRatioNumerator
&& m_perspective == o.m_perspective
&& m_perspectiveOrigin == o.m_perspectiveOrigin
&& lineClamp == o.lineClamp
@@ -249,7 +241,6 @@
&& m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation
&& m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation
&& m_effectiveBlendMode == o.m_effectiveBlendMode
- && m_hasAspectRatio == o.m_hasAspectRatio
&& m_touchAction == o.m_touchAction
&& m_objectFit == o.m_objectFit
&& m_isolation == o.m_isolation
diff --git a/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.h b/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.h
index 0510361..a8314b9 100644
--- a/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.h
+++ b/third_party/WebKit/Source/core/rendering/style/StyleRareNonInheritedData.h
@@ -92,9 +92,6 @@
float opacity; // Whether or not we're transparent.
- float m_aspectRatioDenominator;
- float m_aspectRatioNumerator;
-
float m_perspective;
LengthPoint m_perspectiveOrigin;
@@ -178,8 +175,6 @@
unsigned m_runningTransformAnimationOnCompositor : 1;
unsigned m_runningFilterAnimationOnCompositor : 1;
- unsigned m_hasAspectRatio : 1; // Whether or not an aspect ratio has been specified.
-
unsigned m_effectiveBlendMode: 5; // EBlendMode
unsigned m_touchAction : TouchActionBits; // TouchAction
