Revert of Revert of Fix selection of label having control element.

Source/core/html/HTMLLabelElement.cpp

Index: Source/core/html/HTMLLabelElement.cpp
diff --git a/Source/core/html/HTMLLabelElement.cpp b/Source/core/html/HTMLLabelElement.cpp
index 801692be8c3b995d2d7fd53d5aaa1a547a5c45d7..b625e78f6d1c03e85537220ce833a8da5c2d4f3e 100644
--- a/Source/core/html/HTMLLabelElement.cpp
+++ b/Source/core/html/HTMLLabelElement.cpp
@@ -27,7 +27,9 @@
 
 #include "HTMLNames.h"
 #include "core/dom/ElementTraversal.h"
+#include "core/editing/FrameSelection.h"
 #include "core/events/Event.h"
+#include "core/frame/LocalFrame.h"
 #include "core/html/FormAssociatedElement.h"
 
 namespace WebCore {
@@ -136,6 +138,11 @@ void HTMLLabelElement::defaultEventHandler(Event* evt)
     static bool processingClick = false;
 
     if (evt->type() == EventTypeNames::click && !processingClick) {
+        // If text of label element is selected, do not pass
+        // the event to control element.
+        if (document().frame()->selection().selection().isRange())
+            return;
+
         RefPtrWillBeRawPtr<HTMLElement> element = control();
 
         // If we can't find a control or if the control received the click