<!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>[210681] trunk/Source/WebCore</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/210681">210681</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-12 14:49:51 -0800 (Thu, 12 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update style of ResourceHandleInternal
https://bugs.webkit.org/show_bug.cgi?id=166952
Patch by Alex Christensen <achristensen@webkit.org> on 2017-01-12
Reviewed by Andreas Kling.
No change in behavior. Just un-indent and use initializer lists.
* platform/network/ResourceHandleInternal.h:
(WebCore::ResourceHandleInternal::ResourceHandleInternal):
(WebCore::ResourceHandleInternal::client):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleInternalh">trunk/Source/WebCore/platform/network/ResourceHandleInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210680 => 210681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-12 22:14:44 UTC (rev 210680)
+++ trunk/Source/WebCore/ChangeLog 2017-01-12 22:49:51 UTC (rev 210681)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-01-12 Alex Christensen <achristensen@webkit.org>
+
+ Update style of ResourceHandleInternal
+ https://bugs.webkit.org/show_bug.cgi?id=166952
+
+ Reviewed by Andreas Kling.
+
+ No change in behavior. Just un-indent and use initializer lists.
+
+ * platform/network/ResourceHandleInternal.h:
+ (WebCore::ResourceHandleInternal::ResourceHandleInternal):
+ (WebCore::ResourceHandleInternal::client):
+
</ins><span class="cx"> 2017-01-12 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Use GenericEventQueue rather than callOnMainThread to schedule events in AudioScheduledSourceNode.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (210680 => 210681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2017-01-12 22:14:44 UTC (rev 210680)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2017-01-12 22:49:51 UTC (rev 210681)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef ResourceHandleInternal_h
-#define ResourceHandleInternal_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "NetworkingContext.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="lines">@@ -71,130 +70,116 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class ResourceHandleInternal {
- WTF_MAKE_NONCOPYABLE(ResourceHandleInternal); WTF_MAKE_FAST_ALLOCATED;
- public:
- ResourceHandleInternal(ResourceHandle* loader, NetworkingContext* context, const ResourceRequest& request, ResourceHandleClient* client, bool defersLoading, bool shouldContentSniff)
- : m_context(context)
- , m_client(client)
- , m_firstRequest(request)
- , m_lastHTTPMethod(request.httpMethod())
- , status(0)
- , m_defersLoading(defersLoading)
- , m_shouldContentSniff(shouldContentSniff)
- , m_usesAsyncCallbacks(client && client->usesAsyncCallbacks())
</del><ins>+class ResourceHandleInternal {
+ WTF_MAKE_NONCOPYABLE(ResourceHandleInternal); WTF_MAKE_FAST_ALLOCATED;
+public:
+ ResourceHandleInternal(ResourceHandle* loader, NetworkingContext* context, const ResourceRequest& request, ResourceHandleClient* client, bool defersLoading, bool shouldContentSniff)
+ : m_context(context)
+ , m_client(client)
+ , m_firstRequest(request)
+ , m_lastHTTPMethod(request.httpMethod())
+ , m_defersLoading(defersLoading)
+ , m_shouldContentSniff(shouldContentSniff)
+ , m_usesAsyncCallbacks(client && client->usesAsyncCallbacks())
</ins><span class="cx"> #if USE(CFURLCONNECTION)
</span><del>- , m_currentRequest(request)
</del><ins>+ , m_currentRequest(request)
</ins><span class="cx"> #endif
</span><span class="cx"> #if USE(CURL)
</span><del>- , m_formDataStream(loader)
</del><ins>+ , m_formDataStream(loader)
</ins><span class="cx"> #endif
</span><span class="cx"> #if USE(SOUP)
</span><del>- , m_cancelled(false)
- , m_timeoutSource(RunLoop::main(), loader, &ResourceHandle::timeoutFired)
- , m_bodySize(0)
- , m_bodyDataSent(0)
- , m_redirectCount(0)
- , m_previousPosition(0)
- , m_useAuthenticationManager(true)
</del><ins>+ , m_timeoutSource(RunLoop::main(), loader, &ResourceHandle::timeoutFired)
</ins><span class="cx"> #endif
</span><del>-#if PLATFORM(COCOA)
- , m_startWhenScheduled(false)
- , m_currentMacChallenge(nil)
-#endif
- , m_scheduledFailureType(ResourceHandle::NoFailure)
- , m_failureTimer(*loader, &ResourceHandle::failureTimerFired)
- {
- const URL& url = m_firstRequest.url();
- m_user = url.user();
- m_pass = url.pass();
- m_firstRequest.removeCredentials();
- }
-
- ~ResourceHandleInternal();
</del><ins>+ , m_failureTimer(*loader, &ResourceHandle::failureTimerFired)
+ {
+ const URL& url = m_firstRequest.url();
+ m_user = url.user();
+ m_pass = url.pass();
+ m_firstRequest.removeCredentials();
+ }
+
+ ~ResourceHandleInternal();
</ins><span class="cx">
</span><del>- ResourceHandleClient* client() { return m_client; }
</del><ins>+ ResourceHandleClient* client() { return m_client; }
</ins><span class="cx">
</span><del>- RefPtr<NetworkingContext> m_context;
- ResourceHandleClient* m_client;
- ResourceRequest m_firstRequest;
- String m_lastHTTPMethod;
</del><ins>+ RefPtr<NetworkingContext> m_context;
+ ResourceHandleClient* m_client;
+ ResourceRequest m_firstRequest;
+ String m_lastHTTPMethod;
</ins><span class="cx">
</span><del>- // Suggested credentials for the current redirection step.
- String m_user;
- String m_pass;
-
- Credential m_initialCredential;
-
- int status;
</del><ins>+ // Suggested credentials for the current redirection step.
+ String m_user;
+ String m_pass;
+
+ Credential m_initialCredential;
+
+ int status { 0 };
</ins><span class="cx">
</span><del>- bool m_defersLoading;
- bool m_shouldContentSniff;
- bool m_usesAsyncCallbacks;
</del><ins>+ bool m_defersLoading;
+ bool m_shouldContentSniff;
+ bool m_usesAsyncCallbacks;
</ins><span class="cx"> #if USE(CFURLCONNECTION)
</span><del>- RetainPtr<CFURLConnectionRef> m_connection;
- ResourceRequest m_currentRequest;
- RefPtr<ResourceHandleCFURLConnectionDelegate> m_connectionDelegate;
</del><ins>+ RetainPtr<CFURLConnectionRef> m_connection;
+ ResourceRequest m_currentRequest;
+ RefPtr<ResourceHandleCFURLConnectionDelegate> m_connectionDelegate;
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(COCOA) && !USE(CFURLCONNECTION)
</span><del>- RetainPtr<NSURLConnection> m_connection;
- RetainPtr<id> m_delegate;
</del><ins>+ RetainPtr<NSURLConnection> m_connection;
+ RetainPtr<id> m_delegate;
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- bool m_startWhenScheduled;
</del><ins>+ bool m_startWhenScheduled { false };
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(COCOA) || USE(CFURLCONNECTION)
</span><del>- RetainPtr<CFURLStorageSessionRef> m_storageSession;
</del><ins>+ RetainPtr<CFURLStorageSessionRef> m_storageSession;
</ins><span class="cx"> #endif
</span><span class="cx"> #if USE(CURL)
</span><del>- CURL* m_handle { nullptr };
- char* m_url { nullptr };
- struct curl_slist* m_customHeaders { nullptr };
- ResourceResponse m_response;
- bool m_cancelled { false };
- unsigned short m_authFailureCount { 0 };
</del><ins>+ CURL* m_handle { nullptr };
+ char* m_url { nullptr };
+ struct curl_slist* m_customHeaders { nullptr };
+ ResourceResponse m_response;
+ bool m_cancelled { false };
+ unsigned short m_authFailureCount { 0 };
</ins><span class="cx">
</span><del>- FormDataStream m_formDataStream;
- unsigned m_sslErrors { 0 };
- Vector<char> m_postBytes;
</del><ins>+ FormDataStream m_formDataStream;
+ unsigned m_sslErrors { 0 };
+ Vector<char> m_postBytes;
</ins><span class="cx">
</span><del>- std::unique_ptr<MultipartHandle> m_multipartHandle;
- bool m_addedCacheValidationHeaders { false };
</del><ins>+ std::unique_ptr<MultipartHandle> m_multipartHandle;
+ bool m_addedCacheValidationHeaders { false };
</ins><span class="cx"> #endif
</span><span class="cx"> #if USE(SOUP)
</span><del>- GRefPtr<SoupMessage> m_soupMessage;
- ResourceResponse m_response;
- bool m_cancelled;
- GRefPtr<SoupRequest> m_soupRequest;
- GRefPtr<GInputStream> m_inputStream;
- GRefPtr<SoupMultipartInputStream> m_multipartInputStream;
- GRefPtr<GCancellable> m_cancellable;
- GRefPtr<GAsyncResult> m_deferredResult;
- RunLoop::Timer<ResourceHandle> m_timeoutSource;
- GUniquePtr<SoupBuffer> m_soupBuffer;
- unsigned long m_bodySize;
- unsigned long m_bodyDataSent;
- SoupSession* soupSession();
- int m_redirectCount;
- size_t m_previousPosition;
- bool m_useAuthenticationManager;
- struct {
- Credential credential;
- ProtectionSpace protectionSpace;
- } m_credentialDataToSaveInPersistentStore;
</del><ins>+ GRefPtr<SoupMessage> m_soupMessage;
+ ResourceResponse m_response;
+ bool m_cancelled { false };
+ GRefPtr<SoupRequest> m_soupRequest;
+ GRefPtr<GInputStream> m_inputStream;
+ GRefPtr<SoupMultipartInputStream> m_multipartInputStream;
+ GRefPtr<GCancellable> m_cancellable;
+ GRefPtr<GAsyncResult> m_deferredResult;
+ RunLoop::Timer<ResourceHandle> m_timeoutSource;
+ GUniquePtr<SoupBuffer> m_soupBuffer;
+ unsigned long m_bodySize { 0 };
+ unsigned long m_bodyDataSent { 0 };
+ SoupSession* soupSession();
+ int m_redirectCount { 0 };
+ size_t m_previousPosition { 0 };
+ bool m_useAuthenticationManager { true };
+ struct {
+ Credential credential;
+ ProtectionSpace protectionSpace;
+ } m_credentialDataToSaveInPersistentStore;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- // We need to keep a reference to the original challenge to be able to cancel it.
- // It is almost identical to m_currentWebChallenge.nsURLAuthenticationChallenge(), but has a different sender.
- NSURLAuthenticationChallenge *m_currentMacChallenge;
</del><ins>+ // We need to keep a reference to the original challenge to be able to cancel it.
+ // It is almost identical to m_currentWebChallenge.nsURLAuthenticationChallenge(), but has a different sender.
+ NSURLAuthenticationChallenge *m_currentMacChallenge { nil };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- AuthenticationChallenge m_currentWebChallenge;
- ResourceHandle::FailureType m_scheduledFailureType;
- Timer m_failureTimer;
- };
</del><ins>+ AuthenticationChallenge m_currentWebChallenge;
+ ResourceHandle::FailureType m_scheduledFailureType { ResourceHandle::NoFailure };
+ Timer m_failureTimer;
+};
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ResourceHandleInternal_h
</del></span></pre>
</div>
</div>
</body>
</html>