Changeset 145930 in webkit


Ignore:
Timestamp:
Mar 15, 2013 12:03:39 PM (11 years ago)
Author:
ap@apple.com
Message:

Minor cleanup in worker code
​https://bugs.webkit.org/show_bug.cgi?id=112455

Reviewed by Anders Carlsson.

  • Added OVERRIDE keywords.
  • Toned down FIXMEs about single MessagePort versions of functions. It's not a given that we'll want to get rid of them even when implementing array versions.
  • Explicitly marked virtual destructors as virtual.
  • dom/MessageEvent.cpp:
  • dom/MessageEvent.h:
  • workers/Worker.cpp:
  • workers/Worker.h: Removed an unused version of postMessage() that took no MessagePorts. This makes it less confusing why MessagePortArray is passed by pointer, and not by reference.
  • workers/DedicatedWorkerContext.cpp: (WebCore::DedicatedWorkerContext::~DedicatedWorkerContext):
  • workers/DedicatedWorkerContext.h: Added a destructor instead of an implicit one. Removed an unused version of postMessage() that took no MessagePorts.
  • workers/SharedWorker.h: Removed an unused virtual function (thank you OVERRIDE!)
  • dom/MessagePort.cpp:
  • dom/MessagePort.h:
  • loader/WorkerThreadableLoader.h:
  • page/DOMWindow.h:
  • workers/AbstractWorker.h:
  • workers/DedicatedWorkerThread.h:
  • workers/SharedWorkerContext.h:
  • workers/SharedWorkerThread.h:
  • workers/WorkerContext.h:
  • workers/WorkerMessagingProxy.h:
  • workers/WorkerObjectProxy.h:
  • workers/WorkerScriptLoader.h:
