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

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4966cf09625087b5e0afffec043142b47d6eab0f
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 3 08:19:34 2010 +0000

    2010-10-03  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Holger Freyther.
    
            All the WebSocket tests crash
            https://bugs.webkit.org/show_bug.cgi?id=47055
    
            This code attempts to hold onto temporary objects using references.
            That doesn't work in C++. Instead, we need to actually store the
            objects somewhere.
    
            * bindings/js/JSWebSocketCustom.cpp:
            (WebCore::JSWebSocketConstructor::constructJSWebSocket):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68984 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 118093f..e7ed49a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-03  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Holger Freyther.
+
+        All the WebSocket tests crash
+        https://bugs.webkit.org/show_bug.cgi?id=47055
+
+        This code attempts to hold onto temporary objects using references.
+        That doesn't work in C++. Instead, we need to actually store the
+        objects somewhere.
+
+        * bindings/js/JSWebSocketCustom.cpp:
+        (WebCore::JSWebSocketConstructor::constructJSWebSocket):
+
 2010-10-02  Diego Gonzalez  <diegohcg at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/bindings/js/JSWebSocketCustom.cpp b/WebCore/bindings/js/JSWebSocketCustom.cpp
index 3567206..813c0d4 100644
--- a/WebCore/bindings/js/JSWebSocketCustom.cpp
+++ b/WebCore/bindings/js/JSWebSocketCustom.cpp
@@ -54,16 +54,16 @@ EncodedJSValue JSC_HOST_CALL JSWebSocketConstructor::constructJSWebSocket(ExecSt
     if (!exec->argumentCount())
         return throwVMError(exec, createSyntaxError(exec, "Not enough arguments"));
 
-    const String& urlString = ustringToString(exec->argument(0).toString(exec));
+    String urlString = ustringToString(exec->argument(0).toString(exec));
     if (exec->hadException())
         return throwVMError(exec, createSyntaxError(exec, "wrong URL"));
-    const KURL& url = context->completeURL(urlString);
+    KURL url = context->completeURL(urlString);
     RefPtr<WebSocket> webSocket = WebSocket::create(context);
     ExceptionCode ec = 0;
     if (exec->argumentCount() < 2)
         webSocket->connect(url, ec);
     else {
-        const String& protocol = ustringToString(exec->argument(1).toString(exec));
+        String protocol = ustringToString(exec->argument(1).toString(exec));
         if (exec->hadException())
             return JSValue::encode(JSValue());
         webSocket->connect(url, protocol, ec);

-- 
WebKit Debian packaging