Changeset 142381 in webkit


Ignore:
Timestamp:
Feb 9, 2013 2:53:14 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Make TestWebKitAPI work for iOS
​https://bugs.webkit.org/show_bug.cgi?id=108978

Patch by David Farler <​dfarler@apple.com> on 2013-02-09
Reviewed by David Kilzer.

Source/WebCore:

Tests already exist - refactor only.

  • WebCore.exp.in: Lumped ZNK7WebCore4KURL7hasPathEv with related methods.
  • platform/KURL.cpp: Inlined hasPath() into the header
  • platform/KURL.h: Inlined hasPath() into the header

Tools:

  • Makefile: Added TestWebKitAPI to iOS MODULES list.
  • TestWebKitAPI/Configurations/Base.xcconfig:
  • Include FeatureDefines
  • Removed VALID_ARCHS
  • Removed FRAMEWORK_SEARCH_PATHS - allows building against other SDKs
  • Excluded source files per platform
  • TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
  • framework and library switches per platform
  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
  • Remove explicit framework and library linking (moved to xcconfigs)
  • Added iOS main.mm
  • TestWebKitAPI/config.h:
  • Guard importing Cocoa.h and WebKit2_C.h on iOS
  • TestWebKitAPI/ios/mainIOS.mm: Copied from Tools/TestWebKitAPI/mac/main.mm.
  • TestWebKitAPI/mac/mainMac.mm: Renamed from Tools/TestWebKitAPI/mac/main.mm.
