[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

tkent at chromium.org tkent at chromium.org
Wed Dec 22 11:40:10 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit cf0776c3ae6c7ac923010d8775f7ddb5355c7e0f
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 10:12:34 2010 +0000

    2010-08-03  Satish Sampath  <satish at chromium.org>
    
            Reviewed by Kent Tamura.
    
            Initiate speech input requests on click event
            https://bugs.webkit.org/show_bug.cgi?id=43352
    
            * rendering/TextControlInnerElements.cpp:
            (WebCore::InputFieldSpeechButtonElement::defaultEventHandler):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64542 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3d04ef3..a4538b1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-03  Satish Sampath  <satish at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Initiate speech input requests on click event
+        https://bugs.webkit.org/show_bug.cgi?id=43352
+
+        * rendering/TextControlInnerElements.cpp:
+        (WebCore::InputFieldSpeechButtonElement::defaultEventHandler):
+
 2010-08-02  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/rendering/TextControlInnerElements.cpp b/WebCore/rendering/TextControlInnerElements.cpp
index b29876a..3846f03 100644
--- a/WebCore/rendering/TextControlInnerElements.cpp
+++ b/WebCore/rendering/TextControlInnerElements.cpp
@@ -372,20 +372,21 @@ void InputFieldSpeechButtonElement::defaultEventHandler(Event* event)
         input->select();
         event->setDefaultHandled();
     }
-    // On mouse up, start speech recognition.
+    // On mouse up, release capture cleanly.
     if (event->type() == eventNames().mouseupEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton) {
         if (m_capturing && renderer() && renderer()->visibleToHitTesting()) {
             if (Frame* frame = document()->frame()) {
                 frame->eventHandler()->setCapturingMouseEventsNode(0);
                 m_capturing = false;
             }
-            if (hovered()) {
-                speechInput()->startRecognition(this);
-                event->setDefaultHandled();
-            }
         }
     }
 
+    if (event->type() == eventNames().clickEvent) {
+        speechInput()->startRecognition(this);
+        event->setDefaultHandled();
+    }
+
     if (!event->defaultHandled())
         HTMLDivElement::defaultEventHandler(event);
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list