Fix the !ENABLE(WEB_SOCKETS) build after r202930
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Jul 2016 20:14:22 +0000 (20:14 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Jul 2016 20:14:22 +0000 (20:14 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@203238 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
Source/WebCore/ChangeLog
Source/WebCore/loader/EmptyClients.cpp
Source/WebCore/loader/EmptyClients.h
Source/WebCore/page/SocketProvider.h
Source/WebCore/workers/WorkerGlobalScope.cpp
Source/WebCore/workers/WorkerThread.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Misc/WebSocketProvider.h
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebSocketProvider.h
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/Network/WebSocketProvider.h

index 23b47a9..8505ca5 100644 (file)
@@ -1,3 +1,18 @@
+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):
+
 2016-07-14  Youenn Fablet  <youenn@apple.com>
 
         DOMIterators should be assigned a correct prototype
index a140797..cbd79f4 100644 (file)
@@ -264,10 +264,12 @@ void EmptyEditorClient::registerUndoStep(PassRefPtr<UndoStep>)
 void EmptyEditorClient::registerRedoStep(PassRefPtr<UndoStep>)
 {
 }
-    
+
+#if ENABLE(WEB_SOCKETS)
 RefPtr<ThreadableWebSocketChannel> EmptySocketProvider::createWebSocketChannel(ScriptExecutionContext&, WebSocketChannelClient&)
 {
     return nullptr;
 }
+#endif
 
 }
index 146a389..5f91c47 100644 (file)
@@ -650,7 +650,9 @@ class EmptySocketProvider final : public SocketProvider {
 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&);
index 6111aba..5a0c00c 100644 (file)
@@ -36,7 +36,9 @@ class WebSocketChannelClient;
 
 class SocketProvider : public ThreadSafeRefCounted<SocketProvider> {
 public:
+#if ENABLE(WEB_SOCKETS)
     virtual RefPtr<ThreadableWebSocketChannel> createWebSocketChannel(ScriptExecutionContext&, WebSocketChannelClient&) = 0;
+#endif
     virtual ~SocketProvider() { };
 };
 
index 0fbd994..36fc242 100644 (file)
@@ -83,6 +83,10 @@ WorkerGlobalScope::WorkerGlobalScope(const URL& url, const String& userAgent, Wo
 #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();
index f4cd8e7..564f2e2 100644 (file)
@@ -112,6 +112,10 @@ WorkerThread::WorkerThread(const URL& scriptURL, const String& userAgent, const
 #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);
index c80e433..526b5a5 100644 (file)
@@ -1,3 +1,12 @@
+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:
+
 2016-07-13  Beth Dakin  <bdakin@apple.com>
 
         Add more candidate tests
index 47301e4..49b8a7d 100644 (file)
@@ -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() { }
 };
index 5a14e4b..3297c92 100644 (file)
@@ -1,3 +1,12 @@
+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:
+
 2016-07-11  Enrica Casucci  <enrica@apple.com>
 
         Build fix.
index d6c324a..44ff92d 100644 (file)
@@ -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() { }
 };
index 8b0335d..5aff2e7 100644 (file)
@@ -1,3 +1,12 @@
+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:
+
 2016-07-14  Chris Dumez  <cdumez@apple.com>
 
         Possible crash under NavigationState::NavigationClient::processDidCrash()
index 8cc4dfe..52d4d47 100644 (file)
@@ -32,7 +32,9 @@ namespace WebKit {
 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() { }
 };