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

Unified Diff: Source/core/css/parser/CSSPropertyParser.cpp

Issue 1328673003: Remove -webkit-line-box-contain implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix up a few more tests. Created 5 years, 3 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 | « Source/core/css/parser/CSSPropertyParser.h ('k') | Source/core/css/resolver/StyleBuilderConverter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/CSSPropertyParser.cpp
diff --git a/Source/core/css/parser/CSSPropertyParser.cpp b/Source/core/css/parser/CSSPropertyParser.cpp
index 4ddccd5395483aec08c2bc01bb68c7d3250e60ba..21d3266aa841fd012f0a2101dbe84c8501643ba6 100644
--- a/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/Source/core/css/parser/CSSPropertyParser.cpp
@@ -41,7 +41,6 @@
#include "core/css/CSSGridLineNamesValue.h"
#include "core/css/CSSImageSetValue.h"
#include "core/css/CSSImageValue.h"
-#include "core/css/CSSLineBoxContainValue.h"
#include "core/css/CSSPathValue.h"
#include "core/css/CSSPrimitiveValueMappings.h"
#include "core/css/CSSProperty.h"
@@ -1468,12 +1467,6 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import
validPrimitive = true;
break;
- case CSSPropertyWebkitLineBoxContain:
- if (id == CSSValueNone)
- validPrimitive = true;
- else
- parsedValue = parseLineBoxContain();
- break;
case CSSPropertyWebkitFontFeatureSettings:
if (id == CSSValueNormal)
validPrimitive = true;
@@ -7244,36 +7237,6 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseTextIndent()
return list.release();
}
-PassRefPtrWillBeRawPtr<CSSLineBoxContainValue> CSSPropertyParser::parseLineBoxContain()
-{
- LineBoxContain lineBoxContain = LineBoxContainNone;
-
- for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
- LineBoxContainFlags flag;
- if (value->id == CSSValueBlock) {
- flag = LineBoxContainBlock;
- } else if (value->id == CSSValueInline) {
- flag = LineBoxContainInline;
- } else if (value->id == CSSValueFont) {
- flag = LineBoxContainFont;
- } else if (value->id == CSSValueGlyphs) {
- flag = LineBoxContainGlyphs;
- } else if (value->id == CSSValueReplaced) {
- flag = LineBoxContainReplaced;
- } else if (value->id == CSSValueInlineBox) {
- flag = LineBoxContainInlineBox;
- } else {
- return nullptr;
- }
- if (lineBoxContain & flag)
- return nullptr;
- lineBoxContain |= flag;
- }
-
- ASSERT(lineBoxContain);
- return CSSLineBoxContainValue::create(lineBoxContain);
-}
-
bool CSSPropertyParser::parseFontFeatureTag(CSSValueList* settings)
{
// Feature tag name consists of 4-letter characters.
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.h ('k') | Source/core/css/resolver/StyleBuilderConverter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698