Diff
Modified: trunk/Source/WebCore/ChangeLog (203237 => 203238)
--- 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)
@@ -1,3 +1,18 @@
+2016-07-14 Csaba Osztrogonác <[email protected]>
+
+ 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):
+
2016-07-14 Youenn Fablet <[email protected]>
DOMIterators should be assigned a correct prototype
Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (203237 => 203238)
--- 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)
@@ -264,10 +264,12 @@
void EmptyEditorClient::registerRedoStep(PassRefPtr<UndoStep>)
{
}
-
+
+#if ENABLE(WEB_SOCKETS)
RefPtr<ThreadableWebSocketChannel> EmptySocketProvider::createWebSocketChannel(ScriptExecutionContext&, WebSocketChannelClient&)
{
return nullptr;
}
+#endif
}
Modified: trunk/Source/WebCore/loader/EmptyClients.h (203237 => 203238)
--- 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)
@@ -650,7 +650,9 @@
public:
virtual ~EmptySocketProvider() { }
static Ref<EmptySocketProvider> create() { return adoptRef(*new EmptySocketProvider); }
+#if ENABLE(WEB_SOCKETS)
RefPtr<ThreadableWebSocketChannel> createWebSocketChannel(ScriptExecutionContext&, WebSocketChannelClient&) override;
+#endif
};
void fillWithEmptyClients(PageConfiguration&);
Modified: trunk/Source/WebCore/page/SocketProvider.h (203237 => 203238)
--- 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)
@@ -36,7 +36,9 @@
class SocketProvider : public ThreadSafeRefCounted<SocketProvider> {
public:
+#if ENABLE(WEB_SOCKETS)
virtual RefPtr<ThreadableWebSocketChannel> createWebSocketChannel(ScriptExecutionContext&, WebSocketChannelClient&) = 0;
+#endif
virtual ~SocketProvider() { };
};
Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (203237 => 203238)
--- 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)
@@ -83,6 +83,10 @@
#if !ENABLE(INDEXED_DATABASE)
UNUSED_PARAM(connectionProxy);
#endif
+#if !ENABLE(WEB_SOCKETS)
+ UNUSED_PARAM(socketProvider);
+#endif
+
auto origin = SecurityOrigin::create(url);
if (m_topOrigin->hasUniversalAccess())
origin->grantUniversalAccess();
Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (203237 => 203238)
--- 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)
@@ -112,6 +112,10 @@
#if !ENABLE(INDEXED_DATABASE)
UNUSED_PARAM(connectionProxy);
#endif
+#if !ENABLE(WEB_SOCKETS)
+ UNUSED_PARAM(socketProvider);
+#endif
+
std::lock_guard<StaticLock> lock(threadSetMutex);
workerThreads().add(this);
Modified: trunk/Source/WebKit/mac/ChangeLog (203237 => 203238)
--- 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)
@@ -1,3 +1,12 @@
+2016-07-14 Csaba Osztrogonác <[email protected]>
+
+ Fix the !ENABLE(WEB_SOCKETS) build after r202930
+ https://bugs.webkit.org/show_bug.cgi?id=159768
+
+ Reviewed by Alex Christensen.
+
+ * Misc/WebSocketProvider.h:
+
2016-07-13 Beth Dakin <[email protected]>
Add more candidate tests
Modified: trunk/Source/WebKit/mac/Misc/WebSocketProvider.h (203237 => 203238)
--- 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)
@@ -30,6 +30,8 @@
class WebSocketProvider final : public WebCore::SocketProvider {
public:
static Ref<WebSocketProvider> create() { return adoptRef(*new WebSocketProvider); }
+#if ENABLE(WEB_SOCKETS)
RefPtr<WebCore::ThreadableWebSocketChannel> createWebSocketChannel(WebCore::ScriptExecutionContext&, WebCore::WebSocketChannelClient&) override;
+#endif
virtual ~WebSocketProvider() { }
};
Modified: trunk/Source/WebKit/win/ChangeLog (203237 => 203238)
--- 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)
@@ -1,3 +1,12 @@
+2016-07-14 Csaba Osztrogonác <[email protected]>
+
+ Fix the !ENABLE(WEB_SOCKETS) build after r202930
+ https://bugs.webkit.org/show_bug.cgi?id=159768
+
+ Reviewed by Alex Christensen.
+
+ * WebSocketProvider.h:
+
2016-07-11 Enrica Casucci <[email protected]>
Build fix.
Modified: trunk/Source/WebKit/win/WebSocketProvider.h (203237 => 203238)
--- 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)
@@ -30,6 +30,8 @@
class WebSocketProvider final : public WebCore::SocketProvider {
public:
static Ref<WebSocketProvider> create() { return adoptRef(*new WebSocketProvider); }
+#if ENABLE(WEB_SOCKETS)
RefPtr<WebCore::ThreadableWebSocketChannel> createWebSocketChannel(WebCore::ScriptExecutionContext&, WebCore::WebSocketChannelClient&) override;
+#endif
virtual ~WebSocketProvider() { }
};
Modified: trunk/Source/WebKit2/ChangeLog (203237 => 203238)
--- 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)
@@ -1,3 +1,12 @@
+2016-07-14 Csaba Osztrogonác <[email protected]>
+
+ 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:
+
2016-07-14 Chris Dumez <[email protected]>
Possible crash under NavigationState::NavigationClient::processDidCrash()
Modified: trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.h (203237 => 203238)
--- 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)
@@ -32,7 +32,9 @@
class WebSocketProvider final : public WebCore::SocketProvider {
public:
static Ref<WebSocketProvider> create() { return adoptRef(*new WebSocketProvider); }
+#if ENABLE(WEB_SOCKETS)
RefPtr<WebCore::ThreadableWebSocketChannel> createWebSocketChannel(WebCore::ScriptExecutionContext&, WebCore::WebSocketChannelClient&) override;
+#endif
virtual ~WebSocketProvider() { }
};
