diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 14:32:03 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 14:32:03 +0200 |
commit | b7d9dad58e5a3f87a6c767412941700bc8010044 (patch) | |
tree | f5e99b3029cf54409ae5951e9e91cca3a54addc7 /gfx/layers | |
parent | 73cdd6117df7c17b76aad93952cf574c494351aa (diff) | |
download | UXP-b7d9dad58e5a3f87a6c767412941700bc8010044.tar UXP-b7d9dad58e5a3f87a6c767412941700bc8010044.tar.gz UXP-b7d9dad58e5a3f87a6c767412941700bc8010044.tar.lz UXP-b7d9dad58e5a3f87a6c767412941700bc8010044.tar.xz UXP-b7d9dad58e5a3f87a6c767412941700bc8010044.zip |
Remove MOZ_B2G leftovers and some dead B2G-only components.
Diffstat (limited to 'gfx/layers')
-rw-r--r-- | gfx/layers/Compositor.cpp | 4 | ||||
-rw-r--r-- | gfx/layers/ipc/LayerTransactionChild.cpp | 9 |
2 files changed, 1 insertions, 12 deletions
diff --git a/gfx/layers/Compositor.cpp b/gfx/layers/Compositor.cpp index ce7eb9008..b623b8de9 100644 --- a/gfx/layers/Compositor.cpp +++ b/gfx/layers/Compositor.cpp @@ -173,9 +173,7 @@ Compositor::DrawDiagnosticsInternal(DiagnosticFlags aFlags, const gfx::Matrix4x4& aTransform, uint32_t aFlashCounter) { -#ifdef MOZ_B2G - int lWidth = 4; -#elif defined(ANDROID) +#if defined(ANDROID) int lWidth = 10; #else int lWidth = 2; diff --git a/gfx/layers/ipc/LayerTransactionChild.cpp b/gfx/layers/ipc/LayerTransactionChild.cpp index 8b60d3b51..f07e2c27f 100644 --- a/gfx/layers/ipc/LayerTransactionChild.cpp +++ b/gfx/layers/ipc/LayerTransactionChild.cpp @@ -72,15 +72,6 @@ void LayerTransactionChild::ActorDestroy(ActorDestroyReason why) { mDestroyed = true; -#ifdef MOZ_B2G - // Due to poor lifetime management of gralloc (and possibly shmems) we will - // crash at some point in the future when we get destroyed due to abnormal - // shutdown. Its better just to crash here. On desktop though, we have a chance - // of recovering. - if (why == AbnormalShutdown) { - NS_RUNTIMEABORT("ActorDestroy by IPC channel failure at LayerTransactionChild"); - } -#endif } } // namespace layers |