Diff
Modified: trunk/Source/WebCore/ChangeLog (101593 => 101594)
--- trunk/Source/WebCore/ChangeLog 2011-12-01 03:43:09 UTC (rev 101593)
+++ trunk/Source/WebCore/ChangeLog 2011-12-01 03:44:55 UTC (rev 101594)
@@ -1,3 +1,18 @@
+2011-11-30 Takashi Toyoshima <[email protected]>
+
+ Add OVERRIDE to WebSocket related sources for safe inheritances.
+ https://bugs.webkit.org/show_bug.cgi?id=73308
+
+ Reviewed by Kent Tamura.
+
+ No new tests because this change contains no functional change.
+
+ * platform/network/chromium/SocketStreamHandle.h:
+ * websockets/CloseEvent.h:
+ * websockets/WebSocket.h:
+ * websockets/WebSocketChannel.h:
+ * websockets/WorkerThreadableWebSocketChannel.h:
+
2011-11-30 Mihnea Ovidenie <[email protected]>
[CSSRegions]Rename CSSRegionStyleRule to WebKitCSSRegionRule
Modified: trunk/Source/WebCore/platform/network/chromium/SocketStreamHandle.h (101593 => 101594)
--- trunk/Source/WebCore/platform/network/chromium/SocketStreamHandle.h 2011-12-01 03:43:09 UTC (rev 101593)
+++ trunk/Source/WebCore/platform/network/chromium/SocketStreamHandle.h 2011-12-01 03:44:55 UTC (rev 101594)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2009, 2011 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -51,8 +51,9 @@
virtual ~SocketStreamHandle();
protected:
- virtual int platformSend(const char* data, int length);
- virtual void platformClose();
+ // SocketStreamHandleBase functions.
+ virtual int platformSend(const char* data, int length) OVERRIDE;
+ virtual void platformClose() OVERRIDE;
private:
SocketStreamHandle(const KURL&, SocketStreamHandleClient*);
Modified: trunk/Source/WebCore/websockets/CloseEvent.h (101593 => 101594)
--- trunk/Source/WebCore/websockets/CloseEvent.h 2011-12-01 03:43:09 UTC (rev 101593)
+++ trunk/Source/WebCore/websockets/CloseEvent.h 2011-12-01 03:44:55 UTC (rev 101594)
@@ -69,7 +69,8 @@
unsigned short code() const { return m_code; }
String reason() const { return m_reason; }
- virtual const AtomicString& interfaceName() const { return eventNames().interfaceForCloseEvent; }
+ // Event function.
+ virtual const AtomicString& interfaceName() const OVERRIDE { return eventNames().interfaceForCloseEvent; }
private:
CloseEvent()
Modified: trunk/Source/WebCore/websockets/WebSocket.h (101593 => 101594)
--- trunk/Source/WebCore/websockets/WebSocket.h 2011-12-01 03:43:09 UTC (rev 101593)
+++ trunk/Source/WebCore/websockets/WebSocket.h 2011-12-01 03:44:55 UTC (rev 101594)
@@ -88,27 +88,28 @@
DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
DEFINE_ATTRIBUTE_EVENT_LISTENER(close);
- // EventTarget
- virtual const AtomicString& interfaceName() const;
- virtual ScriptExecutionContext* scriptExecutionContext() const;
+ // EventTarget functions.
+ virtual const AtomicString& interfaceName() const OVERRIDE;
+ virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
- virtual void contextDestroyed();
- virtual bool canSuspend() const;
- virtual void suspend(ReasonForSuspension);
- virtual void resume();
- virtual void stop();
+ // ActiveDOMObject functions.
+ virtual void contextDestroyed() OVERRIDE;
+ virtual bool canSuspend() const OVERRIDE;
+ virtual void suspend(ReasonForSuspension) OVERRIDE;
+ virtual void resume() OVERRIDE;
+ virtual void stop() OVERRIDE;
using RefCounted<WebSocket>::ref;
using RefCounted<WebSocket>::deref;
- // WebSocketChannelClient
- virtual void didConnect();
- virtual void didReceiveMessage(const String& message);
- virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> >);
- virtual void didReceiveMessageError();
- virtual void didUpdateBufferedAmount(unsigned long);
- virtual void didStartClosingHandshake();
- virtual void didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);
+ // WebSocketChannelClient functions.
+ virtual void didConnect() OVERRIDE;
+ virtual void didReceiveMessage(const String& message) OVERRIDE;
+ virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> >) OVERRIDE;
+ virtual void didReceiveMessageError() OVERRIDE;
+ virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) OVERRIDE;
+ virtual void didStartClosingHandshake() OVERRIDE;
+ virtual void didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) OVERRIDE;
private:
WebSocket(ScriptExecutionContext*);
Modified: trunk/Source/WebCore/websockets/WebSocketChannel.h (101593 => 101594)
--- trunk/Source/WebCore/websockets/WebSocketChannel.h 2011-12-01 03:43:09 UTC (rev 101593)
+++ trunk/Source/WebCore/websockets/WebSocketChannel.h 2011-12-01 03:44:55 UTC (rev 101594)
@@ -62,29 +62,31 @@
static PassRefPtr<WebSocketChannel> create(ScriptExecutionContext* context, WebSocketChannelClient* client) { return adoptRef(new WebSocketChannel(context, client)); }
virtual ~WebSocketChannel();
- virtual bool useHixie76Protocol();
- virtual void connect(const KURL&, const String& protocol);
- virtual String subprotocol();
- virtual bool send(const String& message);
- virtual bool send(const ArrayBuffer&);
- virtual bool send(const Blob&);
- virtual bool send(const char* data, int length);
- virtual unsigned long bufferedAmount() const;
- virtual void close(int code, const String& reason); // Start closing handshake.
- virtual void fail(const String& reason);
- virtual void disconnect();
+ bool send(const char* data, int length);
- virtual void suspend();
- virtual void resume();
+ // ThreadableWebSocketChannel functions.
+ virtual bool useHixie76Protocol() OVERRIDE;
+ virtual void connect(const KURL&, const String& protocol) OVERRIDE;
+ virtual String subprotocol() OVERRIDE;
+ virtual bool send(const String& message) OVERRIDE;
+ virtual bool send(const ArrayBuffer&) OVERRIDE;
+ virtual bool send(const Blob&) OVERRIDE;
+ virtual unsigned long bufferedAmount() const OVERRIDE;
+ virtual void close(int code, const String& reason) OVERRIDE; // Start closing handshake.
+ virtual void fail(const String& reason) OVERRIDE;
+ virtual void disconnect() OVERRIDE;
+ virtual void suspend() OVERRIDE;
+ virtual void resume() OVERRIDE;
+
// SocketStreamHandleClient functions.
- virtual void didOpenSocketStream(SocketStreamHandle*);
- virtual void didCloseSocketStream(SocketStreamHandle*);
- virtual void didReceiveSocketStreamData(SocketStreamHandle*, const char*, int);
- virtual void didUpdateBufferedAmount(SocketStreamHandle*, size_t);
- virtual void didFailSocketStream(SocketStreamHandle*, const SocketStreamError&);
- virtual void didReceiveAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&);
- virtual void didCancelAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&);
+ virtual void didOpenSocketStream(SocketStreamHandle*) OVERRIDE;
+ virtual void didCloseSocketStream(SocketStreamHandle*) OVERRIDE;
+ virtual void didReceiveSocketStreamData(SocketStreamHandle*, const char*, int) OVERRIDE;
+ virtual void didUpdateBufferedAmount(SocketStreamHandle*, size_t bufferedAmount) OVERRIDE;
+ virtual void didFailSocketStream(SocketStreamHandle*, const SocketStreamError&) OVERRIDE;
+ virtual void didReceiveAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&) OVERRIDE;
+ virtual void didCancelAuthenticationChallenge(SocketStreamHandle*, const AuthenticationChallenge&) OVERRIDE;
enum CloseEventCode {
CloseEventCodeNotSpecified = -1,
Modified: trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h (101593 => 101594)
--- trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h 2011-12-01 03:43:09 UTC (rev 101593)
+++ trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h 2011-12-01 03:44:55 UTC (rev 101594)
@@ -60,18 +60,19 @@
}
virtual ~WorkerThreadableWebSocketChannel();
- virtual bool useHixie76Protocol();
- virtual void connect(const KURL&, const String& protocol);
- virtual String subprotocol();
- virtual bool send(const String& message);
- virtual bool send(const ArrayBuffer&);
- virtual bool send(const Blob&);
- virtual unsigned long bufferedAmount() const;
- virtual void close(int code, const String& reason);
- virtual void fail(const String& reason);
- virtual void disconnect(); // Will suppress didClose().
- virtual void suspend();
- virtual void resume();
+ // ThreadableWebSocketChannel functions.
+ virtual bool useHixie76Protocol() OVERRIDE;
+ virtual void connect(const KURL&, const String& protocol) OVERRIDE;
+ virtual String subprotocol() OVERRIDE;
+ virtual bool send(const String& message) OVERRIDE;
+ virtual bool send(const ArrayBuffer&) OVERRIDE;
+ virtual bool send(const Blob&) OVERRIDE;
+ virtual unsigned long bufferedAmount() const OVERRIDE;
+ virtual void close(int code, const String& reason) OVERRIDE;
+ virtual void fail(const String& reason) OVERRIDE;
+ virtual void disconnect() OVERRIDE; // Will suppress didClose().
+ virtual void suspend() OVERRIDE;
+ virtual void resume() OVERRIDE;
using RefCounted<WorkerThreadableWebSocketChannel>::ref;
using RefCounted<WorkerThreadableWebSocketChannel>::deref;
@@ -104,12 +105,13 @@
void suspend();
void resume();
- virtual void didConnect();
- virtual void didReceiveMessage(const String& message);
- virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> >);
- virtual void didUpdateBufferedAmount(unsigned long bufferedAmount);
- virtual void didStartClosingHandshake();
- virtual void didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);
+ // WebSocketChannelClient functions.
+ virtual void didConnect() OVERRIDE;
+ virtual void didReceiveMessage(const String& message) OVERRIDE;
+ virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> >) OVERRIDE;
+ virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) OVERRIDE;
+ virtual void didStartClosingHandshake() OVERRIDE;
+ virtual void didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) OVERRIDE;
private:
Peer(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ScriptExecutionContext*, const String& taskMode);
