webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 2 insertions, 5 deletions

diff --git a/Source/WebCore/Modules/websockets/WebSocketFrame.h b/Source/WebCore/Modules/websockets/WebSocketFrame.h
index c1893624f..687ccd0e8 100644
--- a/Source/WebCore/Modules/websockets/WebSocketFrame.h
+++ b/Source/WebCore/Modules/websockets/WebSocketFrame.h
@@ -28,8 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebSocketFrame_h
-#define WebSocketFrame_h
+#pragma once
 
 #if ENABLE(WEB_SOCKETS)
 
@@ -61,7 +60,7 @@ struct WebSocketFrame {
     static bool needsExtendedLengthField(size_t payloadLength);
     static ParseFrameResult parseFrame(char* data, size_t dataLength, WebSocketFrame&, const char*& frameEnd, String& errorString); // May modify part of data to unmask the frame.
 
-    WebSocketFrame(OpCode = OpCodeInvalid, bool final = false, bool compress = false, bool masked = false, const char* payload = 0, size_t payloadLength = 0);
+    WebSocketFrame(OpCode = OpCodeInvalid, bool final = false, bool compress = false, bool masked = false, const char* payload = nullptr, size_t payloadLength = 0);
     void makeFrameData(Vector<char>& frameData);
 
     OpCode opCode;
@@ -77,5 +76,3 @@ struct WebSocketFrame {
 } // namespace WebCore
 
 #endif // ENABLE(WEB_SOCKETS)
-
-#endif // WebSocketFrame_h