Fix for mouse capture and release on ClearButtonElement

Source/core/html/shadow/ClearButtonElement.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 35 matching lines @@
 PassRefPtrWillBeRawPtr<ClearButtonElement> ClearButtonElement::create(Document& document, ClearButtonOwner& clearButtonOwner)
 {
     RefPtrWillBeRawPtr<ClearButtonElement> element = adoptRefWillBeNoop(new ClearButtonElement(document, clearButtonOwner));
     element->setShadowPseudoId(AtomicString("-webkit-clear-button", AtomicString::ConstructFromLiteral));
     element->setAttribute(idAttr, ShadowElementNames::clearButton());
     return element.release();
 }
 
 void ClearButtonElement::detach(const AttachContext& context)
 {
-    if (m_capturing) {
-        if (LocalFrame* frame = document().frame())
-            frame->eventHandler().setCapturingMouseEventsNode(nullptr);
-    }
     HTMLDivElement::detach(context);
 }
 
 void ClearButtonElement::releaseCapture()
 {
     if (!m_capturing)
         return;
-
-    if (LocalFrame* frame = document().frame()) {
-        frame->eventHandler().setCapturingMouseEventsNode(nullptr);
-        m_capturing = false;
-    }
+    m_capturing = false;
 }
 
 void ClearButtonElement::defaultEventHandler(Event* event)
 {
     if (!m_clearButtonOwner) {
         if (!event->defaultHandled())
             HTMLDivElement::defaultEventHandler(event);
         return;
     }
 
     if (!m_clearButtonOwner->shouldClearButtonRespondToMouseEvents()) {
         if (!event->defaultHandled())
             HTMLDivElement::defaultEventHandler(event);
         return;
     }
 
-    if (event->type() == EventTypeNames::mousedown && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) {
-        if (renderer() && renderer()->visibleToHitTesting()) {

[Habib Virji, 2014/10/16 08:39:53]

Should you not still take visibileToHitTesting into criteria when changing
m_capturing state?

[Paritosh Kumar, 2014/10/18 05:46:03]

Thanks. Done.

-            if (LocalFrame* frame = document().frame()) {
-                frame->eventHandler().setCapturingMouseEventsNode(this);
-                m_capturing = true;
-            }
-        }
+    if (event->type() == EventTypeNames::click) {
         m_clearButtonOwner->focusAndSelectClearButtonOwner();
         event->setDefaultHandled();
-    }
-    if (event->type() == EventTypeNames::mouseup && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) {
-        if (m_capturing) {
-            if (LocalFrame* frame = document().frame()) {
-                frame->eventHandler().setCapturingMouseEventsNode(nullptr);
-                m_capturing = false;
-            }
-            if (hovered()) {
-                m_clearButtonOwner->clearValue();
-                event->setDefaultHandled();
-            }
+        if (hovered()) {
+            m_capturing = true;

[Habib Virji, 2014/10/16 08:39:53]

This looks bit unclear. You are changing m_capturing only in state hovered().
What happens after click when m_capturing should not be changed to false..

+            m_clearButtonOwner->clearValue();
+            event->setDefaultHandled();
         }
     }
 
     if (!event->defaultHandled())
         HTMLDivElement::defaultEventHandler(event);
 }
 
 bool ClearButtonElement::isClearButtonElement() const
 {
     return true;
 }
 
 void ClearButtonElement::trace(Visitor* visitor)
 {
     visitor->trace(m_clearButtonOwner);
     HTMLDivElement::trace(visitor);
 }
 
 }