<!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>[186781] branches/safari-600.1.4.17-branch/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/186781">186781</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-07-13 14:48:49 -0700 (Mon, 13 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186530">r186530</a>. rdar://problem/21708151</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001417branchSourceWebCoreChangeLog">branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoreWebCoreexpin">branches/safari-600.1.4.17-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoreWebCorexcodeprojprojectpbxproj">branches/safari-600.1.4.17-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoreloaderLoaderStrategycpp">branches/safari-600.1.4.17-branch/Source/WebCore/loader/LoaderStrategy.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoreloaderLoaderStrategyh">branches/safari-600.1.4.17-branch/Source/WebCore/loader/LoaderStrategy.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoreloaderPingLoadercpp">branches/safari-600.1.4.17-branch/Source/WebCore/loader/PingLoader.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoreloaderPingLoaderh">branches/safari-600.1.4.17-branch/Source/WebCore/loader/PingLoader.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2ChangeLog">branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh">branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin">branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh">branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001417branchSourceWebCoreplatformnetworkPingHandleh">branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/PingHandle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001417branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -1,5 +1,49 @@
</span><span class="cx"> 2015-07-13 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186530. rdar://problem/21708151
+
+ * WebCore.exp.in: Export methods.
+
+ 2015-07-08 Brady Eidson <beidson@apple.com>
+
+ Move PingLoaders to the NetworkingProcess.
+ <rdar://problem/18860263> and https://bugs.webkit.org/show_bug.cgi?id=146710
+
+ Reviewed by Tim Horton.
+
+ No new tests.
+ There's no current solution for communicating back to a page that a ping load has reached its target.
+ Until we have such a solution, any attempt at a layout test will be fragile at best.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
+ * loader/LoaderStrategy.cpp:
+ (WebCore::LoaderStrategy::createPingHandle): Default implementation is create the PingHandle directly.
+ * loader/LoaderStrategy.h:
+
+ PingLoader becomes a static class for now that crafts the ResourceRequest then passes it off
+ to the LoaderStrategy:
+ * loader/PingLoader.cpp:
+ (WebCore::PingLoader::loadImage):
+ (WebCore::PingLoader::sendPing):
+ (WebCore::PingLoader::sendViolationReport):
+ (WebCore::PingLoader::startPingLoad):
+ (WebCore::PingLoader::createPingLoader): Deleted.
+ (WebCore::PingLoader::PingLoader): Deleted.
+ (WebCore::PingLoader::~PingLoader): Deleted.
+ * loader/PingLoader.h:
+ (WebCore::PingLoader::timeoutTimerFired): Deleted.
+
+ PingHandle does what PingLoader used to - It's a basic ResourceHandleClient that simply waits
+ for any response/completion/failure and then deletes itself.
+ * platform/network/PingHandle.h: Added.
+ (WebCore::PingHandle::PingHandle):
+ (WebCore::PingHandle::usesAsyncCallbacks):
+ (WebCore::PingHandle::timeoutTimerFired):
+ (WebCore::PingHandle::~PingHandle):
+
+2015-07-13 David Kilzer <ddkilzer@apple.com>
+
</ins><span class="cx"> Merge r186476. rdar://problem/21708269
</span><span class="cx">
</span><span class="cx"> * WebCore.exp.in: Add symbol to export list since WEBCORE_EXPORT
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/WebCore.exp.in (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/WebCore.exp.in 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/WebCore.exp.in 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -371,6 +371,7 @@
</span><span class="cx"> __ZN7WebCore14FrameSelection6modifyENS0_11EAlterationENS_18SelectionDirectionENS_15TextGranularityENS_14EUserTriggeredE
</span><span class="cx"> __ZN7WebCore14FrameSelection9selectAllEv
</span><span class="cx"> __ZN7WebCore14FrameSelectionC1EPNS_5FrameE
</span><ins>+__ZN7WebCore14LoaderStrategy16createPingHandleEPNS_17NetworkingContextERNS_15ResourceRequestEb
</ins><span class="cx"> __ZN7WebCore14LoaderStrategy18createBlobRegistryEv
</span><span class="cx"> __ZN7WebCore14LoaderStrategy21resourceLoadSchedulerEv
</span><span class="cx"> __ZN7WebCore14LoaderStrategy25loadResourceSynchronouslyEPNS_17NetworkingContextEmRKNS_15ResourceRequestENS_17StoredCredentialsENS_22ClientCredentialPolicyERNS_13ResourceErrorERNS_16ResourceResponseERN3WTF6VectorIcLm0ENSC_15CrashOnOverflowEEE
</span><span class="lines">@@ -868,6 +869,7 @@
</span><span class="cx"> __ZN7WebCore20RenderEmbeddedObject44setPluginUnavailabilityReasonWithDescriptionENS0_26PluginUnavailabilityReasonERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore20ResourceHandleClient16didReceiveBufferEPNS_14ResourceHandleEN3WTF10PassRefPtrINS_12SharedBufferEEEi
</span><span class="cx"> __ZN7WebCore20ResourceHandleClient20willSendRequestAsyncEPNS_14ResourceHandleERKNS_15ResourceRequestERKNS_16ResourceResponseE
</span><ins>+__ZN7WebCore20ResourceHandleClient23didReceiveResponseAsyncEPNS_14ResourceHandleERKNS_16ResourceResponseE
</ins><span class="cx"> __ZN7WebCore20ResourceHandleClient42canAuthenticateAgainstProtectionSpaceAsyncEPNS_14ResourceHandleERKNS_15ProtectionSpaceE
</span><span class="cx"> __ZN7WebCore20ResourceHandleClientC2Ev
</span><span class="cx"> __ZN7WebCore20ResourceHandleClientD2Ev
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -1946,6 +1946,7 @@
</span><span class="cx"> 51AF503616F100F60095B2E8 /* ResourceLoaderTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 51AF503516F100F60095B2E8 /* ResourceLoaderTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 51B07A441823248B00AA8D1A /* IDBPendingDeleteCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 51B07A431823248B00AA8D1A /* IDBPendingDeleteCall.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 51B2417B0D931F3F00E83F5C /* LegacyWebArchiveMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51B2417A0D931F3F00E83F5C /* LegacyWebArchiveMac.mm */; };
</span><ins>+ 51B454EA1B4DAE7D0085EAA6 /* PingHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 51B454E91B4DAE7D0085EAA6 /* PingHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 51B58FD4195A964D002990B0 /* PlatformGamepad.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E5FEF195101470086CA5E /* PlatformGamepad.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 51BE37E00DAEE00E001085FC /* StorageArea.h in Headers */ = {isa = PBXBuildFile; fileRef = 51BE37DE0DAEE00E001085FC /* StorageArea.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 51C0AA390F2AA10A001648C2 /* CachedFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C0AA380F2AA10A001648C2 /* CachedFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -9053,6 +9054,7 @@
</span><span class="cx"> 51AF503516F100F60095B2E8 /* ResourceLoaderTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoaderTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> 51B07A431823248B00AA8D1A /* IDBPendingDeleteCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBPendingDeleteCall.h; sourceTree = "<group>"; };
</span><span class="cx"> 51B2417A0D931F3F00E83F5C /* LegacyWebArchiveMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LegacyWebArchiveMac.mm; sourceTree = "<group>"; };
</span><ins>+ 51B454E91B4DAE7D0085EAA6 /* PingHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PingHandle.h; sourceTree = "<group>"; };
</ins><span class="cx"> 51BE37DE0DAEE00E001085FC /* StorageArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageArea.h; sourceTree = "<group>"; };
</span><span class="cx"> 51C0AA380F2AA10A001648C2 /* CachedFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedFrame.h; sourceTree = "<group>"; };
</span><span class="cx"> 51C0AA400F2AA15E001648C2 /* CachedFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CachedFrame.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</span><span class="lines">@@ -16384,6 +16386,7 @@
</span><span class="cx"> E13EF3421684ECF40034C83F /* NetworkStorageSession.h */,
</span><span class="cx"> 447958021643B47B001E0A7F /* ParsedContentType.cpp */,
</span><span class="cx"> 447958031643B47B001E0A7F /* ParsedContentType.h */,
</span><ins>+ 51B454E91B4DAE7D0085EAA6 /* PingHandle.h */,
</ins><span class="cx"> 37BAAE571980D1DD005DFE71 /* ProtectionSpace.h */,
</span><span class="cx"> 514C765F0CE923A1007EF3CD /* ProtectionSpaceBase.cpp */,
</span><span class="cx"> 514C76600CE923A1007EF3CD /* ProtectionSpaceBase.h */,
</span><span class="lines">@@ -24716,6 +24719,7 @@
</span><span class="cx"> FDF7E9C413AC21DB00A51EAC /* JSAudioBufferCallback.h in Headers */,
</span><span class="cx"> FDA15EA012B03EE1003A583A /* JSAudioBufferSourceNode.h in Headers */,
</span><span class="cx"> FDA15EA612B03EE1003A583A /* JSAudioContext.h in Headers */,
</span><ins>+ 51B454EA1B4DAE7D0085EAA6 /* PingHandle.h in Headers */,
</ins><span class="cx"> FDA15EA812B03EE1003A583A /* JSAudioDestinationNode.h in Headers */,
</span><span class="cx"> FDA15EAE12B03EE1003A583A /* JSAudioListener.h in Headers */,
</span><span class="cx"> FDA15EB012B03EE1003A583A /* JSAudioNode.h in Headers */,
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreloaderLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/loader/LoaderStrategy.cpp (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/loader/LoaderStrategy.cpp 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/loader/LoaderStrategy.cpp 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "LoaderStrategy.h"
</span><span class="cx">
</span><span class="cx"> #include "BlobRegistryImpl.h"
</span><ins>+#include "PingHandle.h"
</ins><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx"> #include "ResourceLoadScheduler.h"
</span><span class="cx">
</span><span class="lines">@@ -47,4 +48,10 @@
</span><span class="cx"> return new BlobRegistryImpl;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void LoaderStrategy::createPingHandle(NetworkingContext* networkingContext, ResourceRequest& request, bool shouldUseCredentialStorage)
+{
+ // PingHandle manages its own lifetime, deleting itself when its purpose has been fulfilled.
+ new PingHandle(networkingContext, request, shouldUseCredentialStorage, PingHandle::UsesAsyncCallbacks::No);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreloaderLoaderStrategyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/loader/LoaderStrategy.h (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/loader/LoaderStrategy.h 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/loader/LoaderStrategy.h 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class BlobRegistry;
</span><ins>+class Frame;
</ins><span class="cx"> class NetworkingContext;
</span><span class="cx"> class ResourceError;
</span><span class="cx"> class ResourceLoadScheduler;
</span><span class="lines">@@ -46,6 +47,8 @@
</span><span class="cx">
</span><span class="cx"> virtual BlobRegistry* createBlobRegistry();
</span><span class="cx">
</span><ins>+ virtual void createPingHandle(NetworkingContext*, ResourceRequest&, bool shouldUseCredentialStorage);
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~LoaderStrategy()
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreloaderPingLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/loader/PingLoader.cpp (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/loader/PingLoader.cpp 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/loader/PingLoader.cpp 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -39,7 +39,9 @@
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "HTTPHeaderNames.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><ins>+#include "LoaderStrategy.h"
</ins><span class="cx"> #include "Page.h"
</span><ins>+#include "PlatformStrategies.h"
</ins><span class="cx"> #include "ProgressTracker.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="lines">@@ -64,7 +66,7 @@
</span><span class="cx"> request.setHTTPReferrer(referrer);
</span><span class="cx"> frame.loader().addExtraFieldsToSubresourceRequest(request);
</span><span class="cx">
</span><del>- createPingLoader(frame, request);
</del><ins>+ startPingLoad(frame, request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // http://www.whatwg.org/specs/web-apps/current-work/multipage/links.html#hyperlink-auditing
</span><span class="lines">@@ -90,7 +92,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- createPingLoader(frame, request);
</del><ins>+ startPingLoad(frame, request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PingLoader::sendViolationReport(Frame& frame, const URL& reportURL, PassRefPtr<FormData> report)
</span><span class="lines">@@ -105,38 +107,22 @@
</span><span class="cx"> if (!referrer.isEmpty())
</span><span class="cx"> request.setHTTPReferrer(referrer);
</span><span class="cx">
</span><del>- createPingLoader(frame, request);
</del><ins>+ startPingLoad(frame, request);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PingLoader::createPingLoader(Frame& frame, ResourceRequest& request)
</del><ins>+void PingLoader::startPingLoad(Frame& frame, ResourceRequest& request)
</ins><span class="cx"> {
</span><del>- // No need to free the PingLoader object or manage it via a smart pointer - it will kill itself as soon as it receives a response.
- new PingLoader(frame, request);
-}
-
-PingLoader::PingLoader(Frame& frame, ResourceRequest& request)
- : m_timeout(this, &PingLoader::timeoutTimerFired)
-{
</del><span class="cx"> unsigned long identifier = frame.page()->progress().createUniqueIdentifier();
</span><span class="cx"> // FIXME: Why activeDocumentLoader? I would have expected documentLoader().
</span><span class="cx"> // Itseems like the PingLoader should be associated with the current
</span><span class="cx"> // Document in the Frame, but the activeDocumentLoader will be associated
</span><span class="cx"> // with the provisional DocumentLoader if there is a provisional
</span><span class="cx"> // DocumentLoader.
</span><del>- m_shouldUseCredentialStorage = frame.loader().client().shouldUseCredentialStorage(frame.loader().activeDocumentLoader(), identifier);
- m_handle = ResourceHandle::create(frame.loader().networkingContext(), request, this, false, false);
</del><ins>+ bool shouldUseCredentialStorage = frame.loader().client().shouldUseCredentialStorage(frame.loader().activeDocumentLoader(), identifier);
</ins><span class="cx">
</span><span class="cx"> InspectorInstrumentation::continueAfterPingLoader(frame, identifier, frame.loader().activeDocumentLoader(), request, ResourceResponse());
</span><span class="cx">
</span><del>- // If the server never responds, FrameLoader won't be able to cancel this load and
- // we'll sit here waiting forever. Set a very generous timeout, just in case.
- m_timeout.startOneShot(60000);
</del><ins>+ platformStrategies()->loaderStrategy()->createPingHandle(frame.loader().networkingContext(), request, shouldUseCredentialStorage);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PingLoader::~PingLoader()
-{
- if (m_handle)
- m_handle->cancel();
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreloaderPingLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/loader/PingLoader.h (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/loader/PingLoader.h 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/loader/PingLoader.h 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -32,48 +32,23 @@
</span><span class="cx"> #ifndef PingLoader_h
</span><span class="cx"> #define PingLoader_h
</span><span class="cx">
</span><del>-#include "ResourceHandleClient.h"
-#include "Timer.h"
-#include <wtf/Noncopyable.h>
-#include <wtf/RefPtr.h>
</del><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FormData;
</span><span class="cx"> class Frame;
</span><span class="cx"> class URL;
</span><del>-class ResourceError;
-class ResourceHandle;
-class ResourceResponse;
</del><ins>+class ResourceRequest;
</ins><span class="cx">
</span><del>-// This class triggers asynchronous loads independent of Frame staying alive (i.e., auditing pingbacks).
-// Since nothing depends on resources loaded through this class, we just want
-// to allow the load to live long enough to ensure the message was actually sent.
-// Therefore, as soon as a callback is received from the ResourceHandle, this class
-// will cancel the load and delete itself.
-class PingLoader : private ResourceHandleClient {
- WTF_MAKE_NONCOPYABLE(PingLoader); WTF_MAKE_FAST_ALLOCATED;
</del><ins>+class PingLoader {
</ins><span class="cx"> public:
</span><span class="cx"> static void loadImage(Frame&, const URL&);
</span><span class="cx"> static void sendPing(Frame&, const URL& pingURL, const URL& destinationURL);
</span><span class="cx"> static void sendViolationReport(Frame&, const URL& reportURL, PassRefPtr<FormData> report);
</span><span class="cx">
</span><del>- virtual ~PingLoader();
-
</del><span class="cx"> private:
</span><del>- static void createPingLoader(Frame&, ResourceRequest&);
- PingLoader(Frame&, ResourceRequest&);
-
- virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) override { delete this; }
- virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int) override { delete this; }
- virtual void didFinishLoading(ResourceHandle*, double) override { delete this; }
- virtual void didFail(ResourceHandle*, const ResourceError&) override { delete this; }
- virtual bool shouldUseCredentialStorage(ResourceHandle*) override { return m_shouldUseCredentialStorage; }
- void timeoutTimerFired(Timer<PingLoader>&) { delete this; }
-
- RefPtr<ResourceHandle> m_handle;
- Timer<PingLoader> m_timeout;
- bool m_shouldUseCredentialStorage;
</del><ins>+ static void startPingLoad(Frame&, ResourceRequest&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreplatformnetworkPingHandleh"></a>
<div class="addfile"><h4>Added: branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/PingHandle.h (0 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/PingHandle.h (rev 0)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/platform/network/PingHandle.h 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -0,0 +1,84 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef PingHandle_h
+#define PingHandle_h
+
+#include "ResourceHandle.h"
+#include "ResourceHandleClient.h"
+#include "Timer.h"
+
+namespace WebCore {
+
+// This class triggers asynchronous loads independent of the networking context staying alive (i.e., auditing pingbacks).
+// The object just needs to live long enough to ensure the message was actually sent.
+// As soon as any callback is received from the ResourceHandle, this class will cancel the load and delete itself.
+
+class PingHandle : private ResourceHandleClient {
+ WTF_MAKE_NONCOPYABLE(PingHandle); WTF_MAKE_FAST_ALLOCATED;
+public:
+ enum class UsesAsyncCallbacks {
+ Yes,
+ No,
+ };
+
+ PingHandle(NetworkingContext*, const ResourceRequest&, bool shouldUseCredentialStorage, UsesAsyncCallbacks);
+
+private:
+ virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) override { delete this; }
+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int) override { delete this; }
+ virtual void didFinishLoading(ResourceHandle*, double) override { delete this; }
+ virtual void didFail(ResourceHandle*, const ResourceError&) override { delete this; }
+ virtual bool shouldUseCredentialStorage(ResourceHandle*) override { return m_shouldUseCredentialStorage; }
+ virtual bool usesAsyncCallbacks() override { return m_usesAsyncCallbacks == UsesAsyncCallbacks::Yes; }
+ void timeoutTimerFired(Timer<PingHandle>&) { delete this; }
+
+ virtual ~PingHandle()
+ {
+ if (m_handle)
+ m_handle->cancel();
+ }
+
+ RefPtr<ResourceHandle> m_handle;
+ Timer<PingHandle> m_timeoutTimer;
+ bool m_shouldUseCredentialStorage;
+ UsesAsyncCallbacks m_usesAsyncCallbacks;
+};
+
+PingHandle::PingHandle(NetworkingContext* networkingContext, const ResourceRequest& request, bool shouldUseCredentialStorage, UsesAsyncCallbacks useAsyncCallbacks)
+ : m_timeoutTimer(this, &PingHandle::timeoutTimerFired)
+ , m_shouldUseCredentialStorage(shouldUseCredentialStorage)
+ , m_usesAsyncCallbacks(useAsyncCallbacks)
+{
+ m_handle = ResourceHandle::create(networkingContext, request, this, false, false);
+
+ // If the server never responds, this object will hang around forever.
+ // Set a very generous timeout, just in case.
+ m_timeoutTimer.startOneShot(60000);
+}
+
+} // namespace WebCore
+
+#endif // PingHandle_h
</ins></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-07-13 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186530. rdar://problem/21708151
+
+ 2015-07-08 Brady Eidson <beidson@apple.com>
+
+ Move PingLoaders to the NetworkingProcess.
+ <rdar://problem/18860263> and https://bugs.webkit.org/show_bug.cgi?id=146710
+
+ Reviewed by Tim Horton.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::loadPing): Create a PingHandle and then return.
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::createPingHandle): If the Network process is enabled,
+ compile the appropriate load parameters and then message to it.
+ Otherwise, use the default in-process PingHandle.
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
+2015-07-13 David Kilzer <ddkilzer@apple.com>
+
</ins><span class="cx"> Merge r186476. rdar://problem/21708269
</span><span class="cx">
</span><span class="cx"> 2015-07-07 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "NetworkResourceLoaderMessages.h"
</span><span class="cx"> #include "RemoteNetworkingContext.h"
</span><span class="cx"> #include "SessionTracker.h"
</span><ins>+#include <WebCore/PingHandle.h>
</ins><span class="cx"> #include <WebCore/PlatformCookieJar.h>
</span><span class="cx"> #include <WebCore/ResourceLoaderOptions.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="lines">@@ -123,6 +124,14 @@
</span><span class="cx"> NetworkProcess::shared().networkResourceLoadScheduler().scheduleLoader(loader.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkConnectionToWebProcess::loadPing(const NetworkResourceLoadParameters& loadParameters)
+{
+ RefPtr<NetworkingContext> context = RemoteNetworkingContext::create(loadParameters.sessionID, loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect);
+
+ // PingHandle manages its own lifetime, deleting itself when its purpose has been fulfilled.
+ new PingHandle(context.get(), loadParameters.request, loadParameters.allowStoredCredentials == AllowStoredCredentials, PingHandle::UsesAsyncCallbacks::Yes);
+}
+
</ins><span class="cx"> void NetworkConnectionToWebProcess::removeLoadIdentifier(ResourceLoadIdentifier identifier)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<NetworkResourceLoader> loader = m_networkResourceLoaders.take(identifier);
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx">
</span><span class="cx"> void scheduleResourceLoad(const NetworkResourceLoadParameters&);
</span><span class="cx"> void performSynchronousLoad(const NetworkResourceLoadParameters&, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>);
</span><ins>+ void loadPing(const NetworkResourceLoadParameters&);
</ins><span class="cx">
</span><span class="cx"> void removeLoadIdentifier(ResourceLoadIdentifier);
</span><span class="cx"> void setDefersLoading(ResourceLoadIdentifier, bool);
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx">
</span><span class="cx"> ScheduleResourceLoad(WebKit::NetworkResourceLoadParameters resourceLoadParameters)
</span><span class="cx"> PerformSynchronousLoad(WebKit::NetworkResourceLoadParameters resourceLoadParameters) -> (WebCore::ResourceError error, WebCore::ResourceResponse response, Vector<char> data) Delayed
</span><ins>+ LoadPing(WebKit::NetworkResourceLoadParameters resourceLoadParameters)
</ins><span class="cx"> RemoveLoadIdentifier(uint64_t resourceLoadIdentifier)
</span><span class="cx"> SetDefersLoading(uint64_t resourceLoadIdentifier, bool defers)
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> #include <WebCore/PageGroup.h>
</span><span class="cx"> #include <WebCore/PlatformCookieJar.h>
</span><span class="cx"> #include <WebCore/PlatformPasteboard.h>
</span><ins>+#include <WebCore/ProgressTracker.h>
</ins><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <WebCore/StorageNamespace.h>
</span><span class="lines">@@ -276,6 +277,28 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPlatformStrategies::createPingHandle(NetworkingContext* networkingContext, ResourceRequest& request, bool shouldUseCredentialStorage)
+{
+ auto& webProcess = WebProcess::shared();
+ if (!webProcess.usesNetworkProcess()) {
+ LoaderStrategy::createPingHandle(networkingContext, request, shouldUseCredentialStorage);
+ return;
+ }
+
+ WebFrameNetworkingContext* webContext = static_cast<WebFrameNetworkingContext*>(networkingContext);
+ WebFrameLoaderClient* webFrameLoaderClient = webContext->webFrameLoaderClient();
+ WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : nullptr;
+ WebPage* webPage = webFrame ? webFrame->page() : nullptr;
+
+ NetworkResourceLoadParameters loadParameters;
+ loadParameters.request = request;
+ loadParameters.sessionID = webPage ? webPage->sessionID() : SessionID::defaultSessionID();
+ loadParameters.allowStoredCredentials = shouldUseCredentialStorage ? AllowStoredCredentials : DoNotAllowStoredCredentials;
+ loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = networkingContext->shouldClearReferrerOnHTTPSToHTTPRedirect();
+
+ webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::LoadPing(loadParameters), 0);
+}
+
</ins><span class="cx"> BlobRegistry* WebPlatformStrategies::createBlobRegistry()
</span><span class="cx"> {
</span><span class="cx"> if (!WebProcess::shared().usesNetworkProcess())
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (186780 => 186781)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2015-07-13 21:40:47 UTC (rev 186780)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2015-07-13 21:48:49 UTC (rev 186781)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> virtual WebCore::ResourceLoadScheduler* resourceLoadScheduler() override;
</span><span class="cx"> virtual void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long resourceLoadIdentifier, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>& data) override;
</span><span class="cx"> virtual WebCore::BlobRegistry* createBlobRegistry() override;
</span><ins>+ virtual void createPingHandle(WebCore::NetworkingContext*, WebCore::ResourceRequest&, bool shouldUseCredentialStorage) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // WebCore::PluginStrategy
</span></span></pre>
</div>
</div>
</body>
</html>