Changeset 177506 in webkit


Ignore:
Timestamp:
Dec 18, 2014 11:22:48 AM (10 years ago)
Author:
Simon Fraser
Message:

Build more of TestWebKitAPI for iOS
​https://bugs.webkit.org/show_bug.cgi?id=139747

Reviewed by Daniel Bates.

Base.xcconfig removed many test files from the iOS build via EXCLUDED_SOURCE_FILE_NAMES,
which excluded some tests that should be run for iOS.

Fix by removing some patterns from EXCLUDED_SOURCE_FILE_NAMES, and #ifdeffing
source files instead. config.h defines WK_HAVE_C_SPI when the WebKit C SPI is
available (i.e. Mac OS X), and most files use that. Some files with Mac-only
functionality (ActionMenus, Downloads) use #if PLATFORM(MAC).

Added PlatformUtilitiesCocoa.mm and moved WeakObjCPtr.mm into a cocoa directory
to share code between Mac and iOS.

  • TestWebKitAPI/Configurations/Base.xcconfig:
  • TestWebKitAPI/Configurations/InjectedBundle.xcconfig:
  • TestWebKitAPI/InjectedBundleController.cpp:
  • TestWebKitAPI/InjectedBundleMain.cpp:
  • TestWebKitAPI/JavaScriptTest.cpp:
  • TestWebKitAPI/PlatformUtilities.cpp:
  • TestWebKitAPI/PlatformUtilities.h:
  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
  • TestWebKitAPI/Tests/CustomProtocolsSyncXHRTest.mm:
  • TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp:
  • TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp:
  • TestWebKitAPI/Tests/WebKit2/CanHandleRequest_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp:
  • TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp:
  • TestWebKitAPI/Tests/WebKit2/CookieManager.cpp:
  • TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp:
  • TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp:
  • TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp:
  • TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp:
  • TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:
  • TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp:
  • TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp:
  • TestWebKitAPI/Tests/WebKit2/EvaluateJavaScript.cpp:
  • TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:
  • TestWebKitAPI/Tests/WebKit2/Find.cpp:
  • TestWebKitAPI/Tests/WebKit2/FindMatches.mm:
  • TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp:
  • TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp:
  • TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp:
  • TestWebKitAPI/Tests/WebKit2/Geolocation.cpp:
  • TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp:
  • TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp:
  • TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp:
  • TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp:
  • TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp:
  • TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp:
  • TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp:
  • TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp:
  • TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp:
  • TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp:
  • TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp:
  • TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp:
  • TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp:
  • TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp:
  • TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
  • TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:
  • TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp:
  • TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm:
  • TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/PreventEmptyUserAgent.cpp:
  • TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp:
  • TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp:
  • TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp:
  • TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp:
  • TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp:
  • TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp:
  • TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp:
  • TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp:
  • TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/ShouldKeepCurrentBackForwardListItemInList.cpp:
  • TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp:
  • TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad.cpp:
  • TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad_bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp:
  • TestWebKitAPI/Tests/WebKit2/UserMessage.cpp:
  • TestWebKitAPI/Tests/WebKit2/UserMessage_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/WKImageCreateCGImageCrash.cpp:
  • TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp:
  • TestWebKitAPI/Tests/WebKit2/WKPageIsPlayingAudio.cpp:
  • TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2/WKString.cpp:
  • TestWebKitAPI/Tests/WebKit2/WKStringJSString.cpp:
  • TestWebKitAPI/Tests/WebKit2/WebArchive.cpp:
  • TestWebKitAPI/Tests/WebKit2/WebArchive_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/WebCoreStatisticsWithNoWebProcess.cpp:
  • TestWebKitAPI/Tests/WebKit2/WillLoad.cpp:
  • TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp:
  • TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2/cocoa/WeakObjCPtr.mm: Renamed from Tools/TestWebKitAPI/Tests/WebKit2/mac/WeakObjCPtr.mm.

(TEST):

  • TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
  • TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm:
  • TestWebKitAPI/Tests/WebKit2ObjC/ActionMenus.mm:
  • TestWebKitAPI/Tests/WebKit2ObjC/ActionMenusBundle.mm:
  • TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm:
  • TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm:
  • TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm:
  • TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp:
  • TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm:
  • TestWebKitAPI/cocoa/PlatformUtilitiesCocoa.mm: Copied from Tools/TestWebKitAPI/Tests/WebKit2/WKImageCreateCGImageCrash.cpp.

(TestWebKitAPI::Util::run):
(TestWebKitAPI::Util::sleep):
(TestWebKitAPI::Util::toSTD):

  • TestWebKitAPI/config.h:
  • TestWebKitAPI/mac/JavaScriptTestMac.mm:
  • TestWebKitAPI/mac/PlatformUtilitiesMac.mm:

(TestWebKitAPI::Util::run): Deleted.
(TestWebKitAPI::Util::sleep): Deleted.
(TestWebKitAPI::Util::toSTD): Deleted.

