Merge WebKit at r76408: Initial merge by git.

Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53

1 files changed, 10 insertions, 5 deletions

diff --git a/Source/WebCore/rendering/TextControlInnerElements.cpp b/Source/WebCore/rendering/TextControlInnerElements.cpp
index 5b8712d..7b1b36f 100644
--- a/Source/WebCore/rendering/TextControlInnerElements.cpp
+++ b/Source/WebCore/rendering/TextControlInnerElements.cpp
@@ -119,7 +119,8 @@ void TextControlInnerElement::detach()
 {
     HTMLDivElement::detach();
     // FIXME: Remove once shadow DOM uses Element::setShadowRoot().
-    setShadowHost(0);
+    if (shadowHost())
+        setShadowHost(0);
 }
 
 // ----------------------------
@@ -243,7 +244,7 @@ void SearchFieldCancelButtonElement::defaultEventHandler(Event* event)
                 input->setValue("");
                 if (!oldValue.isEmpty()) {
                     toRenderTextControl(input->renderer())->setChangedSinceLastChangeEvent(true);
-                    input->dispatchEvent(Event::create(eventNames().inputEvent, true, false));
+                    input->dispatchFormControlInputEvent();
                 }
                 input->onSearch();
                 event->setDefaultHandled();
@@ -433,9 +434,13 @@ void InputFieldSpeechButtonElement::defaultEventHandler(Event* event)
 
     if (event->type() == eventNames().clickEvent) {
         switch (m_state) {
-        case Idle:
-            if (speechInput()->startRecognition(m_listenerId, input->renderer()->absoluteBoundingBoxRect(), input->computeInheritedLanguage(), input->getAttribute(webkitgrammarAttr)))
-                setState(Recording);
+        case Idle: {
+              AtomicString language = input->computeInheritedLanguage();
+              String grammar = input->getAttribute(webkitgrammarAttr);
+              IntRect rect = input->renderer()->absoluteBoundingBoxRect();
+              if (speechInput()->startRecognition(m_listenerId, rect, language, grammar, document()->securityOrigin()))
+                  setState(Recording);
+            }
             break;
         case Recording:
             speechInput()->stopRecording(m_listenerId);