Fix behavior of label associated with control element

Source/core/html/HTMLLabelElement.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, 2010 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 14 matching lines @@
 #include "config.h"
 #include "core/html/HTMLLabelElement.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/Document.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/editing/FrameSelection.h"
 #include "core/events/MouseEvent.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/FormAssociatedElement.h"
+#include "core/page/EventHandler.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 inline HTMLLabelElement::HTMLLabelElement(Document& document)
     : HTMLElement(labelTag, document)
 {
 }
 
@@ skipping 73 matching lines @@
         node = node->parentOrShadowHostNode();
     }
     return false;
 }
 
 void HTMLLabelElement::defaultEventHandler(Event* evt)
 {
     static bool processingClick = false;
 
     if (evt->type() == EventTypeNames::click && !processingClick) {
-        // If the click is not simulated and the text of label element is

[tkent, 2014/09/16 01:53:37]

Why do you move the code?

[deepak.sa, 2014/09/16 10:31:16]

All the checks should happen once it is clear that click event is generated on
label element.

-        // selected, do not pass the event to control element.
-        // Note: a click event may be not a mouse event if created by
-        // document.createEvent().
-        if (evt->isMouseEvent() && !toMouseEvent(evt)->isSimulated()) {
-            if (LocalFrame* frame = document().frame()) {
-                if (frame->selection().selection().isRange())
-                    return;
-            }
-        }
-
-
         RefPtrWillBeRawPtr<HTMLElement> element = control();
 
         // If we can't find a control or if the control received the click
         // event, then there's no need for us to do anything.
         if (!element || (evt->target() && element->containsIncludingShadowDOM(evt->target()->toNode())))
             return;
 
         if (evt->target() && isInInteractiveContent(evt->target()->toNode()))
             return;
 
+        bool isLabelTextSelected = false;
+
+        // If the click is not simulated and the text of the label element
+        // is selected by dragging over it, then return without passing the
+        // click event to control element.
+        // Note: a click event may be not a mouse event if created by
+        // document.createEvent().
+        if (evt->isMouseEvent() && !toMouseEvent(evt)->isSimulated()) {
+            if (LocalFrame* frame = document().frame()) {
+                if (frame->selection().isRange() && !frame->eventHandler().isMouseDownWasSingleClickInSelection())
+                    isLabelTextSelected = true;
+                // If selection is there and is single click i.e. text is selected

[tkent, 2014/09/16 01:53:38]

nit: I recommend to wrap code comments in 80 columns.

[deepak.sa, 2014/09/16 10:31:16]

Added additional comments.

+                // by dragging over label text, then return.
+                if (isLabelTextSelected && frame->eventHandler().clickCount() == 1)

[tkent, 2014/09/16 01:53:38]

Need a comment why clickCount>=2 should not skip the process.

[deepak.sa, 2014/09/16 10:31:16]

Added more comments.

+                    return;
+            }
+        }
+
         processingClick = true;
 
         document().updateLayoutIgnorePendingStylesheets();
-        if (element->isMouseFocusable())
-            element->focus(true, FocusTypeMouse);
+        if (element->isMouseFocusable()) {
+            // If there is selection, do not focus the control element.

[tkent, 2014/09/16 01:53:38]

This comment is helpless. It just says what the code does.
Please write why we don't focus on the control in that case.

[deepak.sa, 2014/09/16 10:31:16]

Replaced this comment.

+            if (!isLabelTextSelected)
+                element->focus(true, FocusTypeMouse);
+        }
 
         // Click the corresponding control.
         element->dispatchSimulatedClick(evt);
 
         processingClick = false;
 
         evt->setDefaultHandled();
     }
 
     HTMLElement::defaultEventHandler(evt);
@@ skipping 63 matching lines @@
 {
     if (insertionPoint->isInTreeScope() && treeScope() == document()) {
         TreeScope& treeScope = insertionPoint->treeScope();
         if (treeScope.shouldCacheLabelsByForAttribute())
             updateLabel(treeScope, fastGetAttribute(forAttr), nullAtom);
     }
     HTMLElement::removedFrom(insertionPoint);
 }
 
 } // namespace