Rename attach and detach to createRenderTree/destroyRenderTree

Source/core/html/HTMLInputElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2012 Samsung Electronics. All rights reserved.
@@ skipping 410 matching lines @@
     RefPtr<InputType> newType = InputType::create(this, newTypeName);
     removeFromRadioButtonGroup();
 
     bool didStoreValue = m_inputType->storesValueSeparateFromAttribute();
     bool didRespectHeightAndWidth = m_inputType->shouldRespectHeightAndWidthAttributes();
 
     m_inputType->destroyShadowSubtree();
 
     bool wasAttached = attached();
     if (wasAttached)
-        detach();
+        destroyRenderTree();
 
     m_inputType = newType.release();
     if (hasAuthorShadowRoot())
         m_inputTypeView = InputTypeView::create(this);
     else
         m_inputTypeView = m_inputType;
     m_inputType->createShadowSubtree();
 
     bool hasTouchEventHandler = m_inputTypeView->hasTouchEventHandler();
     if (hasTouchEventHandler != m_hasTouchEventHandler) {
@@ skipping 28 matching lines @@
         ASSERT(elementData());
         if (const Attribute* height = getAttributeItem(heightAttr))
             attributeChanged(heightAttr, height->value());
         if (const Attribute* width = getAttributeItem(widthAttr))
             attributeChanged(widthAttr, width->value());
         if (const Attribute* align = getAttributeItem(alignAttr))
             attributeChanged(alignAttr, align->value());
     }
 
     if (wasAttached) {
-        lazyAttach();
+        scheduleRenderTreeCreation();
         if (document().focusedElement() == this)
             document().updateFocusAppearanceSoon(true /* restore selection */);
     }
 
     setChangedSinceLastFormControlChangeEvent(false);
 
     addToRadioButtonGroup();
 
     setNeedsValidityCheck();
     notifyFormStateChanged();
@@ skipping 201 matching lines @@
         // FIXME: ignore for the moment
     } else if (name == onsearchAttr) {
         // Search field and slider attributes all just cause updateFromElement to be called through style recalcing.
         setAttributeEventListener(eventNames().searchEvent, createAttributeEventListener(this, name, value));
     } else if (name == resultsAttr) {
         int oldResults = m_maxResults;
         m_maxResults = !value.isNull() ? std::min(value.toInt(), maxSavedResults) : -1;
         // FIXME: Detaching just for maxResults change is not ideal.  We should figure out the right
         // time to relayout for this change.
         if (m_maxResults != oldResults && (m_maxResults <= 0 || oldResults <= 0))
-            lazyReattachIfAttached();
+            scheduleRenderTreeRecreationIfAttached();
         setNeedsStyleRecalc();
         UseCounter::count(&document(), UseCounter::ResultsAttribute);
     } else if (name == incrementalAttr) {
         setNeedsStyleRecalc();
         UseCounter::count(&document(), UseCounter::IncrementalAttribute);
     } else if (name == minAttr) {
         m_inputTypeView->minOrMaxAttributeChanged();
         m_inputType->sanitizeValueInResponseToMinOrMaxAttributeChange();
         setNeedsValidityCheck();
         UseCounter::count(&document(), UseCounter::MinAttribute);
@@ skipping 29 matching lines @@
         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_inputType->destroyShadowSubtree();
-            lazyReattachIfAttached();
+            scheduleRenderTreeRecreationIfAttached();
             m_inputType->createShadowSubtree();
             setFormControlValueMatchesRenderer(false);
         }
         UseCounter::count(&document(), UseCounter::PrefixedSpeechAttribute);
     } else if (name == onwebkitspeechchangeAttr)
         setAttributeEventListener(eventNames().webkitspeechchangeEvent, createAttributeEventListener(this, name, value));
 #endif
     else if (name == webkitdirectoryAttr) {
         HTMLTextFormControlElement::parseAttribute(name, value);
         UseCounter::count(&document(), UseCounter::PrefixedDirectoryAttribute);
@@ skipping 18 matching lines @@
 bool HTMLInputElement::rendererIsNeeded(const RenderStyle& style)
 {
     return m_inputType->rendererIsNeeded() && HTMLTextFormControlElement::rendererIsNeeded(style);
 }
 
 RenderObject* HTMLInputElement::createRenderer(RenderStyle* style)
 {
     return m_inputTypeView->createRenderer(style);
 }
 
-void HTMLInputElement::attach(const AttachContext& context)
+void HTMLInputElement::createRenderTree(const AttachContext& context)
 {
     if (!m_hasType)
         updateType();
 
-    HTMLTextFormControlElement::attach(context);
+    HTMLTextFormControlElement::createRenderTree(context);
 
     m_inputTypeView->attach();
     m_inputType->countUsage();
 
     if (document().focusedElement() == this)
         document().updateFocusAppearanceSoon(true /* restore selection */);
 }
 
-void HTMLInputElement::detach(const AttachContext& context)
+void HTMLInputElement::destroyRenderTree(const AttachContext& context)
 {
-    HTMLTextFormControlElement::detach(context);
+    HTMLTextFormControlElement::destroyRenderTree(context);
     setFormControlValueMatchesRenderer(false);
     m_inputType->detach();
 }
 
 String HTMLInputElement::altText() const
 {
     // http://www.w3.org/TR/1998/REC-html40-19980424/appendix/notes.html#altgen
     // also heavily discussed by Hixie on bugzilla
     // note this is intentionally different to HTMLImageElement::altText()
     String alt = fastGetAttribute(altAttr);
@@ skipping 1061 matching lines @@
 }
 
 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
 PassRefPtr<RenderStyle> HTMLInputElement::customStyleForRenderer()
 {
     return m_inputTypeView->customStyleForRenderer(originalStyleForRenderer());
 }
 #endif
 
 } // namespace