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

[jorlow at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 8c8a3472ce4f4aa1be3898b617ceb94d5486c7f7
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 30 13:19:26 2010 +0000

    2010-07-30  Satish Sampath  <satish at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            Add a check for WebViewClient being null.
            https://bugs.webkit.org/show_bug.cgi?id=43240
    
            * src/SpeechInputClientImpl.cpp:
            (WebKit::SpeechInputClientImpl::SpeechInputClientImpl):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64352 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 3222cd8..b1e4989 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-30  Satish Sampath  <satish at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Add a check for WebViewClient being null.
+        https://bugs.webkit.org/show_bug.cgi?id=43240
+
+        * src/SpeechInputClientImpl.cpp:
+        (WebKit::SpeechInputClientImpl::SpeechInputClientImpl):
+
 2010-07-30  Hans Wennborg  <hans at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/WebKit/chromium/src/SpeechInputClientImpl.cpp b/WebKit/chromium/src/SpeechInputClientImpl.cpp
index 6bd0a2c..66525e3 100644
--- a/WebKit/chromium/src/SpeechInputClientImpl.cpp
+++ b/WebKit/chromium/src/SpeechInputClientImpl.cpp
@@ -42,14 +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)
 {
-    // FIXME: Right now WebViewClient gives a null pointer, and with the
-    // runtime flag for speech input feature set to true by default this will
-    // always assert. Enable this assert once the WebViewClient starts to
-    // give a valid pointer.
-    // ASSERT(m_controller);
 }
 
 SpeechInputClientImpl::~SpeechInputClientImpl()

-- 
WebKit Debian packaging