Location:
trunk
Files:
1 added
10 edited
1 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r142378 r142381  
     12013-02-09  David Farler  <dfarler@apple.com>
     2
     3        Make TestWebKitAPI work for iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=108978
     5
     6        Reviewed by David Kilzer.
     7
     8        Tests already exist - refactor only.
     9
     10        * WebCore.exp.in: Lumped __ZNK7WebCore4KURL7hasPathEv with related methods.
     11        * platform/KURL.cpp: Inlined hasPath() into the header
     12        * platform/KURL.h: Inlined hasPath() into the header
     13
    1142013-02-09  Adam Barth  <abarth@webkit.org>
    215

  • trunk/Source/WebCore/WebCore.exp.in

    r142343 r142381  
    24762476__ZN7WebCore17HTMLPlugInElement11getNPObjectEv
    24772477__ZNK7WebCore14SecurityOrigin9canAccessEPKS0_
    2478 __ZNK7WebCore4KURL7hasPathEv
    24792478#endif
    24802479
    … …  
    27252724#if USE(WTFURL)
    27262725__ZNK7WebCore4KURL6stringEv
     2726__ZNK7WebCore4KURL7hasPathEv
    27272727__ZNK7WebCore4KURL7hasPortEv
    27282728__ZNK7WebCore4KURL7isEmptyEv

  • trunk/Source/WebCore/platform/KURL.cpp

    r142004 r142381  
    564564}
    565565
    566 bool KURL::hasPath() const
    567 {
    568     return m_pathEnd != m_portEnd;
    569 }
    570 
    571566String KURL::lastPathComponent() const
    572567{

  • trunk/Source/WebCore/platform/KURL.h

    r142004 r142381  
    354354}
    355355
     356inline bool KURL::hasPath() const
     357{
     358    return m_pathEnd != m_portEnd;
     359}
     360
    356361inline bool KURL::hasPort() const
    357362{

  • trunk/Tools/ChangeLog

    r142379 r142381  
     12013-02-09  David Farler  <dfarler@apple.com>
     2
     3        Make TestWebKitAPI work for iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=108978
     5
     6        Reviewed by David Kilzer.
     7
     8        * Makefile: Added TestWebKitAPI to iOS MODULES list.
     9        * TestWebKitAPI/Configurations/Base.xcconfig:
     10        - Include FeatureDefines
     11        - Removed VALID_ARCHS
     12        - Removed FRAMEWORK_SEARCH_PATHS - allows building against other SDKs
     13        - Excluded source files per platform
     14        * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
     15        - framework and library switches per platform
     16        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
     17        - Remove explicit framework and library linking (moved to xcconfigs)
     18        - Added iOS main.mm
     19        * TestWebKitAPI/config.h:
     20        - Guard importing Cocoa.h and WebKit2_C.h on iOS
     21        * TestWebKitAPI/ios/mainIOS.mm: Copied from Tools/TestWebKitAPI/mac/main.mm.
     22        * TestWebKitAPI/mac/mainMac.mm: Renamed from Tools/TestWebKitAPI/mac/main.mm.
     23
    1242013-02-09  Justin Schuh  <jschuh@chromium.org>
    225

  • trunk/Tools/Makefile

    r142207 r142381  
    22
    33ifneq (,$(findstring iphoneos,$(SDKROOT)))
    4         MODULES = ../Source/ThirdParty/gtest/xcode
     4        MODULES = ../Source/ThirdParty/gtest/xcode TestWebKitAPI
    55else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
    6         MODULES = DumpRenderTree ../Source/ThirdParty/gtest/xcode
     6        MODULES = DumpRenderTree ../Source/ThirdParty/gtest/xcode TestWebKitAPI
    77endif
    88

  • trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig

    r132925 r142381  
    2626CLANG_WARN_CXX0X_EXTENSIONS = NO;
    2727HEADER_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR}/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu;
    28 FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
    29 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) ENABLE_DASHBOARD_SUPPORT WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST GTEST_HAS_TR1_TUPLE=0 GTEST_HAS_RTTI=0;
     28
     29GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST GTEST_HAS_TR1_TUPLE=0 GTEST_HAS_RTTI=0 $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME));
     30GCC_PREPROCESSOR_DEFINITIONS_macosx = ENABLE_DASHBOARD_SUPPORT;
    3031DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
    3132PREBINDING = NO
    … …  
    4142WARNING_CFLAGS = -Wall -W -Wno-unused-parameter
    4243LINKER_DISPLAYS_MANGLED_NAMES = YES;
    43 VALID_ARCHS = i386 x86_64;
    4444
    4545// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
    … …  
    6464WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
    6565WEBCORE_PRIVATE_HEADERS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
     66
     67EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
     68EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm;
     69EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *Mac.h *Mac.cpp *Mac.mm *InjectedBundle* *PlatformUtilities* Tests/WebKit2/* Tests/WebKit2ObjC/* *_Bundle* JavaScriptTest.*;
     70EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);

  • trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig

    r95188 r142381  
    2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
    24 PRODUCT_NAME = TestWebKitAPI
    25 GCC_ENABLE_OBJC_EXCEPTIONS = YES
     24PRODUCT_NAME = TestWebKitAPI;
     25GCC_ENABLE_OBJC_EXCEPTIONS = YES;
     26
     27OTHER_LDFLAGS = -lgtest -framework JavaScriptCore -framework WebKit $(OTHER_LDFLAGS_$(PLATFORM_NAME));
     28OTHER_LDFLAGS_iphoneos = -framework WebCore;
     29OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
     30OTHER_LDFLAGS_macosx = -framework Cocoa -framework Carbon -framework WebKit2;

  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r141761 r142381  
    3737                29AB8AA1164C735800D49BEC /* CustomProtocolsTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29AB8A9F164C735800D49BEC /* CustomProtocolsTest.mm */; };
    3838                29AB8AA4164C7A9300D49BEC /* TestBrowsingContextLoadDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29AB8AA2164C7A9300D49BEC /* TestBrowsingContextLoadDelegate.mm */; };
     39                2E7765CD16C4D80A00BA2BB1 /* mainIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E7765CC16C4D80A00BA2BB1 /* mainIOS.mm */; };
     40                2E7765CF16C4D81100BA2BB1 /* mainMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E7765CE16C4D81100BA2BB1 /* mainMac.mm */; };
    3941                333B9CE21277F23100FEFCE3 /* PreventEmptyUserAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 333B9CE11277F23100FEFCE3 /* PreventEmptyUserAgent.cpp */; };
    4042                33BE5AF5137B5A6C00705813 /* MouseMoveAfterCrash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33BE5AF4137B5A6C00705813 /* MouseMoveAfterCrash.cpp */; };
    … …  
    117119                BC029B1C1486B25900817DA9 /* RetainPtr.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC029B1B1486B25900817DA9 /* RetainPtr.mm */; };
    118120                BC131885117114B600B69727 /* PlatformUtilitiesMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC131884117114B600B69727 /* PlatformUtilitiesMac.mm */; };
    119                 BC131A9B1171316900B69727 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC131A9A1171316900B69727 /* main.mm */; };
    120121                BC131AA9117131FC00B69727 /* TestsController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC131AA8117131FC00B69727 /* TestsController.cpp */; };
    121122                BC22D31514DC689800FFB1DD /* UserMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC22D31314DC689800FFB1DD /* UserMessage.cpp */; };
    … …  
    144145                BC90955D125548AA00083756 /* PlatformWebViewMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC90955C125548AA00083756 /* PlatformWebViewMac.mm */; };
    145146                BC90964C125561BF00083756 /* VectorBasic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC90964B125561BF00083756 /* VectorBasic.cpp */; };
    146                 BC90964E1255620C00083756 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC90964D1255620C00083756 /* JavaScriptCore.framework */; };
    147147                BC90977A125571AB00083756 /* PageLoadBasic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC909779125571AB00083756 /* PageLoadBasic.cpp */; };
    148148                BC909784125571CF00083756 /* simple.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = BC909778125571AB00083756 /* simple.html */; };
    149149                BC90995E12567BC100083756 /* WKString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC90995D12567BC100083756 /* WKString.cpp */; };
    150150                BC9099941256ACF100083756 /* WKStringJSString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC9099931256ACF100083756 /* WKStringJSString.cpp */; };
    151                 BCA61DB511700EFD00460D1E /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA61DB411700EFD00460D1E /* WebKit2.framework */; };
    152151                BCAA485614A0444C0088FAC4 /* simple-tall.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = BCAA485514A021640088FAC4 /* simple-tall.html */; };
    153152                BCAA485814A044D40088FAC4 /* EditorCommands.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAA485714A044D40088FAC4 /* EditorCommands.mm */; };
    154153                BCB68040126FBFE100642A61 /* DocumentStartUserScriptAlertCrash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB6803F126FBFE100642A61 /* DocumentStartUserScriptAlertCrash.cpp */; };
    155154                BCB68042126FBFF100642A61 /* DocumentStartUserScriptAlertCrash_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB68041126FBFF100642A61 /* DocumentStartUserScriptAlertCrash_Bundle.cpp */; };
    156                 BCB9E9F111235BDE00A137E0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCB9E9F011235BDE00A137E0 /* Cocoa.framework */; };
    157155                BCBD3710125AA2EB00D2C29F /* FrameMIMETypeHTML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCBD370F125AA2EB00D2C29F /* FrameMIMETypeHTML.cpp */; };
    158156                BCBD3737125ABBEB00D2C29F /* icon.png in Copy Resources */ = {isa = PBXBuildFile; fileRef = BCBD372E125ABBE600D2C29F /* icon.png */; };
    … …  
    162160                C01A23F21266156700C9ED55 /* spacebar-scrolling.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C02B7882126615410026BF0F /* spacebar-scrolling.html */; };
    163161                C02B77F2126612140026BF0F /* SpacebarScrolling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C02B77F1126612140026BF0F /* SpacebarScrolling.cpp */; };
    164                 C02B7854126613AE0026BF0F /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C02B7853126613AE0026BF0F /* Carbon.framework */; };
    165162                C045F9451385C2EA00C0F3CD /* DownloadDecideDestinationCrash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C045F9441385C2E900C0F3CD /* DownloadDecideDestinationCrash.cpp */; };
    166163                C07E6CAF13FD67650038B22B /* DynamicDeviceScaleFactor.mm in Sources */ = {isa = PBXBuildFile; fileRef = C07E6CAE13FD67650038B22B /* DynamicDeviceScaleFactor.mm */; };
    … …  
    168165                C081224213FC172400DC39AE /* JavaScriptTestMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C081224013FC172400DC39AE /* JavaScriptTestMac.mm */; };
    169166                C081224513FC19EC00DC39AE /* SyntheticBackingScaleFactorWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = C081224413FC19EC00DC39AE /* SyntheticBackingScaleFactorWindow.m */; };
    170                 C081224913FC1B0300DC39AE /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C081224813FC1B0300DC39AE /* WebKit.framework */; };
    171167                C08587BF13FE956C001EF4E5 /* WebKitAgnosticTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = C08587BD13FE956C001EF4E5 /* WebKitAgnosticTest.mm */; };
    172168                C08587FC13FEC39B001EF4E5 /* InstanceMethodSwizzler.mm in Sources */ = {isa = PBXBuildFile; fileRef = C08587FB13FEC39B001EF4E5 /* InstanceMethodSwizzler.mm */; };
    … …  
    191187                E1220DCA155B28AA0013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = E1220DC9155B287D0013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.html */; };
    192188                E490296814E2E3A4002BEDD1 /* TypingStyleCrash.mm in Sources */ = {isa = PBXBuildFile; fileRef = E490296714E2E3A4002BEDD1 /* TypingStyleCrash.mm */; };
    193                 F3FC3EE313678B7300126A65 /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F3FC3EE213678B7300126A65 /* libgtest.a */; };
    194189                F660AA0D15A5F061003A1243 /* GetInjectedBundleInitializationUserDataCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F660AA0C15A5F061003A1243 /* GetInjectedBundleInitializationUserDataCallback.cpp */; };
    195190                F660AA1115A5F631003A1243 /* GetInjectedBundleInitializationUserDataCallback_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F660AA0F15A5F624003A1243 /* GetInjectedBundleInitializationUserDataCallback_Bundle.cpp */; };
    … …  
    300295                29AB8AA2164C7A9300D49BEC /* TestBrowsingContextLoadDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestBrowsingContextLoadDelegate.mm; sourceTree = "<group>"; };
    301296                29AB8AA3164C7A9300D49BEC /* TestBrowsingContextLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestBrowsingContextLoadDelegate.h; sourceTree = "<group>"; };
     297                2E7765CC16C4D80A00BA2BB1 /* mainIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = mainIOS.mm; sourceTree = "<group>"; };
     298                2E7765CE16C4D81100BA2BB1 /* mainMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = mainMac.mm; sourceTree = "<group>"; };
    302299                333B9CE11277F23100FEFCE3 /* PreventEmptyUserAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreventEmptyUserAgent.cpp; sourceTree = "<group>"; };
    303300                33BE5AF4137B5A6C00705813 /* MouseMoveAfterCrash.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MouseMoveAfterCrash.cpp; sourceTree = "<group>"; };
    … …  
    382379                BC131883117114A800B69727 /* PlatformUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformUtilities.h; sourceTree = "<group>"; };
    383380                BC131884117114B600B69727 /* PlatformUtilitiesMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformUtilitiesMac.mm; sourceTree = "<group>"; };
    384                 BC131A9A1171316900B69727 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
    385381                BC131A9E1171317C00B69727 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
    386382                BC131AA8117131FC00B69727 /* TestsController.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = TestsController.cpp; sourceTree = "<group>"; };
    … …  
    486482                        buildActionMask = 2147483647;
    487483                        files = (
    488                                 C02B7854126613AE0026BF0F /* Carbon.framework in Frameworks */,
    489                                 BCB9E9F111235BDE00A137E0 /* Cocoa.framework in Frameworks */,
    490                                 BC90964E1255620C00083756 /* JavaScriptCore.framework in Frameworks */,
    491                                 F3FC3EE313678B7300126A65 /* libgtest.a in Frameworks */,
    492                                 C081224913FC1B0300DC39AE /* WebKit.framework in Frameworks */,
    493                                 BCA61DB511700EFD00460D1E /* WebKit2.framework in Frameworks */,
    494484                        );
    495485                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    524514                        children = (
    525515                                BC575944126E733C006F0F12 /* InjectedBundle */,
     516                                2E9660DC16C07D7B00371B42 /* ios */,
    526517                                BCA61C3A11700B9400460D1E /* mac */,
    527518                                BC131A9E1171317C00B69727 /* config.h */,
    … …  
    559550                        );
    560551                        name = Products;
     552                        sourceTree = "<group>";
     553                };
     554                2E9660DC16C07D7B00371B42 /* ios */ = {
     555                        isa = PBXGroup;
     556                        children = (
     557                                2E7765CC16C4D80A00BA2BB1 /* mainIOS.mm */,
     558                        );
     559                        path = ios;
    561560                        sourceTree = "<group>";
    562561                };
    … …  
    753752                                C08587FF13FEC3A6001EF4E5 /* InstanceMethodSwizzler.mm */,
    754753                                C081224013FC172400DC39AE /* JavaScriptTestMac.mm */,
    755                                 BC131A9A1171316900B69727 /* main.mm */,
     754                                2E7765CE16C4D81100BA2BB1 /* mainMac.mm */,
    756755                                BC131884117114B600B69727 /* PlatformUtilitiesMac.mm */,
    757756                                BC90955C125548AA00083756 /* PlatformWebViewMac.mm */,
    … …  
    10191018                                52CB47411448FB9300873995 /* LoadAlternateHTMLStringWithNonDirectoryURL.cpp in Sources */,
    10201019                                33DC8911141953A300747EF7 /* LoadCanceledNoServerRedirectCallback.cpp in Sources */,
    1021                                 BC131A9B1171316900B69727 /* main.mm in Sources */,
    10221020                                B4039F9D15E6D8B3007255D6 /* MathExtras.cpp in Sources */,
    10231021                                CD5497B415857F0C00B5BC30 /* MediaTime.cpp in Sources */,
    … …  
    10861084                                BC9099941256ACF100083756 /* WKStringJSString.cpp in Sources */,
    10871085                                265AF55015D1E48A00B0CB4A /* WTFString.cpp in Sources */,
     1086                                2E7765CD16C4D80A00BA2BB1 /* mainIOS.mm in Sources */,
     1087                                2E7765CF16C4D81100BA2BB1 /* mainMac.mm in Sources */,
    10881088                        );
    10891089                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Tools/TestWebKitAPI/config.h

    r142179 r142381  
    4141
    4242#ifdef __OBJC__
     43#if PLATFORM(IOS)
     44#import <Foundation/Foundation.h>
     45#else
    4346#import <Cocoa/Cocoa.h>
     47#endif
    4448#endif
    4549
    … …  
    6771#include <stdint.h>
    6872
    69 #if (!PLATFORM(CHROMIUM) && !PLATFORM(WIN)) || (PLATFORM(GTK) && defined(BUILDING_WEBKIT2__))
     73#if !PLATFORM(IOS) && ((!PLATFORM(CHROMIUM) && !PLATFORM(WIN)) || (PLATFORM(GTK) && defined(BUILDING_WEBKIT2__)))
    7074#include <WebKit2/WebKit2_C.h>
    7175#endif

  • trunk/Tools/TestWebKitAPI/ios/mainIOS.mm

    r142380 r142381  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3131    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
    3232
    33     [NSApplication sharedApplication];
    34 
    3533    bool passed = TestWebKitAPI::TestsController::shared().run(argc, argv);
    3634
Note: See TracChangeset for help on using the changeset viewer.