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

[barraclough at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 97c97c56ac46c4125091aabc8c6cc9d9b1db0866
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 20:51:08 2010 +0000

    Chromium build fix pt1.
    
    * bindings/v8/custom/V8XMLHttpRequestCustom.cpp:
    (WebCore::V8XMLHttpRequest::responseTextAccessorGetter):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69695 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3fbe2d2..4588ba7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-13  Gavin Barraclough  <barraclough at apple.com>
+
+        Chromium build fix pt1.
+
+        * bindings/v8/custom/V8XMLHttpRequestCustom.cpp:
+        (WebCore::V8XMLHttpRequest::responseTextAccessorGetter):
+
 2010-10-13  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp b/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp
index 8ab3ada..393e544 100644
--- a/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8XMLHttpRequestCustom.cpp
@@ -51,10 +51,10 @@ v8::Handle<v8::Value> V8XMLHttpRequest::responseTextAccessorGetter(v8::Local<v8:
     INC_STATS("DOM.XMLHttpRequest.responsetext._get");
     XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toNative(info.Holder());
     ExceptionCode ec = 0;
-    const ScriptString& text = xmlHttpRequest->responseText(ec);
+    const String& text = xmlHttpRequest->responseText(ec);
     if (ec)
         return throwError(ec);
-    return text.v8StringOrNull();
+    return v8String(text);
 }
 
 v8::Handle<v8::Value> V8XMLHttpRequest::openCallback(const v8::Arguments& args)

-- 
WebKit Debian packaging