1 files changed, 9 insertions, 6 deletions
diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp
index 7ae6ad9..83e8c7d 100644
--- a/Source/WebCore/html/HTMLInputElement.cpp
+++ b/Source/WebCore/html/HTMLInputElement.cpp
@@ -443,6 +443,7 @@ void HTMLInputElement::setType(const String& type)
 
 void HTMLInputElement::updateType()
 {
+<<<<<<< HEAD
     const AtomicString& typeString = fastGetAttribute(typeAttr);
 
     OwnPtr<InputType> newType = InputType::create(this, typeString);
@@ -450,19 +451,21 @@ void HTMLInputElement::updateType()
     if (newType->isPasswordField() && document()->focusedNode() == this)
         PlatformBridge::updateTextfield(document()->view(), this, true, String());
 #endif
+=======
+    OwnPtr<InputType> newType = InputType::create(this, fastGetAttribute(typeAttr));
+    bool hadType = m_hasType;
+    m_hasType = true;
+    if (m_inputType->formControlType() == newType->formControlType())
+        return;
+>>>>>>> WebKit.org at r84325
 
-    if (m_hasType && !newType->canChangeFromAnotherType()) {
+    if (hadType && !newType->canChangeFromAnotherType()) {
         // Set the attribute back to the old value.
         // Useful in case we were called from inside parseMappedAttribute.
         setAttribute(typeAttr, type());
         return;
     }
 
-    m_hasType = true;
-
-    if (m_inputType->formControlType() == newType->formControlType())
-        return;
-
     checkedRadioButtons().removeButton(this);
 
     bool wasAttached = attached();