From 53f71049ff08a93a0dbba9eac05f16404e3405a3 Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Tue, 14 Nov 2017 13:04:52 +0200 Subject: [PATCH] Backed out 2 changesets (bug 1416620) for failing own reftest. r=backout a=backout on a CLOSED TREE Backed out changeset 3b45218edc2e (bug 1416620) Backed out changeset c48580e1f535 (bug 1416620) --- gfx/tests/reftest/1416620-1-ref.html | 31 ------------------------- gfx/tests/reftest/1416620-1.html | 32 -------------------------- gfx/tests/reftest/reftest.list | 1 - layout/forms/nsButtonFrameRenderer.cpp | 22 +++++++++--------- 4 files changed, 11 insertions(+), 75 deletions(-) delete mode 100644 gfx/tests/reftest/1416620-1-ref.html delete mode 100644 gfx/tests/reftest/1416620-1.html diff --git a/gfx/tests/reftest/1416620-1-ref.html b/gfx/tests/reftest/1416620-1-ref.html deleted file mode 100644 index 36675fedb4af..000000000000 --- a/gfx/tests/reftest/1416620-1-ref.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - Testcase for bug 1416620 - - - -
 
-
 
- - diff --git a/gfx/tests/reftest/1416620-1.html b/gfx/tests/reftest/1416620-1.html deleted file mode 100644 index 237c178da30e..000000000000 --- a/gfx/tests/reftest/1416620-1.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Testcase for bug 1416620 - - - - - - - diff --git a/gfx/tests/reftest/reftest.list b/gfx/tests/reftest/reftest.list index 6ac100bb6d58..0b77e23ce2a6 100644 --- a/gfx/tests/reftest/reftest.list +++ b/gfx/tests/reftest/reftest.list @@ -7,4 +7,3 @@ skip-if(!asyncPan) == 1086723.html 1086723-ref.html skip-if(Android) fuzzy-if(skiaContent,1,587) == 1143303-1.svg pass.svg fuzzy(100,30) == 1149923.html 1149923-ref.html # use fuzzy due to few distorted pixels caused by border-radius == 1131264-1.svg pass.svg -== 1416620-1.html 1416620-1-ref.html diff --git a/layout/forms/nsButtonFrameRenderer.cpp b/layout/forms/nsButtonFrameRenderer.cpp index c534b94ffab9..2fc0d6402833 100644 --- a/layout/forms/nsButtonFrameRenderer.cpp +++ b/layout/forms/nsButtonFrameRenderer.cpp @@ -293,17 +293,6 @@ nsDisplayButtonBorder::CreateWebRenderCommands(mozilla::wr::DisplayListBuilder& mozilla::layers::WebRenderLayerManager* aManager, nsDisplayListBuilder* aDisplayListBuilder) { - // This is really a combination of paint box shadow inner + - // paint border. - nsRect buttonRect = nsRect(ToReferenceFrame(), mFrame->GetSize()); - bool snap; - nsRegion visible = GetBounds(aDisplayListBuilder, &snap); - nsDisplayBoxShadowInner::CreateInsetBoxShadowWebRenderCommands(aBuilder, - aSc, - visible, - mFrame, - buttonRect); - bool borderIsEmpty = false; Maybe br = nsCSSRendering::CreateBorderRenderer(mFrame->PresContext(), @@ -324,6 +313,17 @@ nsDisplayButtonBorder::CreateWebRenderCommands(mozilla::wr::DisplayListBuilder& return false; } + // This is really a combination of paint box shadow inner + + // paint border. + nsRect buttonRect = nsRect(ToReferenceFrame(), mFrame->GetSize()); + bool snap; + nsRegion visible = GetBounds(aDisplayListBuilder, &snap); + nsDisplayBoxShadowInner::CreateInsetBoxShadowWebRenderCommands(aBuilder, + aSc, + visible, + mFrame, + buttonRect); + br->CreateWebRenderCommands(this, aBuilder, aResources, aSc); return true;