From db14019a23d96bc8a444b6576a5da8bd1cfbc8b0 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 4 Aug 2010 11:41:34 +0100
Subject: Merge WebKit at r64523 : Initial merge by git.

Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
---
 WebKit/chromium/src/SpeechInputClientImpl.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'WebKit/chromium/src/SpeechInputClientImpl.cpp')

diff --git a/WebKit/chromium/src/SpeechInputClientImpl.cpp b/WebKit/chromium/src/SpeechInputClientImpl.cpp
index 8bccacf..66525e3 100644
--- a/WebKit/chromium/src/SpeechInputClientImpl.cpp
+++ b/WebKit/chromium/src/SpeechInputClientImpl.cpp
@@ -42,10 +42,9 @@
 namespace WebKit {
 
 SpeechInputClientImpl::SpeechInputClientImpl(WebViewClient* web_view_client)
-    : m_controller(web_view_client->speechInputController(this))
+    : m_controller(web_view_client ? web_view_client->speechInputController(this) : 0)
     , m_listener(0)
 {
-    ASSERT(m_controller);
 }
 
 SpeechInputClientImpl::~SpeechInputClientImpl()
-- 
cgit v1.1