[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit b6c0d4feceb773743ca087fccb4f9d1057f93b74
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 22 14:42:52 2009 +0000

    2009-09-22  Adam Barth  <abarth at webkit.org>
    
            Unreviewed.
    
            Fix bogus build fix I did last night.
    
            * bindings/v8/custom/V8DOMWindowCustom.cpp:
            (WebCore::V8Custom::WindowSetTimeoutImpl):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48635 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 941e089..26fb7fa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-22  Adam Barth  <abarth at webkit.org>
+
+        Unreviewed.
+
+        Fix bogus build fix I did last night.
+
+        * bindings/v8/custom/V8DOMWindowCustom.cpp:
+        (WebCore::V8Custom::WindowSetTimeoutImpl):
+
 2009-09-22  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
index 84ddb91..ff45d6e 100644
--- a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
@@ -69,8 +69,17 @@ v8::Handle<v8::Value> V8Custom::WindowSetTimeoutImpl(const v8::Arguments& args,
 
     WebCore::String functionString;
     if (!function->IsFunction()) {
-        functionString = function->IsString() ? 
-            toWebCoreString(function) : toWebCoreString(function->ToString());
+        if (function->IsString())
+            functionString = toWebCoreString(function);
+        else {
+            v8::Handle<v8::Value> v8String = function->ToString();
+
+            // Bail out if string conversion failed. 
+            if (v8String.IsEmpty()) 
+                return v8::Undefined(); 
+
+            functionString = toWebCoreString(v8String);
+        }
 
         // Don't allow setting timeouts to run empty functions!
         // (Bug 1009597)

-- 
WebKit Debian packaging