<!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>[203238] 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/203238">203238</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-14 13:14:22 -0700 (Thu, 14 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the !ENABLE(WEB_SOCKETS) build after <a href="http://trac.webkit.org/projects/webkit/changeset/202930">r202930</a>
https://bugs.webkit.org/show_bug.cgi?id=159768
Reviewed by Alex Christensen.
Source/WebCore:
* loader/EmptyClients.cpp:
* loader/EmptyClients.h:
* page/SocketProvider.h:
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::WorkerGlobalScope):
* workers/WorkerThread.cpp:
(WebCore::WorkerThread::WorkerThread):
Source/WebKit/mac:
* Misc/WebSocketProvider.h:
Source/WebKit/win:
* WebSocketProvider.h:
Source/WebKit2:
* WebProcess/Network/WebSocketProvider.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientscpp">trunk/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCorepageSocketProviderh">trunk/Source/WebCore/page/SocketProvider.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadcpp">trunk/Source/WebCore/workers/WorkerThread.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebSocketProviderh">trunk/Source/WebKit/mac/Misc/WebSocketProvider.h</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebSocketProviderh">trunk/Source/WebKit/win/WebSocketProvider.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebSocketProviderh">trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203237 => 203238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-14 19:46:14 UTC (rev 203237)
+++ trunk/Source/WebCore/ChangeLog 2016-07-14 20:14:22 UTC (rev 203238)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-14 Csaba Osztrogonác <ossy@webkit.org>
+
+ Fix the !ENABLE(WEB_SOCKETS) build after r202930
+ https://bugs.webkit.org/show_bug.cgi?id=159768
+
+ Reviewed by Alex Christensen.
+
+ * loader/EmptyClients.cpp:
+ * loader/EmptyClients.h:
+ * page/SocketProvider.h:
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::WorkerGlobalScope):
+ * workers/WorkerThread.cpp:
+ (WebCore::WorkerThread::WorkerThread):
+
</ins><span class="cx"> 2016-07-14 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> DOMIterators should be assigned a correct prototype
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (203237 => 203238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.cpp 2016-07-14 19:46:14 UTC (rev 203237)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2016-07-14 20:14:22 UTC (rev 203238)
</span><span class="lines">@@ -264,10 +264,12 @@
</span><span class="cx"> void EmptyEditorClient::registerRedoStep(PassRefPtr<UndoStep>)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-
</del><ins>+
+#if ENABLE(WEB_SOCKETS)
</ins><span class="cx"> RefPtr<ThreadableWebSocketChannel> EmptySocketProvider::createWebSocketChannel(ScriptExecutionContext&, WebSocketChannelClient&)
</span><span class="cx"> {
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (203237 => 203238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2016-07-14 19:46:14 UTC (rev 203237)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2016-07-14 20:14:22 UTC (rev 203238)
</span><span class="lines">@@ -650,7 +650,9 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~EmptySocketProvider() { }
</span><span class="cx"> static Ref<EmptySocketProvider> create() { return adoptRef(*new EmptySocketProvider); }
</span><ins>+#if ENABLE(WEB_SOCKETS)
</ins><span class="cx"> RefPtr<ThreadableWebSocketChannel> createWebSocketChannel(ScriptExecutionContext&, WebSocketChannelClient&) override;
</span><ins>+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void fillWithEmptyClients(PageConfiguration&);
</span></span></pre></div>
<a id="trunkSourceWebCorepageSocketProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SocketProvider.h (203237 => 203238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SocketProvider.h 2016-07-14 19:46:14 UTC (rev 203237)
+++ trunk/Source/WebCore/page/SocketProvider.h 2016-07-14 20:14:22 UTC (rev 203238)
</span><span class="lines">@@ -36,7 +36,9 @@
</span><span class="cx">
</span><span class="cx"> class SocketProvider : public ThreadSafeRefCounted<SocketProvider> {
</span><span class="cx"> public:
</span><ins>+#if ENABLE(WEB_SOCKETS)
</ins><span class="cx"> virtual RefPtr<ThreadableWebSocketChannel> createWebSocketChannel(ScriptExecutionContext&, WebSocketChannelClient&) = 0;
</span><ins>+#endif
</ins><span class="cx"> virtual ~SocketProvider() { };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (203237 => 203238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2016-07-14 19:46:14 UTC (rev 203237)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2016-07-14 20:14:22 UTC (rev 203238)
</span><span class="lines">@@ -83,6 +83,10 @@
</span><span class="cx"> #if !ENABLE(INDEXED_DATABASE)
</span><span class="cx"> UNUSED_PARAM(connectionProxy);
</span><span class="cx"> #endif
</span><ins>+#if !ENABLE(WEB_SOCKETS)
+ UNUSED_PARAM(socketProvider);
+#endif
+
</ins><span class="cx"> auto origin = SecurityOrigin::create(url);
</span><span class="cx"> if (m_topOrigin->hasUniversalAccess())
</span><span class="cx"> origin->grantUniversalAccess();
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (203237 => 203238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.cpp 2016-07-14 19:46:14 UTC (rev 203237)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2016-07-14 20:14:22 UTC (rev 203238)
</span><span class="lines">@@ -112,6 +112,10 @@
</span><span class="cx"> #if !ENABLE(INDEXED_DATABASE)
</span><span class="cx"> UNUSED_PARAM(connectionProxy);
</span><span class="cx"> #endif
</span><ins>+#if !ENABLE(WEB_SOCKETS)
+ UNUSED_PARAM(socketProvider);
+#endif
+
</ins><span class="cx"> std::lock_guard<StaticLock> lock(threadSetMutex);
</span><span class="cx">
</span><span class="cx"> workerThreads().add(this);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (203237 => 203238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-07-14 19:46:14 UTC (rev 203237)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-07-14 20:14:22 UTC (rev 203238)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-07-14 Csaba Osztrogonác <ossy@webkit.org>
+
+ Fix the !ENABLE(WEB_SOCKETS) build after r202930
+ https://bugs.webkit.org/show_bug.cgi?id=159768
+
+ Reviewed by Alex Christensen.
+
+ * Misc/WebSocketProvider.h:
+
</ins><span class="cx"> 2016-07-13 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Add more candidate tests
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebSocketProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebSocketProvider.h (203237 => 203238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebSocketProvider.h 2016-07-14 19:46:14 UTC (rev 203237)
+++ trunk/Source/WebKit/mac/Misc/WebSocketProvider.h 2016-07-14 20:14:22 UTC (rev 203238)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> class WebSocketProvider final : public WebCore::SocketProvider {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<WebSocketProvider> create() { return adoptRef(*new WebSocketProvider); }
</span><ins>+#if ENABLE(WEB_SOCKETS)
</ins><span class="cx"> RefPtr<WebCore::ThreadableWebSocketChannel> createWebSocketChannel(WebCore::ScriptExecutionContext&, WebCore::WebSocketChannelClient&) override;
</span><ins>+#endif
</ins><span class="cx"> virtual ~WebSocketProvider() { }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (203237 => 203238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-07-14 19:46:14 UTC (rev 203237)
+++ trunk/Source/WebKit/win/ChangeLog 2016-07-14 20:14:22 UTC (rev 203238)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-07-14 Csaba Osztrogonác <ossy@webkit.org>
+
+ Fix the !ENABLE(WEB_SOCKETS) build after r202930
+ https://bugs.webkit.org/show_bug.cgi?id=159768
+
+ Reviewed by Alex Christensen.
+
+ * WebSocketProvider.h:
+
</ins><span class="cx"> 2016-07-11 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebSocketProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebSocketProvider.h (203237 => 203238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebSocketProvider.h 2016-07-14 19:46:14 UTC (rev 203237)
+++ trunk/Source/WebKit/win/WebSocketProvider.h 2016-07-14 20:14:22 UTC (rev 203238)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> class WebSocketProvider final : public WebCore::SocketProvider {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<WebSocketProvider> create() { return adoptRef(*new WebSocketProvider); }
</span><ins>+#if ENABLE(WEB_SOCKETS)
</ins><span class="cx"> RefPtr<WebCore::ThreadableWebSocketChannel> createWebSocketChannel(WebCore::ScriptExecutionContext&, WebCore::WebSocketChannelClient&) override;
</span><ins>+#endif
</ins><span class="cx"> virtual ~WebSocketProvider() { }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203237 => 203238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-14 19:46:14 UTC (rev 203237)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-14 20:14:22 UTC (rev 203238)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-07-14 Csaba Osztrogonác <ossy@webkit.org>
+
+ Fix the !ENABLE(WEB_SOCKETS) build after r202930
+ https://bugs.webkit.org/show_bug.cgi?id=159768
+
+ Reviewed by Alex Christensen.
+
+ * WebProcess/Network/WebSocketProvider.h:
+
</ins><span class="cx"> 2016-07-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Possible crash under NavigationState::NavigationClient::processDidCrash()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebSocketProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.h (203237 => 203238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.h 2016-07-14 19:46:14 UTC (rev 203237)
+++ trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.h 2016-07-14 20:14:22 UTC (rev 203238)
</span><span class="lines">@@ -32,7 +32,9 @@
</span><span class="cx"> class WebSocketProvider final : public WebCore::SocketProvider {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<WebSocketProvider> create() { return adoptRef(*new WebSocketProvider); }
</span><ins>+#if ENABLE(WEB_SOCKETS)
</ins><span class="cx"> RefPtr<WebCore::ThreadableWebSocketChannel> createWebSocketChannel(WebCore::ScriptExecutionContext&, WebCore::WebSocketChannelClient&) override;
</span><ins>+#endif
</ins><span class="cx"> virtual ~WebSocketProvider() { }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>