Skip to content

Commit a1c53ee

Browse files
jteplitzjteplitz
committed
Refactor(WebWorker): Unify WebWorker naming
Closes angular#3205
1 parent 84463cf commit a1c53ee

25 files changed

Lines changed: 163 additions & 154 deletions

‎modules/angular2/src/web-workers/shared/api.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import {CONST_EXPR} from "angular2/src/facade/lang";
22
import {OpaqueToken} from "angular2/di";
33
import {RenderElementRef, RenderViewRef} from "angular2/src/render/api";
44

5-
export const ON_WEBWORKER = CONST_EXPR(new OpaqueToken('WebWorker.onWebWorker'));
5+
export const ON_WEB_WORKER = CONST_EXPR(new OpaqueToken('WebWorker.onWebWorker'));
66

7-
export class WorkerElementRef implements RenderElementRef {
7+
export class WebWorkerElementRef implements RenderElementRef {
88
constructor(public renderView: RenderViewRef, public renderBoundElementIndex: number) {}
99
}

‎modules/angular2/src/web-workers/shared/message_bus.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface MessageBusSource {
1717
/**
1818
* Attaches the SourceListener to this source.
1919
* The SourceListener will get called whenever the bus receives a message
20-
* Returns a listener id that can be passed to {@link removeListener}
20+
* Returns a listener id that can be passed to {removeListener}
2121
*/
2222
addListener(fn: SourceListener): number;
2323
removeListener(index: number);

‎modules/angular2/src/web-workers/shared/render_proto_view_ref_store.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Injectable, Inject} from "angular2/di";
22
import {RenderProtoViewRef} from "angular2/src/render/api";
3-
import {ON_WEBWORKER} from "angular2/src/web-workers/shared/api";
3+
import {ON_WEB_WORKER} from "angular2/src/web-workers/shared/api";
44

55
@Injectable()
66
export class RenderProtoViewRefStore {
@@ -10,7 +10,7 @@ export class RenderProtoViewRefStore {
1010
private _nextIndex: number = 0;
1111
private _onWebworker: boolean;
1212

13-
constructor(@Inject(ON_WEBWORKER) onWebworker) { this._onWebworker = onWebworker; }
13+
constructor(@Inject(ON_WEB_WORKER) onWebworker) { this._onWebworker = onWebworker; }
1414

1515
storeRenderProtoViewRef(ref: RenderProtoViewRef): number {
1616
if (this._lookupByProtoView.has(ref)) {
@@ -32,7 +32,7 @@ export class RenderProtoViewRefStore {
3232
}
3333

3434
if (this._onWebworker) {
35-
return new WebworkerRenderProtoViewRef(index);
35+
return new WebWorkerRenderProtoViewRef(index);
3636
} else {
3737
return this.retreiveRenderProtoViewRef(index);
3838
}
@@ -44,13 +44,13 @@ export class RenderProtoViewRefStore {
4444
}
4545

4646
if (this._onWebworker) {
47-
return (<WebworkerRenderProtoViewRef>ref).refNumber;
47+
return (<WebWorkerRenderProtoViewRef>ref).refNumber;
4848
} else {
4949
return this.storeRenderProtoViewRef(ref);
5050
}
5151
}
5252
}
5353

54-
export class WebworkerRenderProtoViewRef extends RenderProtoViewRef {
54+
export class WebWorkerRenderProtoViewRef extends RenderProtoViewRef {
5555
constructor(public refNumber: number) { super(); }
5656
}

‎modules/angular2/src/web-workers/shared/render_view_with_fragments_store.ts‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Injectable, Inject} from "angular2/di";
22
import {RenderViewRef, RenderFragmentRef, RenderViewWithFragments} from "angular2/src/render/api";
3-
import {ON_WEBWORKER} from "angular2/src/web-workers/shared/api";
3+
import {ON_WEB_WORKER} from "angular2/src/web-workers/shared/api";
44
import {List, ListWrapper} from "angular2/src/facade/collection";
55

66
@Injectable()
@@ -10,7 +10,7 @@ export class RenderViewWithFragmentsStore {
1010
private _lookupByIndex: Map<number, RenderViewRef | RenderFragmentRef>;
1111
private _lookupByView: Map<RenderViewRef | RenderFragmentRef, number>;
1212

13-
constructor(@Inject(ON_WEBWORKER) onWebWorker) {
13+
constructor(@Inject(ON_WEB_WORKER) onWebWorker) {
1414
this._onWebWorker = onWebWorker;
1515
this._lookupByIndex = new Map<number, RenderViewRef | RenderFragmentRef>();
1616
this._lookupByView = new Map<RenderViewRef | RenderFragmentRef, number>();
@@ -19,11 +19,11 @@ export class RenderViewWithFragmentsStore {
1919
allocate(fragmentCount: number): RenderViewWithFragments {
2020
var initialIndex = this._nextIndex;
2121

22-
var viewRef = new WorkerRenderViewRef(this._nextIndex++);
22+
var viewRef = new WebWorkerRenderViewRef(this._nextIndex++);
2323
var fragmentRefs = ListWrapper.createGrowableSize(fragmentCount);
2424

2525
for (var i = 0; i < fragmentCount; i++) {
26-
fragmentRefs[i] = new WorkerRenderFragmentRef(this._nextIndex++);
26+
fragmentRefs[i] = new WebWorkerRenderFragmentRef(this._nextIndex++);
2727
}
2828
var renderViewWithFragments = new RenderViewWithFragments(viewRef, fragmentRefs);
2929
this.store(renderViewWithFragments, initialIndex);
@@ -79,7 +79,7 @@ export class RenderViewWithFragmentsStore {
7979
}
8080

8181
if (this._onWebWorker) {
82-
return (<WorkerRenderFragmentRef | WorkerRenderViewRef>ref).serialize();
82+
return (<WebWorkerRenderFragmentRef | WebWorkerRenderViewRef>ref).serialize();
8383
} else {
8484
return this._lookupByView.get(ref);
8585
}
@@ -92,7 +92,7 @@ export class RenderViewWithFragmentsStore {
9292

9393
if (this._onWebWorker) {
9494
return {
95-
'viewRef': (<WorkerRenderViewRef>view.viewRef).serialize(),
95+
'viewRef': (<WebWorkerRenderViewRef>view.viewRef).serialize(),
9696
'fragmentRefs': ListWrapper.map(view.fragmentRefs, (val) => val.serialize())
9797
};
9898
} else {
@@ -116,19 +116,21 @@ export class RenderViewWithFragmentsStore {
116116
}
117117
}
118118

119-
export class WorkerRenderViewRef extends RenderViewRef {
119+
export class WebWorkerRenderViewRef extends RenderViewRef {
120120
constructor(public refNumber: number) { super(); }
121121
serialize(): number { return this.refNumber; }
122122

123-
static deserialize(ref: number): WorkerRenderViewRef { return new WorkerRenderViewRef(ref); }
123+
static deserialize(ref: number): WebWorkerRenderViewRef {
124+
return new WebWorkerRenderViewRef(ref);
125+
}
124126
}
125127

126-
export class WorkerRenderFragmentRef extends RenderFragmentRef {
128+
export class WebWorkerRenderFragmentRef extends RenderFragmentRef {
127129
constructor(public refNumber: number) { super(); }
128130

129131
serialize(): number { return this.refNumber; }
130132

131-
static deserialize(ref: number): WorkerRenderFragmentRef {
132-
return new WorkerRenderFragmentRef(ref);
133+
static deserialize(ref: number): WebWorkerRenderFragmentRef {
134+
return new WebWorkerRenderFragmentRef(ref);
133135
}
134136
}

‎modules/angular2/src/web-workers/shared/serializer.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {
3131
ViewEncapsulation,
3232
PropertyBindingType
3333
} from "angular2/src/render/api";
34-
import {WorkerElementRef} from 'angular2/src/web-workers/shared/api';
34+
import {WebWorkerElementRef} from 'angular2/src/web-workers/shared/api';
3535
import {AST, ASTWithSource} from 'angular2/src/change_detection/change_detection';
3636
import {Parser} from "angular2/src/change_detection/parser/parser";
3737
import {Injectable} from "angular2/di";
@@ -99,7 +99,7 @@ export class Serializer {
9999
return this._renderViewStore.serializeRenderViewRef(obj);
100100
} else if (type == RenderFragmentRef) {
101101
return this._renderViewStore.serializeRenderFragmentRef(obj);
102-
} else if (type == WorkerElementRef) {
102+
} else if (type == WebWorkerElementRef) {
103103
return this._serializeWorkerElementRef(obj);
104104
} else if (type == ElementPropertyBinding) {
105105
return this._serializeElementPropertyBinding(obj);
@@ -143,7 +143,7 @@ export class Serializer {
143143
return this._renderViewStore.deserializeRenderViewRef(map);
144144
} else if (type == RenderFragmentRef) {
145145
return this._renderViewStore.deserializeRenderFragmentRef(map);
146-
} else if (type == WorkerElementRef) {
146+
} else if (type == WebWorkerElementRef) {
147147
return this._deserializeWorkerElementRef(map);
148148
} else if (type == EventBinding) {
149149
return this._deserializeEventBinding(map);
@@ -219,8 +219,8 @@ export class Serializer {
219219
}
220220

221221
private _deserializeWorkerElementRef(map: StringMap<string, any>): RenderElementRef {
222-
return new WorkerElementRef(this.deserialize(map['renderView'], RenderViewRef),
223-
map['renderBoundElementIndex']);
222+
return new WebWorkerElementRef(this.deserialize(map['renderView'], RenderViewRef),
223+
map['renderBoundElementIndex']);
224224
}
225225

226226
private _serializeRenderProtoViewMergeMapping(mapping: RenderProtoViewMergeMapping): Object {

‎modules/angular2/src/web-workers/ui/application.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import 'package:angular2/src/web-workers/ui/impl.dart' show bootstrapUICommon;
1414
* Note: The WebWorker script must call bootstrapWebworker once it is set up to complete the bootstrapping process
1515
*/
1616
Future<MessageBus> bootstrap(String uri) {
17-
return spawnWorker(Uri.parse(uri)).then((bus) {
17+
return spawnWebWorker(Uri.parse(uri)).then((bus) {
1818
bootstrapUICommon(bus);
1919
return bus;
2020
});
@@ -23,7 +23,7 @@ Future<MessageBus> bootstrap(String uri) {
2323
/**
2424
* To be called from the main thread to spawn and communicate with the worker thread
2525
*/
26-
Future<UIMessageBus> spawnWorker(Uri uri) {
26+
Future<UIMessageBus> spawnWebWorker(Uri uri) {
2727
var receivePort = new ReceivePort();
2828
var isolateEndSendPort = receivePort.sendPort;
2929
return Isolate.spawnUri(uri, const [], isolateEndSendPort).then((_) {

‎modules/angular2/src/web-workers/ui/application.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,34 @@ import {bootstrapUICommon} from "angular2/src/web-workers/ui/impl";
1616
* bootstrapping process
1717
*/
1818
export function bootstrap(uri: string): MessageBus {
19-
var messageBus = spawnWorker(uri);
19+
var messageBus = spawnWebWorker(uri);
2020
bootstrapUICommon(messageBus);
2121
return messageBus;
2222
}
2323

24-
export function spawnWorker(uri: string): MessageBus {
25-
var worker: Worker = new Worker(uri);
26-
return new UIMessageBus(new UIMessageBusSink(worker), new UIMessageBusSource(worker));
24+
export function spawnWebWorker(uri: string): MessageBus {
25+
var webWorker: Worker = new Worker(uri);
26+
return new UIMessageBus(new UIMessageBusSink(webWorker), new UIMessageBusSource(webWorker));
2727
}
2828

2929
export class UIMessageBus implements MessageBus {
3030
constructor(public sink: UIMessageBusSink, public source: UIMessageBusSource) {}
3131
}
3232

3333
export class UIMessageBusSink implements MessageBusSink {
34-
constructor(private _worker: Worker) {}
34+
constructor(private _webWorker: Worker) {}
3535

36-
send(message: Object): void { this._worker.postMessage(message); }
36+
send(message: Object): void { this._webWorker.postMessage(message); }
3737
}
3838

3939
export class UIMessageBusSource implements MessageBusSource {
4040
private _listenerStore: Map<int, SourceListener> = new Map<int, SourceListener>();
4141
private _numListeners: int = 0;
4242

43-
constructor(private _worker: Worker) {}
43+
constructor(private _webWorker: Worker) {}
4444

4545
public addListener(fn: SourceListener): int {
46-
this._worker.addEventListener("message", fn);
46+
this._webWorker.addEventListener("message", fn);
4747
this._listenerStore[++this._numListeners] = fn;
4848
return this._numListeners;
4949
}

‎modules/angular2/src/web-workers/ui/di_bindings.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import {Testability} from 'angular2/src/core/testability/testability';
5656
import {XHR} from 'angular2/src/render/xhr';
5757
import {XHRImpl} from 'angular2/src/render/xhr_impl';
5858
import {Serializer} from 'angular2/src/web-workers/shared/serializer';
59-
import {ON_WEBWORKER} from 'angular2/src/web-workers/shared/api';
59+
import {ON_WEB_WORKER} from 'angular2/src/web-workers/shared/api';
6060
import {RenderProtoViewRefStore} from 'angular2/src/web-workers/shared/render_proto_view_ref_store';
6161
import {
6262
RenderViewWithFragmentsStore
@@ -101,7 +101,7 @@ function _injectorBindings(): List<Type | Binding | List<any>> {
101101
DomSharedStylesHost,
102102
bind(SharedStylesHost).toAlias(DomSharedStylesHost),
103103
Serializer,
104-
bind(ON_WEBWORKER).toValue(false),
104+
bind(ON_WEB_WORKER).toValue(false),
105105
bind(ElementSchemaRegistry).toValue(new DomElementSchemaRegistry()),
106106
RenderViewWithFragmentsStore,
107107
RenderProtoViewRefStore,

‎modules/angular2/src/web-workers/ui/impl.ts‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
RenderViewWithFragmentsStore
2828
} from 'angular2/src/web-workers/shared/render_view_with_fragments_store';
2929
import {createNgZone} from 'angular2/src/core/application_common';
30-
import {WorkerElementRef} from 'angular2/src/web-workers/shared/api';
30+
import {WebWorkerElementRef} from 'angular2/src/web-workers/shared/api';
3131
import {AnchorBasedAppRootUrl} from 'angular2/src/services/anchor_based_app_root_url';
3232
import {Injectable} from 'angular2/di';
3333
import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter';
@@ -50,7 +50,7 @@ export function bootstrapUICommon(bus: MessageBus) {
5050
zone.run(() => {
5151
var injector = createInjector(zone);
5252
var webWorkerMain = injector.get(WebWorkerMain);
53-
webWorkerMain.attachToWorker(bus);
53+
webWorkerMain.attachToWebWorker(bus);
5454
});
5555
}
5656

@@ -70,21 +70,21 @@ export class WebWorkerMain {
7070
* This instance will now listen for all messages from the worker and handle them appropriately
7171
* Note: Don't attach more than one WebWorkerMain instance to the same MessageBus.
7272
*/
73-
attachToWorker(bus: MessageBus) {
73+
attachToWebWorker(bus: MessageBus) {
7474
this._bus = bus;
75-
this._bus.source.addListener((message) => { this._handleWorkerMessage(message); });
75+
this._bus.source.addListener((message) => { this._handleWebWorkerMessage(message); });
7676
}
7777

78-
private _sendInitMessage() { this._sendWorkerMessage("init", {"rootUrl": this._rootUrl}); }
78+
private _sendInitMessage() { this._sendWebWorkerMessage("init", {"rootUrl": this._rootUrl}); }
7979

8080
/*
8181
* Sends an error back to the worker thread in response to an opeartion on the UI thread
8282
*/
83-
private _sendWorkerError(id: string, error: any) {
84-
this._sendWorkerMessage("error", {"error": error}, id);
83+
private _sendWebWorkerError(id: string, error: any) {
84+
this._sendWebWorkerMessage("error", {"error": error}, id);
8585
}
8686

87-
private _sendWorkerMessage(type: string, value: StringMap<string, any>, id?: string) {
87+
private _sendWebWorkerMessage(type: string, value: StringMap<string, any>, id?: string) {
8888
this._bus.sink.send({'type': type, 'id': id, 'value': value});
8989
}
9090

@@ -95,17 +95,17 @@ export class WebWorkerMain {
9595
case "compileHost":
9696
var directiveMetadata = this._serializer.deserialize(data.args[0], DirectiveMetadata);
9797
promise = this._renderCompiler.compileHost(directiveMetadata);
98-
this._wrapWorkerPromise(data.id, promise, ProtoViewDto);
98+
this._wrapWebWorkerPromise(data.id, promise, ProtoViewDto);
9999
break;
100100
case "compile":
101101
var view = this._serializer.deserialize(data.args[0], ViewDefinition);
102102
promise = this._renderCompiler.compile(view);
103-
this._wrapWorkerPromise(data.id, promise, ProtoViewDto);
103+
this._wrapWebWorkerPromise(data.id, promise, ProtoViewDto);
104104
break;
105105
case "mergeProtoViewsRecursively":
106106
var views = this._serializer.deserialize(data.args[0], RenderProtoViewRef);
107107
promise = this._renderCompiler.mergeProtoViewsRecursively(views);
108-
this._wrapWorkerPromise(data.id, promise, RenderProtoViewMergeMapping);
108+
this._wrapWebWorkerPromise(data.id, promise, RenderProtoViewMergeMapping);
109109
break;
110110
default:
111111
throw new BaseException("not implemented");
@@ -145,7 +145,7 @@ export class WebWorkerMain {
145145
this._renderer.attachFragmentAfterFragment(previousFragment, fragment);
146146
break;
147147
case "attachFragmentAfterElement":
148-
var element = this._serializer.deserialize(args[0], WorkerElementRef);
148+
var element = this._serializer.deserialize(args[0], WebWorkerElementRef);
149149
var fragment = this._serializer.deserialize(args[1], RenderFragmentRef);
150150
this._renderer.attachFragmentAfterElement(element, fragment);
151151
break;
@@ -168,31 +168,31 @@ export class WebWorkerMain {
168168
this._renderer.setText(viewRef, textNodeIndex, text);
169169
break;
170170
case "setElementProperty":
171-
var elementRef = this._serializer.deserialize(args[0], WorkerElementRef);
171+
var elementRef = this._serializer.deserialize(args[0], WebWorkerElementRef);
172172
var propName = args[1];
173173
var propValue = args[2];
174174
this._renderer.setElementProperty(elementRef, propName, propValue);
175175
break;
176176
case "setElementAttribute":
177-
var elementRef = this._serializer.deserialize(args[0], WorkerElementRef);
177+
var elementRef = this._serializer.deserialize(args[0], WebWorkerElementRef);
178178
var attributeName = args[1];
179179
var attributeValue = args[2];
180180
this._renderer.setElementAttribute(elementRef, attributeName, attributeValue);
181181
break;
182182
case "setElementClass":
183-
var elementRef = this._serializer.deserialize(args[0], WorkerElementRef);
183+
var elementRef = this._serializer.deserialize(args[0], WebWorkerElementRef);
184184
var className = args[1];
185185
var isAdd = args[2];
186186
this._renderer.setElementClass(elementRef, className, isAdd);
187187
break;
188188
case "setElementStyle":
189-
var elementRef = this._serializer.deserialize(args[0], WorkerElementRef);
189+
var elementRef = this._serializer.deserialize(args[0], WebWorkerElementRef);
190190
var styleName = args[1];
191191
var styleValue = args[2];
192192
this._renderer.setElementStyle(elementRef, styleName, styleValue);
193193
break;
194194
case "invokeElementMethod":
195-
var elementRef = this._serializer.deserialize(args[0], WorkerElementRef);
195+
var elementRef = this._serializer.deserialize(args[0], WebWorkerElementRef);
196196
var methodName = args[1];
197197
var methodArgs = args[2];
198198
this._renderer.invokeElementMethod(elementRef, methodName, methodArgs);
@@ -208,7 +208,7 @@ export class WebWorkerMain {
208208
}
209209

210210
// TODO(jteplitz602): Create message type enum #3044
211-
private _handleWorkerMessage(message: StringMap<string, any>) {
211+
private _handleWebWorkerMessage(message: StringMap<string, any>) {
212212
var data: ReceivedMessage = new ReceivedMessage(message['data']);
213213
switch (data.type) {
214214
case "ready":
@@ -220,14 +220,14 @@ export class WebWorkerMain {
220220
}
221221
}
222222

223-
private _wrapWorkerPromise(id: string, promise: Promise<any>, type: Type): void {
223+
private _wrapWebWorkerPromise(id: string, promise: Promise<any>, type: Type): void {
224224
PromiseWrapper.then(promise, (result: any) => {
225225
try {
226-
this._sendWorkerMessage("result", this._serializer.serialize(result, type), id);
226+
this._sendWebWorkerMessage("result", this._serializer.serialize(result, type), id);
227227
} catch (e) {
228228
print(e);
229229
}
230-
}, (error: any) => { this._sendWorkerError(id, error); });
230+
}, (error: any) => { this._sendWebWorkerError(id, error); });
231231
}
232232
}
233233

0 commit comments

Comments
 (0)