[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:09:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 772f0294fbbec9cce24807cc85d0759be683b2af
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 13 23:59:57 2010 +0000
2010-07-13 Caio Marcelo de Oliveira Filho <caio.oliveira at openbossa.org>
Reviewed by Oliver Hunt.
Separate CoreFoundation specific tests in JSC's testapi.c
testapi.c depends on the Core Foundation.
https://bugs.webkit.org/show_bug.cgi?id=40058
* WebKit.pro: enable compilation of JSC C API test.
2010-07-13 Caio Marcelo de Oliveira Filho <caio.oliveira at openbossa.org>
Reviewed by Oliver Hunt.
testapi.c depends on the Core Foundation.
https://bugs.webkit.org/show_bug.cgi?id=40058
Separate CoreFoundation specific tests in JSC's testapi.c. Enabling it
to compile in Qt environments.
All tests should work except for the JSStringCreateWithCharacters() function,
because its tests depend on Core Foundation specific functions.
* API/tests/testapi.c:
(testJSStringRefCF): moved CoreFoundation specific tests to this function.
(main): The moves plus some minor tweaks.
* testapi.pro: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63262 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index e27569e..eac4d77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-13 Caio Marcelo de Oliveira Filho <caio.oliveira at openbossa.org>
+
+ Reviewed by Oliver Hunt.
+
+ Separate CoreFoundation specific tests in JSC's testapi.c
+
+ testapi.c depends on the Core Foundation.
+ https://bugs.webkit.org/show_bug.cgi?id=40058
+
+ * WebKit.pro: enable compilation of JSC C API test.
+
2010-07-13 Scott Violet <sky at chromium.org>
Reviewed by David Levin.
diff --git a/JavaScriptCore/API/tests/testapi.c b/JavaScriptCore/API/tests/testapi.c
index 183abf5..6577615 100644
--- a/JavaScriptCore/API/tests/testapi.c
+++ b/JavaScriptCore/API/tests/testapi.c
@@ -23,7 +23,18 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "config.h"
+
+#if PLATFORM(CF)
#include "JavaScriptCore.h"
+#else
+#include "JavaScript.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#endif
+
#include "JSBasePrivate.h"
#include "JSContextRefPrivate.h"
#include "JSObjectRefPrivate.h"
@@ -91,6 +102,8 @@ static void assertEqualsAsUTF8String(JSValueRef value, const char* expectedValue
JSStringRelease(valueAsString);
}
+// FIXME: define this assert for non-CF platforms.
+#if PLATFORM(CF)
static void assertEqualsAsCharactersPtr(JSValueRef value, const char* expectedValue)
{
JSStringRef valueAsString = JSValueToStringCopy(context, value, NULL);
@@ -119,6 +132,7 @@ static void assertEqualsAsCharactersPtr(JSValueRef value, const char* expectedVa
free(cfBuffer);
JSStringRelease(valueAsString);
}
+#endif
static bool timeZoneIsPST()
{
@@ -817,6 +831,81 @@ static bool checkForCycleInPrototypeChain()
return result;
}
+#if PLATFORM(CF)
+// Test the JavaScriptCore specific API for converting JSStringRefs to/from CFStrings.
+static void testJSStringRefCF()
+{
+ UniChar singleUniChar = 65; // Capital A
+ CFMutableStringRef cfString =
+ CFStringCreateMutableWithExternalCharactersNoCopy(kCFAllocatorDefault,
+ &singleUniChar,
+ 1,
+ 1,
+ kCFAllocatorNull);
+
+ JSStringRef jsCFIString = JSStringCreateWithCFString(cfString);
+ JSValueRef jsCFString = JSValueMakeString(context, jsCFIString);
+
+ CFStringRef cfEmptyString = CFStringCreateWithCString(kCFAllocatorDefault, "", kCFStringEncodingUTF8);
+
+ JSStringRef jsCFEmptyIString = JSStringCreateWithCFString(cfEmptyString);
+ JSValueRef jsCFEmptyString = JSValueMakeString(context, jsCFEmptyIString);
+
+ CFIndex cfStringLength = CFStringGetLength(cfString);
+ UniChar *buffer = (UniChar*)malloc(cfStringLength * sizeof(UniChar));
+ CFStringGetCharacters(cfString,
+ CFRangeMake(0, cfStringLength),
+ buffer);
+ JSStringRef jsCFIStringWithCharacters = JSStringCreateWithCharacters((JSChar*)buffer, cfStringLength);
+ JSValueRef jsCFStringWithCharacters = JSValueMakeString(context, jsCFIStringWithCharacters);
+
+ JSStringRef jsCFEmptyIStringWithCharacters = JSStringCreateWithCharacters((JSChar*)buffer, CFStringGetLength(cfEmptyString));
+ free(buffer);
+ JSValueRef jsCFEmptyStringWithCharacters = JSValueMakeString(context, jsCFEmptyIStringWithCharacters);
+
+ ASSERT(JSValueGetType(context, jsCFString) == kJSTypeString);
+ ASSERT(JSValueGetType(context, jsCFStringWithCharacters) == kJSTypeString);
+ ASSERT(JSValueGetType(context, jsCFEmptyString) == kJSTypeString);
+ ASSERT(JSValueGetType(context, jsCFEmptyStringWithCharacters) == kJSTypeString);
+
+ assertEqualsAsBoolean(jsCFString, true);
+ assertEqualsAsBoolean(jsCFStringWithCharacters, true);
+ assertEqualsAsBoolean(jsCFEmptyString, false);
+ assertEqualsAsBoolean(jsCFEmptyStringWithCharacters, false);
+
+ assertEqualsAsNumber(jsCFString, nan(""));
+ assertEqualsAsNumber(jsCFStringWithCharacters, nan(""));
+ assertEqualsAsNumber(jsCFEmptyString, 0);
+ assertEqualsAsNumber(jsCFEmptyStringWithCharacters, 0);
+ ASSERT(sizeof(JSChar) == sizeof(UniChar));
+
+ assertEqualsAsCharactersPtr(jsCFString, "A");
+ assertEqualsAsCharactersPtr(jsCFStringWithCharacters, "A");
+ assertEqualsAsCharactersPtr(jsCFEmptyString, "");
+ assertEqualsAsCharactersPtr(jsCFEmptyStringWithCharacters, "");
+
+ assertEqualsAsUTF8String(jsCFString, "A");
+ assertEqualsAsUTF8String(jsCFStringWithCharacters, "A");
+ assertEqualsAsUTF8String(jsCFEmptyString, "");
+ assertEqualsAsUTF8String(jsCFEmptyStringWithCharacters, "");
+
+ CFStringRef cfJSString = JSStringCopyCFString(kCFAllocatorDefault, jsCFIString);
+ CFStringRef cfJSEmptyString = JSStringCopyCFString(kCFAllocatorDefault, jsCFEmptyIString);
+ ASSERT(CFEqual(cfJSString, cfString));
+ ASSERT(CFEqual(cfJSEmptyString, cfEmptyString));
+ CFRelease(cfJSString);
+ CFRelease(cfJSEmptyString);
+
+ CFRelease(cfString);
+ CFRelease(cfEmptyString);
+
+ JSStringRelease(jsCFIString);
+ JSStringRelease(jsCFEmptyIString);
+ JSStringRelease(jsCFIStringWithCharacters);
+ JSStringRelease(jsCFEmptyIStringWithCharacters);
+}
+#endif
+
int main(int argc, char* argv[])
{
const char *scriptPath = "testapi.js";
@@ -869,34 +958,6 @@ int main(int argc, char* argv[])
JSStringRef jsOneIString = JSStringCreateWithUTF8CString("1");
JSValueRef jsOneString = JSValueMakeString(context, jsOneIString);
- UniChar singleUniChar = 65; // Capital A
- CFMutableStringRef cfString =
- CFStringCreateMutableWithExternalCharactersNoCopy(kCFAllocatorDefault,
- &singleUniChar,
- 1,
- 1,
- kCFAllocatorNull);
-
- JSStringRef jsCFIString = JSStringCreateWithCFString(cfString);
- JSValueRef jsCFString = JSValueMakeString(context, jsCFIString);
-
- CFStringRef cfEmptyString = CFStringCreateWithCString(kCFAllocatorDefault, "", kCFStringEncodingUTF8);
-
- JSStringRef jsCFEmptyIString = JSStringCreateWithCFString(cfEmptyString);
- JSValueRef jsCFEmptyString = JSValueMakeString(context, jsCFEmptyIString);
-
- CFIndex cfStringLength = CFStringGetLength(cfString);
- UniChar* buffer = (UniChar*)malloc(cfStringLength * sizeof(UniChar));
- CFStringGetCharacters(cfString,
- CFRangeMake(0, cfStringLength),
- buffer);
- JSStringRef jsCFIStringWithCharacters = JSStringCreateWithCharacters((JSChar*)buffer, cfStringLength);
- JSValueRef jsCFStringWithCharacters = JSValueMakeString(context, jsCFIStringWithCharacters);
-
- JSStringRef jsCFEmptyIStringWithCharacters = JSStringCreateWithCharacters((JSChar*)buffer, CFStringGetLength(cfEmptyString));
- free(buffer);
- JSValueRef jsCFEmptyStringWithCharacters = JSValueMakeString(context, jsCFEmptyIStringWithCharacters);
-
ASSERT(JSValueGetType(context, jsUndefined) == kJSTypeUndefined);
ASSERT(JSValueGetType(context, jsNull) == kJSTypeNull);
ASSERT(JSValueGetType(context, jsTrue) == kJSTypeBoolean);
@@ -906,10 +967,13 @@ int main(int argc, char* argv[])
ASSERT(JSValueGetType(context, jsOneThird) == kJSTypeNumber);
ASSERT(JSValueGetType(context, jsEmptyString) == kJSTypeString);
ASSERT(JSValueGetType(context, jsOneString) == kJSTypeString);
- ASSERT(JSValueGetType(context, jsCFString) == kJSTypeString);
- ASSERT(JSValueGetType(context, jsCFStringWithCharacters) == kJSTypeString);
- ASSERT(JSValueGetType(context, jsCFEmptyString) == kJSTypeString);
- ASSERT(JSValueGetType(context, jsCFEmptyStringWithCharacters) == kJSTypeString);
+
+ // FIXME: Add tests for JSStringCreateWithCharacters, they are only covered in the
+ // CoreFoundation-specific tests.
+
+#if PLATFORM(CF)
+ testJSStringRefCF();
+#endif
JSObjectRef myObject = JSObjectMake(context, MyObject_class(context), NULL);
JSStringRef myObjectIString = JSStringCreateWithUTF8CString("MyObject");
@@ -963,7 +1027,8 @@ int main(int argc, char* argv[])
JSGarbageCollect(context);
- for (int i = 0; i < 10000; i++)
+ int i;
+ for (i = 0; i < 10000; i++)
JSObjectMake(context, 0, 0);
aHeapRef = JSValueToObject(context, JSObjectGetPrivateProperty(context, myObject, privatePropertyName), 0);
@@ -1065,10 +1130,6 @@ int main(int argc, char* argv[])
assertEqualsAsBoolean(jsOneThird, true);
assertEqualsAsBoolean(jsEmptyString, false);
assertEqualsAsBoolean(jsOneString, true);
- assertEqualsAsBoolean(jsCFString, true);
- assertEqualsAsBoolean(jsCFStringWithCharacters, true);
- assertEqualsAsBoolean(jsCFEmptyString, false);
- assertEqualsAsBoolean(jsCFEmptyStringWithCharacters, false);
assertEqualsAsNumber(jsUndefined, nan(""));
assertEqualsAsNumber(jsNull, 0);
@@ -1079,12 +1140,9 @@ int main(int argc, char* argv[])
assertEqualsAsNumber(jsOneThird, 1.0 / 3.0);
assertEqualsAsNumber(jsEmptyString, 0);
assertEqualsAsNumber(jsOneString, 1);
- assertEqualsAsNumber(jsCFString, nan(""));
- assertEqualsAsNumber(jsCFStringWithCharacters, nan(""));
- assertEqualsAsNumber(jsCFEmptyString, 0);
- assertEqualsAsNumber(jsCFEmptyStringWithCharacters, 0);
- ASSERT(sizeof(JSChar) == sizeof(UniChar));
+// FIXME: Implement assertEqualsAsCharactersPtr for non-CF platforms.
+#if PLATFORM(CF)
assertEqualsAsCharactersPtr(jsUndefined, "undefined");
assertEqualsAsCharactersPtr(jsNull, "null");
assertEqualsAsCharactersPtr(jsTrue, "true");
@@ -1094,10 +1152,7 @@ int main(int argc, char* argv[])
assertEqualsAsCharactersPtr(jsOneThird, "0.3333333333333333");
assertEqualsAsCharactersPtr(jsEmptyString, "");
assertEqualsAsCharactersPtr(jsOneString, "1");
- assertEqualsAsCharactersPtr(jsCFString, "A");
- assertEqualsAsCharactersPtr(jsCFStringWithCharacters, "A");
- assertEqualsAsCharactersPtr(jsCFEmptyString, "");
- assertEqualsAsCharactersPtr(jsCFEmptyStringWithCharacters, "");
+#endif
assertEqualsAsUTF8String(jsUndefined, "undefined");
assertEqualsAsUTF8String(jsNull, "null");
@@ -1108,10 +1163,6 @@ int main(int argc, char* argv[])
assertEqualsAsUTF8String(jsOneThird, "0.3333333333333333");
assertEqualsAsUTF8String(jsEmptyString, "");
assertEqualsAsUTF8String(jsOneString, "1");
- assertEqualsAsUTF8String(jsCFString, "A");
- assertEqualsAsUTF8String(jsCFStringWithCharacters, "A");
- assertEqualsAsUTF8String(jsCFEmptyString, "");
- assertEqualsAsUTF8String(jsCFEmptyStringWithCharacters, "");
ASSERT(JSValueIsStrictEqual(context, jsTrue, jsTrue));
ASSERT(!JSValueIsStrictEqual(context, jsOne, jsOneString));
@@ -1119,16 +1170,7 @@ int main(int argc, char* argv[])
ASSERT(JSValueIsEqual(context, jsOne, jsOneString, NULL));
ASSERT(!JSValueIsEqual(context, jsTrue, jsFalse, NULL));
- CFStringRef cfJSString = JSStringCopyCFString(kCFAllocatorDefault, jsCFIString);
- CFStringRef cfJSEmptyString = JSStringCopyCFString(kCFAllocatorDefault, jsCFEmptyIString);
- ASSERT(CFEqual(cfJSString, cfString));
- ASSERT(CFEqual(cfJSEmptyString, cfEmptyString));
- CFRelease(cfJSString);
- CFRelease(cfJSEmptyString);
- CFRelease(cfString);
- CFRelease(cfEmptyString);
-
jsGlobalValue = JSObjectMake(context, NULL, NULL);
makeGlobalNumberValue(context);
JSValueProtect(context, jsGlobalValue);
@@ -1256,7 +1298,7 @@ int main(int argc, char* argv[])
o = JSObjectMake(context, NULL, NULL);
JSObjectSetProperty(context, o, jsOneIString, JSValueMakeNumber(context, 1), kJSPropertyAttributeNone, NULL);
- JSObjectSetProperty(context, o, jsCFIString, JSValueMakeNumber(context, 1), kJSPropertyAttributeDontEnum, NULL);
+ JSObjectSetProperty(context, o, propertyName, JSValueMakeNumber(context, 1), kJSPropertyAttributeDontEnum, NULL);
JSPropertyNameArrayRef nameArray = JSObjectCopyPropertyNames(context, o);
size_t expectedCount = JSPropertyNameArrayGetCount(nameArray);
size_t count;
@@ -1357,9 +1399,13 @@ int main(int argc, char* argv[])
else {
printf("FAIL: Test script returned unexpected value:\n");
JSStringRef exceptionIString = JSValueToStringCopy(context, exception, NULL);
- CFStringRef exceptionCF = JSStringCopyCFString(kCFAllocatorDefault, exceptionIString);
- CFShow(exceptionCF);
- CFRelease(exceptionCF);
+
+ size_t sizeUTF8 = JSStringGetMaximumUTF8CStringSize(exceptionIString);
+ char *exceptionUTF8 = malloc(sizeUTF8);
+ JSStringGetUTF8CString(exceptionIString, exceptionUTF8, sizeUTF8);
+ printf("%s\n", exceptionUTF8);
+ free(exceptionUTF8);
+
JSStringRelease(exceptionIString);
failed = 1;
}
@@ -1376,10 +1422,6 @@ int main(int argc, char* argv[])
JSStringRelease(jsEmptyIString);
JSStringRelease(jsOneIString);
- JSStringRelease(jsCFIString);
- JSStringRelease(jsCFEmptyIString);
- JSStringRelease(jsCFIStringWithCharacters);
- JSStringRelease(jsCFEmptyIStringWithCharacters);
JSStringRelease(goodSyntax);
JSStringRelease(badSyntax);
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index eefcf40..2d9abc4 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-07-13 Caio Marcelo de Oliveira Filho <caio.oliveira at openbossa.org>
+
+ Reviewed by Oliver Hunt.
+
+ testapi.c depends on the Core Foundation.
+ https://bugs.webkit.org/show_bug.cgi?id=40058
+
+ Separate CoreFoundation specific tests in JSC's testapi.c. Enabling it
+ to compile in Qt environments.
+
+ All tests should work except for the JSStringCreateWithCharacters() function,
+ because its tests depend on Core Foundation specific functions.
+
+ * API/tests/testapi.c:
+ (testJSStringRefCF): moved CoreFoundation specific tests to this function.
+ (main): The moves plus some minor tweaks.
+ * testapi.pro: Added.
+
2010-07-13 Gavin Barraclough <barraclough at apple.com>
Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/testapi.pro b/JavaScriptCore/testapi.pro
new file mode 100644
index 0000000..5bc11e0
--- /dev/null
+++ b/JavaScriptCore/testapi.pro
@@ -0,0 +1,32 @@
+TEMPLATE = app
+TARGET = testapi
+SOURCES = API/tests/testapi.c
+QT -= gui
+CONFIG -= app_bundle
+CONFIG += building-libs
+win32-*: CONFIG += console
+win32-msvc*: CONFIG += exceptions_off stl_off
+
+isEmpty(OUTPUT_DIR): OUTPUT_DIR= ..
+include($$PWD/../WebKit.pri)
+
+CONFIG += link_pkgconfig
+
+QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
+
+!CONFIG(release, debug|release) {
+ OBJECTS_DIR = obj/debug
+} else { # Release
+ OBJECTS_DIR = obj/release
+}
+OBJECTS_DIR_WTR = $$OBJECTS_DIR$${QMAKE_DIR_SEP}
+include($$PWD/JavaScriptCore.pri)
+addJavaScriptCoreLib(.)
+
+symbian {
+ TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+}
+
+mac {
+ LIBS_PRIVATE += -framework AppKit
+}
diff --git a/WebKit.pro b/WebKit.pro
index d8c1bc5..6c178ab 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -13,6 +13,7 @@ contains(QT_CONFIG, declarative) {
exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative
}
exists($$PWD/JavaScriptCore/jsc.pro): SUBDIRS += JavaScriptCore/jsc.pro
+exists($$PWD/JavaScriptCore/testapi.pro): SUBDIRS += JavaScriptCore/testapi.pro
exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
exists($$PWD/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro): SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
exists($$PWD/WebKitTools/DumpRenderTree/qt/ImageDiff.pro): SUBDIRS += WebKitTools/DumpRenderTree/qt/ImageDiff.pro
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list