diff options
author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
---|---|---|
committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.h | |
parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
download | WebKitGtk-tarball-master.tar.gz |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.h')
-rw-r--r-- | Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.h b/Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.h index 2430017d5..3b2568cee 100644 --- a/Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.h +++ b/Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.h @@ -28,14 +28,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WebSocketExtensionDispatcher_h -#define WebSocketExtensionDispatcher_h +#pragma once #if ENABLE(WEB_SOCKETS) #include "WebSocketExtensionProcessor.h" -#include <wtf/OwnPtr.h> -#include <wtf/PassOwnPtr.h> #include <wtf/Vector.h> #include <wtf/text/StringBuilder.h> #include <wtf/text/WTFString.h> @@ -47,7 +44,7 @@ public: WebSocketExtensionDispatcher() { } void reset(); - void addProcessor(PassOwnPtr<WebSocketExtensionProcessor>); + void addProcessor(std::unique_ptr<WebSocketExtensionProcessor>); const String createHeaderValue() const; bool processHeaderValue(const String&); @@ -58,13 +55,11 @@ private: void appendAcceptedExtension(const String& extensionToken, HashMap<String, String>& extensionParameters); void fail(const String& reason); - Vector<OwnPtr<WebSocketExtensionProcessor>> m_processors; + Vector<std::unique_ptr<WebSocketExtensionProcessor>> m_processors; StringBuilder m_acceptedExtensionsBuilder; String m_failureReason; }; -} +} // namespace WebCore #endif // ENABLE(WEB_SOCKETS) - -#endif // WebSocketExtensionDispatcher_h |