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

morrita at google.com morrita at google.com
Wed Dec 22 15:47:03 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit bb1d4db89704962f63b24a34253d61530d769207
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 12 07:06:47 2010 +0000

    2010-11-11  MORITA Hajime  <morrita at google.com>
    
            Unreviewed another attempt to fx windows build.
    
            * src/WebBindings.cpp:
            (WebKit::makeStringArrayImpl):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71893 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 20f84d7..b887246 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-11  MORITA Hajime  <morrita at google.com>
+
+        Unreviewed another attempt to fx windows build.
+
+        * src/WebBindings.cpp:
+        (WebKit::makeStringArrayImpl):
+
 2010-11-11  MORITA Hajime <morrita at google.com>
 
         Unreviewed attempt to fx windows build.
diff --git a/WebKit/chromium/src/WebBindings.cpp b/WebKit/chromium/src/WebBindings.cpp
index b49df0e..d0a20d3 100644
--- a/WebKit/chromium/src/WebBindings.cpp
+++ b/WebKit/chromium/src/WebBindings.cpp
@@ -328,7 +328,7 @@ static NPObject* makeStringArrayImpl(const WebVector<WebString>& data)
     v8::HandleScope handleScope;
     v8::Handle<v8::Array> result = v8::Array::New(data.size());
     for (size_t i = 0; i < data.size(); ++i)
-        result->Set(i, data[i].data() ? v8::String::New(reinterpret_cast<const uint16_t*>((data[i].data())) : v8::String::New("")));
+        result->Set(i, data[i].data() ? v8::String::New(reinterpret_cast<const uint16_t*>((data[i].data()))) : v8::String::New(""));
 
     WebCore::DOMWindow* window = WebCore::V8Proxy::retrieveWindow(WebCore::V8Proxy::currentContext());
     return npCreateV8ScriptObject(0, result, window);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list