Attachment 117195 Details for Bug 73308 – Patch again

[patch] Patch again

Patch (text/plain), 10.73 KB, created by Takashi Toyoshima on 2011-11-30 08:07:30 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Toyoshima

Created: 2011-11-30 08:07:30 PST

Size: 10.73 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e94964d..91cd81e 100755
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2011-11-30  Takashi Toyoshima  <toyoshim@chromium.org>
>+
>+        Add OVERRIDE to WebSocket related sources for safe inheritances.
>+        https://bugs.webkit.org/show_bug.cgi?id=73308
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-29  Takashi Toyoshima  <toyoshim@chromium.org>
> 
>         Add didUpdateBufferedAmount() callback to SocketStreamHandleClient
>diff --git a/Source/WebCore/platform/network/chromium/SocketStreamHandle.h b/Source/WebCore/platform/network/chromium/SocketStreamHandle.h
>index 5a905cb..5460235 100644
>--- a/Source/WebCore/platform/network/chromium/SocketStreamHandle.h
>+++ b/Source/WebCore/platform/network/chromium/SocketStreamHandle.h
>@@ -1,6 +1,6 @@
> /*
>  * Copyright (C) 2009 Apple Inc. All rights reserved.
>- * Copyright (C) 2009 Google Inc.  All rights reserved.
>+ * Copyright (C) 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 @@ namespace WebCore {
>         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*);
>diff --git a/Source/WebCore/websockets/CloseEvent.h b/Source/WebCore/websockets/CloseEvent.h
>index c2b7b03..75a7750 100644
>--- a/Source/WebCore/websockets/CloseEvent.h
>+++ b/Source/WebCore/websockets/CloseEvent.h
>@@ -69,7 +69,8 @@ public:
>     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()
>diff --git a/Source/WebCore/websockets/WebSocket.h b/Source/WebCore/websockets/WebSocket.h
>index 70c3653..c1363e9 100644
>--- a/Source/WebCore/websockets/WebSocket.h
>+++ b/Source/WebCore/websockets/WebSocket.h
>@@ -88,27 +88,28 @@ public:
>     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 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 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*);
>diff --git a/Source/WebCore/websockets/WebSocketChannel.h b/Source/WebCore/websockets/WebSocketChannel.h
>index 6f1ed34..9f9bab8 100644
>--- a/Source/WebCore/websockets/WebSocketChannel.h
>+++ b/Source/WebCore/websockets/WebSocketChannel.h
>@@ -62,29 +62,31 @@ public:
>     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();
>-
>-    virtual void suspend();
>-    virtual void resume();
>+    bool send(const char* data, int length);
>+
>+    // 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 bufferedAmount);
>-    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,
>diff --git a/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h b/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h
>index 5533b2b..2b1fa38 100644
>--- a/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h
>+++ b/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h
>@@ -60,18 +60,19 @@ public:
>     }
>     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 @@ private:
>         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);

Actions: View | Formatted Diff | Diff

Attachments on bug 73308: 116958 | 117195 | 117203