webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 6 insertions, 16 deletions

diff --git a/Source/WebCore/Modules/websockets/WebSocketDeflater.h b/Source/WebCore/Modules/websockets/WebSocketDeflater.h
index f73eb20d3..8296c47ed 100644
--- a/Source/WebCore/Modules/websockets/WebSocketDeflater.h
+++ b/Source/WebCore/Modules/websockets/WebSocketDeflater.h
@@ -28,14 +28,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebSocketDeflater_h
-#define WebSocketDeflater_h
+#pragma once
 
 #if ENABLE(WEB_SOCKETS)
 
 #include <wtf/Noncopyable.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
 
 struct z_stream_s;
@@ -50,8 +47,8 @@ public:
         DoNotTakeOverContext,
         TakeOverContext
     };
-    static PassOwnPtr<WebSocketDeflater> create(int windowBits, ContextTakeOverMode = TakeOverContext);
 
+    explicit WebSocketDeflater(int windowBits, ContextTakeOverMode = TakeOverContext);
     ~WebSocketDeflater();
 
     bool initialize();
@@ -62,19 +59,16 @@ public:
     void reset();
 
 private:
-    WebSocketDeflater(int windowBits, ContextTakeOverMode);
-
     int m_windowBits;
     ContextTakeOverMode m_contextTakeOverMode;
     Vector<char> m_buffer;
-    OwnPtr<z_stream> m_stream;
+    std::unique_ptr<z_stream> m_stream;
 };
 
 class WebSocketInflater {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassOwnPtr<WebSocketInflater> create(int windowBits = 15);
-
+    explicit WebSocketInflater(int windowBits = 15);
     ~WebSocketInflater();
 
     bool initialize();
@@ -85,15 +79,11 @@ public:
     void reset();
 
 private:
-    explicit WebSocketInflater(int windowBits);
-
     int m_windowBits;
     Vector<char> m_buffer;
-    OwnPtr<z_stream> m_stream;
+    std::unique_ptr<z_stream> m_stream;
 };
 
-}
+} // namespace WebCore
 
 #endif // ENABLE(WEB_SOCKETS)
-
-#endif // WebSocketDeflater_h