Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Unified Diff: third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp

Issue 1401533005: Move clip property into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch for landing Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
diff --git a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
index 760f5ff0a0d514fce4e08500d5a9a53ef5ed3e25..5f2e6208898c56d7508f2f83aadc0dd823df0b7e 100644
--- a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
@@ -401,12 +401,6 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import
// close-quote | no-open-quote | no-close-quote ]+ | inherit
parsedValue = parseContent();
break;
- case CSSPropertyClip: // <shape> | auto | inherit
- if (id == CSSValueAuto)
- validPrimitive = true;
- else if (value->m_unit == CSSParserValue::Function)
- parsedValue = parseClipShape();
- break;
/* Start of supported CSS properties with validation. This is needed for parseShorthand to work
* correctly and allows optimization in blink::applyRule(..)
@@ -1307,6 +1301,7 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import
case CSSPropertyWebkitMinLogicalHeight:
case CSSPropertyWebkitLogicalWidth:
case CSSPropertyWebkitLogicalHeight:
+ case CSSPropertyClip:
validPrimitive = false;
break;
@@ -3681,50 +3676,6 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseCounterContent(CSSParse
return CSSCounterValue::create(identifier.release(), listStyle.release(), separator.release());
}
-PassRefPtrWillBeRawPtr<CSSQuadValue> CSSPropertyParser::parseClipShape()
-{
- CSSParserValue* value = m_valueList->current();
- CSSParserValueList* args = value->function->args.get();
-
- if (value->function->id != CSSValueRect || !args)
- return nullptr;
-
- // rect(t, r, b, l) || rect(t r b l)
- if (args->size() != 4 && args->size() != 7)
- return nullptr;
- int i = 0;
- CSSParserValue* a = args->current();
-
- RefPtrWillBeRawPtr<CSSPrimitiveValue> top = nullptr;
- RefPtrWillBeRawPtr<CSSPrimitiveValue> right = nullptr;
- RefPtrWillBeRawPtr<CSSPrimitiveValue> bottom = nullptr;
- RefPtrWillBeRawPtr<CSSPrimitiveValue> left = nullptr;
- while (a) {
- if (a->id != CSSValueAuto && !validUnit(a, FLength | FUnitlessQuirk))
- return nullptr;
- RefPtrWillBeRawPtr<CSSPrimitiveValue> length = a->id == CSSValueAuto ?
- cssValuePool().createIdentifierValue(CSSValueAuto) :
- createPrimitiveNumericValue(a);
- if (i == 0)
- top = length;
- else if (i == 1)
- right = length;
- else if (i == 2)
- bottom = length;
- else
- left = length;
- a = args->next();
- if (a && args->size() == 7) {
- if (!consumeComma(args))
- return nullptr;
- a = args->current();
- }
- i++;
- }
- m_valueList->next();
- return CSSQuadValue::create(top.release(), right.release(), bottom.release(), left.release(), CSSQuadValue::SerializeAsRect);
-}
-
static void completeBorderRadii(RefPtrWillBeRawPtr<CSSPrimitiveValue> radii[4])
{
if (radii[3])
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698