Have InputType factories take an HTMLInputElement reference in parameter

Source/core/html/forms/NumberInputType.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 76 matching lines @@
         // In case of "123.456"
         return RealNumberRenderSize(sizeOfSign + sizeBeforeDecimalPoint, sizeOfDigits - sizeBeforeDecimalPoint);
     }
 
     // In case of "0.00012345"
     const unsigned sizeOfZero = 1;
     const unsigned numberOfZeroAfterDecimalPoint = -sizeBeforeDecimalPoint;
     return RealNumberRenderSize(sizeOfSign + sizeOfZero , numberOfZeroAfterDecimalPoint + sizeOfDigits);
 }
 
-PassRefPtr<InputType> NumberInputType::create(HTMLInputElement* element)
+PassRefPtr<InputType> NumberInputType::create(HTMLInputElement& element)
 {
     return adoptRef(new NumberInputType(element));
 }
 
 void NumberInputType::countUsage()
 {
     observeFeatureIfVisible(UseCounter::InputTypeNumber);
 }
 
 const AtomicString& NumberInputType::formControlType() const
 {
     return InputTypeNames::number();
 }
 
 void NumberInputType::setValue(const String& sanitizedValue, bool valueChanged, TextFieldEventBehavior eventBehavior)
 {
-    if (!valueChanged && sanitizedValue.isEmpty() && !element()->innerTextValue().isEmpty())
+    if (!valueChanged && sanitizedValue.isEmpty() && !element().innerTextValue().isEmpty())
         updateInnerTextValue();
     TextFieldInputType::setValue(sanitizedValue, valueChanged, eventBehavior);
 }
 
 double NumberInputType::valueAsDouble() const
 {
-    return parseToDoubleForNumberType(element()->value());
+    return parseToDoubleForNumberType(element().value());
 }
 
 void NumberInputType::setValueAsDouble(double newValue, TextFieldEventBehavior eventBehavior, ExceptionState& es) const
 {
     // FIXME: We should use numeric_limits<double>::max for number input type.
     const double floatMax = numeric_limits<float>::max();
     if (newValue < -floatMax) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
     if (newValue > floatMax) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
-    element()->setValue(serializeForNumberType(newValue), eventBehavior);
+    element().setValue(serializeForNumberType(newValue), eventBehavior);
 }
 
 void NumberInputType::setValueAsDecimal(const Decimal& newValue, TextFieldEventBehavior eventBehavior, ExceptionState& es) const
 {
     // FIXME: We should use numeric_limits<double>::max for number input type.
     const Decimal floatMax = Decimal::fromDouble(numeric_limits<float>::max());
     if (newValue < -floatMax) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
     if (newValue > floatMax) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
-    element()->setValue(serializeForNumberType(newValue), eventBehavior);
+    element().setValue(serializeForNumberType(newValue), eventBehavior);
 }
 
 bool NumberInputType::typeMismatchFor(const String& value) const
 {
     return !value.isEmpty() && !std::isfinite(parseToDoubleForNumberType(value));
 }
 
 bool NumberInputType::typeMismatch() const
 {
-    ASSERT(!typeMismatchFor(element()->value()));
+    ASSERT(!typeMismatchFor(element().value()));
     return false;
 }
 
 StepRange NumberInputType::createStepRange(AnyStepHandling anyStepHandling) const
 {
     DEFINE_STATIC_LOCAL(const StepRange::StepDescription, stepDescription, (numberDefaultStep, numberDefaultStepBase, numberStepScaleFactor));
-    const Decimal stepBase = parseToDecimalForNumberType(element()->fastGetAttribute(minAttr), numberDefaultStepBase);
+    const Decimal stepBase = parseToDecimalForNumberType(element().fastGetAttribute(minAttr), numberDefaultStepBase);
     // FIXME: We should use numeric_limits<double>::max for number input type.
     const Decimal floatMax = Decimal::fromDouble(numeric_limits<float>::max());
-    const Decimal minimum = parseToNumber(element()->fastGetAttribute(minAttr), -floatMax);
-    const Decimal maximum = parseToNumber(element()->fastGetAttribute(maxAttr), floatMax);
-    const Decimal step = StepRange::parseStep(anyStepHandling, stepDescription, element()->fastGetAttribute(stepAttr));
+    const Decimal minimum = parseToNumber(element().fastGetAttribute(minAttr), -floatMax);
+    const Decimal maximum = parseToNumber(element().fastGetAttribute(maxAttr), floatMax);
+    const Decimal step = StepRange::parseStep(anyStepHandling, stepDescription, element().fastGetAttribute(stepAttr));
     return StepRange(stepBase, minimum, maximum, step, stepDescription);
 }
 
 bool NumberInputType::sizeShouldIncludeDecoration(int defaultSize, int& preferredSize) const
 {
     preferredSize = defaultSize;
 
-    const String stepString = element()->fastGetAttribute(stepAttr);
+    const String stepString = element().fastGetAttribute(stepAttr);
     if (equalIgnoringCase(stepString, "any"))
         return false;
 
-    const Decimal minimum = parseToDecimalForNumberType(element()->fastGetAttribute(minAttr));
+    const Decimal minimum = parseToDecimalForNumberType(element().fastGetAttribute(minAttr));
     if (!minimum.isFinite())
         return false;
 
-    const Decimal maximum = parseToDecimalForNumberType(element()->fastGetAttribute(maxAttr));
+    const Decimal maximum = parseToDecimalForNumberType(element().fastGetAttribute(maxAttr));
     if (!maximum.isFinite())
         return false;
 
     const Decimal step = parseToDecimalForNumberType(stepString, 1);
     ASSERT(step.isFinite());
 
     RealNumberRenderSize size = calculateRenderSize(minimum).max(calculateRenderSize(maximum).max(calculateRenderSize(step)));
 
     preferredSize = size.sizeBeforeDecimalPoint + size.sizeAfteDecimalPoint + (size.sizeAfteDecimalPoint ? 1 : 0);
 
@@ skipping 29 matching lines @@
     return ch == 'e' || ch == 'E';
 }
 
 String NumberInputType::localizeValue(const String& proposedValue) const
 {
     if (proposedValue.isEmpty())
         return proposedValue;
     // We don't localize scientific notations.
     if (proposedValue.find(isE) != kNotFound)
         return proposedValue;
-    return element()->locale().convertToLocalizedNumber(proposedValue);
+    return element().locale().convertToLocalizedNumber(proposedValue);
 }
 
 String NumberInputType::visibleValue() const
 {
-    return localizeValue(element()->value());
+    return localizeValue(element().value());
 }
 
 String NumberInputType::convertFromVisibleValue(const String& visibleValue) const
 {
     if (visibleValue.isEmpty())
         return visibleValue;
     // We don't localize scientific notations.
     if (visibleValue.find(isE) != kNotFound)
         return visibleValue;
-    return element()->locale().convertFromLocalizedNumber(visibleValue);
+    return element().locale().convertFromLocalizedNumber(visibleValue);
 }
 
 String NumberInputType::sanitizeValue(const String& proposedValue) const
 {
     if (proposedValue.isEmpty())
         return proposedValue;
     return std::isfinite(parseToDoubleForNumberType(proposedValue)) ? proposedValue : emptyString();
 }
 
 bool NumberInputType::hasBadInput() const
 {
-    String standardValue = convertFromVisibleValue(element()->innerTextValue());
+    String standardValue = convertFromVisibleValue(element().innerTextValue());
     return !standardValue.isEmpty() && !std::isfinite(parseToDoubleForNumberType(standardValue));
 }
 
 String NumberInputType::badInputText() const
 {
     return locale().queryString(WebLocalizedString::ValidationBadInputForNumber);
 }
 
 String NumberInputType::rangeOverflowText(const Decimal& maximum) const
 {
@@ skipping 17 matching lines @@
 
 bool NumberInputType::isNumberField() const
 {
     return true;
 }
 
 void NumberInputType::minOrMaxAttributeChanged()
 {
     InputType::minOrMaxAttributeChanged();
 
-    if (element()->renderer())
-        element()->renderer()->setNeedsLayoutAndPrefWidthsRecalc();
+    if (element().renderer())
+        element().renderer()->setNeedsLayoutAndPrefWidthsRecalc();
 }
 
 void NumberInputType::stepAttributeChanged()
 {
     InputType::stepAttributeChanged();
 
-    if (element()->renderer())
-        element()->renderer()->setNeedsLayoutAndPrefWidthsRecalc();
+    if (element().renderer())
+        element().renderer()->setNeedsLayoutAndPrefWidthsRecalc();
 }
 
 } // namespace WebCore