<!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>[206582] 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/206582">206582</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-29 08:28:54 -0700 (Thu, 29 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Remove WebCoreSynchronousLoader from ResourceHandleSoup
https://bugs.webkit.org/show_bug.cgi?id=162723
Reviewed by Sergio Villar Senin.
Since all soup based ports switched to NetworkProcess this is dead code.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::ResourceHandle::platformLoadResourceSynchronously):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206581 => 206582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-29 15:13:00 UTC (rev 206581)
+++ trunk/Source/WebCore/ChangeLog 2016-09-29 15:28:54 UTC (rev 206582)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-09-29 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Remove WebCoreSynchronousLoader from ResourceHandleSoup
+ https://bugs.webkit.org/show_bug.cgi?id=162723
+
+ Reviewed by Sergio Villar Senin.
+
+ Since all soup based ports switched to NetworkProcess this is dead code.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::ResourceHandle::platformLoadResourceSynchronously):
+
</ins><span class="cx"> 2016-09-29 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Meter: [Mac] Content in label element should be used as AXTitle or AXDescription
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (206581 => 206582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2016-09-29 15:13:00 UTC (rev 206581)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2016-09-29 15:28:54 UTC (rev 206582)
</span><span class="lines">@@ -72,133 +72,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static bool loadingSynchronousRequest = false;
</del><span class="cx"> static const size_t gDefaultReadBufferSize = 8192;
</span><span class="cx">
</span><del>-class WebCoreSynchronousLoader final : public ResourceHandleClient {
- WTF_MAKE_NONCOPYABLE(WebCoreSynchronousLoader);
-public:
-
- WebCoreSynchronousLoader(ResourceError& error, ResourceResponse& response, SoupSession* session, Vector<char>& data, StoredCredentials storedCredentials)
- : m_error(error)
- , m_response(response)
-#if !SOUP_CHECK_VERSION(2, 49, 91)
- , m_session(session)
-#endif
- , m_data(data)
- , m_finished(false)
- , m_storedCredentials(storedCredentials)
- {
- // We don't want any timers to fire while we are doing our synchronous load
- // so we replace the thread default main context. The main loop iterations
- // will only process GSources associated with this inner context.
- loadingSynchronousRequest = true;
- GRefPtr<GMainContext> innerMainContext = adoptGRef(g_main_context_new());
- g_main_context_push_thread_default(innerMainContext.get());
- m_mainLoop = adoptGRef(g_main_loop_new(innerMainContext.get(), false));
-
-#if !SOUP_CHECK_VERSION(2, 49, 91)
- adjustMaxConnections(1);
-#else
- UNUSED_PARAM(session);
-#endif
- }
-
- ~WebCoreSynchronousLoader()
- {
-#if !SOUP_CHECK_VERSION(2, 49, 91)
- adjustMaxConnections(-1);
-#endif
-
- GMainContext* context = g_main_context_get_thread_default();
- while (g_main_context_pending(context))
- g_main_context_iteration(context, FALSE);
-
- g_main_context_pop_thread_default(context);
- loadingSynchronousRequest = false;
- }
-
-#if !SOUP_CHECK_VERSION(2, 49, 91)
- void adjustMaxConnections(int adjustment)
- {
- int maxConnections, maxConnectionsPerHost;
- g_object_get(m_session,
- SOUP_SESSION_MAX_CONNS, &maxConnections,
- SOUP_SESSION_MAX_CONNS_PER_HOST, &maxConnectionsPerHost,
- NULL);
- maxConnections += adjustment;
- maxConnectionsPerHost += adjustment;
- g_object_set(m_session,
- SOUP_SESSION_MAX_CONNS, maxConnections,
- SOUP_SESSION_MAX_CONNS_PER_HOST, maxConnectionsPerHost,
- NULL);
-
- }
-#endif // SOUP_CHECK_VERSION(2, 49, 91)
-
- void didReceiveResponse(ResourceHandle*, ResourceResponse&& response) override
- {
- m_response = response;
- }
-
- void didReceiveData(ResourceHandle*, const char* /* data */, unsigned /* length */, int) override
- {
- ASSERT_NOT_REACHED();
- }
-
- void didReceiveBuffer(ResourceHandle*, Ref<SharedBuffer>&& buffer, int /* encodedLength */) override
- {
- // This pattern is suggested by SharedBuffer.h.
- const char* segment;
- unsigned position = 0;
- while (unsigned length = buffer->getSomeData(segment, position)) {
- m_data.append(segment, length);
- position += length;
- }
- }
-
- void didFinishLoading(ResourceHandle*, double) override
- {
- if (g_main_loop_is_running(m_mainLoop.get()))
- g_main_loop_quit(m_mainLoop.get());
- m_finished = true;
- }
-
- void didFail(ResourceHandle* handle, const ResourceError& error) override
- {
- m_error = error;
- didFinishLoading(handle, 0);
- }
-
- void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) override
- {
- // We do not handle authentication for synchronous XMLHttpRequests.
- challenge.authenticationClient()->receivedRequestToContinueWithoutCredential(challenge);
- }
-
- bool shouldUseCredentialStorage(ResourceHandle*) override
- {
- return m_storedCredentials == AllowStoredCredentials;
- }
-
- void run()
- {
- if (!m_finished)
- g_main_loop_run(m_mainLoop.get());
- }
-
-private:
- ResourceError& m_error;
- ResourceResponse& m_response;
-#if !SOUP_CHECK_VERSION(2, 49, 91)
- SoupSession* m_session;
-#endif
- Vector<char>& m_data;
- bool m_finished;
- GRefPtr<GMainLoop> m_mainLoop;
- StoredCredentials m_storedCredentials;
-};
-
</del><span class="cx"> class HostTLSCertificateSet {
</span><span class="cx"> public:
</span><span class="cx"> void add(GTlsCertificate* certificate)
</span><span class="lines">@@ -952,12 +827,6 @@
</span><span class="cx"> g_signal_connect(d->m_soupMessage.get(), "wrote-body-data", G_CALLBACK(wroteBodyDataCallback), handle);
</span><span class="cx">
</span><span class="cx"> unsigned flags = SOUP_MESSAGE_NO_REDIRECT;
</span><del>-#if SOUP_CHECK_VERSION(2, 49, 91)
- // Ignore the connection limits in synchronous loads to avoid freezing the networking process.
- // See https://bugs.webkit.org/show_bug.cgi?id=141508.
- if (loadingSynchronousRequest)
- flags |= SOUP_MESSAGE_IGNORE_CONNECTION_LIMITS;
-#endif
</del><span class="cx"> soup_message_set_flags(d->m_soupMessage.get(), static_cast<SoupMessageFlags>(soup_message_get_flags(d->m_soupMessage.get()) | flags));
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><span class="lines">@@ -1288,22 +1157,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceHandle::platformLoadResourceSynchronously(NetworkingContext* context, const ResourceRequest& request, StoredCredentials storedCredentials, ResourceError& error, ResourceResponse& response, Vector<char>& data)
</del><ins>+void ResourceHandle::platformLoadResourceSynchronously(NetworkingContext*, const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>&)
</ins><span class="cx"> {
</span><del>- ASSERT(!loadingSynchronousRequest);
- if (loadingSynchronousRequest) // In practice this cannot happen, but if for some reason it does,
- return; // we want to avoid accidentally going into an infinite loop of requests.
-
- WebCoreSynchronousLoader syncLoader(error, response, sessionFromContext(context), data, storedCredentials);
- RefPtr<ResourceHandle> handle = create(context, request, &syncLoader, false /*defersLoading*/, false /*shouldContentSniff*/);
- if (!handle)
- return;
-
- // If the request has already failed, do not run the main loop, or else we'll block indefinitely.
- if (handle->d->m_scheduledFailureType != NoFailure)
- return;
-
- syncLoader.run();
</del><ins>+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void readCallback(GObject*, GAsyncResult* asyncResult, gpointer data)
</span></span></pre>
</div>
</div>
</body>
</html>