Location:
trunk/Source/WebCore
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r145929 r145930  
     12013-03-15  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Minor cleanup in worker code
     4        https://bugs.webkit.org/show_bug.cgi?id=112455
     5
     6        Reviewed by Anders Carlsson.
     7
     8        - Added OVERRIDE keywords.
     9        - Toned down FIXMEs about single MessagePort versions of functions. It's not a given
     10        that we'll want to get rid of them even when implementing array versions.
     11        - Explicitly marked virtual destructors as virtual.
     12
     13        * dom/MessageEvent.cpp:
     14        * dom/MessageEvent.h:
     15        * workers/Worker.cpp:
     16        * workers/Worker.h:
     17        Removed an unused version of postMessage() that took no MessagePorts. This makes
     18        it less confusing why MessagePortArray is passed by pointer, and not by reference.
     19
     20        * workers/DedicatedWorkerContext.cpp:
     21        (WebCore::DedicatedWorkerContext::~DedicatedWorkerContext):
     22        * workers/DedicatedWorkerContext.h:
     23        Added a destructor instead of an implicit one.
     24        Removed an unused version of postMessage() that took no MessagePorts.
     25
     26        * workers/SharedWorker.h: Removed an unused virtual function (thank you OVERRIDE!)
     27
     28        * dom/MessagePort.cpp:
     29        * dom/MessagePort.h:
     30        * loader/WorkerThreadableLoader.h:
     31        * page/DOMWindow.h:
     32        * workers/AbstractWorker.h:
     33        * workers/DedicatedWorkerThread.h:
     34        * workers/SharedWorkerContext.h:
     35        * workers/SharedWorkerThread.h:
     36        * workers/WorkerContext.h:
     37        * workers/WorkerMessagingProxy.h:
     38        * workers/WorkerObjectProxy.h:
     39        * workers/WorkerScriptLoader.h:
     40
    1412013-03-15  Joshua Bell  <jsbell@chromium.org>
    242

  • trunk/Source/WebCore/dom/MessageEvent.cpp

    r135587 r145930  
    154154}
    155155
    156 // FIXME: remove this when we update the ObjC bindings (bug #28774).
    157156MessagePort* MessageEvent::messagePort()
    158157{
    … …  
    163162}
    164163
    165 // FIXME: remove this when we update the ObjC bindings (bug #28774).
    166164void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, DOMWindow* source, MessagePort* port)
    167165{

  • trunk/Source/WebCore/dom/MessageEvent.h

    r140891 r145930  
    9393    // FIXME: Remove this when we have custom ObjC binding support.
    9494    SerializedScriptValue* data() const;
    95     // FIXME: remove this when we update the ObjC bindings (bug #28774).
     95
     96    // Needed for Objective-C bindings (see bug 28774).
    9697    MessagePort* messagePort();
    97     // FIXME: remove this when we update the ObjC bindings (bug #28774).
    9898    void initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, DOMWindow* source, MessagePort*);
    9999

  • trunk/Source/WebCore/dom/MessagePort.cpp

    r142247 r145930  
    5858}
    5959
    60 // FIXME: remove this when we update the ObjC bindings (bug #28774).
    6160void MessagePort::postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort* port, ExceptionCode& ec)
    6261{
    … …  
    6564        ports.append(port);
    6665    postMessage(message, &ports, ec);
    67 }
    68 
    69 void MessagePort::postMessage(PassRefPtr<SerializedScriptValue> message, ExceptionCode& ec)
    70 {
    71     postMessage(message, static_cast<MessagePortArray*>(0), ec);
    7266}
    7367

  • trunk/Source/WebCore/dom/MessagePort.h

    r123451 r145930  
    5656    public:
    5757        static PassRefPtr<MessagePort> create(ScriptExecutionContext& scriptExecutionContext) { return adoptRef(new MessagePort(scriptExecutionContext)); }
    58         ~MessagePort();
     58        virtual ~MessagePort();
    5959
    60         void postMessage(PassRefPtr<SerializedScriptValue> message, ExceptionCode&);
    6160        void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, ExceptionCode&);
    62         // FIXME: remove this when we update the ObjC bindings (bug #28774).
     61        // Needed for Objective-C bindings (see bug 28774).
    6362        void postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort*, ExceptionCode&);
    6463
    … …  
    8382        void contextDestroyed();
    8483
    85         virtual const AtomicString& interfaceName() const;
    86         virtual ScriptExecutionContext* scriptExecutionContext() const;
     84        virtual const AtomicString& interfaceName() const OVERRIDE;
     85        virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
    8786
    8887        void dispatchMessages();
    … …  
    112111        explicit MessagePort(ScriptExecutionContext&);
    113112
    114         virtual void refEventTarget() { ref(); }
    115         virtual void derefEventTarget() { deref(); }
    116         virtual EventTargetData* eventTargetData();
    117         virtual EventTargetData* ensureEventTargetData();
     113        virtual void refEventTarget() OVERRIDE { ref(); }
     114        virtual void derefEventTarget() OVERRIDE { deref(); }
     115        virtual EventTargetData* eventTargetData() OVERRIDE;
     116        virtual EventTargetData* ensureEventTargetData() OVERRIDE;
    118117
    119118        OwnPtr<MessagePortChannel> m_entangledChannel;

  • trunk/Source/WebCore/loader/WorkerThreadableLoader.h

    r138083 r145930  
    6565        ~WorkerThreadableLoader();
    6666
    67         virtual void cancel();
     67        virtual void cancel() OVERRIDE;
    6868
    6969        bool done() const { return m_workerClientWrapper->done(); }
    … …  
    7373
    7474    protected:
    75         virtual void refThreadableLoader() { ref(); }
    76         virtual void derefThreadableLoader() { deref(); }
     75        virtual void refThreadableLoader() OVERRIDE { ref(); }
     76        virtual void derefThreadableLoader() OVERRIDE { deref(); }
    7777
    7878    private:
    … …  
    113113            static void mainThreadCreateLoader(ScriptExecutionContext*, MainThreadBridge*, PassOwnPtr<CrossThreadResourceRequestData>, ThreadableLoaderOptions, const String& outgoingReferrer);
    114114            static void mainThreadCancel(ScriptExecutionContext*, MainThreadBridge*);
    115             virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
    116             virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&);
    117             virtual void didReceiveData(const char*, int dataLength);
    118             virtual void didReceiveCachedMetadata(const char*, int dataLength);
    119             virtual void didFinishLoading(unsigned long identifier, double finishTime);
    120             virtual void didFail(const ResourceError&);
    121             virtual void didFailAccessControlCheck(const ResourceError&);
    122             virtual void didFailRedirectCheck();
     115            virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
     116            virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&) OVERRIDE;
     117            virtual void didReceiveData(const char*, int dataLength) OVERRIDE;
     118            virtual void didReceiveCachedMetadata(const char*, int dataLength) OVERRIDE;
     119            virtual void didFinishLoading(unsigned long identifier, double finishTime) OVERRIDE;
     120            virtual void didFail(const ResourceError&) OVERRIDE;
     121            virtual void didFailAccessControlCheck(const ResourceError&) OVERRIDE;
     122            virtual void didFailRedirectCheck() OVERRIDE;
    123123
    124124            // Only to be used on the main thread.

  • trunk/Source/WebCore/page/DOMWindow.h

    r142739 r145930  
    239239
    240240        void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, const String& targetOrigin, DOMWindow* source, ExceptionCode&);
    241         // FIXME: remove this when we update the ObjC bindings (bug #28774).
     241        // Needed for Objective-C bindings (see bug 28774).
    242242        void postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort*, const String& targetOrigin, DOMWindow* source, ExceptionCode&);
    243243        void postMessageTimerFired(PassOwnPtr<PostMessageTimer>);

  • trunk/Source/WebCore/workers/AbstractWorker.h

    r123223 r145930  
    5151    public:
    5252        // EventTarget APIs
    53         virtual ScriptExecutionContext* scriptExecutionContext() const { return ActiveDOMObject::scriptExecutionContext(); }
     53        virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
    5454
    5555        DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
    … …  
    5858        using RefCounted<AbstractWorker>::deref;
    5959
    60         virtual void contextDestroyed();
     60        virtual void contextDestroyed() OVERRIDE;
    6161        AbstractWorker(ScriptExecutionContext*);
    6262        virtual ~AbstractWorker();
    … …  
    6868
    6969    private:
    70         virtual void refEventTarget() { ref(); }
    71         virtual void derefEventTarget() { deref(); }
    72         virtual EventTargetData* eventTargetData();
    73         virtual EventTargetData* ensureEventTargetData();
     70        virtual void refEventTarget() OVERRIDE { ref(); }
     71        virtual void derefEventTarget() OVERRIDE { deref(); }
     72        virtual EventTargetData* eventTargetData() OVERRIDE;
     73        virtual EventTargetData* ensureEventTargetData() OVERRIDE;
    7474       
    7575        EventTargetData m_eventTargetData;

  • trunk/Source/WebCore/workers/DedicatedWorkerContext.cpp

    r126365 r145930  
    4242namespace WebCore {
    4343
    44 // static
    4544PassRefPtr<DedicatedWorkerContext> DedicatedWorkerContext::create(const KURL& url, const String& userAgent, PassOwnPtr<GroupSettings> settings, DedicatedWorkerThread* thread, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin)
    4645{
    … …  
    5554}
    5655
     56DedicatedWorkerContext::~DedicatedWorkerContext()
     57{
     58}
     59
    5760const AtomicString& DedicatedWorkerContext::interfaceName() const
    5861{
    … …  
    6063}
    6164
    62 // FIXME: remove this when we update the ObjC bindings (bug #28774).
    6365void DedicatedWorkerContext::postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort* port, ExceptionCode& ec)
    6466{
    … …  
    6769        ports.append(port);
    6870    postMessage(message, &ports, ec);
    69 }
    70 
    71 void DedicatedWorkerContext::postMessage(PassRefPtr<SerializedScriptValue> message, ExceptionCode& ec)
    72 {
    73     postMessage(message, static_cast<MessagePortArray*>(0), ec);
    7471}
    7572

  • trunk/Source/WebCore/workers/DedicatedWorkerContext.h

    r126365 r145930  
    4646        typedef WorkerContext Base;
    4747        static PassRefPtr<DedicatedWorkerContext> create(const KURL&, const String& userAgent, PassOwnPtr<GroupSettings>, DedicatedWorkerThread*, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin);
     48        virtual ~DedicatedWorkerContext();
    4849
    49         virtual bool isDedicatedWorkerContext() const { return true; }
     50        virtual bool isDedicatedWorkerContext() const OVERRIDE { return true; }
    5051
    5152        // Overridden to allow us to check our pending activity after executing imported script.
    52         virtual void importScripts(const Vector<String>& urls, ExceptionCode&);
     53        virtual void importScripts(const Vector<String>& urls, ExceptionCode&) OVERRIDE;
    5354
    5455        // EventTarget
    55         virtual const AtomicString& interfaceName() const;
     56        virtual const AtomicString& interfaceName() const OVERRIDE;
    5657
    57         void postMessage(PassRefPtr<SerializedScriptValue>, ExceptionCode&);
    5858        void postMessage(PassRefPtr<SerializedScriptValue>, const MessagePortArray*, ExceptionCode&);
    59         // FIXME: remove this when we update the ObjC bindings (bug #28774).
     59        // Needed for Objective-C bindings (see bug 28774).
    6060        void postMessage(PassRefPtr<SerializedScriptValue>, MessagePort*, ExceptionCode&);
    6161
    … …  
    6363
    6464        DedicatedWorkerThread* thread();
     65
    6566    private:
    6667        DedicatedWorkerContext(const KURL&, const String& userAgent, PassOwnPtr<GroupSettings>, DedicatedWorkerThread*, PassRefPtr<SecurityOrigin> topOrigin);

  • trunk/Source/WebCore/workers/DedicatedWorkerThread.h

    r126365 r145930  
    4444        static PassRefPtr<DedicatedWorkerThread> create(const KURL& scriptURL, const String& userAgent, const GroupSettings*, const String& sourceCode, WorkerLoaderProxy&, WorkerObjectProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, const SecurityOrigin* topOrigin);
    4545        WorkerObjectProxy& workerObjectProxy() const { return m_workerObjectProxy; }
    46         ~DedicatedWorkerThread();
     46        virtual ~DedicatedWorkerThread();
    4747
    4848    protected:
    49         virtual PassRefPtr<WorkerContext> createWorkerContext(const KURL&, const String& userAgent, PassOwnPtr<GroupSettings>, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, PassRefPtr<SecurityOrigin> topOrigin);
    50         virtual void runEventLoop();
     49        virtual PassRefPtr<WorkerContext> createWorkerContext(const KURL&, const String& userAgent, PassOwnPtr<GroupSettings>, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, PassRefPtr<SecurityOrigin> topOrigin) OVERRIDE;
     50        virtual void runEventLoop() OVERRIDE;
    5151
    5252    private:

  • trunk/Source/WebCore/workers/SharedWorker.h

    r123305 r145930  
    4646        MessagePort* port() const { return m_port.get(); }
    4747
    48         virtual const AtomicString& interfaceName() const;
     48        virtual const AtomicString& interfaceName() const OVERRIDE;
    4949
    5050    private:
    5151        explicit SharedWorker(ScriptExecutionContext*);
    52 
    53         virtual SharedWorker* toSharedWorker() { return this; }
    5452
    5553        RefPtr<MessagePort> m_port;

  • trunk/Source/WebCore/workers/SharedWorkerContext.h

    r125120 r145930  
    4848        virtual ~SharedWorkerContext();
    4949
    50         virtual bool isSharedWorkerContext() const { return true; }
     50        virtual bool isSharedWorkerContext() const OVERRIDE { return true; }
    5151
    5252        // EventTarget
    53         virtual const AtomicString& interfaceName() const;
     53        virtual const AtomicString& interfaceName() const OVERRIDE;
    5454
    5555        // Setters/Getters for attributes in SharedWorkerContext.idl
    … …  
    5858
    5959        SharedWorkerThread* thread();
     60
    6061    private:
    6162        SharedWorkerContext(const String& name, const KURL&, const String& userAgent, PassOwnPtr<GroupSettings>, SharedWorkerThread*);
    62         virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack>);
     63        virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack>) OVERRIDE;
    6364
    6465        String m_name;

  • trunk/Source/WebCore/workers/SharedWorkerThread.h

    r126365 r145930  
    4141    public:
    4242        static PassRefPtr<SharedWorkerThread> create(const String& name, const KURL&, const String& userAgent, const GroupSettings*, const String& sourceCode, WorkerLoaderProxy&, WorkerReportingProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType);
    43         ~SharedWorkerThread();
     43        virtual ~SharedWorkerThread();
    4444
    4545    protected:
    46         virtual PassRefPtr<WorkerContext> createWorkerContext(const KURL&, const String& userAgent, PassOwnPtr<GroupSettings>, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, PassRefPtr<SecurityOrigin> topOrigin);
     46        virtual PassRefPtr<WorkerContext> createWorkerContext(const KURL&, const String& userAgent, PassOwnPtr<GroupSettings>, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, PassRefPtr<SecurityOrigin> topOrigin) OVERRIDE;
    4747
    4848    private:

  • trunk/Source/WebCore/workers/Worker.cpp

    r129182 r145930  
    9595}
    9696
    97 // FIXME: remove this when we update the ObjC bindings (bug #28774).
    9897void Worker::postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort* port, ExceptionCode& ec)
    9998{
    … …  
    102101        ports.append(port);
    103102    postMessage(message, &ports, ec);
    104 }
    105 
    106 void Worker::postMessage(PassRefPtr<SerializedScriptValue> message, ExceptionCode& ec)
    107 {
    108     postMessage(message, static_cast<MessagePortArray*>(0), ec);
    109103}
    110104

  • trunk/Source/WebCore/workers/Worker.h

    r123305 r145930  
    5555        virtual ~Worker();
    5656
    57         virtual const AtomicString& interfaceName() const;
     57        virtual const AtomicString& interfaceName() const OVERRIDE;
    5858
    59         void postMessage(PassRefPtr<SerializedScriptValue> message, ExceptionCode&);
    6059        void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, ExceptionCode&);
    61         // FIXME: remove this when we update the ObjC bindings (bug #28774).
     60        // Needed for Objective-C bindings (see bug 28774).
    6261        void postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort*, ExceptionCode&);
    6362
    6463        void terminate();
    6564
    66         virtual bool canSuspend() const;
    67         virtual void stop();
    68         virtual bool hasPendingActivity() const;
     65        virtual bool canSuspend() const OVERRIDE;
     66        virtual void stop() OVERRIDE;
     67        virtual bool hasPendingActivity() const OVERRIDE;
    6968   
    7069        DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
    … …  
    7473
    7574        // WorkerScriptLoaderClient callbacks
    76         virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&);
    77         virtual void notifyFinished();
     75        virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&) OVERRIDE;
     76        virtual void notifyFinished() OVERRIDE;
    7877
    79         virtual void refEventTarget() { ref(); }
    80         virtual void derefEventTarget() { deref(); }
     78        virtual void refEventTarget() OVERRIDE { ref(); }
     79        virtual void derefEventTarget() OVERRIDE { deref(); }
    8180
    8281        RefPtr<WorkerScriptLoader> m_scriptLoader;

  • trunk/Source/WebCore/workers/WorkerContext.h

    r141418 r145930  
    6060        virtual ~WorkerContext();
    6161
    62         virtual bool isWorkerContext() const { return true; }
     62        virtual bool isWorkerContext() const OVERRIDE { return true; }
    6363
    64         virtual ScriptExecutionContext* scriptExecutionContext() const;
     64        virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
    6565
    6666        virtual bool isSharedWorkerContext() const { return false; }
    … …  
    7373        virtual String userAgent(const KURL&) const;
    7474
    75         virtual void disableEval(const String& errorMessage);
     75        virtual void disableEval(const String& errorMessage) OVERRIDE;
    7676
    7777        WorkerScriptController* script() { return m_script.get(); }
    … …  
    8585        bool hasPendingActivity() const;
    8686
    87         virtual void postTask(PassOwnPtr<Task>); // Executes the task on context's thread asynchronously.
     87        virtual void postTask(PassOwnPtr<Task>) OVERRIDE; // Executes the task on context's thread asynchronously.
    8888
    8989        // WorkerGlobalScope
    … …  
    105105
    106106        // ScriptExecutionContext
    107         virtual WorkerEventQueue* eventQueue() const;
     107        virtual WorkerEventQueue* eventQueue() const OVERRIDE;
    108108
    109         virtual bool isContextThread() const;
    110         virtual bool isJSExecutionForbidden() const;
     109        virtual bool isContextThread() const OVERRIDE;
     110        virtual bool isJSExecutionForbidden() const OVERRIDE;
    111111
    112112#if ENABLE(INSPECTOR)
    … …  
    145145        void applyContentSecurityPolicyFromString(const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType);
    146146
    147         virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack>);
     147        virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack>) OVERRIDE;
    148148        void addMessageToWorkerConsole(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0);
    149149
    150150    private:
    151         virtual void refScriptExecutionContext() { ref(); }
    152         virtual void derefScriptExecutionContext() { deref(); }
     151        virtual void refScriptExecutionContext() OVERRIDE { ref(); }
     152        virtual void derefScriptExecutionContext() OVERRIDE { deref(); }
    153153
    154         virtual void refEventTarget() { ref(); }
    155         virtual void derefEventTarget() { deref(); }
    156         virtual EventTargetData* eventTargetData();
    157         virtual EventTargetData* ensureEventTargetData();
     154        virtual void refEventTarget() OVERRIDE { ref(); }
     155        virtual void derefEventTarget() OVERRIDE { deref(); }
     156        virtual EventTargetData* eventTargetData() OVERRIDE;
     157        virtual EventTargetData* ensureEventTargetData() OVERRIDE;
    158158
    159         virtual const KURL& virtualURL() const;
     159        virtual const KURL& virtualURL() const OVERRIDE;
    160160        virtual KURL virtualCompleteURL(const String&) const;
    161161
    162         virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0);
    163         virtual void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0);
     162        virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0) OVERRIDE;
     163        virtual void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0) OVERRIDE;
    164164
    165         virtual EventTarget* errorEventTarget();
     165        virtual EventTarget* errorEventTarget() OVERRIDE;
    166166
    167167        KURL m_url;

  • trunk/Source/WebCore/workers/WorkerMessagingProxy.h

    r138693 r145930  
    5454        // Implementations of WorkerContextProxy.
    5555        // (Only use these methods in the worker object thread.)
    56         virtual void startWorkerContext(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode);
    57         virtual void terminateWorkerContext();
    58         virtual void postMessageToWorkerContext(PassRefPtr<SerializedScriptValue>, PassOwnPtr<MessagePortChannelArray>);
    59         virtual bool hasPendingActivity() const;
    60         virtual void workerObjectDestroyed();
     56        virtual void startWorkerContext(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode) OVERRIDE;
     57        virtual void terminateWorkerContext() OVERRIDE;
     58        virtual void postMessageToWorkerContext(PassRefPtr<SerializedScriptValue>, PassOwnPtr<MessagePortChannelArray>) OVERRIDE;
     59        virtual bool hasPendingActivity() const OVERRIDE;
     60        virtual void workerObjectDestroyed() OVERRIDE;
    6161#if ENABLE(INSPECTOR)
    62         virtual void connectToInspector(WorkerContextProxy::PageInspector*);
    63         virtual void disconnectFromInspector();
    64         virtual void sendMessageToInspector(const String&);
     62        virtual void connectToInspector(WorkerContextProxy::PageInspector*) OVERRIDE;
     63        virtual void disconnectFromInspector() OVERRIDE;
     64        virtual void sendMessageToInspector(const String&) OVERRIDE;
    6565#endif
    6666
    6767        // Implementations of WorkerObjectProxy.
    6868        // (Only use these methods in the worker context thread.)
    69         virtual void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, PassOwnPtr<MessagePortChannelArray>);
    70         virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, const String& sourceURL);
    71         virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, const String& sourceURL);
     69        virtual void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, PassOwnPtr<MessagePortChannelArray>) OVERRIDE;
     70        virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, const String& sourceURL) OVERRIDE;
     71        virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, const String& sourceURL) OVERRIDE;
    7272#if ENABLE(INSPECTOR)
    73         virtual void postMessageToPageInspector(const String&);
    74         virtual void updateInspectorStateCookie(const String&);
     73        virtual void postMessageToPageInspector(const String&) OVERRIDE;
     74        virtual void updateInspectorStateCookie(const String&) OVERRIDE;
    7575#endif
    76         virtual void confirmMessageFromWorkerObject(bool hasPendingActivity);
    77         virtual void reportPendingActivity(bool hasPendingActivity);
    78         virtual void workerContextClosed();
    79         virtual void workerContextDestroyed();
     76        virtual void confirmMessageFromWorkerObject(bool hasPendingActivity) OVERRIDE;
     77        virtual void reportPendingActivity(bool hasPendingActivity) OVERRIDE;
     78        virtual void workerContextClosed() OVERRIDE;
     79        virtual void workerContextDestroyed() OVERRIDE;
    8080
    8181        // Implementation of WorkerLoaderProxy.
    8282        // These methods are called on different threads to schedule loading
    8383        // requests and to send callbacks back to WorkerContext.
    84         virtual void postTaskToLoader(PassOwnPtr<ScriptExecutionContext::Task>);
    85         virtual bool postTaskForModeToWorkerContext(PassOwnPtr<ScriptExecutionContext::Task>, const String& mode);
     84        virtual void postTaskToLoader(PassOwnPtr<ScriptExecutionContext::Task>) OVERRIDE;
     85        virtual bool postTaskForModeToWorkerContext(PassOwnPtr<ScriptExecutionContext::Task>, const String& mode) OVERRIDE;
    8686
    8787        void workerThreadCreated(PassRefPtr<DedicatedWorkerThread>);

  • trunk/Source/WebCore/workers/WorkerObjectProxy.h

    r49734 r145930  
    5151
    5252        // No need to notify the parent page context when dedicated workers are closing.
    53         virtual void workerContextClosed() { }
     53        virtual void workerContextClosed() OVERRIDE { }
    5454    };
    5555

  • trunk/Source/WebCore/workers/WorkerScriptLoader.h

    r127227 r145930  
    6868        unsigned long identifier() const { return m_identifier; }
    6969
    70         virtual void didReceiveResponse(unsigned long /*identifier*/, const ResourceResponse&);
    71         virtual void didReceiveData(const char* data, int dataLength);
    72         virtual void didFinishLoading(unsigned long identifier, double);
    73         virtual void didFail(const ResourceError&);
    74         virtual void didFailRedirectCheck();
     70        virtual void didReceiveResponse(unsigned long /*identifier*/, const ResourceResponse&) OVERRIDE;
     71        virtual void didReceiveData(const char* data, int dataLength) OVERRIDE;
     72        virtual void didFinishLoading(unsigned long identifier, double) OVERRIDE;
     73        virtual void didFail(const ResourceError&) OVERRIDE;
     74        virtual void didFailRedirectCheck() OVERRIDE;
    7575
    7676#if PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)
Note: See TracChangeset for help on using the changeset viewer.