Changeset 162729 in webkit


Ignore:
Timestamp:
Jan 24, 2014, 3:20:08 PM (11 years ago)
Author:
dfarler@apple.com
Message:

Make WebKitTestRunner work with iOS
​https://bugs.webkit.org/show_bug.cgi?id=127448

Reviewed by Simon Fraser.

Combined patch from Simon below with some additional xcconfig cleanups,
rebasing and stubbing out a couple of new functions that popped up
since then.

2013-12-03 Simon Fraser <Simon Fraser>

<rdar://problem/15515469> Get WebKitTestRunner working on iOS

Get WebKitTestRunner limping on iOS. Main parts:

  • Stub out lots of accessibility-related functions.
  • Stub out EventSender
  • Create target to make a bundled app that runs in the simulator, and copy the injected bundle library into it.
  • Make a UIWindow and WKView to load tests in

It runs, load tests, and dumps results to output. More work will be
required once we can execute it via the webkitpy scripts.

  • WebKitTestRunner/Configurations/Base.xcconfig:
  • WebKitTestRunner/Configurations/InjectedBundle.xcconfig:
  • WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
  • WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
  • WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm: Added.

(WTR::AccessibilityController::addNotificationListener):
(WTR::AccessibilityController::removeNotificationListener):
(WTR::AccessibilityController::platformName):
(WTR::AccessibilityController::logAccessibilityEvents):
(WTR::AccessibilityController::resetToConsistentState):
(WTR::findAccessibleObjectById):
(WTR::AccessibilityController::accessibleElementById):

  • WebKitTestRunner/InjectedBundle/ios/AccessibilityNotificationHandler.h: Added.
  • WebKitTestRunner/InjectedBundle/ios/AccessibilityTextMarkerIOS.mm: Copied from Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h.

(WTR::AccessibilityTextMarker::isEqual):

  • WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm: Added.

(WTR::AccessibilityUIElement::AccessibilityUIElement):
(WTR::AccessibilityUIElement::~AccessibilityUIElement):
(WTR::AccessibilityUIElement::isEqual):
(WTR::AccessibilityUIElement::getLinkedUIElements):
(WTR::AccessibilityUIElement::getDocumentLinks):
(WTR::AccessibilityUIElement::getChildren):
(WTR::AccessibilityUIElement::getChildrenWithRange):
(WTR::AccessibilityUIElement::childrenCount):
(WTR::AccessibilityUIElement::elementAtPoint):
(WTR::AccessibilityUIElement::indexOfChild):
(WTR::AccessibilityUIElement::childAtIndex):
(WTR::AccessibilityUIElement::linkedUIElementAtIndex):
(WTR::AccessibilityUIElement::ariaOwnsElementAtIndex):
(WTR::AccessibilityUIElement::ariaFlowToElementAtIndex):
(WTR::AccessibilityUIElement::disclosedRowAtIndex):
(WTR::AccessibilityUIElement::rowAtIndex):
(WTR::AccessibilityUIElement::selectedChildAtIndex):
(WTR::AccessibilityUIElement::selectedChildrenCount):
(WTR::AccessibilityUIElement::selectedRowAtIndex):
(WTR::AccessibilityUIElement::titleUIElement):
(WTR::AccessibilityUIElement::parentElement):
(WTR::AccessibilityUIElement::disclosedByRow):
(WTR::AccessibilityUIElement::attributesOfLinkedUIElements):
(WTR::AccessibilityUIElement::attributesOfDocumentLinks):
(WTR::AccessibilityUIElement::attributesOfChildren):
(WTR::AccessibilityUIElement::allAttributes):
(WTR::AccessibilityUIElement::stringAttributeValue):
(WTR::AccessibilityUIElement::numberAttributeValue):
(WTR::AccessibilityUIElement::uiElementArrayAttributeValue):
(WTR::AccessibilityUIElement::uiElementAttributeValue):
(WTR::AccessibilityUIElement::boolAttributeValue):
(WTR::AccessibilityUIElement::isAttributeSettable):
(WTR::AccessibilityUIElement::isAttributeSupported):
(WTR::AccessibilityUIElement::parameterizedAttributeNames):
(WTR::AccessibilityUIElement::role):
(WTR::AccessibilityUIElement::subrole):
(WTR::AccessibilityUIElement::roleDescription):
(WTR::AccessibilityUIElement::title):
(WTR::AccessibilityUIElement::description):
(WTR::AccessibilityUIElement::orientation):
(WTR::AccessibilityUIElement::stringValue):
(WTR::AccessibilityUIElement::language):
(WTR::AccessibilityUIElement::helpText):
(WTR::AccessibilityUIElement::x):
(WTR::AccessibilityUIElement::y):
(WTR::AccessibilityUIElement::width):
(WTR::AccessibilityUIElement::height):
(WTR::AccessibilityUIElement::clickPointX):
(WTR::AccessibilityUIElement::clickPointY):
(WTR::AccessibilityUIElement::intValue):
(WTR::AccessibilityUIElement::minValue):
(WTR::AccessibilityUIElement::maxValue):
(WTR::AccessibilityUIElement::valueDescription):
(WTR::AccessibilityUIElement::insertionPointLineNumber):
(WTR::AccessibilityUIElement::isPressActionSupported):
(WTR::AccessibilityUIElement::isIncrementActionSupported):
(WTR::AccessibilityUIElement::isDecrementActionSupported):
(WTR::AccessibilityUIElement::isEnabled):
(WTR::AccessibilityUIElement::isRequired):
(WTR::AccessibilityUIElement::isFocused):
(WTR::AccessibilityUIElement::isSelected):
(WTR::AccessibilityUIElement::isSelectedOptionActive):
(WTR::AccessibilityUIElement::isIndeterminate):
(WTR::AccessibilityUIElement::isExpanded):
(WTR::AccessibilityUIElement::isChecked):
(WTR::AccessibilityUIElement::hierarchicalLevel):
(WTR::AccessibilityUIElement::classList):
(WTR::AccessibilityUIElement::speak):
(WTR::AccessibilityUIElement::ariaIsGrabbed):
(WTR::AccessibilityUIElement::ariaDropEffects):
(WTR::AccessibilityUIElement::lineForIndex):
(WTR::AccessibilityUIElement::rangeForLine):
(WTR::AccessibilityUIElement::rangeForPosition):
(WTR::AccessibilityUIElement::boundsForRange):
(WTR::AccessibilityUIElement::stringForRange):
(WTR::AccessibilityUIElement::attributedStringForRange):
(WTR::AccessibilityUIElement::attributedStringRangeIsMisspelled):
(WTR::uiElementCountForSearchPredicate):
(WTR::AccessibilityUIElement::uiElementCountForSearchPredicate):
(WTR::AccessibilityUIElement::uiElementForSearchPredicate):
(WTR::AccessibilityUIElement::attributesOfColumnHeaders):
(WTR::AccessibilityUIElement::attributesOfRowHeaders):
(WTR::AccessibilityUIElement::attributesOfColumns):
(WTR::AccessibilityUIElement::attributesOfRows):
(WTR::AccessibilityUIElement::attributesOfVisibleCells):
(WTR::AccessibilityUIElement::attributesOfHeader):
(WTR::AccessibilityUIElement::rowCount):
(WTR::AccessibilityUIElement::columnCount):
(WTR::AccessibilityUIElement::indexInTable):
(WTR::AccessibilityUIElement::rowIndexRange):
(WTR::AccessibilityUIElement::columnIndexRange):
(WTR::AccessibilityUIElement::cellForColumnAndRow):
(WTR::AccessibilityUIElement::horizontalScrollbar):
(WTR::AccessibilityUIElement::verticalScrollbar):
(WTR::AccessibilityUIElement::scrollToMakeVisible):
(WTR::AccessibilityUIElement::selectedTextRange):
(WTR::AccessibilityUIElement::setSelectedTextRange):
(WTR::AccessibilityUIElement::increment):
(WTR::AccessibilityUIElement::decrement):
(WTR::AccessibilityUIElement::showMenu):
(WTR::AccessibilityUIElement::press):
(WTR::AccessibilityUIElement::setSelectedChild):
(WTR::AccessibilityUIElement::accessibilityValue):
(WTR::AccessibilityUIElement::documentEncoding):
(WTR::AccessibilityUIElement::documentURI):
(WTR::AccessibilityUIElement::url):
(WTR::AccessibilityUIElement::addNotificationListener):
(WTR::AccessibilityUIElement::removeNotificationListener):
(WTR::AccessibilityUIElement::isFocusable):
(WTR::AccessibilityUIElement::isSelectable):
(WTR::AccessibilityUIElement::isMultiSelectable):
(WTR::AccessibilityUIElement::isVisible):
(WTR::AccessibilityUIElement::isOffScreen):
(WTR::AccessibilityUIElement::isCollapsed):
(WTR::AccessibilityUIElement::isIgnored):
(WTR::AccessibilityUIElement::hasPopup):
(WTR::AccessibilityUIElement::takeFocus):
(WTR::AccessibilityUIElement::takeSelection):
(WTR::AccessibilityUIElement::addSelection):
(WTR::AccessibilityUIElement::removeSelection):
(WTR::AccessibilityUIElement::textMarkerRangeForElement):
(WTR::AccessibilityUIElement::textMarkerRangeLength):
(WTR::AccessibilityUIElement::previousTextMarker):
(WTR::AccessibilityUIElement::nextTextMarker):
(WTR::AccessibilityUIElement::stringForTextMarkerRange):
(WTR::AccessibilityUIElement::textMarkerRangeForMarkers):
(WTR::AccessibilityUIElement::startTextMarkerForTextMarkerRange):
(WTR::AccessibilityUIElement::endTextMarkerForTextMarkerRange):
(WTR::AccessibilityUIElement::endTextMarkerForBounds):
(WTR::AccessibilityUIElement::startTextMarkerForBounds):
(WTR::AccessibilityUIElement::textMarkerForPoint):
(WTR::AccessibilityUIElement::accessibilityElementForTextMarker):
(WTR::AccessibilityUIElement::attributedStringForTextMarkerRangeContainsAttribute):
(WTR::AccessibilityUIElement::indexForTextMarker):
(WTR::AccessibilityUIElement::isTextMarkerValid):
(WTR::AccessibilityUIElement::textMarkerForIndex):
(WTR::AccessibilityUIElement::startTextMarker):
(WTR::AccessibilityUIElement::endTextMarker):
(WTR::AccessibilityUIElement::mathPostscriptsDescription):
(WTR::AccessibilityUIElement::mathPrescriptsDescription):
(WTR::AccessibilityUIElement::pathDescription):
(WTR::AccessibilityUIElement::supportedActions):

  • WebKitTestRunner/InjectedBundle/ios/ActivateFontsIOS.mm: Copied from Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h.

(WTR::activateFonts):

  • WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm: Added.

(WTR::EventSenderProxy::EventSenderProxy):
(WTR::EventSenderProxy::~EventSenderProxy):
(WTR::EventSenderProxy::updateClickCountForButton):
(WTR::EventSenderProxy::mouseDown):
(WTR::EventSenderProxy::mouseUp):
(WTR::EventSenderProxy::mouseMoveTo):
(WTR::EventSenderProxy::leapForward):
(WTR::EventSenderProxy::keyDown):
(WTR::EventSenderProxy::mouseScrollBy):
(WTR::EventSenderProxy::continuousMouseScrollBy):
(WTR::EventSenderProxy::addTouchPoint):
(WTR::EventSenderProxy::updateTouchPoint):
(WTR::EventSenderProxy::setTouchModifier):
(WTR::EventSenderProxy::setTouchPointRadius):
(WTR::EventSenderProxy::touchStart):
(WTR::EventSenderProxy::touchMove):
(WTR::EventSenderProxy::touchEnd):
(WTR::EventSenderProxy::touchCancel):
(WTR::EventSenderProxy::clearTouchPoints):
(WTR::EventSenderProxy::releaseTouchPoint):
(WTR::EventSenderProxy::cancelTouchPoint):

  • WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm: Copied from Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h.

(WTR::InjectedBundle::platformInitialize):

  • WebKitTestRunner/InjectedBundle/ios/InjectedBundlePageIOS.mm: Copied from Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h.

(WTR::InjectedBundlePage::platformDidStartProvisionalLoadForFrame):

  • WebKitTestRunner/Makefile:
  • WebKitTestRunner/TestController.cpp:

