Diff
Modified: trunk/Source/WebKit2/ChangeLog (188891 => 188892)
--- trunk/Source/WebKit2/ChangeLog 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-24 23:11:25 UTC (rev 188892)
@@ -1,3 +1,36 @@
+2015-08-24 Tim Horton <[email protected]>
+
+ (Finally...) get rid of WKViewIOS
+ https://bugs.webkit.org/show_bug.cgi?id=148404
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKView.h:
+ * UIProcess/API/ios/WKViewIOS.mm: Removed.
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::PageClientImpl): Deleted.
+ (WebKit::PageClientImpl::didRelaunchProcess): Deleted.
+ (WebKit::PageClientImpl::refView): Deleted.
+ (WebKit::PageClientImpl::derefView): Deleted.
+ * UIProcess/ios/WKContentView.h:
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView initWithFrame:processPool:configuration:wkView:]): Deleted.
+ * WebKit2.xcodeproj/project.pbxproj:
+ Get rid of WKViewIOS and references to it.
+
+ * DatabaseProcess/ios/DatabaseProcessIOS.mm:
+ (WebKit::DatabaseProcess::initializeSandbox):
+ * NetworkProcess/ios/NetworkProcessIOS.mm:
+ (WebKit::NetworkProcess::initializeSandbox):
+ * Shared/Plugins/mac/PluginSandboxProfile.mm:
+ (WebKit::pluginSandboxProfileDirectory):
+ * Shared/ios/ChildProcessIOS.mm:
+ (WebKit::ChildProcess::initializeSandbox):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::initializeSandbox):
+ Look for WKWebView instead of WKView if we have it.
+
2015-08-24 Anders Carlsson <[email protected]>
Rename _WKVisitedLinkProvider to _WKVisitedLinkStore for consistency
Modified: trunk/Source/WebKit2/DatabaseProcess/ios/DatabaseProcessIOS.mm (188891 => 188892)
--- trunk/Source/WebKit2/DatabaseProcess/ios/DatabaseProcessIOS.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Source/WebKit2/DatabaseProcess/ios/DatabaseProcessIOS.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -53,7 +53,7 @@
{
#if ENABLE_MANUAL_DATABASE_SANDBOXING
// Need to override the default, because service has a different bundle ID.
- NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
+ NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.Databases" ofType:@"sb"]);
ChildProcess::initializeSandbox(parameters, sandboxParameters);
#endif
Modified: trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm (188891 => 188892)
--- trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -61,7 +61,7 @@
{
#if ENABLE_MANUAL_NETWORK_SANDBOXING
// Need to override the default, because service has a different bundle ID.
- NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
+ NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.NetworkProcess" ofType:@"sb"]);
ChildProcess::initializeSandbox(parameters, sandboxParameters);
Modified: trunk/Source/WebKit2/Shared/Plugins/mac/PluginSandboxProfile.mm (188891 => 188892)
--- trunk/Source/WebKit2/Shared/Plugins/mac/PluginSandboxProfile.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Source/WebKit2/Shared/Plugins/mac/PluginSandboxProfile.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -26,6 +26,7 @@
#include "config.h"
#include "PluginSandboxProfile.h"
+#include "WKFoundation.h"
#include <wtf/RetainPtr.h>
#include <wtf/text/StringConcatenate.h>
#include <wtf/text/WTFString.h>
@@ -34,7 +35,12 @@
static NSString *pluginSandboxProfileDirectory()
{
- return [[[NSBundle bundleForClass:NSClassFromString(@"WKView")] resourcePath] stringByAppendingPathComponent:@"PlugInSandboxProfiles"];
+#if WK_API_ENABLED
+ NSBundle *bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
+#else
+ NSBundle *bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
+#endif
+ return [[bundle resourcePath] stringByAppendingPathComponent:@"PlugInSandboxProfiles"];
}
static NSString *pluginSandboxProfileName(const String& bundleIdentifier)
Modified: trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm (188891 => 188892)
--- trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -71,7 +71,7 @@
void ChildProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
{
#if ENABLE(MANUAL_SANDBOXING)
- NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
+ NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
String defaultProfilePath = [webkit2Bundle pathForResource:[[NSBundle mainBundle] bundleIdentifier] ofType:@"sb"];
if (sandboxParameters.systemDirectorySuffix().isNull()) {
String defaultSystemDirectorySuffix = String([[NSBundle mainBundle] bundleIdentifier]) + "+" + parameters.clientIdentifier;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h (188891 => 188892)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h 2015-08-24 23:11:25 UTC (rev 188892)
@@ -25,11 +25,9 @@
#import <WebKit/WKFoundation.h>
-#if TARGET_OS_IPHONE
-#import <UIKit/UIKit.h>
-#else
+#if !TARGET_OS_IPHONE
+
#import <Cocoa/Cocoa.h>
-#endif
#import <WebKit/WKDeclarationSpecifiers.h>
@class WKBrowsingContextController;
@@ -37,13 +35,8 @@
@class WKProcessGroup;
@class WKViewData;
-#if TARGET_OS_IPHONE
WK_EXPORT
-@interface WKView : UIView {
-#else
-WK_EXPORT
@interface WKView : NSView <NSTextInputClient> {
-#endif
@private
WKViewData *_data;
unsigned _unused;
@@ -51,13 +44,8 @@
#if WK_API_ENABLED
-#if TARGET_OS_IPHONE
-- (id)initWithFrame:(CGRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup;
-- (id)initWithFrame:(CGRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup relatedToView:(WKView *)relatedView;
-#else
- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup;
- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup relatedToView:(WKView *)relatedView;
-#endif
@property(readonly) WKBrowsingContextController *browsingContextController;
@@ -66,8 +54,6 @@
@property BOOL drawsBackground;
@property BOOL drawsTransparentBackground;
-#if TARGET_OS_IPHONE
-@property (nonatomic, readonly) UIScrollView *scrollView;
-#endif
-
@end
+
+#endif
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (188891 => 188892)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-08-24 23:11:25 UTC (rev 188892)
@@ -33,7 +33,6 @@
#import <wtf/RetainPtr.h>
OBJC_CLASS WKContentView;
-OBJC_CLASS WKView;
OBJC_CLASS WKWebView;
OBJC_CLASS WKEditorUndoTargetObjC;
@@ -46,7 +45,6 @@
{
public:
PageClientImpl(WKContentView *, WKWebView *);
- PageClientImpl(WKContentView *, WKView *);
virtual ~PageClientImpl();
private:
@@ -191,7 +189,6 @@
WKContentView *m_contentView;
WKWebView *m_webView;
- WKView *m_wkView;
RetainPtr<WKEditorUndoTargetObjC> m_undoTarget;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (188891 => 188892)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -40,7 +40,6 @@
#import "WKContentViewInteraction.h"
#import "WKGeolocationProviderIOS.h"
#import "WKProcessPoolInternal.h"
-#import "WKViewPrivate.h"
#import "WKWebViewConfigurationInternal.h"
#import "WKWebViewContentProviderRegistry.h"
#import "WKWebViewInternal.h"
@@ -111,19 +110,10 @@
PageClientImpl::PageClientImpl(WKContentView *contentView, WKWebView *webView)
: m_contentView(contentView)
, m_webView(webView)
- , m_wkView(nil)
, m_undoTarget(adoptNS([[WKEditorUndoTargetObjC alloc] init]))
{
}
-PageClientImpl::PageClientImpl(WKContentView *contentView, WKView *wkView)
- : m_contentView(contentView)
- , m_webView(nil)
- , m_wkView(wkView)
- , m_undoTarget(adoptNS([[WKEditorUndoTargetObjC alloc] init]))
-{
-}
-
PageClientImpl::~PageClientImpl()
{
}
@@ -223,7 +213,6 @@
{
[m_contentView _didRelaunchProcess];
[m_webView _didRelaunchProcess];
- [m_wkView _didRelaunchProcess];
}
void PageClientImpl::pageClosed()
@@ -743,14 +732,12 @@
{
[m_contentView retain];
[m_webView retain];
- [m_wkView retain];
}
void PageClientImpl::derefView()
{
[m_contentView release];
[m_webView release];
- [m_wkView release];
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.h (188891 => 188892)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2015-08-24 23:11:25 UTC (rev 188892)
@@ -31,7 +31,6 @@
#import <wtf/RetainPtr.h>
@class WKContentView;
-@class WKView;
@class WKWebView;
namespace API {
@@ -65,7 +64,6 @@
@property (nonatomic, readonly) BOOL isBackground;
- (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView;
-- (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration wkView:(WKView *)webView;
- (void)didUpdateVisibleRect:(CGRect)visibleRect unobscuredRect:(CGRect)unobscuredRect
unobscuredRectInScrollViewCoordinates:(CGRect)unobscuredRectInScrollViewCoordinates
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (188891 => 188892)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -232,18 +232,6 @@
return [self _commonInitializationWithProcessPool:processPool configuration:WTF::move(configuration)];
}
-- (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration wkView:(WKView *)wkView
-{
- if (!(self = [super initWithFrame:frame]))
- return nil;
-
- InitializeWebKit2();
-
- _pageClient = std::make_unique<PageClientImpl>(self, wkView);
-
- return [self _commonInitializationWithProcessPool:processPool configuration:WTF::move(configuration)];
-}
-
- (void)dealloc
{
[self cleanupInteraction];
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (188891 => 188892)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-08-24 23:11:25 UTC (rev 188892)
@@ -646,7 +646,6 @@
2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */; };
2DA1E4FE18C02B6A00DBC929 /* WKPDFView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA1E4FC18C02B6A00DBC929 /* WKPDFView.h */; };
2DA1E4FF18C02B6A00DBC929 /* WKPDFView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA1E4FD18C02B6A00DBC929 /* WKPDFView.mm */; };
- 2DA944951884E3B500ED86DB /* WKViewIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944861884E3B500ED86DB /* WKViewIOS.mm */; };
2DA9449E1884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */; };
2DA9449F1884E4F000ED86DB /* NativeWebTouchEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */; };
2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */; };
@@ -2797,7 +2796,6 @@
2DA1E4FC18C02B6A00DBC929 /* WKPDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKPDFView.h; path = ios/WKPDFView.h; sourceTree = "<group>"; };
2DA1E4FD18C02B6A00DBC929 /* WKPDFView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKPDFView.mm; path = ios/WKPDFView.mm; sourceTree = "<group>"; };
2DA7FDCB18F88625008DDED0 /* FindIndicatorOverlayClientIOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FindIndicatorOverlayClientIOS.h; path = ios/FindIndicatorOverlayClientIOS.h; sourceTree = "<group>"; };
- 2DA944861884E3B500ED86DB /* WKViewIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKViewIOS.mm; path = ios/WKViewIOS.mm; sourceTree = "<group>"; };
2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NativeWebKeyboardEventIOS.mm; path = ios/NativeWebKeyboardEventIOS.mm; sourceTree = "<group>"; };
2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NativeWebTouchEventIOS.mm; path = ios/NativeWebTouchEventIOS.mm; sourceTree = "<group>"; };
2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebIOSEventFactory.h; path = ios/WebIOSEventFactory.h; sourceTree = "<group>"; };
@@ -5091,14 +5089,6 @@
path = Cocoa;
sourceTree = "<group>";
};
- 2DA944771884E3AB00ED86DB /* ios */ = {
- isa = PBXGroup;
- children = (
- 2DA944861884E3B500ED86DB /* WKViewIOS.mm */,
- );
- name = ios;
- sourceTree = "<group>";
- };
2DA944961884E4DA00ED86DB /* ios */ = {
isa = PBXGroup;
children = (
@@ -6230,7 +6220,6 @@
BC0C376610F807660076D7CB /* C */,
37C4C08318149C2A003688B9 /* Cocoa */,
BC8A501311765F4500757573 /* cpp */,
- 2DA944771884E3AB00ED86DB /* ios */,
BC111B47112F616900337BAB /* mac */,
076E884D1A13CADF005E90FC /* APIContextMenuClient.h */,
83891B621A68B3420030F386 /* APIDiagnosticLoggingClient.h */,
@@ -10111,7 +10100,6 @@
1AAF089A19267EE500B6390C /* WKUserScript.mm in Sources */,
7C89D2A31A678875003A5FDE /* WKUserScriptRef.cpp in Sources */,
BC8699B6116AADAA002A925B /* WKView.mm in Sources */,
- 2DA944951884E3B500ED86DB /* WKViewIOS.mm in Sources */,
2D28A4981AF965A200F190C9 /* WKViewLayoutStrategy.mm in Sources */,
C5E1AFE816B20B67006CC1F2 /* WKWebArchive.cpp in Sources */,
C5E1AFEA16B20B7B006CC1F2 /* WKWebArchiveResource.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (188891 => 188892)
--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -213,11 +213,15 @@
#if ENABLE(WEB_PROCESS_SANDBOX)
#if ENABLE(MANUAL_SANDBOXING)
// Need to override the default, because service has a different bundle ID.
- NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
+#if WK_API_ENABLED
+ NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
+#else
+ NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
+#endif
#if PLATFORM(IOS)
- sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.WebContent" ofType:@"sb"]);
+ sandboxParameters.setOverrideSandboxProfilePath([webKit2Bundle pathForResource:@"com.apple.WebKit.WebContent" ofType:@"sb"]);
#else
- sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebProcess" ofType:@"sb"]);
+ sandboxParameters.setOverrideSandboxProfilePath([webKit2Bundle pathForResource:@"com.apple.WebProcess" ofType:@"sb"]);
#endif
ChildProcess::initializeSandbox(parameters, sandboxParameters);
#endif
Modified: trunk/Tools/ChangeLog (188891 => 188892)
--- trunk/Tools/ChangeLog 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/ChangeLog 2015-08-24 23:11:25 UTC (rev 188892)
@@ -1,3 +1,28 @@
+2015-08-24 Tim Horton <[email protected]>
+
+ (Finally...) get rid of WKViewIOS
+ https://bugs.webkit.org/show_bug.cgi?id=148404
+
+ Reviewed by Anders Carlsson.
+
+ * TestWebKitAPI/Tests/CustomProtocolsSyncXHRTest.mm:
+ * TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm:
+ * TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm:
+ * TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm:
+ * TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm:
+ * TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm:
+ * TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextGroupTest.mm:
+ * TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextLoadDelegateTest.mm:
+ * TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.h:
+ * TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.mm:
+ Mark tests that use WKBrowsingContextController as Mac-only.
+
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm:
+ (WTR::AccessibilityController::addNotificationListener):
+ * WebKitTestRunner/ios/mainIOS.mm:
+ (-[WebKitTestRunnerApp applicationDidEnterBackground:]):
+ Import UIKit instead of depending on WKView.h to do so.
+
2015-08-24 Jason Marcell <[email protected]>
Add support to dashboard for displaying Git SHA's as revisions.
Modified: trunk/Tools/TestWebKitAPI/Tests/CustomProtocolsSyncXHRTest.mm (188891 => 188892)
--- trunk/Tools/TestWebKitAPI/Tests/CustomProtocolsSyncXHRTest.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/TestWebKitAPI/Tests/CustomProtocolsSyncXHRTest.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -40,7 +40,7 @@
#import <WebKit/WKViewPrivate.h>
#import <wtf/RetainPtr.h>
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
static bool testFinished = false;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm (188891 => 188892)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -25,7 +25,7 @@
#import "config.h"
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
#import "PlatformUtilities.h"
#import "TestProtocol.h"
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm (188891 => 188892)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -33,7 +33,7 @@
#import <WebKit/WebKit2.h>
#import <wtf/RetainPtr.h>
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
static bool testFinished = false;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm (188891 => 188892)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -35,7 +35,7 @@
#import <WebKit/WebKit2.h>
#import <wtf/RetainPtr.h>
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
static bool testFinished = false;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm (188891 => 188892)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -36,7 +36,7 @@
#import <WebKit/WebKit2.h>
#import <WebKit/WKViewPrivate.h>
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
static bool testFinished = false;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm (188891 => 188892)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -37,7 +37,7 @@
#import <WebKit/WKViewPrivate.h>
#import <WebKit/WebKit2.h>
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
static bool testFinished = false;
static NSString *htmlString = @"<body style='background-color: red'>";
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextGroupTest.mm (188891 => 188892)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextGroupTest.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextGroupTest.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -28,7 +28,7 @@
#import <WebKit/WKBrowsingContextGroup.h>
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
TEST(WKBrowsingContextGroupTest, GetSetJavaScriptEnabled)
{
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextLoadDelegateTest.mm (188891 => 188892)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextLoadDelegateTest.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextLoadDelegateTest.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -35,7 +35,7 @@
#import "PlatformUtilities.h"
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
namespace {
Modified: trunk/Tools/TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.h (188891 => 188892)
--- trunk/Tools/TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.h 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.h 2015-08-24 23:11:25 UTC (rev 188892)
@@ -25,7 +25,7 @@
#import <WebKit/WebKit2.h>
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
typedef void (^OnLoadBlock)(WKBrowsingContextController *);
Modified: trunk/Tools/TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.mm (188891 => 188892)
--- trunk/Tools/TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -26,7 +26,7 @@
#include "config.h"
#include "TestBrowsingContextLoadDelegate.h"
-#if WK_API_ENABLED
+#if WK_API_ENABLED && PLATFORM(MAC)
@implementation TestBrowsingContextLoadDelegate
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm (188891 => 188892)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -33,6 +33,7 @@
#import <_javascript_Core/JSRetainPtr.h>
#import <_javascript_Core/JSStringRef.h>
#import <_javascript_Core/JSStringRefCF.h>
+#import <UIKit/UIAccessibility.h>
#import <WebKit/WKBundle.h>
#import <WebKit/WKBundlePage.h>
#import <WebKit/WKBundlePagePrivate.h>
@@ -49,8 +50,8 @@
if (m_globalNotificationHandler)
return false;
m_globalNotificationHandler = [[AccessibilityNotificationHandler alloc] init];
- [m_globalNotificationHandler.get() setCallback:functionCallback];
- [m_globalNotificationHandler.get() startObserving];
+ [m_globalNotificationHandler setCallback:functionCallback];
+ [m_globalNotificationHandler startObserving];
return true;
}
Modified: trunk/Tools/WebKitTestRunner/ios/mainIOS.mm (188891 => 188892)
--- trunk/Tools/WebKitTestRunner/ios/mainIOS.mm 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/WebKitTestRunner/ios/mainIOS.mm 2015-08-24 23:11:25 UTC (rev 188892)
@@ -26,8 +26,8 @@
#import "config.h"
#import "TestController.h"
+#import <UIKit/UIKit.h>
-
static int _argc;
static const char **_argv;
@@ -58,7 +58,6 @@
};
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-
NSTimeInterval timeRemaining;
while (true) {
timeRemaining = [application backgroundTimeRemaining];
