[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[steveblock at google.com]

The following commit has been merged in the webkit-1.1 branch:
commit a9414ce448045eca832af655b2e66ee3949fd233
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 1 10:50:32 2010 +0000

    Adds implementation of JavaString for V8.
    https://bugs.webkit.org/show_bug.cgi?id=33953
    
    Reviewed by Ariya Hidayat.
    
    No new tests, build fix only.
    
    * bridge/jni/JNIBridge.h: Modified. Include JavaStringV8.h for V8
    * bridge/jni/v8: Added.
    * bridge/jni/v8/JavaStringV8.h: Added.
    (JSC::Bindings::JavaStringImpl::init):
    (JSC::Bindings::JavaStringImpl::UTF8String):
    (JSC::Bindings::JavaStringImpl::uchars):
    (JSC::Bindings::JavaStringImpl::length):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54132 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cdd9b09..5425140 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-02-01  Steve Block  <steveblock at google.com>
+
+        Reviewed by Ariya Hidayat.
+
+        Adds implementation of JavaString for V8.
+        https://bugs.webkit.org/show_bug.cgi?id=33953
+
+        No new tests, build fix only.
+
+        * bridge/jni/JNIBridge.h: Modified. Include JavaStringV8.h for V8
+        * bridge/jni/v8: Added.
+        * bridge/jni/v8/JavaStringV8.h: Added.
+        (JSC::Bindings::JavaStringImpl::init):
+        (JSC::Bindings::JavaStringImpl::UTF8String):
+        (JSC::Bindings::JavaStringImpl::uchars):
+        (JSC::Bindings::JavaStringImpl::length):
+
 2010-02-01  Alex Milowski  <alex at milowski.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/bridge/jni/JNIBridge.h b/WebCore/bridge/jni/JNIBridge.h
index 712ee7d..5d482a7 100644
--- a/WebCore/bridge/jni/JNIBridge.h
+++ b/WebCore/bridge/jni/JNIBridge.h
@@ -29,10 +29,13 @@
 
 #if ENABLE(MAC_JAVA_BRIDGE)
 
+#include "Bridge.h"
 #include "JNIUtility.h"
 
 #if USE(JSC)
 #include "JavaStringJSC.h"
+#elif USE(V8)
+#include "JavaStringV8.h"
 #endif
 
 namespace JSC {
diff --git a/WebCore/bridge/jni/v8/JavaStringV8.h b/WebCore/bridge/jni/v8/JavaStringV8.h
new file mode 100644
index 0000000..08d4b95
--- /dev/null
+++ b/WebCore/bridge/jni/v8/JavaStringV8.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2010, The Android Open Source Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef JavaStringV8_h
+#define JavaStringV8_h
+
+#include "CString.h"
+#include "JNIUtility.h"
+
+
+namespace JSC {
+
+namespace Bindings {
+
+class JavaStringImpl {
+public:
+    void init() {}
+
+    void init(JNIEnv* e, jstring s)
+    {
+        int size = e->GetStringLength(s);
+        const char* cs = getCharactersFromJStringInEnv(e, s);
+        m_utf8String = WebCore::CString(cs, size);
+        releaseCharactersForJStringInEnv(e, s, cs);
+    }
+
+    const char* UTF8String() const { return m_utf8String.data(); }
+    const jchar* uchars() const { return 0; } // Not implemented
+    int length() const { return m_utf8String.length(); }
+
+private:
+    WebCore::CString m_utf8String;
+};
+
+} // namespace Bindings
+
+} // namespace JSC
+
+#endif // JavaStringV8_h

-- 
WebKit Debian packaging