(WTR::TestController::initialize):

  • WebKitTestRunner/TestController.h:
  • WebKitTestRunner/TestInvocation.cpp:

(WTR::TestInvocation::invoke):
(WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):

  • WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
  • WebKitTestRunner/WebKitTestRunnerApp/AppDelegate.h: Added.
  • WebKitTestRunner/WebKitTestRunnerApp/AppDelegate.m: Added.

(-[AppDelegate application:didFinishLaunchingWithOptions:]):
(-[AppDelegate applicationWillResignActive:]):
(-[AppDelegate applicationDidEnterBackground:]):
(-[AppDelegate applicationWillEnterForeground:]):
(-[AppDelegate applicationDidBecomeActive:]):
(-[AppDelegate applicationWillTerminate:]):

  • WebKitTestRunner/WebKitTestRunnerApp/Images.xcassets/AppIcon.appiconset/Contents.json: Added.
  • WebKitTestRunner/WebKitTestRunnerApp/Images.xcassets/LaunchImage.launchimage/Contents.json: Added.
  • WebKitTestRunner/WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist: Added.
  • WebKitTestRunner/WebKitTestRunnerApp/WebKitTestRunnerApp-Prefix.pch: Added.
  • WebKitTestRunner/WebKitTestRunnerApp/en.lproj/InfoPlist.strings: Added.
  • WebKitTestRunner/WebKitTestRunnerApp/main.m: Added.

(main):

  • WebKitTestRunner/WebKitTestRunnerAppTests-Info.plist: Added.
  • WebKitTestRunner/WebKitTestRunnerAppTests/WebKitTestRunnerAppTests-Info.plist: Added.
  • WebKitTestRunner/WebKitTestRunnerAppTests/WebKitTestRunnerAppTests.m: Added.

(-[WebKitTestRunnerAppTests setUp]):
(-[WebKitTestRunnerAppTests tearDown]):
(-[WebKitTestRunnerAppTests testExample]):

  • WebKitTestRunner/WebKitTestRunnerAppTests/en.lproj/InfoPlist.strings: Added.
  • WebKitTestRunner/WebKitTestRunnerPrefix.h:
  • WebKitTestRunner/cg/TestInvocationCG.cpp:
  • WebKitTestRunner/iOS.xcconfig: Added.
  • WebKitTestRunner/ios/PlatformWebViewIOS.mm: Added.

(-[TestRunnerWKView initWithFrame:contextRef:pageGroupRef:relatedToPage:useTiledDrawing:]):
(-[TestRunnerWKView _shouldUseTiledDrawingArea]):
(-[WebKitTestRunnerWindow isKeyWindow]):
(-[WebKitTestRunnerWindow setFrameOrigin:]):
(-[WebKitTestRunnerWindow setFrame:]):
(-[WebKitTestRunnerWindow frameRespectingFakeOrigin]):
(-[WebKitTestRunnerWindow backingScaleFactor]):
(WTR::PlatformWebView::PlatformWebView):
(WTR::PlatformWebView::resizeTo):
(WTR::PlatformWebView::~PlatformWebView):
(WTR::PlatformWebView::page):
(WTR::PlatformWebView::focus):
(WTR::PlatformWebView::windowFrame):
(WTR::PlatformWebView::setWindowFrame):
(WTR::PlatformWebView::didInitializeClients):
(WTR::PlatformWebView::addChromeInputField):
(WTR::PlatformWebView::removeChromeInputField):
(WTR::PlatformWebView::makeWebViewFirstResponder):
(WTR::PlatformWebView::windowSnapshotImage):
(WTR::PlatformWebView::viewSupportsOptions):

  • WebKitTestRunner/ios/TestControllerIOS.mm: Added.

(WTR::TestController::notifyDone):
(WTR::TestController::platformInitialize):
(WTR::TestController::platformDestroy):
(WTR::TestController::initializeInjectedBundlePath):
(WTR::TestController::initializeTestPluginDirectory):
(WTR::TestController::platformRunUntil):
(WTR::TestController::platformInitializeContext):
(WTR::TestController::runModal):
(WTR::TestController::platformLibraryPathForTesting):

  • WebKitTestRunner/ios/WebArchiveDumpSupportIOS.mm: Copied from Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h.

(createCFURLResponseFromResponseData):
(supportedNonImageMIMETypes):

  • WebKitTestRunner/ios/mainIOS.mm: Copied from Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h.

(-[WebKitTestRunnerApp _runTestController]):
(-[WebKitTestRunnerApp applicationDidFinishLaunching:]):
(main):

