diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-14 10:50:01 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-14 10:50:01 +0200 |
| commit | e9dd029f5d00590e1a53e63b0ab805110a10b54c (patch) | |
| tree | 1126ca5dda925a62be3dc12c99c90e953d08afcf /gfx/layers | |
| parent | 9d6a7ae25d7f5da855a8f8df884de483b4e2a538 (diff) | |
| parent | 36b8fd734f590eb726ca2e50f8d1ff9cc968b8e1 (diff) | |
| download | UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.gz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.lz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.xz UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'gfx/layers')
| -rw-r--r-- | gfx/layers/Compositor.cpp | 4 | ||||
| -rw-r--r-- | gfx/layers/apz/src/APZCTreeManager.cpp | 1 | ||||
| -rw-r--r-- | gfx/layers/ipc/LayerTransactionChild.cpp | 9 |
3 files changed, 2 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/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp index 857ae5958..f54326360 100644 --- a/gfx/layers/apz/src/APZCTreeManager.cpp +++ b/gfx/layers/apz/src/APZCTreeManager.cpp @@ -1145,6 +1145,7 @@ APZCTreeManager::UpdateWheelTransaction(LayoutDeviceIntPoint aRefPoint, case eMouseUp: case eMouseDown: case eMouseDoubleClick: + case eMouseAuxClick: case eMouseClick: case eContextMenu: case eDrop: 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 |