<!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>[194472] trunk/Source</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/194472">194472</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-12-31 15:49:46 -0800 (Thu, 31 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using USE(CFNETWORK) path on iOS
Source/WebCore:
https://bugs.webkit.org/show_bug.cgi?id=142540
Step 1/2: Do everything but turn off USE(CFNETWORK) internally.
Original patch by Antti Koivisto <antti@apple.com> on 2015-03-10
Reviewed by Daniel Bates.
Unify OS X and iOS code paths.
This patch just fixes the NSURLConnection code path on iOS. It
doesn't yet delete any unnecessary code.
Changes covered by most existing tests.
* loader/DocumentLoader.h:
* loader/ResourceLoader.cpp:
* loader/ResourceLoader.h:
* loader/mac/DocumentLoaderMac.cpp:
- Update for iOS to use NSURLConnection loader.
* page/mac/PageMac.mm:
(WebCore::Page::platformInitialize): Always use the correct
runloop on iOS regardless of which thread this was called on.
(WebCore::Page::addSchedulePair): Update for iOS to use
NSURLConnection loader.
(WebCore::Page::removeSchedulePair): Ditto.
* platform/ios/wak/WebCoreThread.h:
(WebThreadRunLoop): No longer needs to be exported.
(WebThreadNSRunLoop): Export for WebKitLegacy.
* platform/network/ios/QuickLook.mm: Fix header order.
(WebQuickLookHandleAsDelegate): Make delegate objects implement
WebCoreResourceLoaderDelegate protocol. This unifies the
-clearHandle and -detachHandle methods that were used on iOS and
OS X, respectively.
(-[WebQuickLookHandleAsDelegate clearHandle]): Deleted.
(-[WebQuickLookHandleAsDelegate detachHandle]): Renamed from
-clearHandle.
(WebResourceLoaderQuickLookDelegate): Make delegate objects
implement WebCoreResourceLoaderDelegate protocol.
(-[WebResourceLoaderQuickLookDelegate clearHandle]): Deleted.
(-[WebResourceLoaderQuickLookDelegate detachHandle]): Renamed from
-clearHandle.
(WebCore::QuickLookHandle::~QuickLookHandle): Call
-detachHandle instead of -clearHandle.
* platform/network/mac/ResourceHandleMac.mm:
- Update for iOS to use NSURLConnection loader.
* platform/network/mac/WebCoreResourceHandleAsDelegate.h:
(WebCoreResourceLoaderDelegate): Define new protocol.
* platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
(-[WebCoreResourceHandleAsDelegate detachHandle]): Gratuitous
nullptr fix.
* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h:
(WebCoreResourceHandleAsOperationQueueDelegate): Implement
WebCoreResourceLoaderDelegate protocol.
* platform/spi/cocoa/NSURLDownloadSPI.h: Declare more
NSURDownload SPI to clean up other source files and make
source compile on iOS with NSURLConnection code path.
Source/WebKit/mac:
https://bugs.webkit.org/show_bug.cgi?id=142540
Step 1/2: Do everything but turn off USE(CFNETWORK) internally.
Original patch by Antti Koivisto <antti@apple.com> on 2015-03-10
Reviewed by Daniel Bates.
* Misc/WebDownload.h: Add header guard to make
NSURLDownloadSPI.h work when pre-declaring NSURLDownload object.
* Misc/WebKitVersionChecks.h: Define
WEBKIT_FIRST_VERSION_WITH_LOADING_DURING_COMMON_RUNLOOP_MODES
for iOS.
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]): Use
the correct runloop on iOS.
* WebView/WebViewPrivate.h:
(-[WebView(WebPendingPublic) scheduleInRunLoop:forMode:]):
(-[WebView(WebPendingPublic) unscheduleFromRunLoop:forMode:]):
- These are available on iOS now.
Source/WebKit2:
https://bugs.webkit.org/show_bug.cgi?id=142540
Step 1/2: Do everything but turn off USE(CFNETWORK) internally.
Original patch by Antti Koivisto <antti@apple.com> on 2015-03-10
Reviewed by Daniel Bates.
* NetworkProcess/Downloads/ios/DownloadIOS.mm: This is now the
USE(CFNETWORK) && !USE(NETWORK_SESSION) code path.
* NetworkProcess/Downloads/mac/DownloadMac.mm: This is now the
!USE(CFNETWORK) && !USE(NETWORK_SESSION) code path. Make use of
NSURLDownloadSPI.h. Ignore a deprecated delcaration warning now
that we're using actual header declarations internally.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::initializeNetworkProcess): Update for
iOS to use NSURLConnection loader.
Source/WTF:
<https://webkit.org/b/142540>
Step 1/2: Do everything but turn off USE(CFNETWORK) internally.
Original patch by Antti Koivisto <antti@apple.com> on 2015-03-10
Reviewed by Daniel Bates.
* wtf/SchedulePair.h: Update macros to match WebCore.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfSchedulePairh">trunk/Source/WTF/wtf/SchedulePair.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoaderh">trunk/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadercpp">trunk/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoaderh">trunk/Source/WebCore/loader/ResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloadermacDocumentLoaderMaccpp">trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp</a></li>
<li><a href="#trunkSourceWebCorepagemacPageMacmm">trunk/Source/WebCore/page/mac/PageMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWebCoreThreadh">trunk/Source/WebCore/platform/ios/wak/WebCoreThread.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkiosQuickLookmm">trunk/Source/WebCore/platform/network/ios/QuickLook.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegateh">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegatemm">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegateh">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNSURLDownloadSPIh">trunk/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebDownloadh">trunk/Source/WebKit/mac/Misc/WebDownload.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitVersionChecksh">trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewPrivateh">trunk/Source/WebKit/mac/WebView/WebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsiosDownloadIOSmm">trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsmacDownloadMacmm">trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WTF/ChangeLog 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-12-31 David Kilzer <ddkilzer@apple.com>
+
+ Stop using USE(CFNETWORK) path on iOS
+ <https://webkit.org/b/142540>
+
+ Step 1/2: Do everything but turn off USE(CFNETWORK) internally.
+
+ Original patch by Antti Koivisto <antti@apple.com> on 2015-03-10
+ Reviewed by Daniel Bates.
+
+ * wtf/SchedulePair.h: Update macros to match WebCore.
+
</ins><span class="cx"> 2015-12-31 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename WTF_MOVE to WTFMove
</span></span></pre></div>
<a id="trunkSourceWTFwtfSchedulePairh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/SchedulePair.h (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SchedulePair.h 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WTF/wtf/SchedulePair.h 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if USE(FOUNDATION)
</del><ins>+#if PLATFORM(COCOA) && !USE(CFNETWORK)
</ins><span class="cx"> OBJC_CLASS NSRunLoop;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<SchedulePair> create(CFRunLoopRef runLoop, CFStringRef mode) { return adoptRef(*new SchedulePair(runLoop, mode)); }
</span><span class="cx">
</span><del>-#if USE(FOUNDATION) && !USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) && !USE(CFNETWORK)
</ins><span class="cx"> static Ref<SchedulePair> create(NSRunLoop* runLoop, CFStringRef mode) { return adoptRef(*new SchedulePair(runLoop, mode)); }
</span><span class="cx"> NSRunLoop* nsRunLoop() const { return m_nsRunLoop.get(); }
</span><span class="cx"> #endif
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> m_mode = adoptCF(CFStringCreateCopy(0, mode));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(FOUNDATION) && !USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) && !USE(CFNETWORK)
</ins><span class="cx"> WTF_EXPORT_PRIVATE SchedulePair(NSRunLoop*, CFStringRef);
</span><span class="cx"> RetainPtr<NSRunLoop*> m_nsRunLoop;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/ChangeLog 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -1,3 +1,71 @@
</span><ins>+2015-12-31 David Kilzer <ddkilzer@apple.com>
+
+ Stop using USE(CFNETWORK) path on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=142540
+
+ Step 1/2: Do everything but turn off USE(CFNETWORK) internally.
+
+ Original patch by Antti Koivisto <antti@apple.com> on 2015-03-10
+ Reviewed by Daniel Bates.
+
+ Unify OS X and iOS code paths.
+
+ This patch just fixes the NSURLConnection code path on iOS. It
+ doesn't yet delete any unnecessary code.
+
+ Changes covered by most existing tests.
+
+ * loader/DocumentLoader.h:
+ * loader/ResourceLoader.cpp:
+ * loader/ResourceLoader.h:
+ * loader/mac/DocumentLoaderMac.cpp:
+ - Update for iOS to use NSURLConnection loader.
+
+ * page/mac/PageMac.mm:
+ (WebCore::Page::platformInitialize): Always use the correct
+ runloop on iOS regardless of which thread this was called on.
+ (WebCore::Page::addSchedulePair): Update for iOS to use
+ NSURLConnection loader.
+ (WebCore::Page::removeSchedulePair): Ditto.
+
+ * platform/ios/wak/WebCoreThread.h:
+ (WebThreadRunLoop): No longer needs to be exported.
+ (WebThreadNSRunLoop): Export for WebKitLegacy.
+
+ * platform/network/ios/QuickLook.mm: Fix header order.
+ (WebQuickLookHandleAsDelegate): Make delegate objects implement
+ WebCoreResourceLoaderDelegate protocol. This unifies the
+ -clearHandle and -detachHandle methods that were used on iOS and
+ OS X, respectively.
+ (-[WebQuickLookHandleAsDelegate clearHandle]): Deleted.
+ (-[WebQuickLookHandleAsDelegate detachHandle]): Renamed from
+ -clearHandle.
+ (WebResourceLoaderQuickLookDelegate): Make delegate objects
+ implement WebCoreResourceLoaderDelegate protocol.
+ (-[WebResourceLoaderQuickLookDelegate clearHandle]): Deleted.
+ (-[WebResourceLoaderQuickLookDelegate detachHandle]): Renamed from
+ -clearHandle.
+ (WebCore::QuickLookHandle::~QuickLookHandle): Call
+ -detachHandle instead of -clearHandle.
+
+ * platform/network/mac/ResourceHandleMac.mm:
+ - Update for iOS to use NSURLConnection loader.
+
+ * platform/network/mac/WebCoreResourceHandleAsDelegate.h:
+ (WebCoreResourceLoaderDelegate): Define new protocol.
+
+ * platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
+ (-[WebCoreResourceHandleAsDelegate detachHandle]): Gratuitous
+ nullptr fix.
+
+ * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h:
+ (WebCoreResourceHandleAsOperationQueueDelegate): Implement
+ WebCoreResourceLoaderDelegate protocol.
+
+ * platform/spi/cocoa/NSURLDownloadSPI.h: Declare more
+ NSURDownload SPI to clean up other source files and make
+ source compile on iOS with NSURLConnection code path.
+
</ins><span class="cx"> 2015-12-31 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix warnings uncovered by migrating to WTF_MOVE
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -56,6 +56,10 @@
</span><span class="cx"> #include "QuickLook.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA) && !USE(CFNETWORK)
+#include <wtf/SchedulePair.h>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class ApplicationCacheHost;
</span><span class="lines">@@ -144,7 +148,7 @@
</span><span class="cx"> WEBCORE_EXPORT void setTitle(const StringWithDirection&);
</span><span class="cx"> const String& overrideEncoding() const { return m_overrideEncoding; }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA) && !USE(CFNETWORK)
</ins><span class="cx"> void schedule(SchedulePair&);
</span><span class="cx"> void unschedule(SchedulePair&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -724,7 +724,7 @@
</span><span class="cx"> cancel();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA) && !USE(CFNETWORK)
</ins><span class="cx">
</span><span class="cx"> void ResourceLoader::schedule(SchedulePair& pair)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.h (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.h 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx">
</span><span class="cx"> void willSwitchToSubstituteResource();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA) && !USE(CFNETWORK)
</ins><span class="cx"> void schedule(WTF::SchedulePair&);
</span><span class="cx"> void unschedule(WTF::SchedulePair&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloadermacDocumentLoaderMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/loader/mac/DocumentLoaderMac.cpp 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if !USE(CFNETWORK)
</ins><span class="cx">
</span><span class="cx"> static void scheduleAll(const ResourceLoaderMap& loaders, SchedulePair& pair)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/PageMac.mm (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/PageMac.mm 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/page/mac/PageMac.mm 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -34,13 +34,21 @@
</span><span class="cx"> #import "FrameTree.h"
</span><span class="cx"> #import "MainFrame.h"
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#import "WebCoreThread.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> void Page::platformInitialize()
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> #if USE(CFNETWORK)
</span><del>- addSchedulePair(SchedulePair::create([[NSRunLoop currentRunLoop] getCFRunLoop], kCFRunLoopCommonModes));
</del><ins>+ addSchedulePair(SchedulePair::create(WebThreadRunLoop(), kCFRunLoopCommonModes));
</ins><span class="cx"> #else
</span><ins>+ addSchedulePair(SchedulePair::create(WebThreadNSRunLoop(), kCFRunLoopCommonModes));
+#endif // USE(CFNETWORK)
+#else
</ins><span class="cx"> addSchedulePair(SchedulePair::create([NSRunLoop currentRunLoop], kCFRunLoopCommonModes));
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -51,7 +59,7 @@
</span><span class="cx"> m_scheduledRunLoopPairs = std::make_unique<SchedulePairHashSet>();
</span><span class="cx"> m_scheduledRunLoopPairs->add(pair.ptr());
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#if !USE(CFNETWORK)
</ins><span class="cx"> for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (DocumentLoader* documentLoader = frame->loader().documentLoader())
</span><span class="cx"> documentLoader->schedule(pair);
</span><span class="lines">@@ -71,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> m_scheduledRunLoopPairs->remove(pair.ptr());
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#if !USE(CFNETWORK)
</ins><span class="cx"> for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (DocumentLoader* documentLoader = frame->loader().documentLoader())
</span><span class="cx"> documentLoader->unschedule(pair);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWebCoreThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WebCoreThread.h (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WebCoreThread.h 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/platform/ios/wak/WebCoreThread.h 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -80,8 +80,8 @@
</span><span class="cx"> static inline bool WebThreadShouldYield(void) { return webThreadShouldYield; }
</span><span class="cx"> static inline void WebThreadSetShouldYield() { webThreadShouldYield = true; }
</span><span class="cx">
</span><del>-WEBCORE_EXPORT CFRunLoopRef WebThreadRunLoop(void);
-NSRunLoop* WebThreadNSRunLoop(void);
</del><ins>+CFRunLoopRef WebThreadRunLoop(void);
+WEBCORE_EXPORT NSRunLoop* WebThreadNSRunLoop(void);
</ins><span class="cx"> WebThreadContext *WebThreadCurrentContext(void);
</span><span class="cx"> bool WebThreadContextIsCurrent(void);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkiosQuickLookmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ios/QuickLook.mm (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ios/QuickLook.mm 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/platform/network/ios/QuickLook.mm 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -32,12 +32,12 @@
</span><span class="cx"> #import "FileSystemIOS.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "NSFileManagerSPI.h"
</span><del>-#import "QuickLookSoftLink.h"
</del><span class="cx"> #import "ResourceError.h"
</span><span class="cx"> #import "ResourceHandle.h"
</span><span class="cx"> #import "ResourceLoader.h"
</span><span class="cx"> #import "RuntimeApplicationChecksIOS.h"
</span><span class="cx"> #import "SynchronousResourceHandleCFURLConnectionDelegate.h"
</span><ins>+#import "WebCoreResourceHandleAsDelegate.h"
</ins><span class="cx"> #import "WebCoreURLResponseIOS.h"
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+#import "QuickLookSoftLink.h"
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> NSSet *WebCore::QLPreviewGetSupportedMIMETypesSet()
</span><span class="lines">@@ -193,12 +195,11 @@
</span><span class="cx"> // This works fine when using NS APIs, but when using CFNetwork, we don't have a NSURLConnectionDelegate.
</span><span class="cx"> // So we create WebQuickLookHandleAsDelegate as an intermediate delegate object and pass it to
</span><span class="cx"> // QLPreviewConverter. The proxy delegate then forwards the messages on to the CFNetwork code.
</span><del>-@interface WebQuickLookHandleAsDelegate : NSObject <NSURLConnectionDelegate> {
</del><ins>+@interface WebQuickLookHandleAsDelegate : NSObject <NSURLConnectionDelegate, WebCoreResourceLoaderDelegate> {
</ins><span class="cx"> RefPtr<SynchronousResourceHandleCFURLConnectionDelegate> m_connectionDelegate;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)initWithConnectionDelegate:(SynchronousResourceHandleCFURLConnectionDelegate*)connectionDelegate;
</span><del>-- (void)clearHandle;
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebQuickLookHandleAsDelegate
</span><span class="lines">@@ -252,14 +253,14 @@
</span><span class="cx"> m_connectionDelegate->didFail(reinterpret_cast<CFErrorRef>(error));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)clearHandle
</del><ins>+- (void)detachHandle
</ins><span class="cx"> {
</span><span class="cx"> m_connectionDelegate = nullptr;
</span><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-@interface WebResourceLoaderQuickLookDelegate : NSObject <NSURLConnectionDelegate> {
</del><ins>+@interface WebResourceLoaderQuickLookDelegate : NSObject <NSURLConnectionDelegate, WebCoreResourceLoaderDelegate> {
</ins><span class="cx"> RefPtr<ResourceLoader> _resourceLoader;
</span><span class="cx"> BOOL _hasSentDidReceiveResponse;
</span><span class="cx"> BOOL _hasFailed;
</span><span class="lines">@@ -350,7 +351,7 @@
</span><span class="cx"> _resourceLoader->didFail(ResourceError(error));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)clearHandle
</del><ins>+- (void)detachHandle
</ins><span class="cx"> {
</span><span class="cx"> _resourceLoader = nullptr;
</span><span class="cx"> _quickLookHandle = nullptr;
</span><span class="lines">@@ -491,7 +492,7 @@
</span><span class="cx"> LOG(Network, "QuickLookHandle::~QuickLookHandle()");
</span><span class="cx"> m_converter = nullptr;
</span><span class="cx">
</span><del>- [m_delegate clearHandle];
</del><ins>+ [m_delegate detachHandle];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String QuickLookHandle::previewFileName() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> [d->m_connection setDefersCallbacks:defers];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if !USE(CFNETWORK)
</ins><span class="cx">
</span><span class="cx"> void ResourceHandle::schedule(SchedulePair& pair)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.h (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.h 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.h 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -26,17 +26,20 @@
</span><span class="cx"> #ifndef WebCoreResourceHandleAsDelegate_h
</span><span class="cx"> #define WebCoreResourceHandleAsDelegate_h
</span><span class="cx">
</span><del>-#if !USE(CFNETWORK)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> class ResourceHandle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@interface WebCoreResourceHandleAsDelegate : NSObject <NSURLConnectionDelegate> {
</del><ins>+@protocol WebCoreResourceLoaderDelegate
+- (void)detachHandle;
+@end
+
+#if !USE(CFNETWORK)
+
+@interface WebCoreResourceHandleAsDelegate : NSObject <NSURLConnectionDelegate, WebCoreResourceLoaderDelegate> {
</ins><span class="cx"> WebCore::ResourceHandle* m_handle;
</span><span class="cx"> }
</span><span class="cx"> - (id)initWithHandle:(WebCore::ResourceHandle*)handle;
</span><del>-- (void)detachHandle;
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // !USE(CFNETWORK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)detachHandle
</span><span class="cx"> {
</span><del>- m_handle = 0;
</del><ins>+ m_handle = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)newRequest redirectResponse:(NSURLResponse *)redirectResponse
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if !USE(CFNETWORK)
</span><span class="cx">
</span><ins>+#include "WebCoreResourceHandleAsDelegate.h"
</ins><span class="cx"> #include <dispatch/dispatch.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -35,7 +36,7 @@
</span><span class="cx"> class ResourceHandle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@interface WebCoreResourceHandleAsOperationQueueDelegate : NSObject <NSURLConnectionDelegate> {
</del><ins>+@interface WebCoreResourceHandleAsOperationQueueDelegate : NSObject <NSURLConnectionDelegate, WebCoreResourceLoaderDelegate> {
</ins><span class="cx"> WebCore::ResourceHandle* m_handle;
</span><span class="cx">
</span><span class="cx"> // Synchronous delegates on operation queue wait until main thread sends an asynchronous response.
</span><span class="lines">@@ -46,7 +47,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)initWithHandle:(WebCore::ResourceHandle*)handle;
</span><del>-- (void)detachHandle;
</del><span class="cx"> - (void)continueWillSendRequest:(NSURLRequest *)newRequest;
</span><span class="cx"> - (void)continueDidReceiveResponse;
</span><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNSURLDownloadSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -29,8 +29,16 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/NSURLDownload.h>
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#import <Foundation/NSURLDownloadPrivate.h>
</ins><span class="cx"> #else
</span><ins>+@interface NSURLDownload ()
++(id)_downloadWithLoadingConnection:(NSURLConnection *)connection request:(NSURLRequest *)request response:(NSURLResponse *)response delegate:(id)delegate proxy:(id)proxy;
+@end
+#endif
</ins><span class="cx">
</span><ins>+#else
+
</ins><span class="cx"> @class NSString;
</span><span class="cx"> @class NSURLAuthenticationChallenge;
</span><span class="cx"> @class NSURLDownload;
</span><span class="lines">@@ -56,8 +64,22 @@
</span><span class="cx"> - (void)download:(NSURLDownload *)download didFailWithError:(NSError *)error;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#ifndef WebDownload_h
+/* Also defined in <WebKit/WebDownload.h>. */
+@interface NSURLDownload : NSObject
+@end
+#endif
+
</ins><span class="cx"> @interface NSURLDownload ()
</span><span class="cx"> - (instancetype)initWithRequest:(NSURLRequest *)request delegate:(id <NSURLDownloadDelegate>)delegate;
</span><ins>+- (instancetype)initWithResumeData:(NSData *)resumeData delegate:(id <NSURLDownloadDelegate>)delegate path:(NSString *)path;
+- (void)cancel;
+- (void)setDestination:(NSString *)path allowOverwrite:(BOOL)allowOverwrite;
+@property (readonly, copy) NSURLRequest *request;
+@property (readonly, copy) NSData *resumeData;
+@property BOOL deletesFileUponFailure;
+
++(id)_downloadWithLoadingConnection:(NSURLConnection *)connection request:(NSURLRequest *)request response:(NSURLResponse *)response delegate:(id)delegate proxy:(id)proxy;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-12-31 David Kilzer <ddkilzer@apple.com>
+
+ Stop using USE(CFNETWORK) path on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=142540
+
+ Step 1/2: Do everything but turn off USE(CFNETWORK) internally.
+
+ Original patch by Antti Koivisto <antti@apple.com> on 2015-03-10
+ Reviewed by Daniel Bates.
+
+ * Misc/WebDownload.h: Add header guard to make
+ NSURLDownloadSPI.h work when pre-declaring NSURLDownload object.
+ * Misc/WebKitVersionChecks.h: Define
+ WEBKIT_FIRST_VERSION_WITH_LOADING_DURING_COMMON_RUNLOOP_MODES
+ for iOS.
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]): Use
+ the correct runloop on iOS.
+ * WebView/WebViewPrivate.h:
+ (-[WebView(WebPendingPublic) scheduleInRunLoop:forMode:]):
+ (-[WebView(WebPendingPublic) unscheduleFromRunLoop:forMode:]):
+ - These are available on iOS now.
+
</ins><span class="cx"> 2015-12-31 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Clarify that scrollPositionChangedViaPlatformWidget takes offsets
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebDownload.h (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebDownload.h 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.h 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -26,6 +26,9 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#ifndef WebDownload_h
+#define WebDownload_h
+
</ins><span class="cx"> #if !TARGET_OS_IPHONE || (defined USE_APPLE_INTERNAL_SDK && USE_APPLE_INTERNAL_SDK)
</span><span class="cx"> #import <Foundation/NSURLDownload.h>
</span><span class="cx"> #else
</span><span class="lines">@@ -78,3 +81,5 @@
</span><span class="cx"> - (NSWindow *)downloadWindowForAuthenticationSheet:(WebDownload *)download;
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+#endif /* WebDownload_h */
</ins></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitVersionChecksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITH_CSS_ATTRIBUTE_SETTERS_IGNORING_PRIORITY 2239 // iOS 6.0
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITH_YOUTUBE_EMBED_IFRAME_TRANSFORM 2239 // iOS 6.0
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITHOUT_LEGACY_BACKGROUNDSIZE_SHORTHAND_BEHAVIOR 2665 // iOS 7.0
</span><ins>+#define WEBKIT_FIRST_VERSION_WITH_LOADING_DURING_COMMON_RUNLOOP_MODES 2665 // iOS 7.0
</ins><span class="cx"> #define WEBKIT_FIRST_VERSION_WITH_INSECURE_CONTENT_BLOCKING 3454
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -1026,14 +1026,16 @@
</span><span class="cx">
</span><span class="cx"> [WebFrame _createMainFrameWithPage:_private->page frameName:frameName frameView:frameView];
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#if PLATFORM(IOS)
+ NSRunLoop *runLoop = WebThreadNSRunLoop();
+#else
</ins><span class="cx"> NSRunLoop *runLoop = [NSRunLoop mainRunLoop];
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> if (WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_LOADING_DURING_COMMON_RUNLOOP_MODES))
</span><span class="cx"> [self scheduleInRunLoop:runLoop forMode:(NSString *)kCFRunLoopCommonModes];
</span><span class="cx"> else
</span><span class="cx"> [self scheduleInRunLoop:runLoop forMode:NSDefaultRunLoopMode];
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> [self _addToAllWebViewsSet];
</span><span class="cx">
</span><span class="lines">@@ -6618,7 +6620,6 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebView (WebPendingPublic)
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> - (void)scheduleInRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode
</span><span class="cx"> {
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="lines">@@ -6640,7 +6641,6 @@
</span><span class="cx"> if (runLoop && mode)
</span><span class="cx"> core(self)->removeSchedulePair(SchedulePair::create(schedulePairRunLoop, (CFStringRef)mode));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static BOOL findString(NSView <WebDocumentSearching> *searchView, NSString *string, WebFindOptions options)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -198,10 +198,8 @@
</span><span class="cx">
</span><span class="cx"> @interface WebView (WebPendingPublic)
</span><span class="cx">
</span><del>-#if !TARGET_OS_IPHONE
</del><span class="cx"> - (void)scheduleInRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode;
</span><span class="cx"> - (void)unscheduleFromRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> - (BOOL)findString:(NSString *)string options:(WebFindOptions)options;
</span><span class="cx"> - (DOMRange *)DOMRangeOfString:(NSString *)string relativeTo:(DOMRange *)previousRange options:(WebFindOptions)options;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-31 David Kilzer <ddkilzer@apple.com>
+
+ Stop using USE(CFNETWORK) path on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=142540
+
+ Step 1/2: Do everything but turn off USE(CFNETWORK) internally.
+
+ Original patch by Antti Koivisto <antti@apple.com> on 2015-03-10
+ Reviewed by Daniel Bates.
+
+ * NetworkProcess/Downloads/ios/DownloadIOS.mm: This is now the
+ USE(CFNETWORK) && !USE(NETWORK_SESSION) code path.
+ * NetworkProcess/Downloads/mac/DownloadMac.mm: This is now the
+ !USE(CFNETWORK) && !USE(NETWORK_SESSION) code path. Make use of
+ NSURLDownloadSPI.h. Ignore a deprecated delcaration warning now
+ that we're using actual header declarations internally.
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::initializeNetworkProcess): Update for
+ iOS to use NSURLConnection loader.
+
</ins><span class="cx"> 2015-12-31 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix warnings uncovered by migrating to WTF_MOVE
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsiosDownloadIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -26,9 +26,10 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "Download.h"
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && !USE(NETWORK_SESSION)
</del><ins>+#if USE(CFNETWORK) && !USE(NETWORK_SESSION)
</ins><span class="cx">
</span><span class="cx"> #import "DataReference.h"
</span><ins>+#import <CFNetwork/CFURLDownload.h>
</ins><span class="cx"> #import <WebCore/NotImplemented.h>
</span><span class="cx"> #import <WebCore/ResourceError.h>
</span><span class="cx"> #import <WebCore/ResourceHandle.h>
</span><span class="lines">@@ -36,15 +37,10 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/RunLoop.h>
</span><span class="cx">
</span><del>-#if USE(CFNETWORK)
-#import <CFNetwork/CFURLDownload.h>
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-#if USE(CFNETWORK)
</del><span class="cx"> // FIXME: If possible, we should consider moving some callbacks off the main thread or at least
</span><span class="cx"> // making them asynchonous calls.
</span><span class="cx"> static void dispatchOnMainThread(void(^block)())
</span><span class="lines">@@ -125,7 +121,6 @@
</span><span class="cx"> });
</span><span class="cx"> };
</span><span class="cx"> }
</span><del>-#endif // USE(CFNETWORK)
</del><span class="cx">
</span><span class="cx"> void Download::start()
</span><span class="cx"> {
</span><span class="lines">@@ -139,16 +134,12 @@
</span><span class="cx">
</span><span class="cx"> void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& response)
</span><span class="cx"> {
</span><del>-#if USE(CFNETWORK)
</del><span class="cx"> CFURLDownloadClient client;
</span><span class="cx"> setUpDownloadClient(client, *this);
</span><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span class="cx"> m_download = adoptCF(CFURLDownloadCreateAndStartWithLoadingConnection(NULL, handle->releaseConnectionForDownload().get(), m_request.cfURLRequest(UpdateHTTPBody), response.cfURLResponse(), &client));
</span><span class="cx"> #pragma clang diagnostic pop
</span><del>-#else
- notImplemented();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Download::cancel()
</span><span class="lines">@@ -193,4 +184,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // PLATFORM(IOS)
</del><ins>+#endif // USE(CFNETWORK) && !USE(NETWORK_SESSION)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsmacDownloadMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -26,10 +26,11 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "Download.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !USE(NETWORK_SESSION)
</del><ins>+#if !USE(CFNETWORK) && !USE(NETWORK_SESSION)
</ins><span class="cx">
</span><span class="cx"> #import <WebCore/AuthenticationChallenge.h>
</span><span class="cx"> #import <WebCore/AuthenticationMac.h>
</span><ins>+#import <WebCore/NSURLDownloadSPI.h>
</ins><span class="cx"> #import <WebCore/NotImplemented.h>
</span><span class="cx"> #import <WebCore/ResourceHandle.h>
</span><span class="cx"> #import <WebCore/ResourceHandleClient.h>
</span><span class="lines">@@ -37,14 +38,6 @@
</span><span class="cx"> #import "DataReference.h"
</span><span class="cx"> #import "WebPage.h"
</span><span class="cx">
</span><del>-@interface NSURLDownload (WebNSURLDownloadDetails)
-+(id)_downloadWithLoadingConnection:(NSURLConnection *)connection
- request:(NSURLRequest *)request
- response:(NSURLResponse *)r
- delegate:(id)delegate
- proxy:(id)proxy;
-@end
-
</del><span class="cx"> @interface WKDownloadAsDelegate : NSObject <NSURLDownloadDelegate> {
</span><span class="cx"> WebKit::Download* _download;
</span><span class="cx"> }
</span><span class="lines">@@ -77,11 +70,14 @@
</span><span class="cx"> ASSERT(!m_delegate);
</span><span class="cx">
</span><span class="cx"> m_delegate = adoptNS([[WKDownloadAsDelegate alloc] initWithDownload:this]);
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> m_nsURLDownload = [NSURLDownload _downloadWithLoadingConnection:handle->connection()
</span><span class="cx"> request:m_request.nsURLRequest(UpdateHTTPBody)
</span><span class="cx"> response:response.nsURLResponse()
</span><span class="cx"> delegate:m_delegate.get()
</span><span class="cx"> proxy:nil];
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> // FIXME: Allow this to be changed by the client.
</span><span class="cx"> [m_nsURLDownload setDeletesFileUponFailure:NO];
</span><span class="lines">@@ -308,4 +304,4 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC) && !USE(NETWORK_SESSION)
</del><ins>+#endif // !USE(CFNETWORK) && !USE(NETWORK_SESSION)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (194471 => 194472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-12-31 22:51:40 UTC (rev 194471)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-12-31 23:49:46 UTC (rev 194472)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> setCanHandleHTTPSServerTrustEvaluation(parameters.canHandleHTTPSServerTrustEvaluation);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || USE(CFNETWORK)
</del><ins>+#if PLATFORM(COCOA) || USE(CFNETWORK)
</ins><span class="cx"> SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>