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

Unified Diff: Source/core/css/CSSPrimitiveValue.cpp

Issue 17450016: Implementation of CSS3 nav-up/down/left/right properties from CSS3 UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Review fixes, rebase, added more tests, made Style Navigation Data refcounted. Created 6 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
Index: Source/core/css/CSSPrimitiveValue.cpp
diff --git a/Source/core/css/CSSPrimitiveValue.cpp b/Source/core/css/CSSPrimitiveValue.cpp
index 6f95728f9f9b220c45cc72ee232cca28d7a6ae0d..9bf3dbb2aaccaec41d2cd99df0e6afb322b21411 100644
--- a/Source/core/css/CSSPrimitiveValue.cpp
+++ b/Source/core/css/CSSPrimitiveValue.cpp
@@ -95,6 +95,7 @@ static inline bool isValidCSSUnitTypeForDoubleConversion(CSSPrimitiveValue::Unit
case CSSPrimitiveValue::CSS_VALUE_ID:
case CSSPrimitiveValue::CSS_PAIR:
case CSSPrimitiveValue::CSS_PARSER_HEXCOLOR:
+ case CSSPrimitiveValue::CSS_PARSER_IDSEL:
case CSSPrimitiveValue::CSS_RECT:
case CSSPrimitiveValue::CSS_QUAD:
case CSSPrimitiveValue::CSS_RGBCOLOR:
@@ -443,6 +444,7 @@ void CSSPrimitiveValue::cleanup()
case CSS_ATTR:
case CSS_COUNTER_NAME:
case CSS_PARSER_HEXCOLOR:
+ case CSS_PARSER_IDSEL:
if (m_value.string)
m_value.string->deref();
break;
@@ -1113,6 +1115,7 @@ const char* CSSPrimitiveValue::unitTypeToString(UnitType type)
case CSS_QUAD:
case CSS_RGBCOLOR:
case CSS_PARSER_HEXCOLOR:
+ case CSS_PARSER_IDSEL:
case CSS_PAIR:
case CSS_CALC:
case CSS_SHAPE:
@@ -1240,6 +1243,9 @@ String CSSPrimitiveValue::customCSSText(CSSTextFormattingFlags formattingFlag) c
case CSS_PAIR:
text = getPairValue()->cssText();
break;
+ case CSS_PARSER_IDSEL:
+ text = "#" + String(m_value.string);
+ break;
case CSS_CALC:
text = m_value.calc->cssText();
break;
@@ -1328,6 +1334,7 @@ PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::cloneForCSSOM() con
case CSS_DIMENSION:
case CSS_UNKNOWN:
case CSS_PARSER_HEXCOLOR:
+ case CSS_PARSER_IDSEL:
ASSERT_NOT_REACHED();
break;
}
@@ -1383,6 +1390,7 @@ bool CSSPrimitiveValue::equals(const CSSPrimitiveValue& other) const
case CSS_ATTR:
case CSS_COUNTER_NAME:
case CSS_PARSER_HEXCOLOR:
+ case CSS_PARSER_IDSEL:
return equal(m_value.string, other.m_value.string);
case CSS_COUNTER:
return m_value.counter && other.m_value.counter && m_value.counter->equals(*other.m_value.counter);

Powered by Google App Engine
This is Rietveld 408576698