<!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>[206479] trunk/Source/WebKit2</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/206479">206479</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-27 18:01:29 -0700 (Tue, 27 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>NetworkLoad and PingLoad should use private inheritance
https://bugs.webkit.org/show_bug.cgi?id=162649
Reviewed by Alex Christensen.
Make NetworkLoad privately inherit from NetworkDataTaskClient and ResourceHandleClient,
and make the client callbacks from these interfaces private as this class implements
these interfaces.
Similarly, make PingLoad privately inherit from ResourceHandleClient.
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/PingLoad.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadh">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessPingLoadh">trunk/Source/WebKit2/NetworkProcess/PingLoad.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206478 => 206479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-28 00:37:01 UTC (rev 206478)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-28 01:01:29 UTC (rev 206479)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-09-27 Daniel Bates <dabates@apple.com>
+
+ NetworkLoad and PingLoad should use private inheritance
+ https://bugs.webkit.org/show_bug.cgi?id=162649
+
+ Reviewed by Alex Christensen.
+
+ Make NetworkLoad privately inherit from NetworkDataTaskClient and ResourceHandleClient,
+ and make the client callbacks from these interfaces private as this class implements
+ these interfaces.
+
+ Similarly, make PingLoad privately inherit from ResourceHandleClient.
+
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/PingLoad.h:
+
</ins><span class="cx"> 2016-09-20 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> PlatformEvent::m_modifiers should be an OptionSet
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (206478 => 206479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-09-28 00:37:01 UTC (rev 206478)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-09-28 01:01:29 UTC (rev 206479)
</span><span class="lines">@@ -40,9 +40,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class NetworkLoad : public WebCore::ResourceHandleClient
</del><ins>+class NetworkLoad : private WebCore::ResourceHandleClient
</ins><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- , public NetworkDataTaskClient
</del><ins>+ , private NetworkDataTaskClient
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -69,33 +69,7 @@
</span><span class="cx"> void setSuggestedFilename(const String&);
</span><span class="cx"> void setPendingDownload(PendingDownload&);
</span><span class="cx"> DownloadID pendingDownloadID() { return m_task->pendingDownloadID(); }
</span><del>-
- // NetworkDataTaskClient
- void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler&&) final;
- void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler&&) final;
- void didReceiveResponseNetworkSession(WebCore::ResourceResponse&&, ResponseCompletionHandler&&) final;
- void didReceiveData(Ref<WebCore::SharedBuffer>&&) final;
- void didCompleteWithError(const WebCore::ResourceError&) final;
- void didBecomeDownload() final;
- void didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend) override;
- void wasBlocked() override;
- void cannotShowURL() override;
</del><span class="cx"> #endif
</span><del>- // ResourceHandleClient
- void willSendRequestAsync(WebCore::ResourceHandle*, WebCore::ResourceRequest&&, WebCore::ResourceResponse&& redirectResponse) override;
- void didSendData(WebCore::ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
- void didReceiveResponseAsync(WebCore::ResourceHandle*, WebCore::ResourceResponse&&) override;
- void didReceiveData(WebCore::ResourceHandle*, const char*, unsigned, int encodedDataLength) override;
- void didReceiveBuffer(WebCore::ResourceHandle*, Ref<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override;
- void didFinishLoading(WebCore::ResourceHandle*, double finishTime) override;
- void didFail(WebCore::ResourceHandle*, const WebCore::ResourceError&) override;
- void wasBlocked(WebCore::ResourceHandle*) override;
- void cannotShowURL(WebCore::ResourceHandle*) override;
- bool shouldUseCredentialStorage(WebCore::ResourceHandle*) override;
- void didReceiveAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) override;
- void receivedCancellation(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) override;
- bool usesAsyncCallbacks() override { return true; }
- bool loadingSynchronousXHR() override { return m_client.isSynchronous(); }
</del><span class="cx">
</span><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="cx"> void canAuthenticateAgainstProtectionSpaceAsync(WebCore::ResourceHandle*, const WebCore::ProtectionSpace&) override;
</span><span class="lines">@@ -122,6 +96,35 @@
</span><span class="cx"> NetworkLoadClient::ShouldContinueDidReceiveResponse sharedDidReceiveResponse(WebCore::ResourceResponse&&);
</span><span class="cx"> void sharedWillSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceResponse&&);
</span><span class="cx">
</span><ins>+ // ResourceHandleClient
+ void willSendRequestAsync(WebCore::ResourceHandle*, WebCore::ResourceRequest&&, WebCore::ResourceResponse&& redirectResponse) override;
+ void didSendData(WebCore::ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
+ void didReceiveResponseAsync(WebCore::ResourceHandle*, WebCore::ResourceResponse&&) override;
+ void didReceiveData(WebCore::ResourceHandle*, const char*, unsigned, int encodedDataLength) override;
+ void didReceiveBuffer(WebCore::ResourceHandle*, Ref<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override;
+ void didFinishLoading(WebCore::ResourceHandle*, double finishTime) override;
+ void didFail(WebCore::ResourceHandle*, const WebCore::ResourceError&) override;
+ void wasBlocked(WebCore::ResourceHandle*) override;
+ void cannotShowURL(WebCore::ResourceHandle*) override;
+ bool shouldUseCredentialStorage(WebCore::ResourceHandle*) override;
+ void didReceiveAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) override;
+ void receivedCancellation(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) override;
+ bool usesAsyncCallbacks() override { return true; }
+ bool loadingSynchronousXHR() override { return m_client.isSynchronous(); }
+
+#if USE(NETWORK_SESSION)
+ // NetworkDataTaskClient
+ void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler&&) final;
+ void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler&&) final;
+ void didReceiveResponseNetworkSession(WebCore::ResourceResponse&&, ResponseCompletionHandler&&) final;
+ void didReceiveData(Ref<WebCore::SharedBuffer>&&) final;
+ void didCompleteWithError(const WebCore::ResourceError&) final;
+ void didBecomeDownload() final;
+ void didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend) override;
+ void wasBlocked() override;
+ void cannotShowURL() override;
+#endif
+
</ins><span class="cx"> NetworkLoadClient& m_client;
</span><span class="cx"> const NetworkLoadParameters m_parameters;
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessPingLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/PingLoad.h (206478 => 206479)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/PingLoad.h 2016-09-28 00:37:01 UTC (rev 206478)
+++ trunk/Source/WebKit2/NetworkProcess/PingLoad.h 2016-09-28 01:01:29 UTC (rev 206479)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class PingLoad final : public NetworkDataTaskClient {
</del><ins>+class PingLoad final : private NetworkDataTaskClient {
</ins><span class="cx"> public:
</span><span class="cx"> PingLoad(const NetworkResourceLoadParameters& parameters)
</span><span class="cx"> : m_timeoutTimer(*this, &PingLoad::timeoutTimerFired)
</span></span></pre>
</div>
</div>
</body>
</html>