Skip to content

Commit aa91ef3

Browse files
aproskuryakovaproskuryakov
committed
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: Canonical link: https://commits.webkit.org/130760@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@145930 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent cc4f41e commit aa91ef3

20 files changed

Lines changed: 140 additions & 119 deletions

‎Source/WebCore/ChangeLog‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,43 @@
1+
2013-03-15 Alexey Proskuryakov <[email protected]>
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+
141
2013-03-15 Joshua Bell <[email protected]>
242

343
[V8] Binding: Implement EnforceRange IDL Attribute for long long conversions

‎Source/WebCore/dom/MessageEvent.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ SerializedScriptValue* MessageEvent::data() const
153153
return m_dataAsSerializedScriptValue.get();
154154
}
155155

156-
// FIXME: remove this when we update the ObjC bindings (bug #28774).
157156
MessagePort* MessageEvent::messagePort()
158157
{
159158
if (!m_ports)
@@ -162,7 +161,6 @@ MessagePort* MessageEvent::messagePort()
162161
return (*m_ports)[0].get();
163162
}
164163

165-
// FIXME: remove this when we update the ObjC bindings (bug #28774).
166164
void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, DOMWindow* source, MessagePort* port)
167165
{
168166
OwnPtr<MessagePortArray> ports;

‎Source/WebCore/dom/MessageEvent.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ class MessageEvent : public Event {
9292

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

100100
virtual const AtomicString& interfaceName() const;

‎Source/WebCore/dom/MessagePort.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ MessagePort::~MessagePort()
5757
m_scriptExecutionContext->destroyedMessagePort(this);
5858
}
5959

60-
// FIXME: remove this when we update the ObjC bindings (bug #28774).
6160
void MessagePort::postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort* port, ExceptionCode& ec)
6261
{
6362
MessagePortArray ports;
@@ -66,11 +65,6 @@ void MessagePort::postMessage(PassRefPtr<SerializedScriptValue> message, Message
6665
postMessage(message, &ports, ec);
6766
}
6867

69-
void MessagePort::postMessage(PassRefPtr<SerializedScriptValue> message, ExceptionCode& ec)
70-
{
71-
postMessage(message, static_cast<MessagePortArray*>(0), ec);
72-
}
73-
7468
void MessagePort::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionCode& ec)
7569
{
7670
if (!isEntangled())

‎Source/WebCore/dom/MessagePort.h‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,10 @@ namespace WebCore {
5555
class MessagePort : public RefCounted<MessagePort>, public EventTarget {
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

6564
void start();
@@ -82,8 +81,8 @@ namespace WebCore {
8281

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();
8988

@@ -111,10 +110,10 @@ namespace WebCore {
111110
private:
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;
120119

‎Source/WebCore/loader/WorkerThreadableLoader.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ namespace WebCore {
6464

6565
~WorkerThreadableLoader();
6666

67-
virtual void cancel();
67+
virtual void cancel() OVERRIDE;
6868

6969
bool done() const { return m_workerClientWrapper->done(); }
7070

7171
using RefCounted<WorkerThreadableLoader>::ref;
7272
using RefCounted<WorkerThreadableLoader>::deref;
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:
7979
// Creates a loader on the main thread and bridges communication between
@@ -112,14 +112,14 @@ namespace WebCore {
112112

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.
125125
RefPtr<ThreadableLoader> m_mainThreadLoader;

‎Source/WebCore/page/DOMWindow.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ namespace WebCore {
238238
String crossDomainAccessErrorMessage(DOMWindow* activeWindow);
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>);
244244
void dispatchMessageEventWithOriginCheck(SecurityOrigin* intendedTargetOrigin, PassRefPtr<Event>, PassRefPtr<ScriptCallStack>);

‎Source/WebCore/workers/AbstractWorker.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ namespace WebCore {
5050
class AbstractWorker : public RefCounted<AbstractWorker>, public ActiveDOMObject, public EventTarget {
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);
5656

5757
using RefCounted<AbstractWorker>::ref;
5858
using RefCounted<AbstractWorker>::deref;
5959

60-
virtual void contextDestroyed();
60+
virtual void contextDestroyed() OVERRIDE;
6161
AbstractWorker(ScriptExecutionContext*);
6262
virtual ~AbstractWorker();
6363

@@ -67,10 +67,10 @@ namespace WebCore {
6767
intptr_t asID() const { return reinterpret_cast<intptr_t>(this); }
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;
7676
};

‎Source/WebCore/workers/DedicatedWorkerContext.cpp‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242
namespace WebCore {
4343

44-
// static
4544
PassRefPtr<DedicatedWorkerContext> DedicatedWorkerContext::create(const KURL& url, const String& userAgent, PassOwnPtr<GroupSettings> settings, DedicatedWorkerThread* thread, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin)
4645
{
4746
RefPtr<DedicatedWorkerContext> context = adoptRef(new DedicatedWorkerContext(url, userAgent, settings, thread, topOrigin));
@@ -54,12 +53,15 @@ DedicatedWorkerContext::DedicatedWorkerContext(const KURL& url, const String& us
5453
{
5554
}
5655

56+
DedicatedWorkerContext::~DedicatedWorkerContext()
57+
{
58+
}
59+
5760
const AtomicString& DedicatedWorkerContext::interfaceName() const
5861
{
5962
return eventNames().interfaceForDedicatedWorkerContext;
6063
}
6164

62-
// FIXME: remove this when we update the ObjC bindings (bug #28774).
6365
void DedicatedWorkerContext::postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort* port, ExceptionCode& ec)
6466
{
6567
MessagePortArray ports;
@@ -68,11 +70,6 @@ void DedicatedWorkerContext::postMessage(PassRefPtr<SerializedScriptValue> messa
6870
postMessage(message, &ports, ec);
6971
}
7072

71-
void DedicatedWorkerContext::postMessage(PassRefPtr<SerializedScriptValue> message, ExceptionCode& ec)
72-
{
73-
postMessage(message, static_cast<MessagePortArray*>(0), ec);
74-
}
75-
7673
void DedicatedWorkerContext::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionCode& ec)
7774
{
7875
// Disentangle the port in preparation for sending it to the remote context.

‎Source/WebCore/workers/DedicatedWorkerContext.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,24 @@ namespace WebCore {
4545
public:
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

6262
DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
6363

6464
DedicatedWorkerThread* thread();
65+
6566
private:
6667
DedicatedWorkerContext(const KURL&, const String& userAgent, PassOwnPtr<GroupSettings>, DedicatedWorkerThread*, PassRefPtr<SecurityOrigin> topOrigin);
6768
};

0 commit comments

Comments
 (0)