diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-26 18:41:32 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-26 18:41:32 +0100 |
| commit | 1e1525c44c23bde16102a64e685e02a9ab6825cc (patch) | |
| tree | a2462a2f6278466e93ddedbf71983c325698933a /dom/ipc/ContentChild.h | |
| parent | e25ad543952b5afc13181aaebef9c5951fc27be0 (diff) | |
| parent | eb77e289bbe056b58051db0fa868e95da803aa0a (diff) | |
| download | UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.tar UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.tar.gz UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.tar.lz UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.tar.xz UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.zip | |
Merge commit 'eb77e289bbe056b58051db0fa868e95da803aa0a' into Basilisk-release
Diffstat (limited to 'dom/ipc/ContentChild.h')
| -rw-r--r-- | dom/ipc/ContentChild.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h index f29d17e7f..4c8f15cc0 100644 --- a/dom/ipc/ContentChild.h +++ b/dom/ipc/ContentChild.h @@ -152,13 +152,13 @@ public: RecvInitRendering( Endpoint<PCompositorBridgeChild>&& aCompositor, Endpoint<PImageBridgeChild>&& aImageBridge, - Endpoint<PVideoDecoderManagerChild>&& aVideoManager); + Endpoint<PVideoDecoderManagerChild>&& aVideoManager) override; bool RecvReinitRendering( Endpoint<PCompositorBridgeChild>&& aCompositor, Endpoint<PImageBridgeChild>&& aImageBridge, - Endpoint<PVideoDecoderManagerChild>&& aVideoManager); + Endpoint<PVideoDecoderManagerChild>&& aVideoManager) override; PProcessHangMonitorChild* AllocPProcessHangMonitorChild(Transport* aTransport, |