Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / FormAssociatedElement.cpp

diff --git a/src/third_party/WebKit/Source/core/html/FormAssociatedElement.cpp b/src/third_party/WebKit/Source/core/html/FormAssociatedElement.cpp
index ee8aec0..d5f32a3 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/FormAssociatedElement.cpp
+++ b/src/third_party/WebKit/Source/core/html/FormAssociatedElement.cpp
@@ -30,6 +30,7 @@
 #include "core/dom/NodeTraversal.h"
 #include "core/html/HTMLFormControlElement.h"
 #include "core/html/HTMLFormElement.h"
+#include "core/html/HTMLLabelElement.h"
 #include "core/html/HTMLObjectElement.h"
 #include "core/html/ValidityState.h"
 
@@ -307,8 +308,10 @@ const HTMLElement& toHTMLElement(const FormAssociatedElement& associatedElement)
 {
     if (associatedElement.isFormControlElement())
         return toHTMLFormControlElement(associatedElement);
-    // Assumes the element is an HTMLObjectElement
-    return toHTMLObjectElement(associatedElement);
+    else if (associatedElement.isLabelElement())
+        return toHTMLLabelElement(associatedElement);
+    else
+        return toHTMLObjectElement(associatedElement);
 }
 
 const HTMLElement* toHTMLElement(const FormAssociatedElement* associatedElement)
@@ -349,4 +352,4 @@ void FormAttributeTargetObserver::idTargetChanged()
     m_element->formAttributeTargetChanged();
 }
 
-} // namespace Webcore
+} // namespace blink