From a6cd6e17ee9659a8137e706101e258b20dde06ca Mon Sep 17 00:00:00 2001 From: Hiroyuki Ikezoe Date: Wed, 13 May 2020 21:52:08 +0000 Subject: [PATCH] Bug 1332588 - Drop nsChangeHint_UpdateTransformLayer on the frame that we don't support transform. r=boris Depends on D75049 Differential Revision: https://phabricator.services.mozilla.com/D75050 --- dom/animation/test/crashtests/1332588-1.html | 25 +++++++++++++++++++ dom/animation/test/crashtests/crashtests.list | 1 + layout/base/RestyleManager.cpp | 8 +++--- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 dom/animation/test/crashtests/1332588-1.html diff --git a/dom/animation/test/crashtests/1332588-1.html b/dom/animation/test/crashtests/1332588-1.html new file mode 100644 index 000000000000..11719a86ca73 --- /dev/null +++ b/dom/animation/test/crashtests/1332588-1.html @@ -0,0 +1,25 @@ + + + + + + + + + diff --git a/dom/animation/test/crashtests/crashtests.list b/dom/animation/test/crashtests/crashtests.list index 74df0e0b6e0b..d058847eb589 100644 --- a/dom/animation/test/crashtests/crashtests.list +++ b/dom/animation/test/crashtests/crashtests.list @@ -23,6 +23,7 @@ pref(dom.animations-api.compositing.enabled,true) load 1323114-2.html pref(dom.animations-api.implicit-keyframes.enabled,true) load 1323119-1.html pref(dom.animations-api.implicit-keyframes.enabled,true) load 1324554-1.html pref(dom.animations-api.implicit-keyframes.enabled,true) pref(dom.animations-api.compositing.enabled,true) load 1325193-1.html +load 1332588-1.html pref(dom.animations-api.implicit-keyframes.enabled,true) load 1330190-1.html pref(dom.animations-api.core.enabled,true) pref(dom.animations-api.implicit-keyframes.enabled,true) pref(dom.animations-api.compositing.enabled,true) pref(dom.animations-api.getAnimations.enabled,true) load 1330190-2.html pref(dom.animations-api.implicit-keyframes.enabled,true) pref(dom.animations-api.compositing.enabled,true) load 1330513-1.html diff --git a/layout/base/RestyleManager.cpp b/layout/base/RestyleManager.cpp index d8deed9b5780..0aa4f6b98cd6 100644 --- a/layout/base/RestyleManager.cpp +++ b/layout/base/RestyleManager.cpp @@ -1500,9 +1500,11 @@ void RestyleManager::ProcessRestyledFrames(nsStyleChangeList& aChangeList) { if (!(frame->GetStateBits() & NS_FRAME_MAY_BE_TRANSFORMED)) { // Frame can not be transformed, and thus a change in transform will - // have no effect and we should not use the - // nsChangeHint_UpdatePostTransformOverflow hint. - hint &= ~nsChangeHint_UpdatePostTransformOverflow; + // have no effect and we should not use either + // nsChangeHint_UpdatePostTransformOverflow or + // nsChangeHint_UpdateTransformLayerhint. + hint &= ~(nsChangeHint_UpdatePostTransformOverflow | + nsChangeHint_UpdateTransformLayer); } if ((hint & nsChangeHint_UpdateTransformLayer) &&