<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[188892] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/188892">188892</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-08-24 16:11:25 -0700 (Mon, 24 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>(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.
* 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessiosDatabaseProcessIOSmm">trunk/Source/WebKit2/DatabaseProcess/ios/DatabaseProcessIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessiosNetworkProcessIOSmm">trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsmacPluginSandboxProfilemm">trunk/Source/WebKit2/Shared/Plugins/mac/PluginSandboxProfile.mm</a></li>
<li><a href="#trunkSourceWebKit2SharediosChildProcessIOSmm">trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSh">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewh">trunk/Source/WebKit2/UIProcess/ios/WKContentView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsCustomProtocolsSyncXHRTestmm">trunk/Tools/TestWebKitAPI/Tests/CustomProtocolsSyncXHRTest.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaContentFilteringmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ObjCCustomProtocolsInvalidSchememm">trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ObjCCustomProtocolsTestmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ObjCPreventImageLoadWithAutoResizingmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ObjCUserContentTestmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ObjCWKBrowsingContextGroupTestmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextGroupTest.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2ObjCWKBrowsingContextLoadDelegateTestmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextLoadDelegateTest.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPImacTestBrowsingContextLoadDelegateh">trunk/Tools/TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.h</a></li>
<li><a href="#trunkToolsTestWebKitAPImacTestBrowsingContextLoadDelegatemm">trunk/Tools/TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityControllerIOSmm">trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosmainIOSmm">trunk/Tools/WebKitTestRunner/ios/mainIOS.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/Source/WebKit2/UIProcess/API/ios/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-08-24 Tim Horton <timothy_horton@apple.com>
+
+ (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.
+
</ins><span class="cx"> 2015-08-24 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename _WKVisitedLinkProvider to _WKVisitedLinkStore for consistency
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessiosDatabaseProcessIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/ios/DatabaseProcessIOS.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE_MANUAL_DATABASE_SANDBOXING
</span><span class="cx"> // Need to override the default, because service has a different bundle ID.
</span><del>- NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
</del><ins>+ NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
</ins><span class="cx"> sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.Databases" ofType:@"sb"]);
</span><span class="cx"> ChildProcess::initializeSandbox(parameters, sandboxParameters);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessiosNetworkProcessIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE_MANUAL_NETWORK_SANDBOXING
</span><span class="cx"> // Need to override the default, because service has a different bundle ID.
</span><del>- NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
</del><ins>+ NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
</ins><span class="cx"> sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.NetworkProcess" ofType:@"sb"]);
</span><span class="cx">
</span><span class="cx"> ChildProcess::initializeSandbox(parameters, sandboxParameters);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsmacPluginSandboxProfilemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/mac/PluginSandboxProfile.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PluginSandboxProfile.h"
</span><span class="cx">
</span><ins>+#include "WKFoundation.h"
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/text/StringConcatenate.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -34,7 +35,12 @@
</span><span class="cx">
</span><span class="cx"> static NSString *pluginSandboxProfileDirectory()
</span><span class="cx"> {
</span><del>- return [[[NSBundle bundleForClass:NSClassFromString(@"WKView")] resourcePath] stringByAppendingPathComponent:@"PlugInSandboxProfiles"];
</del><ins>+#if WK_API_ENABLED
+ NSBundle *bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
+#else
+ NSBundle *bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
+#endif
+ return [[bundle resourcePath] stringByAppendingPathComponent:@"PlugInSandboxProfiles"];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NSString *pluginSandboxProfileName(const String& bundleIdentifier)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharediosChildProcessIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ios/ChildProcessIOS.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> void ChildProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MANUAL_SANDBOXING)
</span><del>- NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
</del><ins>+ NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
</ins><span class="cx"> String defaultProfilePath = [webkit2Bundle pathForResource:[[NSBundle mainBundle] bundleIdentifier] ofType:@"sb"];
</span><span class="cx"> if (sandboxParameters.systemDirectorySuffix().isNull()) {
</span><span class="cx"> String defaultSystemDirectorySuffix = String([[NSBundle mainBundle] bundleIdentifier]) + "+" + parameters.clientIdentifier;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,11 +25,9 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WKFoundation.h>
</span><span class="cx">
</span><del>-#if TARGET_OS_IPHONE
-#import <UIKit/UIKit.h>
-#else
</del><ins>+#if !TARGET_OS_IPHONE
+
</ins><span class="cx"> #import <Cocoa/Cocoa.h>
</span><del>-#endif
</del><span class="cx"> #import <WebKit/WKDeclarationSpecifiers.h>
</span><span class="cx">
</span><span class="cx"> @class WKBrowsingContextController;
</span><span class="lines">@@ -37,13 +35,8 @@
</span><span class="cx"> @class WKProcessGroup;
</span><span class="cx"> @class WKViewData;
</span><span class="cx">
</span><del>-#if TARGET_OS_IPHONE
</del><span class="cx"> WK_EXPORT
</span><del>-@interface WKView : UIView {
-#else
-WK_EXPORT
</del><span class="cx"> @interface WKView : NSView <NSTextInputClient> {
</span><del>-#endif
</del><span class="cx"> @private
</span><span class="cx"> WKViewData *_data;
</span><span class="cx"> unsigned _unused;
</span><span class="lines">@@ -51,13 +44,8 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#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
</del><span class="cx"> - (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup;
</span><span class="cx"> - (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup relatedToView:(WKView *)relatedView;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> @property(readonly) WKBrowsingContextController *browsingContextController;
</span><span class="cx">
</span><span class="lines">@@ -66,8 +54,6 @@
</span><span class="cx"> @property BOOL drawsBackground;
</span><span class="cx"> @property BOOL drawsTransparentBackground;
</span><span class="cx">
</span><del>-#if TARGET_OS_IPHONE
-@property (nonatomic, readonly) UIScrollView *scrollView;
-#endif
-
</del><span class="cx"> @end
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS WKContentView;
</span><del>-OBJC_CLASS WKView;
</del><span class="cx"> OBJC_CLASS WKWebView;
</span><span class="cx"> OBJC_CLASS WKEditorUndoTargetObjC;
</span><span class="cx">
</span><span class="lines">@@ -46,7 +45,6 @@
</span><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx"> PageClientImpl(WKContentView *, WKWebView *);
</span><del>- PageClientImpl(WKContentView *, WKView *);
</del><span class="cx"> virtual ~PageClientImpl();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -191,7 +189,6 @@
</span><span class="cx">
</span><span class="cx"> WKContentView *m_contentView;
</span><span class="cx"> WKWebView *m_webView;
</span><del>- WKView *m_wkView;
</del><span class="cx"> RetainPtr<WKEditorUndoTargetObjC> m_undoTarget;
</span><span class="cx"> };
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #import "WKContentViewInteraction.h"
</span><span class="cx"> #import "WKGeolocationProviderIOS.h"
</span><span class="cx"> #import "WKProcessPoolInternal.h"
</span><del>-#import "WKViewPrivate.h"
</del><span class="cx"> #import "WKWebViewConfigurationInternal.h"
</span><span class="cx"> #import "WKWebViewContentProviderRegistry.h"
</span><span class="cx"> #import "WKWebViewInternal.h"
</span><span class="lines">@@ -111,19 +110,10 @@
</span><span class="cx"> PageClientImpl::PageClientImpl(WKContentView *contentView, WKWebView *webView)
</span><span class="cx"> : m_contentView(contentView)
</span><span class="cx"> , m_webView(webView)
</span><del>- , m_wkView(nil)
</del><span class="cx"> , m_undoTarget(adoptNS([[WKEditorUndoTargetObjC alloc] init]))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PageClientImpl::PageClientImpl(WKContentView *contentView, WKView *wkView)
- : m_contentView(contentView)
- , m_webView(nil)
- , m_wkView(wkView)
- , m_undoTarget(adoptNS([[WKEditorUndoTargetObjC alloc] init]))
-{
-}
-
</del><span class="cx"> PageClientImpl::~PageClientImpl()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -223,7 +213,6 @@
</span><span class="cx"> {
</span><span class="cx"> [m_contentView _didRelaunchProcess];
</span><span class="cx"> [m_webView _didRelaunchProcess];
</span><del>- [m_wkView _didRelaunchProcess];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::pageClosed()
</span><span class="lines">@@ -743,14 +732,12 @@
</span><span class="cx"> {
</span><span class="cx"> [m_contentView retain];
</span><span class="cx"> [m_webView retain];
</span><del>- [m_wkView retain];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::derefView()
</span><span class="cx"> {
</span><span class="cx"> [m_contentView release];
</span><span class="cx"> [m_webView release];
</span><del>- [m_wkView release];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.h (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> @class WKContentView;
</span><del>-@class WKView;
</del><span class="cx"> @class WKWebView;
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="lines">@@ -65,7 +64,6 @@
</span><span class="cx"> @property (nonatomic, readonly) BOOL isBackground;
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView;
</span><del>-- (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration wkView:(WKView *)webView;
</del><span class="cx">
</span><span class="cx"> - (void)didUpdateVisibleRect:(CGRect)visibleRect unobscuredRect:(CGRect)unobscuredRect
</span><span class="cx"> unobscuredRectInScrollViewCoordinates:(CGRect)unobscuredRectInScrollViewCoordinates
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -232,18 +232,6 @@
</span><span class="cx"> return [self _commonInitializationWithProcessPool:processPool configuration:WTF::move(configuration)];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (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)];
-}
-
</del><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><span class="cx"> [self cleanupInteraction];
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -646,7 +646,6 @@
</span><span class="cx"> 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */; };
</span><span class="cx"> 2DA1E4FE18C02B6A00DBC929 /* WKPDFView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA1E4FC18C02B6A00DBC929 /* WKPDFView.h */; };
</span><span class="cx"> 2DA1E4FF18C02B6A00DBC929 /* WKPDFView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA1E4FD18C02B6A00DBC929 /* WKPDFView.mm */; };
</span><del>- 2DA944951884E3B500ED86DB /* WKViewIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944861884E3B500ED86DB /* WKViewIOS.mm */; };
</del><span class="cx"> 2DA9449E1884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */; };
</span><span class="cx"> 2DA9449F1884E4F000ED86DB /* NativeWebTouchEventIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */; };
</span><span class="cx"> 2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */; };
</span><span class="lines">@@ -2797,7 +2796,6 @@
</span><span class="cx"> 2DA1E4FC18C02B6A00DBC929 /* WKPDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKPDFView.h; path = ios/WKPDFView.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DA1E4FD18C02B6A00DBC929 /* WKPDFView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKPDFView.mm; path = ios/WKPDFView.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DA7FDCB18F88625008DDED0 /* FindIndicatorOverlayClientIOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = FindIndicatorOverlayClientIOS.h; path = ios/FindIndicatorOverlayClientIOS.h; sourceTree = "<group>"; };
</span><del>- 2DA944861884E3B500ED86DB /* WKViewIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKViewIOS.mm; path = ios/WKViewIOS.mm; sourceTree = "<group>"; };
</del><span class="cx"> 2DA944971884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NativeWebKeyboardEventIOS.mm; path = ios/NativeWebKeyboardEventIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DA944981884E4F000ED86DB /* NativeWebTouchEventIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NativeWebTouchEventIOS.mm; path = ios/NativeWebTouchEventIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebIOSEventFactory.h; path = ios/WebIOSEventFactory.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5091,14 +5089,6 @@
</span><span class="cx"> path = Cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 2DA944771884E3AB00ED86DB /* ios */ = {
- isa = PBXGroup;
- children = (
- 2DA944861884E3B500ED86DB /* WKViewIOS.mm */,
- );
- name = ios;
- sourceTree = "<group>";
- };
</del><span class="cx"> 2DA944961884E4DA00ED86DB /* ios */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -6230,7 +6220,6 @@
</span><span class="cx"> BC0C376610F807660076D7CB /* C */,
</span><span class="cx"> 37C4C08318149C2A003688B9 /* Cocoa */,
</span><span class="cx"> BC8A501311765F4500757573 /* cpp */,
</span><del>- 2DA944771884E3AB00ED86DB /* ios */,
</del><span class="cx"> BC111B47112F616900337BAB /* mac */,
</span><span class="cx"> 076E884D1A13CADF005E90FC /* APIContextMenuClient.h */,
</span><span class="cx"> 83891B621A68B3420030F386 /* APIDiagnosticLoggingClient.h */,
</span><span class="lines">@@ -10111,7 +10100,6 @@
</span><span class="cx"> 1AAF089A19267EE500B6390C /* WKUserScript.mm in Sources */,
</span><span class="cx"> 7C89D2A31A678875003A5FDE /* WKUserScriptRef.cpp in Sources */,
</span><span class="cx"> BC8699B6116AADAA002A925B /* WKView.mm in Sources */,
</span><del>- 2DA944951884E3B500ED86DB /* WKViewIOS.mm in Sources */,
</del><span class="cx"> 2D28A4981AF965A200F190C9 /* WKViewLayoutStrategy.mm in Sources */,
</span><span class="cx"> C5E1AFE816B20B67006CC1F2 /* WKWebArchive.cpp in Sources */,
</span><span class="cx"> C5E1AFEA16B20B7B006CC1F2 /* WKWebArchiveResource.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -213,11 +213,15 @@
</span><span class="cx"> #if ENABLE(WEB_PROCESS_SANDBOX)
</span><span class="cx"> #if ENABLE(MANUAL_SANDBOXING)
</span><span class="cx"> // Need to override the default, because service has a different bundle ID.
</span><del>- NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
</del><ins>+#if WK_API_ENABLED
+ NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKWebView")];
+#else
+ NSBundle *webKit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")];
+#endif
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.WebContent" ofType:@"sb"]);
</del><ins>+ sandboxParameters.setOverrideSandboxProfilePath([webKit2Bundle pathForResource:@"com.apple.WebKit.WebContent" ofType:@"sb"]);
</ins><span class="cx"> #else
</span><del>- sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebProcess" ofType:@"sb"]);
</del><ins>+ sandboxParameters.setOverrideSandboxProfilePath([webKit2Bundle pathForResource:@"com.apple.WebProcess" ofType:@"sb"]);
</ins><span class="cx"> #endif
</span><span class="cx"> ChildProcess::initializeSandbox(parameters, sandboxParameters);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-24 22:45:17 UTC (rev 188891)
+++ trunk/Tools/ChangeLog 2015-08-24 23:11:25 UTC (rev 188892)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-08-24 Tim Horton <timothy_horton@apple.com>
+
+ (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.
+
</ins><span class="cx"> 2015-08-24 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support to dashboard for displaying Git SHA's as revisions.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsCustomProtocolsSyncXHRTestmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/CustomProtocolsSyncXHRTest.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #import <WebKit/WKViewPrivate.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
</del><ins>+#if WK_API_ENABLED && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> static bool testFinished = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaContentFilteringmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ContentFiltering.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
</del><ins>+#if WK_API_ENABLED && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #import "PlatformUtilities.h"
</span><span class="cx"> #import "TestProtocol.h"
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ObjCCustomProtocolsInvalidSchememm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsInvalidScheme.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #import <WebKit/WebKit2.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
</del><ins>+#if WK_API_ENABLED && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> static bool testFinished = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ObjCCustomProtocolsTestmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/CustomProtocolsTest.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #import <WebKit/WebKit2.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
</del><ins>+#if WK_API_ENABLED && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> static bool testFinished = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ObjCPreventImageLoadWithAutoResizingmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #import <WebKit/WebKit2.h>
</span><span class="cx"> #import <WebKit/WKViewPrivate.h>
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
</del><ins>+#if WK_API_ENABLED && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> static bool testFinished = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ObjCUserContentTestmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/UserContentTest.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #import <WebKit/WKViewPrivate.h>
</span><span class="cx"> #import <WebKit/WebKit2.h>
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
</del><ins>+#if WK_API_ENABLED && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> static bool testFinished = false;
</span><span class="cx"> static NSString *htmlString = @"<body style='background-color: red'>";
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ObjCWKBrowsingContextGroupTestmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextGroupTest.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WKBrowsingContextGroup.h>
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
</del><ins>+#if WK_API_ENABLED && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> TEST(WKBrowsingContextGroupTest, GetSetJavaScriptEnabled)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2ObjCWKBrowsingContextLoadDelegateTestmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2ObjC/WKBrowsingContextLoadDelegateTest.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> #import "PlatformUtilities.h"
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
</del><ins>+#if WK_API_ENABLED && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> namespace {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPImacTestBrowsingContextLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.h (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WebKit2.h>
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
</del><ins>+#if WK_API_ENABLED && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> typedef void (^OnLoadBlock)(WKBrowsingContextController *);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPImacTestBrowsingContextLoadDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/mac/TestBrowsingContextLoadDelegate.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestBrowsingContextLoadDelegate.h"
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
</del><ins>+#if WK_API_ENABLED && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> @implementation TestBrowsingContextLoadDelegate
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import <JavaScriptCore/JSRetainPtr.h>
</span><span class="cx"> #import <JavaScriptCore/JSStringRef.h>
</span><span class="cx"> #import <JavaScriptCore/JSStringRefCF.h>
</span><ins>+#import <UIKit/UIAccessibility.h>
</ins><span class="cx"> #import <WebKit/WKBundle.h>
</span><span class="cx"> #import <WebKit/WKBundlePage.h>
</span><span class="cx"> #import <WebKit/WKBundlePagePrivate.h>
</span><span class="lines">@@ -49,8 +50,8 @@
</span><span class="cx"> if (m_globalNotificationHandler)
</span><span class="cx"> return false;
</span><span class="cx"> m_globalNotificationHandler = [[AccessibilityNotificationHandler alloc] init];
</span><del>- [m_globalNotificationHandler.get() setCallback:functionCallback];
- [m_globalNotificationHandler.get() startObserving];
</del><ins>+ [m_globalNotificationHandler setCallback:functionCallback];
+ [m_globalNotificationHandler startObserving];
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosmainIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/mainIOS.mm (188891 => 188892)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx">
</span><span class="cx"> #import "TestController.h"
</span><ins>+#import <UIKit/UIKit.h>
</ins><span class="cx">
</span><del>-
</del><span class="cx"> static int _argc;
</span><span class="cx"> static const char **_argv;
</span><span class="cx">
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
</span><del>-
</del><span class="cx"> NSTimeInterval timeRemaining;
</span><span class="cx"> while (true) {
</span><span class="cx"> timeRemaining = [application backgroundTimeRemaining];
</span></span></pre>
</div>
</div>
</body>
</html>