Changeset 21342 in webkit


Ignore:
Timestamp:
May 9, 2007 3:16:41 PM (17 years ago)
Author:
ggaren
Message:

Reviewed by Darin Adler.


Fixed #includes of JSStringRefCF.h and use of CF datatypes. I think I
misunderstood this issue before.

  • API/JavaScriptCore.h: #include JSStringRefCF.h. Platforms that don't want this behavior can just #include individual headers, instead of the umbrella framework header. But we definitely want Mac OS X clients to get the #include of JSStringRefCF.h "for free."
  • API/minidom.c: Don't #include JSStringRefCF.h. (Don't need to #include JavaScriptCore.h, either.)
  • API/testapi.c: Don't #include JSStringRefCF.h. Do use CF datatypes regardless of whether APPLE is defined. Platforms that don't support CF just shouldn't compile this file. (main):
Location:
trunk/JavaScriptCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/API/JavaScriptCore.h

    r15400 r21342  
    3131#include <JavaScriptCore/JSContextRef.h>
    3232#include <JavaScriptCore/JSStringRef.h>
     33#include <JavaScriptCore/JSStringRefCF.h>
    3334#include <JavaScriptCore/JSObjectRef.h>
    3435#include <JavaScriptCore/JSValueRef.h>

  • trunk/JavaScriptCore/API/minidom.c

    r21131 r21342  
    2525 */
    2626
    27 #include "JavaScriptCore.h"
    28 #include "JSStringRefCF.h"
    2927#include "JSNode.h"
    3028#include <wtf/UnusedParam.h>

  • trunk/JavaScriptCore/API/testapi.c

    r21131 r21342  
    2525 */
    2626
    27 #if defined(__APPLE__)
    28 #include "JSStringRefCF.h"
    29 #endif
    30 
    3127#include "JavaScriptCore.h"
    3228#include <assert.h>
    … …  
    7369}
    7470
    75 #if defined(__APPLE__)
    7671static void assertEqualsAsCharactersPtr(JSValueRef value, const char* expectedValue)
    7772{
    … …  
    9792    JSStringRelease(valueAsString);
    9893}
    99 
    100 #endif // __APPLE__
    10194
    10295static JSValueRef jsGlobalValue; // non-stack value for testing JSValueProtect()
    … …  
    507500    JSValueRef jsOneString = JSValueMakeString(context, jsOneIString);
    508501
    509 #if defined(__APPLE__)
    510502    UniChar singleUniChar = 65; // Capital A
    511503    CFMutableStringRef cfString =
    … …  
    534526    JSStringRef jsCFEmptyIStringWithCharacters = JSStringCreateWithCharacters(buffer, CFStringGetLength(cfEmptyString));
    535527    JSValueRef jsCFEmptyStringWithCharacters = JSValueMakeString(context, jsCFEmptyIStringWithCharacters);
    536 #endif // __APPLE__
    537528
    538529    assert(JSValueGetType(context, jsUndefined) == kJSTypeUndefined);
    … …  
    545536    assert(JSValueGetType(context, jsEmptyString) == kJSTypeString);
    546537    assert(JSValueGetType(context, jsOneString) == kJSTypeString);
    547 #if defined(__APPLE__)
    548538    assert(JSValueGetType(context, jsCFString) == kJSTypeString);
    549539    assert(JSValueGetType(context, jsCFStringWithCharacters) == kJSTypeString);
    550540    assert(JSValueGetType(context, jsCFEmptyString) == kJSTypeString);
    551541    assert(JSValueGetType(context, jsCFEmptyStringWithCharacters) == kJSTypeString);
    552 #endif // __APPLE__
    553542
    554543    JSObjectRef myObject = JSObjectMake(context, MyObject_class(context), NULL);
    … …  
    594583    assertEqualsAsBoolean(jsEmptyString, false);
    595584    assertEqualsAsBoolean(jsOneString, true);
    596 #if defined(__APPLE__)
    597585    assertEqualsAsBoolean(jsCFString, true);
    598586    assertEqualsAsBoolean(jsCFStringWithCharacters, true);
    599587    assertEqualsAsBoolean(jsCFEmptyString, false);
    600588    assertEqualsAsBoolean(jsCFEmptyStringWithCharacters, false);
    601 #endif // __APPLE__
    602589   
    603590    assertEqualsAsNumber(jsUndefined, nan(""));
    … …  
    610597    assertEqualsAsNumber(jsEmptyString, 0);
    611598    assertEqualsAsNumber(jsOneString, 1);
    612 #if defined(__APPLE__)
    613599    assertEqualsAsNumber(jsCFString, nan(""));
    614600    assertEqualsAsNumber(jsCFStringWithCharacters, nan(""));
    … …  
    616602    assertEqualsAsNumber(jsCFEmptyStringWithCharacters, 0);
    617603    assert(sizeof(JSChar) == sizeof(UniChar));
    618 #endif // __APPLE__
    619604   
    620605    assertEqualsAsCharactersPtr(jsUndefined, "undefined");
    … …  
    627612    assertEqualsAsCharactersPtr(jsEmptyString, "");
    628613    assertEqualsAsCharactersPtr(jsOneString, "1");
    629 #if defined(__APPLE__)
    630614    assertEqualsAsCharactersPtr(jsCFString, "A");
    631615    assertEqualsAsCharactersPtr(jsCFStringWithCharacters, "A");
    632616    assertEqualsAsCharactersPtr(jsCFEmptyString, "");
    633617    assertEqualsAsCharactersPtr(jsCFEmptyStringWithCharacters, "");
    634 #endif // __APPLE__
    635618   
    636619    assertEqualsAsUTF8String(jsUndefined, "undefined");
    … …  
    643626    assertEqualsAsUTF8String(jsEmptyString, "");
    644627    assertEqualsAsUTF8String(jsOneString, "1");
    645 #if defined(__APPLE__)
    646628    assertEqualsAsUTF8String(jsCFString, "A");
    647629    assertEqualsAsUTF8String(jsCFStringWithCharacters, "A");
    648630    assertEqualsAsUTF8String(jsCFEmptyString, "");
    649631    assertEqualsAsUTF8String(jsCFEmptyStringWithCharacters, "");
    650 #endif // __APPLE__
    651632   
    652633    assert(JSValueIsStrictEqual(context, jsTrue, jsTrue));
    … …  
    656637    assert(!JSValueIsEqual(context, jsTrue, jsFalse, NULL));
    657638   
    658 #if defined(__APPLE__)
    659639    CFStringRef cfJSString = JSStringCopyCFString(kCFAllocatorDefault, jsCFIString);
    660640    CFStringRef cfJSEmptyString = JSStringCopyCFString(kCFAllocatorDefault, jsCFEmptyIString);
    … …  
    666646    CFRelease(cfString);
    667647    CFRelease(cfEmptyString);
    668 #endif // __APPLE__
    669648   
    670649    jsGlobalValue = JSObjectMake(context, NULL, NULL);
    … …  
    827806    JSStringRelease(jsEmptyIString);
    828807    JSStringRelease(jsOneIString);
    829 #if defined(__APPLE__)
    830808    JSStringRelease(jsCFIString);
    831809    JSStringRelease(jsCFEmptyIString);
    832810    JSStringRelease(jsCFIStringWithCharacters);
    833811    JSStringRelease(jsCFEmptyIStringWithCharacters);
    834 #endif // __APPLE__
    835812    JSStringRelease(goodSyntax);
    836813    JSStringRelease(badSyntax);

  • trunk/JavaScriptCore/ChangeLog

    r21332 r21342  
     12007-05-08  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Reviewed by Darin Adler.
     4       
     5        Fixed #includes of JSStringRefCF.h and use of CF datatypes. I think I
     6        misunderstood this issue before.
     7
     8        * API/JavaScriptCore.h: #include JSStringRefCF.h. Platforms that don't
     9        want this behavior can just #include individual headers, instead of the
     10        umbrella framework header. But we definitely want Mac OS X clients to
     11        get the #include of JSStringRefCF.h "for free."
     12        * API/minidom.c: Don't #include JSStringRefCF.h. (Don't need to #include
     13        JavaScriptCore.h, either.)
     14        * API/testapi.c: Don't #include JSStringRefCF.h. Do use CF datatypes
     15        regardless of whether __APPLE__ is defined. Platforms that don't support
     16        CF just shouldn't compile this file.
     17        (main):
     18
    1192007-05-09  Eric Seidel  <eric@webkit.org>
    220
Note: See TracChangeset for help on using the changeset viewer.