diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/dom/EventTarget.h | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/dom/EventTarget.h')
| -rw-r--r-- | WebCore/dom/EventTarget.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/WebCore/dom/EventTarget.h b/WebCore/dom/EventTarget.h index 662902e..2ededda 100644 --- a/WebCore/dom/EventTarget.h +++ b/WebCore/dom/EventTarget.h @@ -36,7 +36,9 @@ namespace WebCore { + class AbstractWorker; class AtomicString; + class DedicatedWorkerContext; class DOMApplicationCache; class DOMWindow; class Event; @@ -45,8 +47,9 @@ namespace WebCore { class Node; class SVGElementInstance; class ScriptExecutionContext; + class SharedWorker; + class SharedWorkerContext; class Worker; - class WorkerContext; class XMLHttpRequest; class XMLHttpRequestUpload; @@ -67,7 +70,12 @@ namespace WebCore { #endif #if ENABLE(WORKERS) virtual Worker* toWorker(); - virtual WorkerContext* toWorkerContext(); + virtual DedicatedWorkerContext* toDedicatedWorkerContext(); +#endif + +#if ENABLE(SHARED_WORKERS) + virtual SharedWorker* toSharedWorker(); + virtual SharedWorkerContext* toSharedWorkerContext(); #endif virtual ScriptExecutionContext* scriptExecutionContext() const = 0; |