| Index: Source/core/css/CSSPrimitiveValue.cpp
|
| diff --git a/Source/core/css/CSSPrimitiveValue.cpp b/Source/core/css/CSSPrimitiveValue.cpp
|
| index 9e9631ebfba3cfd3576c8ab8a58a29a9d9aba666..16612d6a7e3d4dda348cf4d94f451d71f32394a0 100644
|
| --- a/Source/core/css/CSSPrimitiveValue.cpp
|
| +++ b/Source/core/css/CSSPrimitiveValue.cpp
|
| @@ -622,12 +622,12 @@ double CSSPrimitiveValue::computeLengthDouble(const RenderStyle* style, const Re
|
| return result * multiplier;
|
| }
|
|
|
| -void CSSPrimitiveValue::setFloatValue(unsigned short, double, ExceptionState& es)
|
| +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.
|
| - es.throwUninformativeAndGenericDOMException(NoModificationAllowedError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(NoModificationAllowedError);
|
| }
|
|
|
| double CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(unsigned short unitType)
|
| @@ -682,12 +682,12 @@ double CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(unsigned short u
|
| return factor;
|
| }
|
|
|
| -double CSSPrimitiveValue::getDoubleValue(unsigned short unitType, ExceptionState& es) const
|
| +double CSSPrimitiveValue::getDoubleValue(unsigned short unitType, ExceptionState& exceptionState) const
|
| {
|
| double result = 0;
|
| bool success = getDoubleValueInternal(static_cast<UnitTypes>(unitType), &result);
|
| if (!success) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| return 0.0;
|
| }
|
|
|
| @@ -782,15 +782,15 @@ bool CSSPrimitiveValue::getDoubleValueInternal(UnitTypes requestedUnitType, doub
|
| return true;
|
| }
|
|
|
| -void CSSPrimitiveValue::setStringValue(unsigned short, const String&, ExceptionState& es)
|
| +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.
|
| - es.throwUninformativeAndGenericDOMException(NoModificationAllowedError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(NoModificationAllowedError);
|
| }
|
|
|
| -String CSSPrimitiveValue::getStringValue(ExceptionState& es) const
|
| +String CSSPrimitiveValue::getStringValue(ExceptionState& exceptionState) const
|
| {
|
| switch (m_primitiveUnitType) {
|
| case CSS_STRING:
|
| @@ -803,7 +803,7 @@ String CSSPrimitiveValue::getStringValue(ExceptionState& es) const
|
| case CSS_PROPERTY_ID:
|
| return propertyName(m_value.propertyID);
|
| default:
|
| - es.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| break;
|
| }
|
|
|
| @@ -829,40 +829,40 @@ String CSSPrimitiveValue::getStringValue() const
|
| return String();
|
| }
|
|
|
| -Counter* CSSPrimitiveValue::getCounterValue(ExceptionState& es) const
|
| +Counter* CSSPrimitiveValue::getCounterValue(ExceptionState& exceptionState) const
|
| {
|
| if (m_primitiveUnitType != CSS_COUNTER) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| return 0;
|
| }
|
|
|
| return m_value.counter;
|
| }
|
|
|
| -Rect* CSSPrimitiveValue::getRectValue(ExceptionState& es) const
|
| +Rect* CSSPrimitiveValue::getRectValue(ExceptionState& exceptionState) const
|
| {
|
| if (m_primitiveUnitType != CSS_RECT) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| return 0;
|
| }
|
|
|
| return m_value.rect;
|
| }
|
|
|
| -Quad* CSSPrimitiveValue::getQuadValue(ExceptionState& es) const
|
| +Quad* CSSPrimitiveValue::getQuadValue(ExceptionState& exceptionState) const
|
| {
|
| if (m_primitiveUnitType != CSS_QUAD) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| return 0;
|
| }
|
|
|
| return m_value.quad;
|
| }
|
|
|
| -PassRefPtr<RGBColor> CSSPrimitiveValue::getRGBColorValue(ExceptionState& es) const
|
| +PassRefPtr<RGBColor> CSSPrimitiveValue::getRGBColorValue(ExceptionState& exceptionState) const
|
| {
|
| if (m_primitiveUnitType != CSS_RGBCOLOR) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| return 0;
|
| }
|
|
|
| @@ -870,10 +870,10 @@ PassRefPtr<RGBColor> CSSPrimitiveValue::getRGBColorValue(ExceptionState& es) con
|
| return RGBColor::create(m_value.rgbcolor);
|
| }
|
|
|
| -Pair* CSSPrimitiveValue::getPairValue(ExceptionState& es) const
|
| +Pair* CSSPrimitiveValue::getPairValue(ExceptionState& exceptionState) const
|
| {
|
| if (m_primitiveUnitType != CSS_PAIR) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| return 0;
|
| }
|
|
|
|
|