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 21 matching lines @@
 #include "core/page/EventHandler.h"
 #include "core/rendering/RenderView.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 inline ClearButtonElement::ClearButtonElement(Document& document, ClearButtonOwner& clearButtonOwner)
     : HTMLDivElement(document)
     , m_clearButtonOwner(&clearButtonOwner)
-    , m_capturing(false)
 {
 }
 
 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;
-    }
-}
-
 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 (event->type() == EventTypeNames::click) {
         if (renderer() && renderer()->visibleToHitTesting()) {
-            if (LocalFrame* frame = document().frame()) {
-                frame->eventHandler().setCapturingMouseEventsNode(this);
-                m_capturing = true;
-            }
-        }
-        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();
-            }
+            m_clearButtonOwner->focusAndSelectClearButtonOwner();
+            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);
 }
 
 }