using namespace HTMLNames;
-class ListAttributeTargetObserver : IdTargetObserver {
- WTF_MAKE_FAST_ALLOCATED;
+class ListAttributeTargetObserver : public IdTargetObserver {
+ WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
public:
- static PassOwnPtr<ListAttributeTargetObserver> create(const AtomicString& id, HTMLInputElement*);
+ static PassOwnPtrWillBeRawPtr<ListAttributeTargetObserver> create(const AtomicString& id, HTMLInputElement*);
+ virtual void trace(Visitor*) OVERRIDE;
virtual void idTargetChanged() OVERRIDE;
private:
ListAttributeTargetObserver(const AtomicString& id, HTMLInputElement*);
- HTMLInputElement* m_element;
+ RawPtrWillBeMember<HTMLInputElement> m_element;
};
// FIXME: According to HTML4, the length attribute's value can be arbitrarily
, m_isChecked(false)
, m_reflectsCheckedAttribute(true)
, m_isIndeterminate(false)
- , m_hasType(false)
, m_isActivatedSubmit(false)
, m_autocomplete(Uninitialized)
, m_hasNonEmptyList(false)
, m_canReceiveDroppedFiles(false)
, m_hasTouchEventHandler(false)
, m_shouldRevealPassword(false)
+ , m_needsToUpdateViewValue(true)
, m_inputType(InputType::createText(*this))
, m_inputTypeView(m_inputType)
{
ScriptWrappable::init(this);
}
-PassRefPtr<HTMLInputElement> HTMLInputElement::create(Document& document, HTMLFormElement* form, bool createdByParser)
+PassRefPtrWillBeRawPtr<HTMLInputElement> HTMLInputElement::create(Document& document, HTMLFormElement* form, bool createdByParser)
{
- RefPtr<HTMLInputElement> inputElement = adoptRef(new HTMLInputElement(document, form, createdByParser));
+ RefPtrWillBeRawPtr<HTMLInputElement> inputElement = adoptRefWillBeRefCountedGarbageCollected(new HTMLInputElement(document, form, createdByParser));
inputElement->ensureUserAgentShadowRoot();
return inputElement.release();
}
+void HTMLInputElement::trace(Visitor* visitor)
+{
+ visitor->trace(m_inputType);
+ visitor->trace(m_inputTypeView);
+ visitor->trace(m_listAttributeTargetObserver);
+ HTMLTextFormControlElement::trace(visitor);
+}
+
HTMLImageLoader* HTMLInputElement::imageLoader()
{
if (!m_imageLoader)
m_inputTypeView->createShadowSubtree();
}
-void HTMLInputElement::didAddShadowRoot(ShadowRoot& root)
+void HTMLInputElement::willAddFirstAuthorShadowRoot()
{
- if (!root.isOldestAuthorShadowRoot())
- return;
m_inputTypeView->destroyShadowSubtree();
m_inputTypeView = InputTypeView::create(*this);
lazyReattachIfAttached();
HTMLInputElement::~HTMLInputElement()
{
+#if !ENABLE(OILPAN)
// Need to remove form association while this is still an HTMLInputElement
// so that virtual functions are called correctly.
setForm(0);
document().formController().radioButtonGroupScope().removeButton(this);
if (m_hasTouchEventHandler)
document().didRemoveTouchEventHandler(this);
+#endif
}
const AtomicString& HTMLInputElement::name() const
void HTMLInputElement::updateFocusAppearance(bool restorePreviousSelection)
{
if (isTextField()) {
- if (!restorePreviousSelection || !hasCachedSelection())
+ if (!restorePreviousSelection)
select();
else
restoreCachedSelection();
void HTMLInputElement::updateType()
{
const AtomicString& newTypeName = InputType::normalizeTypeName(fastGetAttribute(typeAttr));
- bool hadType = m_hasType;
- m_hasType = true;
- if (m_inputType->formControlType() == newTypeName)
- return;
- if (hadType && !InputType::canChangeFromAnotherType(newTypeName)) {
- // Set the attribute back to the old value.
- // Useful in case we were called from inside parseAttribute.
- setAttribute(typeAttr, type());
+ if (m_inputType->formControlType() == newTypeName)
return;
- }
- RefPtr<InputType> newType = InputType::create(*this, newTypeName);
+ RefPtrWillBeRawPtr<InputType> newType = InputType::create(*this, newTypeName);
removeFromRadioButtonGroup();
bool didStoreValue = m_inputType->storesValueSeparateFromAttribute();
} else
updateValueIfNeeded();
- setFormControlValueMatchesRenderer(false);
+ m_needsToUpdateViewValue = true;
m_inputTypeView->updateView();
if (didRespectHeightAndWidth != m_inputType->shouldRespectHeightAndWidthAttributes()) {
updatePlaceholderVisibility(false);
setNeedsStyleRecalc(SubtreeStyleChange);
}
- setFormControlValueMatchesRenderer(false);
+ m_needsToUpdateViewValue = true;
setNeedsValidityCheck();
m_valueAttributeWasUpdatedAfterParsing = !m_parsingInProgress;
m_inputTypeView->valueAttributeChanged();
listAttributeTargetChanged();
}
UseCounter::count(document(), UseCounter::ListAttribute);
- }
-#if ENABLE(INPUT_SPEECH)
- else if (name == webkitspeechAttr) {
- if (RuntimeEnabledFeatures::speechInputEnabled() && m_inputType->shouldRespectSpeechAttribute()) {
- // This renderer and its children have quite different layouts and
- // styles depending on whether the speech button is visible or
- // not. So we reset the whole thing and recreate to get the right
- // styles and layout.
- m_inputTypeView->destroyShadowSubtree();
- lazyReattachIfAttached();
- m_inputTypeView->createShadowSubtree();
- setFormControlValueMatchesRenderer(false);
- }
- UseCounter::countDeprecation(document(), UseCounter::PrefixedSpeechAttribute);
- } else if (name == onwebkitspeechchangeAttr)
- setAttributeEventListener(EventTypeNames::webkitspeechchange, createAttributeEventListener(this, name, value));
-#endif
- else if (name == webkitdirectoryAttr) {
+ } else if (name == webkitdirectoryAttr) {
HTMLTextFormControlElement::parseAttribute(name, value);
UseCounter::count(document(), UseCounter::PrefixedDirectoryAttribute);
}
void HTMLInputElement::attach(const AttachContext& context)
{
- if (!m_hasType)
- updateType();
-
HTMLTextFormControlElement::attach(context);
m_inputTypeView->startResourceLoading();
void HTMLInputElement::detach(const AttachContext& context)
{
HTMLTextFormControlElement::detach(context);
- setFormControlValueMatchesRenderer(false);
+ m_needsToUpdateViewValue = true;
m_inputTypeView->closePopupView();
}
if (checked() == nowChecked)
return;
- RefPtr<HTMLInputElement> protector(this);
+ RefPtrWillBeRawPtr<HTMLInputElement> protector(this);
m_reflectsCheckedAttribute = false;
m_isChecked = nowChecked;
setNeedsStyleRecalc(SubtreeStyleChange);
setChecked(sourceElement.m_isChecked);
m_reflectsCheckedAttribute = sourceElement.m_reflectsCheckedAttribute;
m_isIndeterminate = sourceElement.m_isIndeterminate;
+ m_inputType->copyNonAttributeProperties(sourceElement);
HTMLTextFormControlElement::copyNonAttributePropertiesFromElement(source);
- setFormControlValueMatchesRenderer(false);
+ m_needsToUpdateViewValue = true;
m_inputTypeView->updateView();
}
{
if (!m_inputType->canSetSuggestedValue())
return;
- setFormControlValueMatchesRenderer(false);
+ m_needsToUpdateViewValue = true;
m_suggestedValue = sanitizeValue(value);
setNeedsStyleRecalc(SubtreeStyleChange);
m_inputTypeView->updateView();
dispatchInputEvent();
}
+void HTMLInputElement::setInnerTextValue(const String& value)
+{
+ HTMLTextFormControlElement::setInnerTextValue(value);
+ m_needsToUpdateViewValue = false;
+}
+
void HTMLInputElement::setValue(const String& value, ExceptionState& exceptionState, TextFieldEventBehavior eventBehavior)
{
if (isFileUpload() && !value.isEmpty()) {
if (!m_inputType->canSetValue(value))
return;
- RefPtr<HTMLInputElement> protector(this);
+ RefPtrWillBeRawPtr<HTMLInputElement> protector(this);
EventQueueScope scope;
String sanitizedValue = sanitizeValue(value);
bool valueChanged = sanitizedValue != this->value();
setLastChangeWasNotUserEdit();
- setFormControlValueMatchesRenderer(false);
+ m_needsToUpdateViewValue = true;
m_suggestedValue = String(); // Prevent TextFieldInputType::setValue from using the suggested value.
m_inputType->setValue(sanitizedValue, valueChanged, eventBehavior);
{
m_valueIfDirty = sanitizedValue;
setNeedsValidityCheck();
+ if (document().focusedElement() == this)
+ document().frameHost()->chrome().client().didUpdateTextOfFocusedElementByNonUserInput();
}
void HTMLInputElement::updateView()
m_inputTypeView->updateView();
}
-double HTMLInputElement::valueAsDate() const
+double HTMLInputElement::valueAsDate(bool& isNull) const
{
- return m_inputType->valueAsDate();
+ double date = m_inputType->valueAsDate();
+ isNull = !std::isfinite(date);
+ return date;
}
void HTMLInputElement::setValueAsDate(double value, ExceptionState& exceptionState)
void HTMLInputElement::setValueAsNumber(double newValue, ExceptionState& exceptionState, TextFieldEventBehavior eventBehavior)
{
+ // http://www.whatwg.org/specs/web-apps/current-work/multipage/common-input-element-attributes.html#dom-input-valueasnumber
+ // On setting, if the new value is infinite, then throw a TypeError exception.
if (std::isinf(newValue)) {
exceptionState.throwTypeError(ExceptionMessages::notAFiniteNumber(newValue));
return;
ASSERT(value == sanitizeValue(value) || sanitizeValue(value).isEmpty());
m_valueIfDirty = value;
-
- setFormControlValueMatchesRenderer(true);
+ m_needsToUpdateViewValue = false;
// Input event is fired by the Node::defaultEventHandler for editable controls.
if (!isTextField())
if (wasChangedSinceLastFormControlChangeEvent())
dispatchFormControlChangeEvent();
- RefPtr<HTMLFormElement> formForSubmission = m_inputTypeView->formForSubmission();
+ RefPtrWillBeRawPtr<HTMLFormElement> formForSubmission = m_inputTypeView->formForSubmission();
// Form may never have been present, or may have been destroyed by code responding to the change event.
if (formForSubmission)
formForSubmission->submitImplicitly(evt, canTriggerImplicitSubmission());
return document().completeURL(fastGetAttribute(srcAttr));
}
-FileList* HTMLInputElement::files()
+FileList* HTMLInputElement::files() const
{
return m_inputType->files();
}
return false;
}
+void HTMLInputElement::setListAttributeTargetObserver(PassOwnPtrWillBeRawPtr<ListAttributeTargetObserver> newObserver)
+{
+ if (m_listAttributeTargetObserver)
+ m_listAttributeTargetObserver->unregister();
+ m_listAttributeTargetObserver = newObserver;
+}
+
void HTMLInputElement::resetListAttributeTargetObserver()
{
if (inDocument())
- m_listAttributeTargetObserver = ListAttributeTargetObserver::create(fastGetAttribute(listAttr), this);
+ setListAttributeTargetObserver(ListAttributeTargetObserver::create(fastGetAttribute(listAttr), this));
else
- m_listAttributeTargetObserver = nullptr;
+ setListAttributeTargetObserver(nullptr);
}
void HTMLInputElement::listAttributeTargetChanged()
return m_inputType->isSteppable();
}
-#if ENABLE(INPUT_SPEECH)
-
-bool HTMLInputElement::isSpeechEnabled() const
-{
- // FIXME: Add support for RANGE, EMAIL, URL, COLOR and DATE/TIME input types.
- return m_inputType->shouldRespectSpeechAttribute() && RuntimeEnabledFeatures::speechInputEnabled() && hasAttribute(webkitspeechAttr);
-}
-
-#endif
-
bool HTMLInputElement::isTextButton() const
{
return m_inputType->isTextButton();
setUnsignedIntegralAttribute(widthAttr, width);
}
-PassOwnPtr<ListAttributeTargetObserver> ListAttributeTargetObserver::create(const AtomicString& id, HTMLInputElement* element)
+PassOwnPtrWillBeRawPtr<ListAttributeTargetObserver> ListAttributeTargetObserver::create(const AtomicString& id, HTMLInputElement* element)
{
- return adoptPtr(new ListAttributeTargetObserver(id, element));
+ return adoptPtrWillBeNoop(new ListAttributeTargetObserver(id, element));
}
ListAttributeTargetObserver::ListAttributeTargetObserver(const AtomicString& id, HTMLInputElement* element)
{
}
+void ListAttributeTargetObserver::trace(Visitor* visitor)
+{
+ visitor->trace(m_element);
+ IdTargetObserver::trace(visitor);
+}
+
void ListAttributeTargetObserver::idTargetChanged()
{
m_element->listAttributeTargetChanged();
}
#endif
+bool HTMLInputElement::shouldDispatchFormControlChangeEvent(String& oldValue, String& newValue)
+{
+ return m_inputType->shouldDispatchFormControlChangeEvent(oldValue, newValue);
+}
+
} // namespace
projects / platform / framework / web / crosswalk.git / blobdiff