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

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

Issue 717933002: Clean up after getPropertyCSSValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase / fix debug compile? Created 6 years, 1 month 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/CSSPrimitiveValue.h ('k') | Source/core/css/CSSPrimitiveValue.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSPrimitiveValue.cpp
diff --git a/Source/core/css/CSSPrimitiveValue.cpp b/Source/core/css/CSSPrimitiveValue.cpp
index ec39fd2273088e77f43fcee323b12473dd8f1847..9b31b3935f9eb8b0ad4db8cbfc9376623801e709 100644
--- a/Source/core/css/CSSPrimitiveValue.cpp
+++ b/Source/core/css/CSSPrimitiveValue.cpp
@@ -21,7 +21,6 @@
#include "config.h"
#include "core/css/CSSPrimitiveValue.h"
-#include "bindings/core/v8/ExceptionState.h"
#include "core/css/CSSBasicShapes.h"
#include "core/css/CSSCalculationValue.h"
#include "core/css/CSSHelper.h"
@@ -29,10 +28,8 @@
#include "core/css/CSSToLengthConversionData.h"
#include "core/css/Counter.h"
#include "core/css/Pair.h"
-#include "core/css/RGBColor.h"
#include "core/css/Rect.h"
#include "core/css/StyleSheetContents.h"
-#include "core/dom/ExceptionCode.h"
#include "core/dom/Node.h"
#include "core/rendering/style/RenderStyle.h"
#include "platform/Decimal.h"
@@ -682,14 +679,6 @@ void CSSPrimitiveValue::accumulateLengthArray(CSSLengthArray& lengthArray, doubl
lengthArray.at(lengthType) += m_value.num * conversionToCanonicalUnitsScaleFactor(static_cast<UnitType>(m_primitiveUnitType)) * multiplier;
}
-void CSSPrimitiveValue::setFloatValue(unsigned short, double, ExceptionState& exceptionState)
-{
- // Keeping values immutable makes optimizations easier and allows sharing of the primitive value objects.
- // No other engine supports mutating style through this API. Computed style is always read-only anyway.
- // Supporting setter would require making primitive value copy-on-write and taking care of style invalidation.
- exceptionState.throwDOMException(NoModificationAllowedError, "CSSPrimitiveValue objects are read-only.");
-}
-
double CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(UnitType unitType)
{
double factor = 1.0;
@@ -742,18 +731,6 @@ double CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(UnitType unitTyp
return factor;
}
-double CSSPrimitiveValue::getDoubleValue(UnitType unitType, ExceptionState& exceptionState) const
-{
- double result = 0;
- bool success = getDoubleValueInternal(unitType, &result);
- if (!success) {
- exceptionState.throwDOMException(InvalidAccessError, "Failed to obtain a double value.");
- return 0.0;
- }
-
- return result;
-}
-
double CSSPrimitiveValue::getDoubleValue(UnitType unitType) const
{
double result = 0;
@@ -913,33 +890,6 @@ CSSPrimitiveValue::UnitType CSSPrimitiveValue::lengthUnitTypeToUnitType(LengthUn
return CSSPrimitiveValue::CSS_UNKNOWN;
}
-void CSSPrimitiveValue::setStringValue(unsigned short, const String&, ExceptionState& exceptionState)
-{
- // Keeping values immutable makes optimizations easier and allows sharing of the primitive value objects.
- // No other engine supports mutating style through this API. Computed style is always read-only anyway.
- // Supporting setter would require making primitive value copy-on-write and taking care of style invalidation.
- exceptionState.throwDOMException(NoModificationAllowedError, "CSSPrimitiveValue objects are read-only.");
-}
-
-String CSSPrimitiveValue::getStringValue(ExceptionState& exceptionState) const
-{
- switch (m_primitiveUnitType) {
- case CSS_STRING:
- case CSS_ATTR:
- case CSS_URI:
- return m_value.string;
- case CSS_VALUE_ID:
- return valueName(m_value.valueID);
- case CSS_PROPERTY_ID:
- return propertyName(m_value.propertyID);
- default:
- exceptionState.throwDOMException(InvalidAccessError, "This object's value cannot be represented as a string.");
- break;
- }
-
- return String();
-}
-
String CSSPrimitiveValue::getStringValue() const
{
switch (m_primitiveUnitType) {
@@ -958,57 +908,6 @@ String CSSPrimitiveValue::getStringValue() const
return String();
}
-Counter* CSSPrimitiveValue::getCounterValue(ExceptionState& exceptionState) const
-{
- if (m_primitiveUnitType != CSS_COUNTER) {
- exceptionState.throwDOMException(InvalidAccessError, "This object is not a counter value.");
- return 0;
- }
-
- return m_value.counter;
-}
-
-Rect* CSSPrimitiveValue::getRectValue(ExceptionState& exceptionState) const
-{
- if (m_primitiveUnitType != CSS_RECT) {
- exceptionState.throwDOMException(InvalidAccessError, "This object is not a rect value.");
- return 0;
- }
-
- return m_value.rect;
-}
-
-Quad* CSSPrimitiveValue::getQuadValue(ExceptionState& exceptionState) const
-{
- if (m_primitiveUnitType != CSS_QUAD) {
- exceptionState.throwDOMException(InvalidAccessError, "This object is not a quad value.");
- return 0;
- }
-
- return m_value.quad;
-}
-
-PassRefPtrWillBeRawPtr<RGBColor> CSSPrimitiveValue::getRGBColorValue(ExceptionState& exceptionState) const
-{
- if (m_primitiveUnitType != CSS_RGBCOLOR) {
- exceptionState.throwDOMException(InvalidAccessError, "This object is not an RGB color value.");
- return nullptr;
- }
-
- // FIMXE: This should not return a new object for each invocation.
- return RGBColor::create(m_value.rgbcolor);
-}
-
-Pair* CSSPrimitiveValue::getPairValue(ExceptionState& exceptionState) const
-{
- if (m_primitiveUnitType != CSS_PAIR) {
- exceptionState.throwDOMException(InvalidAccessError, "This object is not a pair value.");
- return 0;
- }
-
- return m_value.pair;
-}
-
static String formatNumber(double number, const char* suffix, unsigned suffixLength)
{
Decimal decimal = Decimal::fromDouble(number);
@@ -1241,89 +1140,6 @@ String CSSPrimitiveValue::customCSSText(CSSTextFormattingFlags formattingFlag) c
return text;
}
-PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPrimitiveValue::cloneForCSSOM() const
-{
- RefPtrWillBeRawPtr<CSSPrimitiveValue> result = nullptr;
-
- switch (m_primitiveUnitType) {
- case CSS_STRING:
- case CSS_URI:
- case CSS_ATTR:
- case CSS_COUNTER_NAME:
- result = CSSPrimitiveValue::create(m_value.string, static_cast<UnitType>(m_primitiveUnitType));
- break;
- case CSS_COUNTER:
- result = CSSPrimitiveValue::create(m_value.counter->cloneForCSSOM());
- break;
- case CSS_RECT:
- result = CSSPrimitiveValue::create(m_value.rect->cloneForCSSOM());
- break;
- case CSS_QUAD:
- result = CSSPrimitiveValue::create(m_value.quad->cloneForCSSOM());
- break;
- case CSS_PAIR:
- // Pair is not exposed to the CSSOM, no need for a deep clone.
- result = CSSPrimitiveValue::create(m_value.pair);
- break;
- case CSS_CALC:
- // CSSCalcValue is not exposed to the CSSOM, no need for a deep clone.
- result = CSSPrimitiveValue::create(m_value.calc);
- break;
- case CSS_SHAPE:
- // CSSShapeValue is not exposed to the CSSOM, no need for a deep clone.
- result = CSSPrimitiveValue::create(m_value.shape);
- break;
- case CSS_NUMBER:
- case CSS_PERCENTAGE:
- case CSS_EMS:
- case CSS_EXS:
- case CSS_REMS:
- case CSS_CHS:
- case CSS_PX:
- case CSS_CM:
- case CSS_MM:
- case CSS_IN:
- case CSS_PT:
- case CSS_PC:
- case CSS_DEG:
- case CSS_RAD:
- case CSS_GRAD:
- case CSS_MS:
- case CSS_S:
- case CSS_HZ:
- case CSS_KHZ:
- case CSS_TURN:
- case CSS_VW:
- case CSS_VH:
- case CSS_VMIN:
- case CSS_VMAX:
- case CSS_DPPX:
- case CSS_DPI:
- case CSS_DPCM:
- case CSS_FR:
- result = CSSPrimitiveValue::create(m_value.num, static_cast<UnitType>(m_primitiveUnitType));
- break;
- case CSS_PROPERTY_ID:
- result = CSSPrimitiveValue::createIdentifier(m_value.propertyID);
- break;
- case CSS_VALUE_ID:
- result = CSSPrimitiveValue::createIdentifier(m_value.valueID);
- break;
- case CSS_RGBCOLOR:
- result = CSSPrimitiveValue::createColor(m_value.rgbcolor);
- break;
- case CSS_DIMENSION:
- case CSS_UNKNOWN:
- case CSS_PARSER_HEXCOLOR:
- ASSERT_NOT_REACHED();
- break;
- }
- if (result)
- result->setCSSOMSafe();
-
- return result;
-}
-
bool CSSPrimitiveValue::equals(const CSSPrimitiveValue& other) const
{
if (m_primitiveUnitType != other.m_primitiveUnitType)
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.h ('k') | Source/core/css/CSSPrimitiveValue.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698