Location:
trunk/Tools
Files:
21 added
13 edited
6 copied

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/Tools/ChangeLog

    r162714 r162729  
     12014-01-23  David Farler  <dfarler@apple.com>
     2
     3        Make WebKitTestRunner work with iOS
     4        https://bugs.webkit.org/show_bug.cgi?id=127448
     5
     6        Reviewed by Simon Fraser.
     7
     8        Combined patch from Simon below with some additional xcconfig cleanups,
     9        rebasing and stubbing out a couple of new functions that popped up
     10        since then.
     11
     12        2013-12-03  Simon Fraser  <simon.fraser@apple.com>
     13
     14                <rdar://problem/15515469> Get WebKitTestRunner working on iOS
     15
     16                Get WebKitTestRunner limping on iOS. Main parts:
     17                - Stub out lots of accessibility-related functions.
     18                - Stub out EventSender
     19                - Create target to make a bundled app that runs in the simulator,
     20                  and copy the injected bundle library into it.
     21                - Make a UIWindow and WKView to load tests in
     22
     23                It runs, load tests, and dumps results to output. More work will be
     24                required once we can execute it via the webkitpy scripts.
     25
     26        * WebKitTestRunner/Configurations/Base.xcconfig:
     27        * WebKitTestRunner/Configurations/InjectedBundle.xcconfig:
     28        * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
     29        * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
     30        * WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm: Added.
     31        (WTR::AccessibilityController::addNotificationListener):
     32        (WTR::AccessibilityController::removeNotificationListener):
     33        (WTR::AccessibilityController::platformName):
     34        (WTR::AccessibilityController::logAccessibilityEvents):
     35        (WTR::AccessibilityController::resetToConsistentState):
     36        (WTR::findAccessibleObjectById):
     37        (WTR::AccessibilityController::accessibleElementById):
     38        * WebKitTestRunner/InjectedBundle/ios/AccessibilityNotificationHandler.h: Added.
     39        * WebKitTestRunner/InjectedBundle/ios/AccessibilityTextMarkerIOS.mm: Copied from Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h.
     40        (WTR::AccessibilityTextMarker::isEqual):
     41        * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm: Added.
     42        (WTR::AccessibilityUIElement::AccessibilityUIElement):
     43        (WTR::AccessibilityUIElement::~AccessibilityUIElement):
     44        (WTR::AccessibilityUIElement::isEqual):
     45        (WTR::AccessibilityUIElement::getLinkedUIElements):
     46        (WTR::AccessibilityUIElement::getDocumentLinks):
     47        (WTR::AccessibilityUIElement::getChildren):
     48        (WTR::AccessibilityUIElement::getChildrenWithRange):
     49        (WTR::AccessibilityUIElement::childrenCount):
     50        (WTR::AccessibilityUIElement::elementAtPoint):
     51        (WTR::AccessibilityUIElement::indexOfChild):
     52        (WTR::AccessibilityUIElement::childAtIndex):
     53        (WTR::AccessibilityUIElement::linkedUIElementAtIndex):
     54        (WTR::AccessibilityUIElement::ariaOwnsElementAtIndex):
     55        (WTR::AccessibilityUIElement::ariaFlowToElementAtIndex):
     56        (WTR::AccessibilityUIElement::disclosedRowAtIndex):
     57        (WTR::AccessibilityUIElement::rowAtIndex):
     58        (WTR::AccessibilityUIElement::selectedChildAtIndex):
     59        (WTR::AccessibilityUIElement::selectedChildrenCount):
     60        (WTR::AccessibilityUIElement::selectedRowAtIndex):
     61        (WTR::AccessibilityUIElement::titleUIElement):
     62        (WTR::AccessibilityUIElement::parentElement):
     63        (WTR::AccessibilityUIElement::disclosedByRow):
     64        (WTR::AccessibilityUIElement::attributesOfLinkedUIElements):
     65        (WTR::AccessibilityUIElement::attributesOfDocumentLinks):
     66        (WTR::AccessibilityUIElement::attributesOfChildren):
     67        (WTR::AccessibilityUIElement::allAttributes):
     68        (WTR::AccessibilityUIElement::stringAttributeValue):
     69        (WTR::AccessibilityUIElement::numberAttributeValue):
     70        (WTR::AccessibilityUIElement::uiElementArrayAttributeValue):
     71        (WTR::AccessibilityUIElement::uiElementAttributeValue):
     72        (WTR::AccessibilityUIElement::boolAttributeValue):
     73        (WTR::AccessibilityUIElement::isAttributeSettable):
     74        (WTR::AccessibilityUIElement::isAttributeSupported):
     75        (WTR::AccessibilityUIElement::parameterizedAttributeNames):
     76        (WTR::AccessibilityUIElement::role):
     77        (WTR::AccessibilityUIElement::subrole):
     78        (WTR::AccessibilityUIElement::roleDescription):
     79        (WTR::AccessibilityUIElement::title):
     80        (WTR::AccessibilityUIElement::description):
     81        (WTR::AccessibilityUIElement::orientation):
     82        (WTR::AccessibilityUIElement::stringValue):
     83        (WTR::AccessibilityUIElement::language):
     84        (WTR::AccessibilityUIElement::helpText):
     85        (WTR::AccessibilityUIElement::x):
     86        (WTR::AccessibilityUIElement::y):
     87        (WTR::AccessibilityUIElement::width):
     88        (WTR::AccessibilityUIElement::height):
     89        (WTR::AccessibilityUIElement::clickPointX):
     90        (WTR::AccessibilityUIElement::clickPointY):
     91        (WTR::AccessibilityUIElement::intValue):
     92        (WTR::AccessibilityUIElement::minValue):
     93        (WTR::AccessibilityUIElement::maxValue):
     94        (WTR::AccessibilityUIElement::valueDescription):
     95        (WTR::AccessibilityUIElement::insertionPointLineNumber):
     96        (WTR::AccessibilityUIElement::isPressActionSupported):
     97        (WTR::AccessibilityUIElement::isIncrementActionSupported):
     98        (WTR::AccessibilityUIElement::isDecrementActionSupported):
     99        (WTR::AccessibilityUIElement::isEnabled):
     100        (WTR::AccessibilityUIElement::isRequired):
     101        (WTR::AccessibilityUIElement::isFocused):
     102        (WTR::AccessibilityUIElement::isSelected):
     103        (WTR::AccessibilityUIElement::isSelectedOptionActive):
     104        (WTR::AccessibilityUIElement::isIndeterminate):
     105        (WTR::AccessibilityUIElement::isExpanded):
     106        (WTR::AccessibilityUIElement::isChecked):
     107        (WTR::AccessibilityUIElement::hierarchicalLevel):
     108        (WTR::AccessibilityUIElement::classList):
     109        (WTR::AccessibilityUIElement::speak):
     110        (WTR::AccessibilityUIElement::ariaIsGrabbed):
     111        (WTR::AccessibilityUIElement::ariaDropEffects):
     112        (WTR::AccessibilityUIElement::lineForIndex):
     113        (WTR::AccessibilityUIElement::rangeForLine):
     114        (WTR::AccessibilityUIElement::rangeForPosition):
     115        (WTR::AccessibilityUIElement::boundsForRange):
     116        (WTR::AccessibilityUIElement::stringForRange):
     117        (WTR::AccessibilityUIElement::attributedStringForRange):
     118        (WTR::AccessibilityUIElement::attributedStringRangeIsMisspelled):
     119        (WTR::uiElementCountForSearchPredicate):
     120        (WTR::AccessibilityUIElement::uiElementCountForSearchPredicate):
     121        (WTR::AccessibilityUIElement::uiElementForSearchPredicate):
     122        (WTR::AccessibilityUIElement::attributesOfColumnHeaders):
     123        (WTR::AccessibilityUIElement::attributesOfRowHeaders):
     124        (WTR::AccessibilityUIElement::attributesOfColumns):
     125        (WTR::AccessibilityUIElement::attributesOfRows):
     126        (WTR::AccessibilityUIElement::attributesOfVisibleCells):
     127        (WTR::AccessibilityUIElement::attributesOfHeader):
     128        (WTR::AccessibilityUIElement::rowCount):
     129        (WTR::AccessibilityUIElement::columnCount):
     130        (WTR::AccessibilityUIElement::indexInTable):
     131        (WTR::AccessibilityUIElement::rowIndexRange):
     132        (WTR::AccessibilityUIElement::columnIndexRange):
     133        (WTR::AccessibilityUIElement::cellForColumnAndRow):
     134        (WTR::AccessibilityUIElement::horizontalScrollbar):
     135        (WTR::AccessibilityUIElement::verticalScrollbar):
     136        (WTR::AccessibilityUIElement::scrollToMakeVisible):
     137        (WTR::AccessibilityUIElement::selectedTextRange):
     138        (WTR::AccessibilityUIElement::setSelectedTextRange):
     139        (WTR::AccessibilityUIElement::increment):
     140        (WTR::AccessibilityUIElement::decrement):
     141        (WTR::AccessibilityUIElement::showMenu):
     142        (WTR::AccessibilityUIElement::press):
     143        (WTR::AccessibilityUIElement::setSelectedChild):
     144        (WTR::AccessibilityUIElement::accessibilityValue):
     145        (WTR::AccessibilityUIElement::documentEncoding):
     146        (WTR::AccessibilityUIElement::documentURI):
     147        (WTR::AccessibilityUIElement::url):
     148        (WTR::AccessibilityUIElement::addNotificationListener):
     149        (WTR::AccessibilityUIElement::removeNotificationListener):
     150        (WTR::AccessibilityUIElement::isFocusable):
     151        (WTR::AccessibilityUIElement::isSelectable):
     152        (WTR::AccessibilityUIElement::isMultiSelectable):
     153        (WTR::AccessibilityUIElement::isVisible):
     154        (WTR::AccessibilityUIElement::isOffScreen):
     155        (WTR::AccessibilityUIElement::isCollapsed):
     156        (WTR::AccessibilityUIElement::isIgnored):
     157        (WTR::AccessibilityUIElement::hasPopup):
     158        (WTR::AccessibilityUIElement::takeFocus):
     159        (WTR::AccessibilityUIElement::takeSelection):
     160        (WTR::AccessibilityUIElement::addSelection):
     161        (WTR::AccessibilityUIElement::removeSelection):
     162        (WTR::AccessibilityUIElement::textMarkerRangeForElement):
     163        (WTR::AccessibilityUIElement::textMarkerRangeLength):
     164        (WTR::AccessibilityUIElement::previousTextMarker):
     165        (WTR::AccessibilityUIElement::nextTextMarker):
     166        (WTR::AccessibilityUIElement::stringForTextMarkerRange):
     167        (WTR::AccessibilityUIElement::textMarkerRangeForMarkers):
     168        (WTR::AccessibilityUIElement::startTextMarkerForTextMarkerRange):
     169        (WTR::AccessibilityUIElement::endTextMarkerForTextMarkerRange):
     170        (WTR::AccessibilityUIElement::endTextMarkerForBounds):
     171        (WTR::AccessibilityUIElement::startTextMarkerForBounds):
     172        (WTR::AccessibilityUIElement::textMarkerForPoint):
     173        (WTR::AccessibilityUIElement::accessibilityElementForTextMarker):
     174        (WTR::AccessibilityUIElement::attributedStringForTextMarkerRangeContainsAttribute):
     175        (WTR::AccessibilityUIElement::indexForTextMarker):
     176        (WTR::AccessibilityUIElement::isTextMarkerValid):
     177        (WTR::AccessibilityUIElement::textMarkerForIndex):
     178        (WTR::AccessibilityUIElement::startTextMarker):
     179        (WTR::AccessibilityUIElement::endTextMarker):
     180        (WTR::AccessibilityUIElement::mathPostscriptsDescription):
     181        (WTR::AccessibilityUIElement::mathPrescriptsDescription):
     182        (WTR::AccessibilityUIElement::pathDescription):
     183        (WTR::AccessibilityUIElement::supportedActions):
     184        * WebKitTestRunner/InjectedBundle/ios/ActivateFontsIOS.mm: Copied from Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h.
     185        (WTR::activateFonts):
     186        * WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm: Added.
     187        (WTR::EventSenderProxy::EventSenderProxy):
     188        (WTR::EventSenderProxy::~EventSenderProxy):
     189        (WTR::EventSenderProxy::updateClickCountForButton):
     190        (WTR::EventSenderProxy::mouseDown):
     191        (WTR::EventSenderProxy::mouseUp):
     192        (WTR::EventSenderProxy::mouseMoveTo):
     193        (WTR::EventSenderProxy::leapForward):
     194        (WTR::EventSenderProxy::keyDown):
     195        (WTR::EventSenderProxy::mouseScrollBy):
     196        (WTR::EventSenderProxy::continuousMouseScrollBy):
     197        (WTR::EventSenderProxy::addTouchPoint):
     198        (WTR::EventSenderProxy::updateTouchPoint):
     199        (WTR::EventSenderProxy::setTouchModifier):
     200        (WTR::EventSenderProxy::setTouchPointRadius):
     201        (WTR::EventSenderProxy::touchStart):
     202        (WTR::EventSenderProxy::touchMove):
     203        (WTR::EventSenderProxy::touchEnd):
     204        (WTR::EventSenderProxy::touchCancel):
     205        (WTR::EventSenderProxy::clearTouchPoints):
     206        (WTR::EventSenderProxy::releaseTouchPoint):
     207        (WTR::EventSenderProxy::cancelTouchPoint):
     208        * WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm: Copied from Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h.
     209        (WTR::InjectedBundle::platformInitialize):
     210        * WebKitTestRunner/InjectedBundle/ios/InjectedBundlePageIOS.mm: Copied from Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h.
     211        (WTR::InjectedBundlePage::platformDidStartProvisionalLoadForFrame):
     212        * WebKitTestRunner/Makefile:
     213        * WebKitTestRunner/TestController.cpp:
     214        (WTR::TestController::initialize):
     215        * WebKitTestRunner/TestController.h:
     216        * WebKitTestRunner/TestInvocation.cpp:
     217        (WTR::TestInvocation::invoke):
     218        (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
     219        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
     220        * WebKitTestRunner/WebKitTestRunnerApp/AppDelegate.h: Added.
     221        * WebKitTestRunner/WebKitTestRunnerApp/AppDelegate.m: Added.
     222        (-[AppDelegate application:didFinishLaunchingWithOptions:]):
     223        (-[AppDelegate applicationWillResignActive:]):
     224        (-[AppDelegate applicationDidEnterBackground:]):
     225        (-[AppDelegate applicationWillEnterForeground:]):
     226        (-[AppDelegate applicationDidBecomeActive:]):
     227        (-[AppDelegate applicationWillTerminate:]):
     228        * WebKitTestRunner/WebKitTestRunnerApp/Images.xcassets/AppIcon.appiconset/Contents.json: Added.
     229        * WebKitTestRunner/WebKitTestRunnerApp/Images.xcassets/LaunchImage.launchimage/Contents.json: Added.
     230        * WebKitTestRunner/WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist: Added.
     231        * WebKitTestRunner/WebKitTestRunnerApp/WebKitTestRunnerApp-Prefix.pch: Added.
     232        * WebKitTestRunner/WebKitTestRunnerApp/en.lproj/InfoPlist.strings: Added.
     233        * WebKitTestRunner/WebKitTestRunnerApp/main.m: Added.
     234        (main):
     235        * WebKitTestRunner/WebKitTestRunnerAppTests-Info.plist: Added.
     236        * WebKitTestRunner/WebKitTestRunnerAppTests/WebKitTestRunnerAppTests-Info.plist: Added.
     237        * WebKitTestRunner/WebKitTestRunnerAppTests/WebKitTestRunnerAppTests.m: Added.
     238        (-[WebKitTestRunnerAppTests setUp]):
     239        (-[WebKitTestRunnerAppTests tearDown]):
     240        (-[WebKitTestRunnerAppTests testExample]):
     241        * WebKitTestRunner/WebKitTestRunnerAppTests/en.lproj/InfoPlist.strings: Added.
     242        * WebKitTestRunner/WebKitTestRunnerPrefix.h:
     243        * WebKitTestRunner/cg/TestInvocationCG.cpp:
     244        * WebKitTestRunner/iOS.xcconfig: Added.
     245        * WebKitTestRunner/ios/PlatformWebViewIOS.mm: Added.
     246        (-[TestRunnerWKView initWithFrame:contextRef:pageGroupRef:relatedToPage:useTiledDrawing:]):
     247        (-[TestRunnerWKView _shouldUseTiledDrawingArea]):
     248        (-[WebKitTestRunnerWindow isKeyWindow]):
     249        (-[WebKitTestRunnerWindow setFrameOrigin:]):
     250        (-[WebKitTestRunnerWindow setFrame:]):
     251        (-[WebKitTestRunnerWindow frameRespectingFakeOrigin]):
     252        (-[WebKitTestRunnerWindow backingScaleFactor]):
     253        (WTR::PlatformWebView::PlatformWebView):
     254        (WTR::PlatformWebView::resizeTo):
     255        (WTR::PlatformWebView::~PlatformWebView):
     256        (WTR::PlatformWebView::page):
     257        (WTR::PlatformWebView::focus):
     258        (WTR::PlatformWebView::windowFrame):
     259        (WTR::PlatformWebView::setWindowFrame):
     260        (WTR::PlatformWebView::didInitializeClients):
     261        (WTR::PlatformWebView::addChromeInputField):
     262        (WTR::PlatformWebView::removeChromeInputField):
     263        (WTR::PlatformWebView::makeWebViewFirstResponder):
     264        (WTR::PlatformWebView::windowSnapshotImage):
     265        (WTR::PlatformWebView::viewSupportsOptions):
     266        * WebKitTestRunner/ios/TestControllerIOS.mm: Added.
     267        (WTR::TestController::notifyDone):
     268        (WTR::TestController::platformInitialize):
     269        (WTR::TestController::platformDestroy):
     270        (WTR::TestController::initializeInjectedBundlePath):
     271        (WTR::TestController::initializeTestPluginDirectory):
     272        (WTR::TestController::platformRunUntil):
     273        (WTR::TestController::platformInitializeContext):
     274        (WTR::TestController::runModal):
     275        (WTR::TestController::platformLibraryPathForTesting):
     276        * WebKitTestRunner/ios/WebArchiveDumpSupportIOS.mm: Copied from Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h.
     277        (createCFURLResponseFromResponseData):
     278        (supportedNonImageMIMETypes):
     279        * WebKitTestRunner/ios/mainIOS.mm: Copied from Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h.
     280        (-[WebKitTestRunnerApp _runTestController]):
     281        (-[WebKitTestRunnerApp applicationDidFinishLaunching:]):
     282        (main):
     283
    12842014-01-24  Enrique Ocaña González  <eocanha@igalia.com>
    2285

  • TabularUnified trunk/Tools/Makefile

    r162476 r162729  
    44        # FIXME: Build projects ../Source/ThirdParty/gtest/xcode, TestWebKitAPI for both device and simulator
    55        # and build project DumpRenderTree for simulator.
    6         MODULES =
     6        MODULES = WebKitTestRunner
    77endif
    88

  • TabularUnified trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig

    r159669 r162729  
    2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
     24#include "iOS.xcconfig"
     25
    2426CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
    2527CLANG_CXX_LIBRARY = libc++;
    … …  
    3840GCC_WARN_UNUSED_FUNCTION = YES
    3941GCC_WARN_UNUSED_VARIABLE = YES
     42GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO;
     43GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
    4044WARNING_CFLAGS = -Wall -W -Wno-unused-parameter -Wundef
    4145LINKER_DISPLAYS_MANGLED_NAMES = YES;

  • TabularUnified trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig

    r156611 r162729  
    2929INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
    3030SKIP_INSTALL = NO;
    31 OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY);
     31
     32OTHER_LDFLAGS_BASE = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -framework QuartzCore;
     33OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
     34OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework UIKit;
     35OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
     36OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -framework Carbon -framework Cocoa;
     37
     38EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
     39EXCLUDED_SOURCE_FILE_NAMES_iphoneos = AccessibilityControllerMac.mm AccessibilityTextMarkerMac.mm AccessibilityUIElementMac.mm ActivateFonts.mm InjectedBundleMac.mm InjectedBundlePageMac.mm WebArchiveDumpSupportMac.mm;
     40EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
     41EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.*;

  • TabularUnified trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig

    r156611 r162729  
    2727GCC_ENABLE_OBJC_EXCEPTIONS = YES
    2828
     29OTHER_LDFLAGS_BASE = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -framework WebKit2;
     30OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
     31OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) -framework JavaScriptCore -framework CoreGraphics -framework ImageIO -framework UIKit;
     32OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
     33OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -framework Carbon -framework Cocoa;
     34
    2935INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
    3036SKIP_INSTALL = NO;
     37
     38EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
     39EXCLUDED_SOURCE_FILE_NAMES_iphoneos = EventSenderProxy.mm main.mm PlatformWebViewMac.mm TestControllerMac.mm mac/*;
     40EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
     41EXCLUDED_SOURCE_FILE_NAMES_macosx = AccessibilityUIElementIPhone.mm;

  • TabularUnified trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp

    r160811 r162729  
    5252};
    5353
    54 
     54#if ENABLE(CONTEXT_MENUS)
    5555static JSValueRef menuItemClickCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    5656{
    … …  
    105105    return menuItemClass;
    106106}
     107#endif
    107108
    108109static WKEventModifiers parseModifier(JSStringRef modifier)

  • TabularUnified trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityTextMarkerIOS.mm

    r162728 r162729  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #ifdef __OBJC__
    27 #include <Cocoa/Cocoa.h>
    28 #endif
     26#import "AccessibilityTextMarker.h"
    2927
    30 #if defined(BUILDING_GTK__)
    31 #include "autotoolsconfig.h"
    32 #endif /* defined (BUILDING_GTK__) */
     28namespace WTR {
    3329
    34 #include <wtf/Platform.h>
    35 #include <WebKit2/WebKit2_C.h>
     30bool AccessibilityTextMarker::isEqual(AccessibilityTextMarker* other)
     31{
     32    return [(id)platformTextMarker() isEqual:(id)other->platformTextMarker()];
     33}
    3634
     35} // namespace WTR
    3736
    38 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
    39 * to allow C++ code that expects exceptions to build. These definitions
    40 * interfere with Objective-C++ uses of Objective-C exception handlers, which
    41 * use |@try| and |@catch|. As a workaround, undefine these macros. */
    42 
    43 #ifdef __cplusplus
    44 #include <algorithm> // needed for exception_defines.h
    45 #endif
    46 
    47 #ifdef __OBJC__
    48 #undef try
    49 #undef catch
    50 #endif
    51 

  • TabularUnified trunk/Tools/WebKitTestRunner/InjectedBundle/ios/ActivateFontsIOS.mm

    r162728 r162729  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #ifdef __OBJC__
    27 #include <Cocoa/Cocoa.h>
    28 #endif
     26#include "config.h"
     27#include "ActivateFonts.h"
    2928
    30 #if defined(BUILDING_GTK__)
    31 #include "autotoolsconfig.h"
    32 #endif /* defined (BUILDING_GTK__) */
     29namespace WTR {
    3330
    34 #include <wtf/Platform.h>
    35 #include <WebKit2/WebKit2_C.h>
     31void activateFonts()
     32{
     33    // Write me.
     34}
    3635
     36}
    3737
    38 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
    39 * to allow C++ code that expects exceptions to build. These definitions
    40 * interfere with Objective-C++ uses of Objective-C exception handlers, which
    41 * use |@try| and |@catch|. As a workaround, undefine these macros. */
    42 
    43 #ifdef __cplusplus
    44 #include <algorithm> // needed for exception_defines.h
    45 #endif
    46 
    47 #ifdef __OBJC__
    48 #undef try
    49 #undef catch
    50 #endif
    51 

  • TabularUnified trunk/Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm

    r162728 r162729  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #ifdef __OBJC__
    27 #include <Cocoa/Cocoa.h>
    28 #endif
     26#import "InjectedBundle.h"
    2927
    30 #if defined(BUILDING_GTK__)
    31 #include "autotoolsconfig.h"
    32 #endif /* defined (BUILDING_GTK__) */
     28#import <Foundation/Foundation.h>
    3329
    34 #include <wtf/Platform.h>
    35 #include <WebKit2/WebKit2_C.h>
     30@interface NSURLRequest (PrivateThingsWeShouldntReallyUse)
     31+(void)setAllowsAnyHTTPSCertificate:(BOOL)allow forHost:(NSString *)host;
     32@end
    3633
     34namespace WTR {
    3735
    38 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
    39 * to allow C++ code that expects exceptions to build. These definitions
    40 * interfere with Objective-C++ uses of Objective-C exception handlers, which
    41 * use |@try| and |@catch|. As a workaround, undefine these macros. */
     36void InjectedBundle::platformInitialize(WKTypeRef)
     37{
     38    NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
     39        nil];
    4240
    43 #ifdef __cplusplus
    44 #include <algorithm> // needed for exception_defines.h
    45 #endif
     41    [[NSUserDefaults standardUserDefaults] setVolatileDomain:dict forName:NSArgumentDomain];
    4642
    47 #ifdef __OBJC__
    48 #undef try
    49 #undef catch
    50 #endif
     43    [NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:@"localhost"];
     44    [NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:@"127.0.0.1"];
     45}
    5146
     47} // namespace WTR

  • TabularUnified trunk/Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundlePageIOS.mm

    r162728 r162729  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #ifdef __OBJC__
    27 #include <Cocoa/Cocoa.h>
    28 #endif
     26#import "config.h"
     27#import "InjectedBundlePage.h"
    2928
    30 #if defined(BUILDING_GTK__)
    31 #include "autotoolsconfig.h"
    32 #endif /* defined (BUILDING_GTK__) */
     29#import "StringFunctions.h"
     30#import <WebKit2/WKBundleFrame.h>
     31#import <WebKit2/WKURLCF.h>
     32#import <WebKitSystemInterface.h>
     33#import <wtf/RetainPtr.h>
     34#import <wtf/text/StringBuilder.h>
     35#import <wtf/text/WTFString.h>
    3336
    34 #include <wtf/Platform.h>
    35 #include <WebKit2/WebKit2_C.h>
     37namespace WTR {
    3638
     39using namespace WTF;
    3740
    38 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
    39 * to allow C++ code that expects exceptions to build. These definitions
    40 * interfere with Objective-C++ uses of Objective-C exception handlers, which
    41 * use |@try| and |@catch|. As a workaround, undefine these macros. */
     41void InjectedBundlePage::platformDidStartProvisionalLoadForFrame(WKBundleFrameRef)
     42{
     43}
    4244
    43 #ifdef __cplusplus
    44 #include <algorithm> // needed for exception_defines.h
    45 #endif
    46 
    47 #ifdef __OBJC__
    48 #undef try
    49 #undef catch
    50 #endif
    51 
     45} // namespace WTR

  • TabularUnified trunk/Tools/WebKitTestRunner/Makefile

    r61780 r162729  
    55
    66ifeq "$(BUILD_WEBKITTESTRUNNER)" "YES"
     7
     8ifneq (,$(findstring iphone,$(SDKROOT)))
     9        OTHER_OPTIONS += -target WebKitTestRunnerApp
     10endif
    711
    812SCRIPTS_PATH = ../Scripts

  • TabularUnified trunk/Tools/WebKitTestRunner/TestController.cpp

    r162629 r162729  
    312312    m_geolocationProvider = adoptPtr(new GeolocationProviderMock(m_context.get()));
    313313
    314 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080
     314#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
    315315    WKContextSetUsesNetworkProcess(m_context.get(), true);
    316316    WKContextSetProcessModel(m_context.get(), kWKProcessModelMultipleSecondaryProcesses);

  • TabularUnified trunk/Tools/WebKitTestRunner/TestController.h

    r162629 r162729  
    2727#define TestController_h
    2828
     29#include "GeolocationProviderMock.h"
    2930#include "WebNotificationProvider.h"
    3031#include "WorkQueueManager.h"
    31 #include <GeolocationProviderMock.h>
    3232#include <WebKit2/WKRetainPtr.h>
    3333#include <string>

  • TabularUnified trunk/Tools/WebKitTestRunner/TestInvocation.cpp

    r160811 r162729  
    4343
    4444#if PLATFORM(MAC)
     45#if !PLATFORM(IOS)
    4546#include <Carbon/Carbon.h>
     47#endif
    4648#include <WebKit2/WKPagePrivateMac.h>
    4749#endif
    … …  
    130132}
    131133
    132 #if ENABLE(INSPECTOR)
     134#if ENABLE(INSPECTOR) && !PLATFORM(IOS)
    133135static bool shouldOpenWebInspector(const char* pathOrURL)
    134136{
    … …  
    227229        goto end;
    228230
    229 #if ENABLE(INSPECTOR)
     231#if ENABLE(INSPECTOR) && !PLATFORM(IOS)
    230232    if (shouldOpenWebInspector(m_pathOrURL.c_str()))
    231233        WKInspectorShow(WKPageGetInspector(TestController::shared().mainWebView()->page()));
    … …  
    252254
    253255end:
    254 #if ENABLE(INSPECTOR)
     256#if ENABLE(INSPECTOR) && !PLATFORM(IOS)
    255257    if (m_gotInitialResponse)
    256258        WKInspectorClose(WKPageGetInspector(TestController::shared().mainWebView()->page()));
    … …  
    677679
    678680    if (WKStringIsEqualToUTF8CString(messageName, "SecureEventInputIsEnabled")) {
    679 #if PLATFORM(MAC)
     681#if PLATFORM(MAC) && !PLATFORM(IOS)
    680682        WKRetainPtr<WKBooleanRef> result(AdoptWK, WKBooleanCreate(IsSecureEventInputEnabled()));
    681683#else

  • TabularUnified trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj

    r160627 r162729  
    3838                29A8FCE2145F037B009045A6 /* AccessibilityTextMarkerRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE1145F037B009045A6 /* AccessibilityTextMarkerRange.cpp */; };
    3939                29A8FCE5145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE4145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm */; };
     40                2E63ED8A1891AD7E002A7AFC /* AccessibilityControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED751891ACE9002A7AFC /* AccessibilityControllerIOS.mm */; };
     41                2E63ED8B1891AD7E002A7AFC /* AccessibilityTextMarkerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED771891ACE9002A7AFC /* AccessibilityTextMarkerIOS.mm */; };
     42                2E63ED8D1891AD7E002A7AFC /* ActivateFontsIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED791891ACE9002A7AFC /* ActivateFontsIOS.mm */; };
     43                2E63ED8E1891AD7E002A7AFC /* EventSenderProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED7A1891ACE9002A7AFC /* EventSenderProxyIOS.mm */; };
     44                2E63ED8F1891AD7E002A7AFC /* InjectedBundleIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED7B1891ACE9002A7AFC /* InjectedBundleIOS.mm */; };
     45                2E63ED901891AD7E002A7AFC /* InjectedBundlePageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED7C1891ACE9002A7AFC /* InjectedBundlePageIOS.mm */; };
     46                2E63ED911891ADAD002A7AFC /* PlatformWebViewIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D131890A9FB0010ED21 /* PlatformWebViewIOS.mm */; };
     47                2E63ED921891ADAD002A7AFC /* TestControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D141890A9FB0010ED21 /* TestControllerIOS.mm */; };
     48                2E63ED941891ADAD002A7AFC /* mainIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D161890A9FB0010ED21 /* mainIOS.mm */; };
     49                2E63ED951891ADC7002A7AFC /* CyclicRedundancyCheck.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5322FB4113FDA0CD0041ABCC /* CyclicRedundancyCheck.cpp */; };
     50                2E63ED961891ADC7002A7AFC /* GeolocationProviderMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D758E5160BECDC00268472 /* GeolocationProviderMock.cpp */; };
     51                2E63ED971891ADC7002A7AFC /* PixelDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5322FB4413FDA0EA0041ABCC /* PixelDumpSupport.cpp */; };
     52                2E63ED981891ADC7002A7AFC /* TestController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC793430118F7F19005EA8E2 /* TestController.cpp */; };
     53                2E63ED991891ADC7002A7AFC /* TestInvocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD7D2F711921278006DB7EE /* TestInvocation.cpp */; };
     54                2E63ED9A1891ADC7002A7AFC /* WebNotificationProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3164C8EF15D1ADA100EF1FE0 /* WebNotificationProvider.cpp */; };
     55                2E63ED9B1891ADC7002A7AFC /* WorkQueueManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4429FC5E1627089600F66D8B /* WorkQueueManager.cpp */; };
     56                2E63ED9C1891ADC7002A7AFC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52CF21890A9A80010ED21 /* AppDelegate.m */; };
     57                2E63ED9E1891AEC1002A7AFC /* WebArchiveDumpSupportIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D151890A9FB0010ED21 /* WebArchiveDumpSupportIOS.mm */; };
     58                2E63EDA11891B291002A7AFC /* AccessibilityUIElementIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED781891ACE9002A7AFC /* AccessibilityUIElementIOS.mm */; };
     59                2E63EDA51891BD8E002A7AFC /* TestInvocationCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC9192041333E4F8003011DC /* TestInvocationCG.cpp */; };
     60                2E63EDA61891BDC0002A7AFC /* TestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC9981711D3F51E0017BCA2 /* TestRunner.cpp */; };
     61                2E749BEF1891E939007FC175 /* Options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 841CC00D181185BF0042E9B6 /* Options.cpp */; };
     62                2E749BF21891EBFA007FC175 /* EventSenderProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED7A1891ACE9002A7AFC /* EventSenderProxyIOS.mm */; };
     63                2EE52CE31890A9A80010ED21 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CE21890A9A80010ED21 /* Foundation.framework */; };
     64                2EE52CE51890A9A80010ED21 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CE41890A9A80010ED21 /* CoreGraphics.framework */; };
     65                2EE52CE71890A9A80010ED21 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CE61890A9A80010ED21 /* UIKit.framework */; };
     66                2EE52CED1890A9A80010ED21 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2EE52CEB1890A9A80010ED21 /* InfoPlist.strings */; };
     67                2EE52CFC1890A9A90010ED21 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CFB1890A9A90010ED21 /* XCTest.framework */; };
     68                2EE52CFD1890A9A90010ED21 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CE21890A9A80010ED21 /* Foundation.framework */; };
     69                2EE52CFE1890A9A90010ED21 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CE61890A9A80010ED21 /* UIKit.framework */; };
     70                2EE52D061890A9A90010ED21 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2EE52D041890A9A90010ED21 /* InfoPlist.strings */; };
     71                2EE52D081890A9A90010ED21 /* WebKitTestRunnerAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D071890A9A90010ED21 /* WebKitTestRunnerAppTests.m */; };
     72                2EE52D111890A9BB0010ED21 /* WebKitTestRunnerInjectedBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BC25186211D15D54002EBC01 /* WebKitTestRunnerInjectedBundle.bundle */; };
    4073                3164C8F015D1ADA100EF1FE0 /* WebNotificationProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3164C8EF15D1ADA100EF1FE0 /* WebNotificationProvider.cpp */; };
    4174                4429FC5F1627089600F66D8B /* WorkQueueManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4429FC5E1627089600F66D8B /* WorkQueueManager.cpp */; };
    … …  
    6598                BC14E4DB120E02D000826C0C /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14E4D9120E02D000826C0C /* GCController.cpp */; };
    6699                BC14E4EA120E03D800826C0C /* JSGCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14E4E8120E03D800826C0C /* JSGCController.cpp */; };
    67                 BC25193E11D15D8B002EBC01 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC7934A411906584005EA8E2 /* Cocoa.framework */; };
    68100                BC25193F11D15D8B002EBC01 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC7934AB1190658C005EA8E2 /* WebKit2.framework */; };
    69101                BC25194011D15D8B002EBC01 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCDA2B991191051F00C3BC47 /* JavaScriptCore.framework */; };
    … …  
    71103                BC793400118F7C84005EA8E2 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7933FF118F7C84005EA8E2 /* main.mm */; };
    72104                BC793431118F7F19005EA8E2 /* TestController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC793430118F7F19005EA8E2 /* TestController.cpp */; };
    73                 BC7934A511906584005EA8E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC7934A411906584005EA8E2 /* Cocoa.framework */; };
    74105                BC7934AC1190658C005EA8E2 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC7934AB1190658C005EA8E2 /* WebKit2.framework */; };
    75106                BC7934E811906846005EA8E2 /* PlatformWebViewMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7934E711906846005EA8E2 /* PlatformWebViewMac.mm */; };
    … …  
    83114                BCC997A411D3C8F60017BCA2 /* InjectedBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC997A011D3C8F60017BCA2 /* InjectedBundle.cpp */; };
    84115                BCC997A511D3C8F60017BCA2 /* InjectedBundlePage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC997A211D3C8F60017BCA2 /* InjectedBundlePage.cpp */; };
    85                 BCC9981811D3F51E0017BCA2 /* TestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC9981711D3F51E0017BCA2 /* TestRunner.cpp */; };
    86116                BCD7D2F811921278006DB7EE /* TestInvocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD7D2F711921278006DB7EE /* TestInvocation.cpp */; };
    87117                BCDA2B9A1191051F00C3BC47 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCDA2B991191051F00C3BC47 /* JavaScriptCore.framework */; };
    … …  
    89119                E132AA3A17CD5F1000611DF0 /* WebKitTestRunnerDraggingInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = E132AA3817CD5F1000611DF0 /* WebKitTestRunnerDraggingInfo.mm */; };
    90120                E132AA3D17CE776F00611DF0 /* WebKitTestRunnerEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = E132AA3B17CE776F00611DF0 /* WebKitTestRunnerEvent.mm */; };
    91                 E1BA671E1742DA6A00C20251 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1BA671D1742DA5A00C20251 /* Carbon.framework */; };
    92121                E1C642C317CBCC7300D66A3C /* PoseAsClass.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1C642C117CBCC7300D66A3C /* PoseAsClass.mm */; };
    93122                E1C642C617CBCD4C00D66A3C /* WebKitTestRunnerPasteboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1C642C417CBCD4C00D66A3C /* WebKitTestRunnerPasteboard.mm */; };
    … …  
    95124
    96125/* Begin PBXContainerItemProxy section */
     126                2E63ED881891AD47002A7AFC /* PBXContainerItemProxy */ = {
     127                        isa = PBXContainerItemProxy;
     128                        containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
     129                        proxyType = 1;
     130                        remoteGlobalIDString = BC25186111D15D54002EBC01;
     131                        remoteInfo = WebKitTestRunnerInjectedBundle;
     132                };
     133                2EE52CFF1890A9A90010ED21 /* PBXContainerItemProxy */ = {
     134                        isa = PBXContainerItemProxy;
     135                        containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
     136                        proxyType = 1;
     137                        remoteGlobalIDString = 2EE52CDF1890A9A80010ED21;
     138                        remoteInfo = WebKitTestRunnerApp;
     139                };
    97140                BC25194111D15D94002EBC01 /* PBXContainerItemProxy */ = {
    98141                        isa = PBXContainerItemProxy;
    … …  
    121164                29210EA9144CACB200835BB5 /* AccessibilityUIElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityUIElement.cpp; sourceTree = "<group>"; };
    122165                29210EAA144CACB200835BB5 /* AccessibilityUIElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityUIElement.h; sourceTree = "<group>"; };
    123                 29210EAB144CACB200835BB5 /* AccessibilityUIElementMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AccessibilityUIElementMac.mm; path = mac/AccessibilityUIElementMac.mm; sourceTree = "<group>"; };
    124                 29210EAB144CACB200835BB6 /* AccessibilityCommonMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AccessibilityCommonMac.mm; path = mac/AccessibilityCommonMac.mm; sourceTree = "<group>"; };
     166                29210EAB144CACB200835BB5 /* AccessibilityUIElementMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityUIElementMac.mm; sourceTree = "<group>"; };
     167                29210EAB144CACB200835BB6 /* AccessibilityCommonMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityCommonMac.mm; sourceTree = "<group>"; };
    125168                29210EB1144CACD400835BB5 /* AccessibilityTextMarker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityTextMarker.cpp; sourceTree = "<group>"; };
    126169                29210EB2144CACD400835BB5 /* AccessibilityTextMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityTextMarker.h; sourceTree = "<group>"; };
    … …  
    137180                29A8FCE1345E7021006AA5A6 /* JSAccessibilityTextMarkerRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSAccessibilityTextMarkerRange.cpp; path = DerivedSources/WebKitTestRunner/JSAccessibilityTextMarkerRange.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    138181                29A8FCE1345E7021006AA5A7 /* JSAccessibilityTextMarkerRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSAccessibilityTextMarkerRange.h; path = DerivedSources/WebKitTestRunner/JSAccessibilityTextMarkerRange.h; sourceTree = BUILT_PRODUCTS_DIR; };
    139                 29A8FCE4145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AccessibilityTextMarkerRangeMac.mm; path = mac/AccessibilityTextMarkerRangeMac.mm; sourceTree = "<group>"; };
     182                29A8FCE4145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityTextMarkerRangeMac.mm; sourceTree = "<group>"; };
     183                2E63ED751891ACE9002A7AFC /* AccessibilityControllerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityControllerIOS.mm; sourceTree = "<group>"; };
     184                2E63ED761891ACE9002A7AFC /* AccessibilityNotificationHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityNotificationHandler.h; sourceTree = "<group>"; };
     185                2E63ED771891ACE9002A7AFC /* AccessibilityTextMarkerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityTextMarkerIOS.mm; sourceTree = "<group>"; };
     186                2E63ED781891ACE9002A7AFC /* AccessibilityUIElementIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityUIElementIOS.mm; sourceTree = "<group>"; };
     187                2E63ED791891ACE9002A7AFC /* ActivateFontsIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ActivateFontsIOS.mm; sourceTree = "<group>"; };
     188                2E63ED7A1891ACE9002A7AFC /* EventSenderProxyIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EventSenderProxyIOS.mm; sourceTree = "<group>"; };
     189                2E63ED7B1891ACE9002A7AFC /* InjectedBundleIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InjectedBundleIOS.mm; sourceTree = "<group>"; };
     190                2E63ED7C1891ACE9002A7AFC /* InjectedBundlePageIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InjectedBundlePageIOS.mm; sourceTree = "<group>"; };
     191                2EE52CE01890A9A80010ED21 /* WebKitTestRunnerApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WebKitTestRunnerApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
     192                2EE52CE21890A9A80010ED21 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
     193                2EE52CE41890A9A80010ED21 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
     194                2EE52CE61890A9A80010ED21 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
     195                2EE52CEA1890A9A80010ED21 /* WebKitTestRunnerApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "WebKitTestRunnerApp-Info.plist"; path = "WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist"; sourceTree = "<group>"; };
     196                2EE52CEC1890A9A80010ED21 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
     197                2EE52CF11890A9A80010ED21 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
     198                2EE52CF21890A9A80010ED21 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
     199                2EE52CFA1890A9A80010ED21 /* WebKitTestRunnerAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WebKitTestRunnerAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
     200                2EE52CFB1890A9A90010ED21 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
     201                2EE52D031890A9A90010ED21 /* WebKitTestRunnerAppTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WebKitTestRunnerAppTests-Info.plist"; sourceTree = "<group>"; };
     202                2EE52D051890A9A90010ED21 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
     203                2EE52D071890A9A90010ED21 /* WebKitTestRunnerAppTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WebKitTestRunnerAppTests.m; sourceTree = "<group>"; };
     204                2EE52D131890A9FB0010ED21 /* PlatformWebViewIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformWebViewIOS.mm; sourceTree = "<group>"; };
     205                2EE52D141890A9FB0010ED21 /* TestControllerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestControllerIOS.mm; sourceTree = "<group>"; };
     206                2EE52D151890A9FB0010ED21 /* WebArchiveDumpSupportIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebArchiveDumpSupportIOS.mm; sourceTree = "<group>"; };
     207                2EE52D161890A9FB0010ED21 /* mainIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = mainIOS.mm; sourceTree = "<group>"; };
    140208                3110BE0F15BA011400D216AC /* WebNotificationProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebNotificationProvider.h; sourceTree = "<group>"; };
    141209                3164C8EF15D1ADA100EF1FE0 /* WebNotificationProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationProvider.cpp; sourceTree = "<group>"; };
    … …  
    173241                65EB859D11EC67CC0034D300 /* ActivateFonts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivateFonts.h; sourceTree = "<group>"; };
    174242                65EB859F11EC67CC0034D300 /* ActivateFonts.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ActivateFonts.mm; sourceTree = "<group>"; };
    175                 8034C6611487636400AC32E9 /* AccessibilityControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AccessibilityControllerMac.mm; path = mac/AccessibilityControllerMac.mm; sourceTree = "<group>"; };
     243                8034C6611487636400AC32E9 /* AccessibilityControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityControllerMac.mm; sourceTree = "<group>"; };
    176244                8097338814874A5A008156D9 /* AccessibilityNotificationHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AccessibilityNotificationHandler.h; path = mac/AccessibilityNotificationHandler.h; sourceTree = "<group>"; };
    177245                8097338914874A5A008156D9 /* AccessibilityNotificationHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AccessibilityNotificationHandler.mm; path = mac/AccessibilityNotificationHandler.mm; sourceTree = "<group>"; };
    … …  
    239307
    240308/* Begin PBXFrameworksBuildPhase section */
     309                2EE52CDD1890A9A80010ED21 /* Frameworks */ = {
     310                        isa = PBXFrameworksBuildPhase;
     311                        buildActionMask = 2147483647;
     312                        files = (
     313                                2EE52CE51890A9A80010ED21 /* CoreGraphics.framework in Frameworks */,
     314                                2EE52CE71890A9A80010ED21 /* UIKit.framework in Frameworks */,
     315                                2EE52CE31890A9A80010ED21 /* Foundation.framework in Frameworks */,
     316                        );
     317                        runOnlyForDeploymentPostprocessing = 0;
     318                };
     319                2EE52CF71890A9A80010ED21 /* Frameworks */ = {
     320                        isa = PBXFrameworksBuildPhase;
     321                        buildActionMask = 2147483647;
     322                        files = (
     323                                2EE52CFC1890A9A90010ED21 /* XCTest.framework in Frameworks */,
     324                                2EE52CFE1890A9A90010ED21 /* UIKit.framework in Frameworks */,
     325                                2EE52CFD1890A9A90010ED21 /* Foundation.framework in Frameworks */,
     326                        );
     327                        runOnlyForDeploymentPostprocessing = 0;
     328                };
    241329                8DD76F9B0486AA7600D96B5E /* Frameworks */ = {
    242330                        isa = PBXFrameworksBuildPhase;
    243331                        buildActionMask = 2147483647;
    244332                        files = (
    245                                 BC7934A511906584005EA8E2 /* Cocoa.framework in Frameworks */,
    246333                                BCDA2B9A1191051F00C3BC47 /* JavaScriptCore.framework in Frameworks */,
    247334                                0F5169CB1445222D00E0A9D7 /* WebKit.framework in Frameworks */,
    248                                 E1BA671E1742DA6A00C20251 /* Carbon.framework in Frameworks */,
    249335                                BC7934AC1190658C005EA8E2 /* WebKit2.framework in Frameworks */,
    250336                        );
    … …  
    255341                        buildActionMask = 2147483647;
    256342                        files = (
    257                                 BC25193E11D15D8B002EBC01 /* Cocoa.framework in Frameworks */,
    258343                                BC25194011D15D8B002EBC01 /* JavaScriptCore.framework in Frameworks */,
    259344                                A664BC7613A5F3A9009A7B25 /* libWebCoreTestSupport.dylib in Frameworks */,
    … …  
    270355                        children = (
    271356                                BC952EC511F3C10F003398B4 /* DerivedSources.make */,
     357                                2EE52CEA1890A9A80010ED21 /* WebKitTestRunnerApp-Info.plist */,
    272358                                BC99CBF11207642D00FDEE76 /* Shared */,
    273359                                08FB7795FE84155DC02AAC07 /* TestRunner */,
    … …  
    276362                                08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */,
    277363                                BC25194411D15DBE002EBC01 /* Resources */,
     364                                2EE52CE81890A9A80010ED21 /* WebKitTestRunnerApp */,
     365                                2EE52D011890A9A90010ED21 /* WebKitTestRunnerAppTests */,
     366                                2EE52CE11890A9A80010ED21 /* Frameworks */,
    278367                                1AB674ADFE9D54B511CA2CBB /* Products */,
    279368                        );
    … …  
    284373                        isa = PBXGroup;
    285374                        children = (
     375                                2EE52D121890A9FB0010ED21 /* ios */,
    286376                                841CC00D181185BF0042E9B6 /* Options.cpp */,
    287377                                841CC00E181185BF0042E9B6 /* Options.h */,
    … …  
    328418                                8DD76FA10486AA7600D96B5E /* WebKitTestRunner */,
    329419                                BC25186211D15D54002EBC01 /* WebKitTestRunnerInjectedBundle.bundle */,
     420                                2EE52CE01890A9A80010ED21 /* WebKitTestRunnerApp.app */,
     421                                2EE52CFA1890A9A80010ED21 /* WebKitTestRunnerAppTests.xctest */,
    330422                        );
    331423                        name = Products;
    … …  
    335427                        isa = PBXGroup;
    336428                        children = (
    337                                 29210EAB144CACB200835BB6 /* AccessibilityCommonMac.mm */,
    338429                                29210EA2144CAAA500835BB5 /* AccessibilityController.cpp */,
    339430                                29210EA3144CAAA500835BB5 /* AccessibilityController.h */,
    340                                 8034C6611487636400AC32E9 /* AccessibilityControllerMac.mm */,
    341431                                8097338814874A5A008156D9 /* AccessibilityNotificationHandler.h */,
    342432                                8097338914874A5A008156D9 /* AccessibilityNotificationHandler.mm */,
    … …  
    346436                                29A8FCE1145F037B009045A6 /* AccessibilityTextMarkerRange.cpp */,
    347437                                29A8FCDF145F0358009045A6 /* AccessibilityTextMarkerRange.h */,
    348                                 29A8FCE4145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm */,
    349438                                29210EA9144CACB200835BB5 /* AccessibilityUIElement.cpp */,
    350439                                29210EAA144CACB200835BB5 /* AccessibilityUIElement.h */,
    351                                 29210EAB144CACB200835BB5 /* AccessibilityUIElementMac.mm */,
    352440                        );
    353441                        name = Accessibility;
     442                        sourceTree = "<group>";
     443                };
     444                2E63ED741891ACE9002A7AFC /* ios */ = {
     445                        isa = PBXGroup;
     446                        children = (
     447                                2E63ED751891ACE9002A7AFC /* AccessibilityControllerIOS.mm */,
     448                                2E63ED761891ACE9002A7AFC /* AccessibilityNotificationHandler.h */,
     449                                2E63ED771891ACE9002A7AFC /* AccessibilityTextMarkerIOS.mm */,
     450                                2E63ED781891ACE9002A7AFC /* AccessibilityUIElementIOS.mm */,
     451                                2E63ED791891ACE9002A7AFC /* ActivateFontsIOS.mm */,
     452                                2E63ED7A1891ACE9002A7AFC /* EventSenderProxyIOS.mm */,
     453                                2E63ED7B1891ACE9002A7AFC /* InjectedBundleIOS.mm */,
     454                                2E63ED7C1891ACE9002A7AFC /* InjectedBundlePageIOS.mm */,
     455                        );
     456                        path = ios;
     457                        sourceTree = "<group>";
     458                };
     459                2EE52CE11890A9A80010ED21 /* Frameworks */ = {
     460                        isa = PBXGroup;
     461                        children = (
     462                                2EE52CE21890A9A80010ED21 /* Foundation.framework */,
     463                                2EE52CE41890A9A80010ED21 /* CoreGraphics.framework */,
     464                                2EE52CE61890A9A80010ED21 /* UIKit.framework */,
     465                                2EE52CFB1890A9A90010ED21 /* XCTest.framework */,
     466                        );
     467                        name = Frameworks;
     468                        sourceTree = "<group>";
     469                };
     470                2EE52CE81890A9A80010ED21 /* WebKitTestRunnerApp */ = {
     471                        isa = PBXGroup;
     472                        children = (
     473                                2EE52CF11890A9A80010ED21 /* AppDelegate.h */,
     474                                2EE52CF21890A9A80010ED21 /* AppDelegate.m */,
     475                        );
     476                        path = WebKitTestRunnerApp;
     477                        sourceTree = "<group>";
     478                };
     479                2EE52D011890A9A90010ED21 /* WebKitTestRunnerAppTests */ = {
     480                        isa = PBXGroup;
     481                        children = (
     482                                2EE52D071890A9A90010ED21 /* WebKitTestRunnerAppTests.m */,
     483                                2EE52D021890A9A90010ED21 /* Supporting Files */,
     484                        );
     485                        path = WebKitTestRunnerAppTests;
     486                        sourceTree = "<group>";
     487                };
     488                2EE52D021890A9A90010ED21 /* Supporting Files */ = {
     489                        isa = PBXGroup;
     490                        children = (
     491                                2EE52D031890A9A90010ED21 /* WebKitTestRunnerAppTests-Info.plist */,
     492                                2EE52D041890A9A90010ED21 /* InfoPlist.strings */,
     493                        );
     494                        name = "Supporting Files";
     495                        sourceTree = "<group>";
     496                };
     497                2EE52D121890A9FB0010ED21 /* ios */ = {
     498                        isa = PBXGroup;
     499                        children = (
     500                                2EE52CEB1890A9A80010ED21 /* InfoPlist.strings */,
     501                                2EE52D131890A9FB0010ED21 /* PlatformWebViewIOS.mm */,
     502                                2EE52D141890A9FB0010ED21 /* TestControllerIOS.mm */,
     503                                2EE52D151890A9FB0010ED21 /* WebArchiveDumpSupportIOS.mm */,
     504                                2EE52D161890A9FB0010ED21 /* mainIOS.mm */,
     505                        );
     506                        path = ios;
    354507                        sourceTree = "<group>";
    355508                };
    … …  
    366519                        isa = PBXGroup;
    367520                        children = (
     521                                29210EAB144CACB200835BB6 /* AccessibilityCommonMac.mm */,
     522                                8034C6611487636400AC32E9 /* AccessibilityControllerMac.mm */,
     523                                29A8FCE4145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm */,
     524                                29210EAB144CACB200835BB5 /* AccessibilityUIElementMac.mm */,
    368525                                5C45C30E17398E290079714E /* WebArchiveDumpSupportMac.mm */,
    369526                                65EB859F11EC67CC0034D300 /* ActivateFonts.mm */,
    … …  
    394551                        isa = PBXGroup;
    395552                        children = (
     553                                2E63ED741891ACE9002A7AFC /* ios */,
    396554                                5C45C31017398E370079714E /* cf */,
    397555                                BC952C0A11F3B939003398B4 /* Bindings */,
    … …  
    520678
    521679/* Begin PBXNativeTarget section */
     680                2EE52CDF1890A9A80010ED21 /* WebKitTestRunnerApp */ = {
     681                        isa = PBXNativeTarget;
     682                        buildConfigurationList = 2EE52D0F1890A9A90010ED21 /* Build configuration list for PBXNativeTarget "WebKitTestRunnerApp" */;
     683                        buildPhases = (
     684                                2EE52CDC1890A9A80010ED21 /* Sources */,
     685                                2EE52CDD1890A9A80010ED21 /* Frameworks */,
     686                                2EE52CDE1890A9A80010ED21 /* Resources */,
     687                        );
     688                        buildRules = (
     689                        );
     690                        dependencies = (
     691                                2E63ED891891AD47002A7AFC /* PBXTargetDependency */,
     692                        );
     693                        name = WebKitTestRunnerApp;
     694                        productName = WebKitTestRunnerApp;
     695                        productReference = 2EE52CE01890A9A80010ED21 /* WebKitTestRunnerApp.app */;
     696                        productType = "com.apple.product-type.application";
     697                };
     698                2EE52CF91890A9A80010ED21 /* WebKitTestRunnerAppTests */ = {
     699                        isa = PBXNativeTarget;
     700                        buildConfigurationList = 2EE52D101890A9A90010ED21 /* Build configuration list for PBXNativeTarget "WebKitTestRunnerAppTests" */;
     701                        buildPhases = (
     702                                2EE52CF61890A9A80010ED21 /* Sources */,
     703                                2EE52CF71890A9A80010ED21 /* Frameworks */,
     704                                2EE52CF81890A9A80010ED21 /* Resources */,
     705                        );
     706                        buildRules = (
     707                        );
     708                        dependencies = (
     709                                2EE52D001890A9A90010ED21 /* PBXTargetDependency */,
     710                        );
     711                        name = WebKitTestRunnerAppTests;
     712                        productName = WebKitTestRunnerAppTests;
     713                        productReference = 2EE52CFA1890A9A80010ED21 /* WebKitTestRunnerAppTests.xctest */;
     714                        productType = "com.apple.product-type.bundle.unit-test";
     715                };
    522716                8DD76F960486AA7600D96B5E /* WebKitTestRunner */ = {
    523717                        isa = PBXNativeTarget;
    … …  
    562756                        isa = PBXProject;
    563757                        attributes = {
     758                                TargetAttributes = {
     759                                        2EE52CF91890A9A80010ED21 = {
     760                                                TestTargetID = 2EE52CDF1890A9A80010ED21;
     761                                        };
     762                                };
    564763                        };
    565764                        buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "WebKitTestRunner" */;
    … …  
    572771                                French,
    573772                                German,
     773                                en,
    574774                        );
    575775                        mainGroup = 08FB7794FE84155DC02AAC07 /* WebKitTestRunner */;
    … …  
    580780                                BC25186111D15D54002EBC01 /* WebKitTestRunnerInjectedBundle */,
    581781                                BC952D7711F3BF5D003398B4 /* Derived Sources */,
     782                                2EE52CDF1890A9A80010ED21 /* WebKitTestRunnerApp */,
     783                                2EE52CF91890A9A80010ED21 /* WebKitTestRunnerAppTests */,
    582784                        );
    583785                };
    … …  
    585787
    586788/* Begin PBXResourcesBuildPhase section */
     789                2EE52CDE1890A9A80010ED21 /* Resources */ = {
     790                        isa = PBXResourcesBuildPhase;
     791                        buildActionMask = 2147483647;
     792                        files = (
     793                                2EE52CED1890A9A80010ED21 /* InfoPlist.strings in Resources */,
     794                        );
     795                        runOnlyForDeploymentPostprocessing = 0;
     796                };
     797                2EE52CF81890A9A80010ED21 /* Resources */ = {
     798                        isa = PBXResourcesBuildPhase;
     799                        buildActionMask = 2147483647;
     800                        files = (
     801                                2EE52D111890A9BB0010ED21 /* WebKitTestRunnerInjectedBundle.bundle in Resources */,
     802                                2EE52D061890A9A90010ED21 /* InfoPlist.strings in Resources */,
     803                        );
     804                        runOnlyForDeploymentPostprocessing = 0;
     805                };
    587806                BC25185E11D15D54002EBC01 /* Resources */ = {
    588807                        isa = PBXResourcesBuildPhase;
    … …  
    623842
    624843/* Begin PBXSourcesBuildPhase section */
     844                2EE52CDC1890A9A80010ED21 /* Sources */ = {
     845                        isa = PBXSourcesBuildPhase;
     846                        buildActionMask = 2147483647;
     847                        files = (
     848                                2E63ED951891ADC7002A7AFC /* CyclicRedundancyCheck.cpp in Sources */,
     849                                2E749BF21891EBFA007FC175 /* EventSenderProxyIOS.mm in Sources */,
     850                                2E63ED961891ADC7002A7AFC /* GeolocationProviderMock.cpp in Sources */,
     851                                2E63ED941891ADAD002A7AFC /* mainIOS.mm in Sources */,
     852                                2E63ED971891ADC7002A7AFC /* PixelDumpSupport.cpp in Sources */,
     853                                2E63ED981891ADC7002A7AFC /* TestController.cpp in Sources */,
     854                                2E63ED921891ADAD002A7AFC /* TestControllerIOS.mm in Sources */,
     855                                2E63ED991891ADC7002A7AFC /* TestInvocation.cpp in Sources */,
     856                                2E63EDA51891BD8E002A7AFC /* TestInvocationCG.cpp in Sources */,
     857                                2E63ED9A1891ADC7002A7AFC /* WebNotificationProvider.cpp in Sources */,
     858                                2E63ED9B1891ADC7002A7AFC /* WorkQueueManager.cpp in Sources */,
     859                                2E749BEF1891E939007FC175 /* Options.cpp in Sources */,
     860                                2E63ED9C1891ADC7002A7AFC /* AppDelegate.m in Sources */,
     861                                2E63ED911891ADAD002A7AFC /* PlatformWebViewIOS.mm in Sources */,
     862                        );
     863                        runOnlyForDeploymentPostprocessing = 0;
     864                };
     865                2EE52CF61890A9A80010ED21 /* Sources */ = {
     866                        isa = PBXSourcesBuildPhase;
     867                        buildActionMask = 2147483647;
     868                        files = (
     869                                2EE52D081890A9A90010ED21 /* WebKitTestRunnerAppTests.m in Sources */,
     870                        );
     871                        runOnlyForDeploymentPostprocessing = 0;
     872                };
    625873                8DD76F990486AA7600D96B5E /* Sources */ = {
    626874                        isa = PBXSourcesBuildPhase;
    … …  
    651899                        buildActionMask = 2147483647;
    652900                        files = (
     901                                2E63EDA61891BDC0002A7AFC /* TestRunner.cpp in Sources */,
     902                                2E63EDA11891B291002A7AFC /* AccessibilityUIElementIOS.mm in Sources */,
     903                                2E63ED9E1891AEC1002A7AFC /* WebArchiveDumpSupportIOS.mm in Sources */,
     904                                2E63ED8A1891AD7E002A7AFC /* AccessibilityControllerIOS.mm in Sources */,
     905                                2E63ED8B1891AD7E002A7AFC /* AccessibilityTextMarkerIOS.mm in Sources */,
     906                                2E63ED8D1891AD7E002A7AFC /* ActivateFontsIOS.mm in Sources */,
     907                                2E63ED8E1891AD7E002A7AFC /* EventSenderProxyIOS.mm in Sources */,
     908                                2E63ED8F1891AD7E002A7AFC /* InjectedBundleIOS.mm in Sources */,
     909                                2E63ED901891AD7E002A7AFC /* InjectedBundlePageIOS.mm in Sources */,
    653910                                29210EDA144CC3EA00835BB6 /* AccessibilityCommonMac.mm in Sources */,
    654911                                29210EB0144CACBD00835BB5 /* AccessibilityController.cpp in Sources */,
    … …  
    678935                                5641E2D014335E95008307E5 /* JSTextInputController.cpp in Sources */,
    679936                                BC952C0D11F3B965003398B4 /* JSWrapper.cpp in Sources */,
    680                                 BCC9981811D3F51E0017BCA2 /* TestRunner.cpp in Sources */,
    681937                                5C45C30F17398E290079714E /* WebArchiveDumpSupportMac.mm in Sources */,
    682938                                5C45C31317398E480079714E /* WebArchiveDumpSupport.cpp in Sources */,
    … …  
    689945
    690946/* Begin PBXTargetDependency section */
     947                2E63ED891891AD47002A7AFC /* PBXTargetDependency */ = {
     948                        isa = PBXTargetDependency;
     949                        target = BC25186111D15D54002EBC01 /* WebKitTestRunnerInjectedBundle */;
     950                        targetProxy = 2E63ED881891AD47002A7AFC /* PBXContainerItemProxy */;
     951                };
     952                2EE52D001890A9A90010ED21 /* PBXTargetDependency */ = {
     953                        isa = PBXTargetDependency;
     954                        target = 2EE52CDF1890A9A80010ED21 /* WebKitTestRunnerApp */;
     955                        targetProxy = 2EE52CFF1890A9A90010ED21 /* PBXContainerItemProxy */;
     956                };
    691957                BC25194211D15D94002EBC01 /* PBXTargetDependency */ = {
    692958                        isa = PBXTargetDependency;
    … …  
    701967/* End PBXTargetDependency section */
    702968
     969/* Begin PBXVariantGroup section */
     970                2EE52CEB1890A9A80010ED21 /* InfoPlist.strings */ = {
     971                        isa = PBXVariantGroup;
     972                        children = (
     973                                2EE52CEC1890A9A80010ED21 /* en */,
     974                        );
     975                        name = InfoPlist.strings;
     976                        path = ../WebKitTestRunnerApp;
     977                        sourceTree = "<group>";
     978                };
     979                2EE52D041890A9A90010ED21 /* InfoPlist.strings */ = {
     980                        isa = PBXVariantGroup;
     981                        children = (
     982                                2EE52D051890A9A90010ED21 /* en */,
     983                        );
     984                        name = InfoPlist.strings;
     985                        sourceTree = "<group>";
     986                };
     987/* End PBXVariantGroup section */
     988
    703989/* Begin XCBuildConfiguration section */
    704990                1DEB927508733DD40010E9CD /* Debug */ = {
    … …  
    7311017                        };
    7321018                        name = Release;
     1019                };
     1020                2EE52D091890A9A90010ED21 /* Debug */ = {
     1021                        isa = XCBuildConfiguration;
     1022                        baseConfigurationReference = BC251A1811D16795002EBC01 /* WebKitTestRunner.xcconfig */;
     1023                        buildSettings = {
     1024                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
     1025                                ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
     1026                                GCC_DYNAMIC_NO_PIC = NO;
     1027                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;
     1028                                INFOPLIST_FILE = "WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist";
     1029                                IPHONEOS_DEPLOYMENT_TARGET = 8.0;
     1030                                PRODUCT_NAME = "$(TARGET_NAME)";
     1031                                TARGETED_DEVICE_FAMILY = "1,2";
     1032                                WRAPPER_EXTENSION = app;
     1033                        };
     1034                        name = Debug;
     1035                };
     1036                2EE52D0A1890A9A90010ED21 /* Release */ = {
     1037                        isa = XCBuildConfiguration;
     1038                        baseConfigurationReference = BC251A1811D16795002EBC01 /* WebKitTestRunner.xcconfig */;
     1039                        buildSettings = {
     1040                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
     1041                                ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
     1042                                INFOPLIST_FILE = "WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist";
     1043                                IPHONEOS_DEPLOYMENT_TARGET = 8.0;
     1044                                PRODUCT_NAME = "$(TARGET_NAME)";
     1045                                TARGETED_DEVICE_FAMILY = "1,2";
     1046                                WRAPPER_EXTENSION = app;
     1047                        };
     1048                        name = Release;
     1049                };
     1050                2EE52D0B1890A9A90010ED21 /* Production */ = {
     1051                        isa = XCBuildConfiguration;
     1052                        baseConfigurationReference = BC251A1811D16795002EBC01 /* WebKitTestRunner.xcconfig */;
     1053                        buildSettings = {
     1054                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
     1055                                ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
     1056                                INFOPLIST_FILE = "WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist";
     1057                                IPHONEOS_DEPLOYMENT_TARGET = 8.0;
     1058                                PRODUCT_NAME = "$(TARGET_NAME)";
     1059                                TARGETED_DEVICE_FAMILY = "1,2";
     1060                                WRAPPER_EXTENSION = app;
     1061                        };
     1062                        name = Production;
     1063                };
     1064                2EE52D0C1890A9A90010ED21 /* Debug */ = {
     1065                        isa = XCBuildConfiguration;
     1066                        buildSettings = {
     1067                                ALWAYS_SEARCH_USER_PATHS = NO;
     1068                                ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
     1069                                BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/WebKitTestRunnerApp.app/WebKitTestRunnerApp";
     1070                                CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
     1071                                CLANG_CXX_LIBRARY = "libc++";
     1072                                CLANG_ENABLE_MODULES = YES;
     1073                                CLANG_ENABLE_OBJC_ARC = YES;
     1074                                CLANG_WARN_BOOL_CONVERSION = YES;
     1075                                CLANG_WARN_CONSTANT_CONVERSION = YES;
     1076                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
     1077                                CLANG_WARN_EMPTY_BODY = YES;
     1078                                CLANG_WARN_ENUM_CONVERSION = YES;
     1079                                CLANG_WARN_INT_CONVERSION = YES;
     1080                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
     1081                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
     1082                                COPY_PHASE_STRIP = NO;
     1083                                FRAMEWORK_SEARCH_PATHS = (
     1084                                        "$(SDKROOT)/Developer/Library/Frameworks",
     1085                                        "$(inherited)",
     1086                                        "$(DEVELOPER_FRAMEWORKS_DIR)",
     1087                                );
     1088                                GCC_C_LANGUAGE_STANDARD = gnu99;
     1089                                GCC_DYNAMIC_NO_PIC = NO;
     1090                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
     1091                                GCC_PREFIX_HEADER = "WebKitTestRunnerApp/WebKitTestRunnerApp-Prefix.pch";
     1092                                GCC_PREPROCESSOR_DEFINITIONS = (
     1093                                        "DEBUG=1",
     1094                                        "$(inherited)",
     1095                                );
     1096                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;
     1097                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
     1098                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
     1099                                GCC_WARN_UNDECLARED_SELECTOR = YES;
     1100                                GCC_WARN_UNINITIALIZED_AUTOS = YES;
     1101                                GCC_WARN_UNUSED_FUNCTION = YES;
     1102                                GCC_WARN_UNUSED_VARIABLE = YES;
     1103                                INFOPLIST_FILE = "WebKitTestRunnerAppTests/WebKitTestRunnerAppTests-Info.plist";
     1104                                IPHONEOS_DEPLOYMENT_TARGET = 8.0;
     1105                                ONLY_ACTIVE_ARCH = YES;
     1106                                PRODUCT_NAME = "$(TARGET_NAME)";
     1107                                SDKROOT = iphoneos;
     1108                                TEST_HOST = "$(BUNDLE_LOADER)";
     1109                                WRAPPER_EXTENSION = xctest;
     1110                        };
     1111                        name = Debug;
     1112                };
     1113                2EE52D0D1890A9A90010ED21 /* Release */ = {
     1114                        isa = XCBuildConfiguration;
     1115                        buildSettings = {
     1116                                ALWAYS_SEARCH_USER_PATHS = NO;
     1117                                ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
     1118                                BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/WebKitTestRunnerApp.app/WebKitTestRunnerApp";
     1119                                CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
     1120                                CLANG_CXX_LIBRARY = "libc++";
     1121                                CLANG_ENABLE_MODULES = YES;
     1122                                CLANG_ENABLE_OBJC_ARC = YES;
     1123                                CLANG_WARN_BOOL_CONVERSION = YES;
     1124                                CLANG_WARN_CONSTANT_CONVERSION = YES;
     1125                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
     1126                                CLANG_WARN_EMPTY_BODY = YES;
     1127                                CLANG_WARN_ENUM_CONVERSION = YES;
     1128                                CLANG_WARN_INT_CONVERSION = YES;
     1129                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
     1130                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
     1131                                COPY_PHASE_STRIP = YES;
     1132                                ENABLE_NS_ASSERTIONS = NO;
     1133                                FRAMEWORK_SEARCH_PATHS = (
     1134                                        "$(SDKROOT)/Developer/Library/Frameworks",
     1135                                        "$(inherited)",
     1136                                        "$(DEVELOPER_FRAMEWORKS_DIR)",
     1137                                );
     1138                                GCC_C_LANGUAGE_STANDARD = gnu99;
     1139                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
     1140                                GCC_PREFIX_HEADER = "WebKitTestRunnerApp/WebKitTestRunnerApp-Prefix.pch";
     1141                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
     1142                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
     1143                                GCC_WARN_UNDECLARED_SELECTOR = YES;
     1144                                GCC_WARN_UNINITIALIZED_AUTOS = YES;
     1145                                GCC_WARN_UNUSED_FUNCTION = YES;
     1146                                GCC_WARN_UNUSED_VARIABLE = YES;
     1147                                INFOPLIST_FILE = "WebKitTestRunnerAppTests/WebKitTestRunnerAppTests-Info.plist";
     1148                                IPHONEOS_DEPLOYMENT_TARGET = 8.0;
     1149                                PRODUCT_NAME = "$(TARGET_NAME)";
     1150                                SDKROOT = iphoneos;
     1151                                TEST_HOST = "$(BUNDLE_LOADER)";
     1152                                VALIDATE_PRODUCT = YES;
     1153                                WRAPPER_EXTENSION = xctest;
     1154                        };
     1155                        name = Release;
     1156                };
     1157                2EE52D0E1890A9A90010ED21 /* Production */ = {
     1158                        isa = XCBuildConfiguration;
     1159                        buildSettings = {
     1160                                ALWAYS_SEARCH_USER_PATHS = NO;
     1161                                ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
     1162                                BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/WebKitTestRunnerApp.app/WebKitTestRunnerApp";
     1163                                CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
     1164                                CLANG_CXX_LIBRARY = "libc++";
     1165                                CLANG_ENABLE_MODULES = YES;
     1166                                CLANG_ENABLE_OBJC_ARC = YES;
     1167                                CLANG_WARN_BOOL_CONVERSION = YES;
     1168                                CLANG_WARN_CONSTANT_CONVERSION = YES;
     1169                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
     1170                                CLANG_WARN_EMPTY_BODY = YES;
     1171                                CLANG_WARN_ENUM_CONVERSION = YES;
     1172                                CLANG_WARN_INT_CONVERSION = YES;
     1173                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
     1174                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
     1175                                COPY_PHASE_STRIP = YES;
     1176                                ENABLE_NS_ASSERTIONS = NO;
     1177                                FRAMEWORK_SEARCH_PATHS = (
     1178                                        "$(SDKROOT)/Developer/Library/Frameworks",
     1179                                        "$(inherited)",
     1180                                        "$(DEVELOPER_FRAMEWORKS_DIR)",
     1181                                );
     1182                                GCC_C_LANGUAGE_STANDARD = gnu99;
     1183                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
     1184                                GCC_PREFIX_HEADER = "WebKitTestRunnerApp/WebKitTestRunnerApp-Prefix.pch";
     1185                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
     1186                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
     1187                                GCC_WARN_UNDECLARED_SELECTOR = YES;
     1188                                GCC_WARN_UNINITIALIZED_AUTOS = YES;
     1189                                GCC_WARN_UNUSED_FUNCTION = YES;
     1190                                GCC_WARN_UNUSED_VARIABLE = YES;
     1191                                INFOPLIST_FILE = "WebKitTestRunnerAppTests/WebKitTestRunnerAppTests-Info.plist";
     1192                                IPHONEOS_DEPLOYMENT_TARGET = 8.0;
     1193                                PRODUCT_NAME = "$(TARGET_NAME)";
     1194                                SDKROOT = iphoneos;
     1195                                TEST_HOST = "$(BUNDLE_LOADER)";
     1196                                VALIDATE_PRODUCT = YES;
     1197                                WRAPPER_EXTENSION = xctest;
     1198                        };
     1199                        name = Production;
    7331200                };
    7341201                BC25186411D15D55002EBC01 /* Debug */ = {
    … …  
    8111278                        defaultConfigurationName = Production;
    8121279                };
     1280                2EE52D0F1890A9A90010ED21 /* Build configuration list for PBXNativeTarget "WebKitTestRunnerApp" */ = {
     1281                        isa = XCConfigurationList;
     1282                        buildConfigurations = (
     1283                                2EE52D091890A9A90010ED21 /* Debug */,
     1284                                2EE52D0A1890A9A90010ED21 /* Release */,
     1285                                2EE52D0B1890A9A90010ED21 /* Production */,
     1286                        );
     1287                        defaultConfigurationIsVisible = 0;
     1288                        defaultConfigurationName = Production;
     1289                };
     1290                2EE52D101890A9A90010ED21 /* Build configuration list for PBXNativeTarget "WebKitTestRunnerAppTests" */ = {
     1291                        isa = XCConfigurationList;
     1292                        buildConfigurations = (
     1293                                2EE52D0C1890A9A90010ED21 /* Debug */,
     1294                                2EE52D0D1890A9A90010ED21 /* Release */,
     1295                                2EE52D0E1890A9A90010ED21 /* Production */,
     1296                        );
     1297                        defaultConfigurationIsVisible = 0;
     1298                        defaultConfigurationName = Production;
     1299                };
    8131300                BC25186611D15D55002EBC01 /* Build configuration list for PBXNativeTarget "WebKitTestRunnerInjectedBundle" */ = {
    8141301                        isa = XCConfigurationList;

  • TabularUnified trunk/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h

    r156302 r162729  
    2525
    2626#ifdef __OBJC__
    27 #include <Cocoa/Cocoa.h>
     27#import <Foundation/Foundation.h>
    2828#endif
    2929

  • TabularUnified trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp

    r160386 r162729  
    3636#include <wtf/StringExtras.h>
    3737
    38 #if PLATFORM(MAC)
     38#if PLATFORM(MAC) && !PLATFORM(IOS)
    3939#include <LaunchServices/UTCoreTypes.h>
     40#endif
     41
     42#if PLATFORM(IOS)
     43// FIXME: get kUTTypePNG from MobileCoreServices on iOS
     44static const CFStringRef kUTTypePNG = CFSTR("public.png");
    4045#endif
    4146

  • TabularUnified trunk/Tools/WebKitTestRunner/ios/WebArchiveDumpSupportIOS.mm

    r162728 r162729  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2f* Copyright (C) 2014 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #ifdef __OBJC__
    27 #include <Cocoa/Cocoa.h>
    28 #endif
     26#import "config.h"
     27#import "WebArchiveDumpSupport.h"
    2928
    30 #if defined(BUILDING_GTK__)
    31 #include "autotoolsconfig.h"
    32 #endif /* defined (BUILDING_GTK__) */
     29#if PLATFORM(IOS)
    3330
    34 #include <wtf/Platform.h>
    35 #include <WebKit2/WebKit2_C.h>
     31CFURLResponseRef createCFURLResponseFromResponseData(CFDataRef /*responseData*/)
     32{
     33    return 0;
     34}
    3635
     36CFArrayRef supportedNonImageMIMETypes()
     37{
     38    return 0;
     39}
    3740
    38 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
    39 * to allow C++ code that expects exceptions to build. These definitions
    40 * interfere with Objective-C++ uses of Objective-C exception handlers, which
    41 * use |@try| and |@catch|. As a workaround, undefine these macros. */
    42 
    43 #ifdef __cplusplus
    44 #include <algorithm> // needed for exception_defines.h
    45 #endif
    46 
    47 #ifdef __OBJC__
    48 #undef try
    49 #undef catch
    50 #endif
    51 
     41#endif // PLATFORM(IOS)

  • TabularUnified trunk/Tools/WebKitTestRunner/ios/mainIOS.mm

    r162728 r162729  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #ifdef __OBJC__
    27 #include <Cocoa/Cocoa.h>
    28 #endif
     26#import "config.h"
    2927
    30 #if defined(BUILDING_GTK__)
    31 #include "autotoolsconfig.h"
    32 #endif /* defined (BUILDING_GTK__) */
    33 
    34 #include <wtf/Platform.h>
    35 #include <WebKit2/WebKit2_C.h>
     28#import "TestController.h"
    3629
    3730
    38 /* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
    39 * to allow C++ code that expects exceptions to build. These definitions
    40 * interfere with Objective-C++ uses of Objective-C exception handlers, which
    41 * use |@try| and |@catch|. As a workaround, undefine these macros. */
     31static int _argc;
     32static const char **_argv;
    4233
    43 #ifdef __cplusplus
    44 #include <algorithm> // needed for exception_defines.h
    45 #endif
     34@interface WebKitTestRunnerApp : UIApplication
     35@end
    4636
    47 #ifdef __OBJC__
    48 #undef try
    49 #undef catch
    50 #endif
     37@implementation WebKitTestRunnerApp
    5138
     39- (void)_runTestController
     40{
     41    WTR::TestController controller(_argc, _argv);
     42}
     43
     44- (void)applicationDidFinishLaunching:(NSNotification *)notification
     45{
     46    [self performSelectorOnMainThread:@selector(_runTestController) withObject:nil waitUntilDone:NO];
     47}
     48
     49@end
     50
     51int main(int argc, const char* argv[])
     52{
     53    _argc = argc;
     54    _argv = argv;
     55
     56    UIApplicationMain(argc, (char**)argv, NSStringFromClass([WebKitTestRunnerApp class]), nil);
     57    return 0;
     58}
Note: See TracChangeset for help on using the changeset viewer.