diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-18 08:14:23 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-18 08:14:23 +0100 |
| commit | a36c3f69c82e1a38b43f0c5f36c562fb08615c62 (patch) | |
| tree | 78f9875465a215447e28f1a2c8363c2ea05b3a87 /dom/ipc | |
| parent | c7c3c8600febd196152e5b23f687cbe8aa493627 (diff) | |
| parent | b0c7cca308a4321dea734044ccdb511dbedea83b (diff) | |
| download | UXP-a36c3f69c82e1a38b43f0c5f36c562fb08615c62.tar UXP-a36c3f69c82e1a38b43f0c5f36c562fb08615c62.tar.gz UXP-a36c3f69c82e1a38b43f0c5f36c562fb08615c62.tar.lz UXP-a36c3f69c82e1a38b43f0c5f36c562fb08615c62.tar.xz UXP-a36c3f69c82e1a38b43f0c5f36c562fb08615c62.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'dom/ipc')
| -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, |