Location:
trunk/Tools
Files:
2 added
110 edited
1 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r177505 r177506  
     12014-12-18  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Build more of TestWebKitAPI for iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=139747
     5
     6        Reviewed by Daniel Bates.
     7       
     8        Base.xcconfig removed many test files from the iOS build via EXCLUDED_SOURCE_FILE_NAMES,
     9        which excluded some tests that should be run for iOS.
     10       
     11        Fix by removing some patterns from EXCLUDED_SOURCE_FILE_NAMES, and #ifdeffing
     12        source files instead. config.h defines WK_HAVE_C_SPI when the WebKit C SPI is
     13        available (i.e. Mac OS X), and most files use that. Some files with Mac-only
     14        functionality (ActionMenus, Downloads) use #if PLATFORM(MAC).
     15       
     16        Added PlatformUtilitiesCocoa.mm and moved WeakObjCPtr.mm into a cocoa directory
     17        to share code between Mac and iOS.
     18
     19        * TestWebKitAPI/Configurations/Base.xcconfig:
     20        * TestWebKitAPI/Configurations/InjectedBundle.xcconfig:
     21        * TestWebKitAPI/InjectedBundleController.cpp:
     22        * TestWebKitAPI/InjectedBundleMain.cpp:
     23        * TestWebKitAPI/JavaScriptTest.cpp:
     24        * TestWebKitAPI/PlatformUtilities.cpp:
     25        * TestWebKitAPI/PlatformUtilities.h:
     26        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
     27        * TestWebKitAPI/Tests/CustomProtocolsSyncXHRTest.mm:
     28        * TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp:
     29        * TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp:
     30        * TestWebKitAPI/Tests/WebKit2/CanHandleRequest_Bundle.cpp:
     31        * TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp:
     32        * TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp:
     33        * TestWebKitAPI/Tests/WebKit2/CookieManager.cpp:
     34        * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp:
     35        * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp:
     36        * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp:
     37        * TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp:
     38        * TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp:
     39        * TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp:
     40        * TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp:
     41        * TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:
     42        * TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp:
     43        * TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp:
     44        * TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp:
     45        * TestWebKitAPI/Tests/WebKit2/EvaluateJavaScript.cpp:
     46        * TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:
     47        * TestWebKitAPI/Tests/WebKit2/Find.cpp:
     48        * TestWebKitAPI/Tests/WebKit2/FindMatches.mm:
     49        * TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp:
     50        * TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp:
     51        * TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp:
     52        * TestWebKitAPI/Tests/WebKit2/Geolocation.cpp:
     53        * TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp:
     54        * TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp:
     55        * TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp:
     56        * TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp:
     57        * TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp:
     58        * TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp:
     59        * TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp:
     60        * TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp:
     61        * TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp:
     62        * TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp:
     63        * TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp:
     64        * TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp:
     65        * TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp:
     66        * TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp:
     67        * TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp:
     68        * TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp:
     69        * TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash_Bundle.cpp:
     70        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp:
     71        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp:
     72        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp:
     73        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp:
     74        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp:
     75        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp:
     76        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp:
     77        * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout_Bundle.cpp:
     78        * TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp:
     79        * TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:
     80        * TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp:
     81        * TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp:
     82        * TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm:
     83        * TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp:
     84        * TestWebKitAPI/Tests/WebKit2/PreventEmptyUserAgent.cpp:
     85        * TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp:
     86        * TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp:
     87        * TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp:
     88        * TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp:
     89        * TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp:
     90        * TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly_Bundle.cpp:
     91        * TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp:
     92        * TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp:
     93        * TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp:
     94        * TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp:
     95        * TestWebKitAPI/Tests/WebKit2/ShouldKeepCurrentBackForwardListItemInList.cpp:
     96        * TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp:
     97        * TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad.cpp:
     98        * TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad_bundle.cpp:
     99        * TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp:
     100        * TestWebKitAPI/Tests/WebKit2/UserMessage.cpp:
     101        * TestWebKitAPI/Tests/WebKit2/UserMessage_Bundle.cpp:
     102        * TestWebKitAPI/Tests/WebKit2/WKImageCreateCGImageCrash.cpp:
     103        * TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp:
     104        * TestWebKitAPI/Tests/WebKit2/WKPageIsPlayingAudio.cpp:
     105        * TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
     106        (TestWebKitAPI::TEST):
     107        * TestWebKitAPI/Tests/WebKit2/WKString.cpp:
     108        * TestWebKitAPI/Tests/WebKit2/WKStringJSString.cpp:
     109        * TestWebKitAPI/Tests/WebKit2/WebArchive.cpp:
     110        * TestWebKitAPI/Tests/WebKit2/WebArchive_Bundle.cpp:
     111        * TestWebKitAPI/Tests/WebKit2/WebCoreStatisticsWithNoWebProcess.cpp:
     112        * TestWebKitAPI/Tests/WebKit2/WillLoad.cpp:
     113        * TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp:
     114        * TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp:
     115        * TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp:
     116        * TestWebKitAPI/Tests/WebKit2/cocoa/WeakObjCPtr.mm: Renamed from Tools/TestWebKitAPI/Tests/WebKit2/mac/WeakObjCPtr.mm.
     117        (TEST):
     118        * TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
     119        * TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm:
     120        * TestWebKitAPI/Tests/WebKit2ObjC/ActionMenus.mm:
     121        * TestWebKitAPI/Tests/WebKit2ObjC/ActionMenusBundle.mm:
     122        * TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm:
     123        * TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp:
     124        * TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm:
     125        * TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm:
     126        * TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp:
     127        * TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm:
     128        * TestWebKitAPI/cocoa/PlatformUtilitiesCocoa.mm: Copied from Tools/TestWebKitAPI/Tests/WebKit2/WKImageCreateCGImageCrash.cpp.
     129        (TestWebKitAPI::Util::run):
     130        (TestWebKitAPI::Util::sleep):
     131        (TestWebKitAPI::Util::toSTD):
     132        * TestWebKitAPI/config.h:
     133        * TestWebKitAPI/mac/JavaScriptTestMac.mm:
     134        * TestWebKitAPI/mac/PlatformUtilitiesMac.mm:
     135        (TestWebKitAPI::Util::run): Deleted.
     136        (TestWebKitAPI::Util::sleep): Deleted.
     137        (TestWebKitAPI::Util::toSTD): Deleted.
     138
    11392014-12-18  Dániel Bátyai  <dbatyai.u-szeged@partner.samsung.com>
    2140

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

    r175397 r177506  
    6565EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
    6666EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm;
    67 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *Mac.h *Mac.cpp *Mac.mm *InjectedBundle* *PlatformUtilities* Tests/WebKit2/* Tests/WebKit2ObjC/* *_Bundle* JavaScriptTest.* */mac/* CustomProtocolsSyncXHRTest.mm Tests/WebKit2Cocoa/*;
     67EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *Mac.h *Mac.cpp *Mac.mm */mac/*;
    6868EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
    6969

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

    r95188 r177506  
    2323
    2424PRODUCT_NAME = InjectedBundleTestWebKitAPI;
     25
     26FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
     27FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework UIKit;
     28FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator);
     29FRAMEWORK_AND_LIBRARY_LDFLAGS_macosx = -framework JavaScriptCore -framework WebKit -framework CoreGraphics -framework Cocoa;
     30
     31OTHER_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS);

  • trunk/Tools/TestWebKitAPI/InjectedBundleController.cpp

    r160104 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleController.h"
    2831
    … …  
    139142
    140143} // namespace TestWebKitAPI
     144
     145#endif

  • trunk/Tools/TestWebKitAPI/InjectedBundleMain.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleController.h"
    2831#include <WebKit/WKBundleInitialize.h>
    … …  
    3740    TestWebKitAPI::InjectedBundleController::shared().initialize(bundle, initializationUserData);
    3841}
     42
     43#endif

  • trunk/Tools/TestWebKitAPI/JavaScriptTest.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "JavaScriptTest.h"
    2831
    … …  
    9194
    9295} // namespace TestWebKitAPI
     96
     97#endif

  • trunk/Tools/TestWebKitAPI/PlatformUtilities.cpp

    r160811 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831
    … …  
    8992} // namespace Util
    9093} // namespace TestWebKitAPI
     94
     95#endif

  • trunk/Tools/TestWebKitAPI/PlatformUtilities.h

    r173126 r177506  
    4040// Runs a platform runloop until the 'done' is true.
    4141void run(bool* done);
     42void sleep(double seconds);
    4243
    43 void sleep(double seconds);
     44std::string toSTD(const char*);
     45#if USE(FOUNDATION)
     46std::string toSTD(NSString *);
     47#endif
     48
     49#if WK_HAVE_C_SPI
    4450
    4551WKContextRef createContextWithInjectedBundle();
    … …  
    5662std::string toSTD(WKStringRef);
    5763std::string toSTD(WKRetainPtr<WKStringRef>);
    58 std::string toSTD(const char*);
    59 #if USE(FOUNDATION)
    60 std::string toSTD(NSString *);
    61 #endif
    6264
    6365WKRetainPtr<WKStringRef> toWK(const char* utf8String);
     66
     67#endif // WK_HAVE_C_SPI
    6468
    6569template<typename T, typename U>

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

    r177434 r177506  
    88
    99/* Begin PBXBuildFile section */
     10                0F139E771A423A5B00F590F5 /* WeakObjCPtr.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F139E751A423A5300F590F5 /* WeakObjCPtr.mm */; };
     11                0F139E781A423A6B00F590F5 /* PlatformUtilitiesCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F139E721A423A2B00F590F5 /* PlatformUtilitiesCocoa.mm */; };
     12                0F139E791A42457000F590F5 /* PlatformUtilitiesCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F139E721A423A2B00F590F5 /* PlatformUtilitiesCocoa.mm */; };
    1013                1A02C870125D4CFD00E3F4BD /* find.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A02C84B125D4A5E00E3F4BD /* find.html */; };
    1114                1A50AA201A2A51FC00F4C345 /* close-from-within-create-page.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A50AA1F1A2A4EA500F4C345 /* close-from-within-create-page.html */; };
    … …  
    116119                7CCE7EE11A411A9A00447C4C /* GetBackingScaleFactor.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0C5D3BC14598B6F00A802A6 /* GetBackingScaleFactor.mm */; };
    117120                7CCE7EE21A411A9A00447C4C /* GetPIDAfterAbortedProcessLaunch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AEF994817A09F5300998EF0 /* GetPIDAfterAbortedProcessLaunch.cpp */; };
    118                 7CCE7EE31A411A9A00447C4C /* WeakObjCPtr.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AA9BAE218500450003B6BC6 /* WeakObjCPtr.mm */; };
    119121                7CCE7EE41A411AE600447C4C /* AboutBlankLoad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC246D8C132F115A00B56D7C /* AboutBlankLoad.cpp */; };
    120122                7CCE7EE51A411AE600447C4C /* CloseThenTerminate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C8DDAA91735DE1D00EA5AC0 /* CloseThenTerminate.cpp */; };
    … …  
    243245                BC246D9C132F1FF000B56D7C /* CanHandleRequest_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC246D97132F1FE100B56D7C /* CanHandleRequest_Bundle.cpp */; };
    244246                BC2D006412AA04CE00E732A3 /* file-with-anchor.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = BC2D004A12A9FEB300E732A3 /* file-with-anchor.html */; };
    245                 BC575A90126E74D3006F0F12 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCB9E9F011235BDE00A137E0 /* Cocoa.framework */; };
    246                 BC575A91126E74D3006F0F12 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCA61DB411700EFD00460D1E /* WebKit2.framework */; };
    247                 BC575A92126E74D3006F0F12 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC90964D1255620C00083756 /* JavaScriptCore.framework */; };
    248247                BC575A97126E74F1006F0F12 /* InjectedBundleMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC575946126E7351006F0F12 /* InjectedBundleMain.cpp */; };
    249248                BC575AA2126E7660006F0F12 /* InjectedBundleController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC575AA0126E7657006F0F12 /* InjectedBundleController.cpp */; };
    … …  
    383382                0BCD833414857CE400EA2003 /* HashMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HashMap.cpp; sourceTree = "<group>"; };
    384383                0BCD85691485C98B00EA2003 /* TemporaryChange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TemporaryChange.cpp; sourceTree = "<group>"; };
     384                0F139E721A423A2B00F590F5 /* PlatformUtilitiesCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PlatformUtilitiesCocoa.mm; path = cocoa/PlatformUtilitiesCocoa.mm; sourceTree = "<group>"; };
     385                0F139E751A423A5300F590F5 /* WeakObjCPtr.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WeakObjCPtr.mm; path = cocoa/WeakObjCPtr.mm; sourceTree = "<group>"; };
    385386                0F17BBD415AF6C4D007AB753 /* WebCoreStatisticsWithNoWebProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreStatisticsWithNoWebProcess.cpp; sourceTree = "<group>"; };
    386387                0FC6C4CB141027E0005B7F0C /* RedBlackTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RedBlackTree.cpp; sourceTree = "<group>"; };
    … …  
    396397                1A7E8B33181208DE00AEB74A /* FragmentNavigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FragmentNavigation.mm; sourceTree = "<group>"; };
    397398                1A7E8B351812093600AEB74A /* FragmentNavigation.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = FragmentNavigation.html; sourceTree = "<group>"; };
    398                 1AA9BAE218500450003B6BC6 /* WeakObjCPtr.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WeakObjCPtr.mm; sourceTree = "<group>"; };
    399399                1AA9E55714980A9900001A8A /* Functional.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Functional.cpp; sourceTree = "<group>"; };
    400400                1ABC3DED1899BE6D004F0626 /* Navigation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Navigation.mm; sourceTree = "<group>"; };
    … …  
    699699                        buildActionMask = 2147483647;
    700700                        files = (
    701                                 BC575A90126E74D3006F0F12 /* Cocoa.framework in Frameworks */,
    702                                 BC575A92126E74D3006F0F12 /* JavaScriptCore.framework in Frameworks */,
    703                                 BC575A91126E74D3006F0F12 /* WebKit2.framework in Frameworks */,
    704701                        );
    705702                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    723720                        isa = PBXGroup;
    724721                        children = (
     722                                0F139E711A423A1D00F590F5 /* cocoa */,
    725723                                BC575944126E733C006F0F12 /* InjectedBundle */,
    726724                                2E9660DC16C07D7B00371B42 /* ios */,
    … …  
    755753                        sourceTree = "<group>";
    756754                };
     755                0F139E711A423A1D00F590F5 /* cocoa */ = {
     756                        isa = PBXGroup;
     757                        children = (
     758                                0F139E721A423A2B00F590F5 /* PlatformUtilitiesCocoa.mm */,
     759                        );
     760                        name = cocoa;
     761                        sourceTree = "<group>";
     762                };
     763                0F139E741A423A4600F590F5 /* cocoa */ = {
     764                        isa = PBXGroup;
     765                        children = (
     766                                0F139E751A423A5300F590F5 /* WeakObjCPtr.mm */,
     767                        );
     768                        name = cocoa;
     769                        sourceTree = "<group>";
     770                };
    757771                1AB674ADFE9D54B511CA2CBB /* Products */ = {
    758772                        isa = PBXGroup;
    … …  
    876890                        isa = PBXGroup;
    877891                        children = (
     892                                0F139E741A423A4600F590F5 /* cocoa */,
    878893                                C0C5D3BB14598B6F00A802A6 /* mac */,
    879894                                BC90977B125571AE00083756 /* Resources */,
    … …  
    12021217                                C0C5D3BD14598B6F00A802A6 /* GetBackingScaleFactor_Bundle.mm */,
    12031218                                1AEF994817A09F5300998EF0 /* GetPIDAfterAbortedProcessLaunch.cpp */,
    1204                                 1AA9BAE218500450003B6BC6 /* WeakObjCPtr.mm */,
    12051219                        );
    12061220                        path = mac;
    … …  
    13231337                                7CCE7ED81A411A7E00447C4C /* WillSendSubmitEvent.mm in Sources */,
    13241338                                7CCE7ECD1A411A7E00447C4C /* SimplifyMarkup.mm in Sources */,
     1339                                0F139E781A423A6B00F590F5 /* PlatformUtilitiesCocoa.mm in Sources */,
    13251340                                7CCE7ED01A411A7E00447C4C /* StringByEvaluatingJavaScriptFromString.mm in Sources */,
    13261341                                7CCE7EB81A411A7E00447C4C /* ContextMenuCanCopyURL.mm in Sources */,
    … …  
    13821397                                7CCE7F2E1A411B1000447C4C /* WKBrowsingContextGroupTest.mm in Sources */,
    13831398                                7CCE7EBC1A411A7E00447C4C /* DOMNodeFromJSObject.mm in Sources */,
     1399                                0F139E771A423A5B00F590F5 /* WeakObjCPtr.mm in Sources */,
    13841400                                7CCE7F091A411AE600447C4C /* ParentFrame.cpp in Sources */,
    13851401                                7CCE7EAB1A411A2400447C4C /* WebKitAgnosticTest.mm in Sources */,
    … …  
    14571473                                7CCE7EC41A411A7E00447C4C /* JSWrapperForNodeInWebFrame.mm in Sources */,
    14581474                                7CCE7F031A411AE600447C4C /* NewFirstVisuallyNonEmptyLayoutFails.cpp in Sources */,
    1459                                 7CCE7EE31A411A9A00447C4C /* WeakObjCPtr.mm in Sources */,
    14601475                                7CCE7EFE1A411AE600447C4C /* LoadAlternateHTMLStringWithNonDirectoryURL.cpp in Sources */,
    14611476                                7CCE7F1E1A411AE600447C4C /* WKStringJSString.cpp in Sources */,
    … …  
    15301545                                93AF4ECE1506F064007FD57E /* NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp in Sources */,
    15311546                                93F7E86F14DC8E5C00C84A99 /* NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp in Sources */,
     1547                                0F139E791A42457000F590F5 /* PlatformUtilitiesCocoa.mm in Sources */,
    15321548                                52E5CE4914D21EAB003B2BD8 /* ParentFrame_Bundle.cpp in Sources */,
    15331549                                C54237F116B8957D00E638FC /* PasteboardNotifications_Bundle.cpp in Sources */,
    … …  
    16471663                        );
    16481664                        defaultConfigurationIsVisible = 0;
     1665                        defaultConfigurationName = Release;
    16491666                };
    16501667                BC575986126E74AF006F0F12 /* Build configuration list for PBXNativeTarget "InjectedBundleTestWebKitAPI" */ = {

  • trunk/Tools/TestWebKitAPI/Tests/CustomProtocolsSyncXHRTest.mm

    r168961 r177506  
    2525
    2626#import "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#import "JavaScriptTest.h"
    2831#import "Test.h"
    … …  
    7275
    7376#endif // WK_API_ENABLED
     77
     78#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp

    r160104 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    5861
    5962} // namespace TestWebKitAPI
     63
     64#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/CanHandleRequest.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    7275
    7376} // namespace TestWebKitAPI
     77
     78#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/CanHandleRequest_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    6669
    6770} // namespace TestWebKitAPI
     71
     72#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/CloseFromWithinCreatePage.cpp

    r176574 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    8184
    8285}
     86
     87#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/CloseThenTerminate.cpp

    r160104 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    6366
    6467} // namespace TestWebKitAPI
     68
     69#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/CookieManager.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    8790
    8891} // namespace TestWebKitAPI
     92
     93#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    134137
    135138} // namespace TestWebKitAPI
     139
     140#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionBasic_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831#include <WebKit/WKBundleDOMWindowExtension.h>
    … …  
    258261
    259262} // namespace TestWebKitAPI
     263
     264#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache.cpp

    r160104 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    133136
    134137} // namespace TestWebKitAPI
     138
     139#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DOMWindowExtensionNoCache_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831#include <WebKit/WKBundleDOMWindowExtension.h>
    … …  
    277280
    278281} // namespace TestWebKitAPI
     282
     283#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls.cpp

    r160104 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    8487
    8588} // namespace TestWebKitAPI
     89
     90#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidAssociateFormControls_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    7780
    7881} // namespace TestWebKitAPI
     82
     83#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DidNotHandleKeyDown.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "JavaScriptTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    7780
    7881} // namespace TestWebKitAPI
     82
     83#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    6669
    6770} // namespace TestWebKitAPI
     71
     72#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831#include <WebKit/WKBundlePageGroup.h>
    … …  
    5457
    5558} // namespace TestWebKitAPI
     59
     60#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/DownloadDecideDestinationCrash.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    8487
    8588} // namespace TestWebKitAPI
     89
     90#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/EphemeralSessionPushStateNoHistoryCallback.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    7780
    7881} // namespace TestWebKitAPI
     82
     83#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/EvaluateJavaScript.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    5962
    6063} // namespace TestWebKitAPI
     64
     65#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    6669
    6770} // namespace TestWebKitAPI
     71
     72#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/Find.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    8083
    8184} // namespace TestWebKitAPI
     85
     86#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/FindMatches.mm

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    168171
    169172} // namespace TestWebKitAPI
     173
     174#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ForceRepaint.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    6871
    6972} // namespace TestWebKitAPI
     73
     74#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypeHTML.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    7679
    7780} // namespace TestWebKitAPI
     81
     82#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/FrameMIMETypePNG.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    7578
    7679} // namespace TestWebKitAPI
     80
     81#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    336339
    337340} // namespace TestWebKitAPI
     341
     342#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    6669
    6770} // namespace TestWebKitAPI
     71
     72#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/GetInjectedBundleInitializationUserDataCallback_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    4750
    4851} // namespace TestWebKitAPI
     52
     53#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    8790
    8891} // namespace TestWebKitAPI
     92
     93#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/HitTestResultNodeHandle_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831#include "InjectedBundleController.h"
    … …  
    6568
    6669} // namespace TestWebKitAPI
     70
     71#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    7881
    7982} // namespace TestWebKitAPI
     83
     84#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleBasic_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831#include <WebKit/WKRetainPtr.h>
    … …  
    4851
    4952} // namespace TestWebKitAPI
     53
     54#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    6770
    6871} // namespace TestWebKitAPI
     72
     73#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleFrameHitTest_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    7780
    7881} // namespace TestWebKitAPI
     82
     83#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    6871
    6972} // namespace TestWebKitAPI
     73
     74#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleInitializationUserDataCallbackWins_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    4750
    4851} // namespace TestWebKitAPI
     52
     53#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/LayoutMilestonesWithAllContentInFrame.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    6568
    6669} // namespace TestWebKitAPI
     70
     71#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadAlternateHTMLStringWithNonDirectoryURL.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "JavaScriptTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    6568
    6669} // namespace TestWebKitAPI
     70
     71#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "JavaScriptTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    9497
    9598} // namespace TestWebKitAPI
     99
     100#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadCanceledNoServerRedirectCallback_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    7174
    7275} // namespace TestWebKitAPI
     76
     77#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/LoadPageOnCrash.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    104107
    105108} // namespace TestWebKitAPI
     109
     110#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp

    r173126 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "JavaScriptTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    8790
    8891} // namespace TestWebKitAPI
     92
     93#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash_Bundle.cpp

    r95188 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    5558
    5659} // namespace TestWebKitAPI
     60
     61#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    8790
    8891} // namespace TestWebKitAPI
     92
     93#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    8790
    8891} // namespace TestWebKitAPI
     92
     93#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFails_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    5053
    5154} // namespace TestWebKitAPI
     55
     56#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    8790
    8891} // namespace TestWebKitAPI
     92
     93#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    5053
    5154} // namespace TestWebKitAPI
     55
     56#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    9194
    9295} // namespace TestWebKitAPI
     96
     97#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    5053
    5154} // namespace TestWebKitAPI
     55
     56#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayout_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    5053
    5154} // namespace TestWebKitAPI
     55
     56#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadBasic.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    154157
    155158} // namespace TestWebKitAPI
     159
     160#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    8588
    8689} // namespace TestWebKitAPI
     90
     91#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    6972
    7073} // namespace TestWebKitAPI
     74
     75#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ParentFrame_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    7881
    7982} // namespace TestWebKitAPI
     83
     84#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    7679
    7780} // namespace TestWebKitAPI
     81
     82#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    8386
    8487} // namespace TestWebKitAPI
     88
     89#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/PreventEmptyUserAgent.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    6972
    7073} // namespace TestWebKitAPI
     74
     75#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/PrivateBrowsingPushStateNoHistoryCallback.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    9598
    9699} // namespace TestWebKitAPI
     100
     101#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ReloadPageAfterCrash.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    8790
    8891} // namespace TestWebKitAPI
     92
     93#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResizeReversePaginatedWebView.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "JavaScriptTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    8992
    9093} // namespace TestWebKitAPI
     94
     95#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResizeWindowAfterCrash.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    98101
    99102} // namespace TestWebKitAPI
     103
     104#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly.cpp

    r160104 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    97100
    98101} // namespace TestWebKitAPI
     102
     103#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ResponsivenessTimerDoesntFireEarly_Bundle.cpp

    r95188 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    5861
    5962} // namespace TestWebKitAPI
     63
     64#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp

    r170695 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "JavaScriptTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    9093
    9194} // namespace TestWebKitAPI
     95
     96#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ScrollPinningBehaviors.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "JavaScriptTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    9699
    97100} // namespace TestWebKitAPI
     101
     102#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    9194
    9295} // namespace TestWebKitAPI
     96
     97#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldGoToBackForwardListItem_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    6972
    7073} // namespace TestWebKitAPI
     74
     75#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/ShouldKeepCurrentBackForwardListItemInList.cpp

    r171072 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    157160} // namespace TestWebKitAPI
    158161
     162
     163#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp

    r173126 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "JavaScriptTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    108111
    109112} // namespace TestWebKitAPI
     113
     114#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad.cpp

    r169429 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    7780
    7881} // namespace TestWebKitAPI
     82
     83#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/StopLoadingDuringDidFailProvisionalLoad_bundle.cpp

    r169429 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    7578
    7679} // namespace TestWebKitAPI
     80
     81#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/TerminateTwice.cpp

    r172680 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    7073} // namespace TestWebKitAPI
    7174
     75#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp

    r160104 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "Test.h"
    2831
    … …  
    158161
    159162} // namespace TestWebKitAPI
     163
     164#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage_Bundle.cpp

    r106751 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    5154
    5255} // namespace TestWebKitAPI
     56
     57#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKImageCreateCGImageCrash.cpp

    r173566 r177506  
    2626#include "config.h"
    2727
     28#if WK_HAVE_C_SPI
     29
    2830#include <WebKit/WKImageCG.h>
    2931
    … …  
    3638
    3739} // namespace TestWebKitAPI
     40
     41#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp

    r170683 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    7881
    7982} // namespace TestWebKitAPI
     83
     84#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPageIsPlayingAudio.cpp

    r174667 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    146149
    147150} // namespace TestWebKitAPI
     151
     152#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp

    r173126 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include <WebKit/WKPreferencesRefPrivate.h>
    … …  
    4245TEST(WebKit2, WKPreferencesDefaults)
    4346{
    44 #if PLATFORM(MAC)
     47#if WK_HAVE_C_SPI
    4548    static const char* expectedStandardFontFamily = "Times";
    4649    static const char* expectedFixedFontFamily = "Courier";
    … …  
    119122
    120123} // namespace TestWebKitAPI
     124
     125#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKString.cpp

    r95188 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
    2729
    2830namespace TestWebKitAPI {
    … …  
    7072
    7173} // namespace TestWebKitAPI
     74
     75#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKStringJSString.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include <WebKit/WKStringPrivate.h>
    2831#include <JavaScriptCore/JSStringRef.h>
    … …  
    4952
    5053} // namespace TestWebKitAPI
     54
     55#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    129132
    130133} // namespace TestWebKitAPI
     134
     135#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WebArchive_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    6366
    6467} // namespace TestWebKitAPI
     68
     69#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WebCoreStatisticsWithNoWebProcess.cpp

    r122648 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    28 #include "test.h"
     31#include "Test.h"
    2932
    3033namespace TestWebKitAPI {
    … …  
    4952
    5053} // namespace TestWebKitAPI
     54
     55#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad.cpp

    r160664 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "Test.h"
    2831
    … …  
    240243
    241244} // namespace TestWebKitAPI
     245
     246#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillLoad_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    8386
    8487} // namespace TestWebKitAPI
     88
     89#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent.cpp

    r160104 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "PlatformUtilities.h"
    2831#include "PlatformWebView.h"
    … …  
    7881
    7982} // namespace TestWebKitAPI
     83
     84#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2/WillSendSubmitEvent_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831
    … …  
    6467
    6568} // namespace TestWebKitAPI
     69
     70#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm

    r168961 r177506  
    2828
    2929#if WK_API_ENABLED
     30#if PLATFORM(MAC) // No downloading on iOS
    3031
    3132#import "PlatformUtilities.h"
    … …  
    270271
    271272#endif
     273#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm

    r171355 r177506  
    3232
    3333#if WK_API_ENABLED
    34 
    3534
    3635static bool isDoneWithNavigation;
    … …  
    8988}
    9089
     90#if !PLATFORM(IOS) // FIXME: hangs in the iOS simulator
    9191TEST(WKUserContentController, ScriptMessageHandlerWithNavigation)
    9292{
    … …  
    126126    EXPECT_WK_STREQ(@"Second Message", (NSString *)[lastScriptMessage body]);   
    127127}
     128#endif
    128129
    129130#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/ActionMenus.mm

    r177299 r177506  
    2525
    2626#import "config.h"
     27
     28#if PLATFORM(MAC)
     29
    2730#import "Test.h"
    2831
    … …  
    739742
    740743} // namespace TestWebKitAPI
     744
     745#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/ActionMenusBundle.mm

    r176959 r177506  
    2525
    2626#import "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#import "ActionMenusBundleSPI.h"
    2831#import "InjectedBundleTest.h"
    … …  
    139142
    140143} // namespace TestWebKitAPI
     144
     145#endif // PLATFORM(MAC)

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm

    r168961 r177506  
    2525
    2626#import "config.h"
     27
     28#if WK_HAVE_C_SPI
    2729
    2830#import "PlatformUtilities.h"
    … …  
    6163
    6264#endif // WK_API_ENABLED
     65
     66#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
    2729
    2830#include "InjectedBundleTest.h"
    … …  
    6163
    6264} // namespace TestWebKitAPI
     65
     66#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm

    r168961 r177506  
    2525
    2626#import "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#import "Test.h"
    2831
    … …  
    5861
    5962#endif // WK_API_ENABLED
     63
     64#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm

    r168961 r177506  
    2525
    2626#import "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#import "Test.h"
    2831
    … …  
    6063
    6164#endif // WK_API_ENABLED
     65
     66#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#include "InjectedBundleTest.h"
    2831#include "PlatformUtilities.h"
    … …  
    6366
    6467} // namespace TestWebKitAPI
     68
     69#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm

    r169992 r177506  
    2525
    2626#import "config.h"
     27
     28#if WK_HAVE_C_SPI
     29
    2730#import "Test.h"
    2831
    … …  
    246249
    247250#endif // WK_API_ENABLED
     251
     252#endif

  • trunk/Tools/TestWebKitAPI/cocoa/PlatformUtilitiesCocoa.mm

    r177505 r177506  
    2525
    2626#include "config.h"
     27#include "PlatformUtilities.h"
    2728
    28 #include <WebKit/WKImageCG.h>
     29#include <wtf/RetainPtr.h>
     30#include <wtf/StdLibExtras.h>
    2931
    3032namespace TestWebKitAPI {
     33namespace Util {
    3134
    32 TEST(WebKit2, WKImageCreateCGImageCrash)
     35void run(bool* done)
    3336{
    34     EXPECT_FALSE(WKImageCreateCGImage(nullptr));
     37    while (!*done)
     38        [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]];
    3539}
    3640
     41void sleep(double seconds)
     42{
     43    usleep(seconds * 1000000);
     44}
     45
     46std::string toSTD(NSString *string)
     47{
     48    if (!string)
     49        return std::string();
     50
     51    size_t bufferSize = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
     52    auto buffer = std::make_unique<char[]>(bufferSize);
     53    NSUInteger stringLength;
     54    [string getBytes:buffer.get() maxLength:bufferSize usedLength:&stringLength encoding:NSUTF8StringEncoding options:0 range:NSMakeRange(0, [string length]) remainingRange:0];
     55    return std::string(buffer.get(), stringLength);
     56}
     57
     58} // namespace Util
    3759} // namespace TestWebKitAPI

  • trunk/Tools/TestWebKitAPI/config.h

    r173949 r177506  
    8686#import <WebKit/WebKit.h>
    8787#endif
     88
     89#if !PLATFORM(IOS)
     90#define WK_HAVE_C_SPI 1
     91#endif

  • trunk/Tools/TestWebKitAPI/mac/JavaScriptTestMac.mm

    r168961 r177506  
    2525
    2626#include "config.h"
     27
     28#if PLATFORM(MAC)
     29
    2730#include "JavaScriptTest.h"
    2831
    … …  
    4447
    4548} // namespace TestWebKitAPI
     49
     50#endif

  • trunk/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm

    r168961 r177506  
    3737namespace Util {
    3838
    39 void run(bool* done)
    40 {
    41     while (!*done)
    42         [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]];
    43 }
    44 
    45 void sleep(double seconds)
    46 {
    47     usleep(seconds * 1000000);
    48 }
    49 
    5039WKStringRef createInjectedBundlePath()
    5140{
    … …  
    7766}
    7867
    79 std::string toSTD(NSString *string)
    80 {
    81     if (!string)
    82         return std::string();
    83 
    84     size_t bufferSize = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
    85     auto buffer = std::make_unique<char[]>(bufferSize);
    86     NSUInteger stringLength;
    87     [string getBytes:buffer.get() maxLength:bufferSize usedLength:&stringLength encoding:NSUTF8StringEncoding options:0 range:NSMakeRange(0, [string length]) remainingRange:0];
    88     return std::string(buffer.get(), stringLength);
    89 }
    90 
    9168} // namespace Util
    9269} // namespace TestWebKitAPI
Note: See TracChangeset for help on using the changeset viewer.