Backed out 5 changesets (bug 1330962) for failures in display-block-baselines-1.html and 315920-17.html

CLOSED TREE Backed out changeset 71c277105903 (bug 1330962) Backed out changeset 8cfebee598a6 (bug 1330962) Backed out changeset 2394701998b2 (bug 1330962) Backed out changeset 0b92b30ed1d3 (bug 1330962) Backed out changeset cc7508381dc1 (bug 1330962)
2024-10-07 18:04:46 +00:00 · 2017-01-27 20:30:07 -08:00 · 2017-01-27 20:30:07 -08:00 · 5ee174a663
commit 5ee174a663
parent e3e3523d58
19 changed files with 26 additions and 971 deletions
--- a/image/DrawResult.h
+++ b/image/DrawResult.h
@ -6,7 +6,6 @@
 #ifndef mozilla_image_DrawResult_h
 #define mozilla_image_DrawResult_h

-#include <cstdint> // for uint8_t
 #include "mozilla/Attributes.h"
 #include "mozilla/Likely.h"

--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@ -5,22 +5,26 @@

 #include "nsFieldSetFrame.h"

-#include <algorithm>
 #include "mozilla/gfx/2D.h"
-#include "mozilla/Likely.h"
-#include "mozilla/Maybe.h"
 #include "nsCSSAnonBoxes.h"
-#include "nsCSSRendering.h"
-#include "nsDisplayList.h"
-#include "nsGkAtoms.h"
-#include "nsIFrameInlines.h"
 #include "nsLayoutUtils.h"
 #include "nsLegendFrame.h"
-#include "nsRenderingContext.h"
+#include "nsCSSRendering.h"
+#include <algorithm>
+#include "nsIFrame.h"
+#include "nsPresContext.h"
+#include "mozilla/RestyleManager.h"
+#include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
+#include "nsDisplayList.h"
+#include "nsRenderingContext.h"
+#include "nsIScrollableFrame.h"
+#include "mozilla/Likely.h"
+#include "mozilla/Maybe.h"

 using namespace mozilla;
 using namespace mozilla::gfx;
+using namespace mozilla::image;
 using namespace mozilla::layout;

 nsContainerFrame*
@ -111,7 +115,7 @@ void
 nsDisplayFieldSetBorder::Paint(nsDisplayListBuilder* aBuilder,
                               nsRenderingContext* aCtx)
 {
-  image::DrawResult result = static_cast<nsFieldSetFrame*>(mFrame)->
+  DrawResult result = static_cast<nsFieldSetFrame*>(mFrame)->
    PaintBorder(aBuilder, *aCtx, ToReferenceFrame(), mVisibleRect);

  nsDisplayItemGenericImageGeometry::UpdateDrawResult(this, result);
@ -208,7 +212,7 @@ nsFieldSetFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
  contentDisplayItems.MoveTo(aLists);
 }

-image::DrawResult
+DrawResult
 nsFieldSetFrame::PaintBorder(
  nsDisplayListBuilder* aBuilder,
  nsRenderingContext& aRenderingContext,
@ -624,50 +628,9 @@ nsFieldSetFrame::AccessibleType()
 #endif

 nscoord
-nsFieldSetFrame::GetLogicalBaseline(WritingMode aWM) const
-{
-  switch (StyleDisplay()->mDisplay) {
-    case mozilla::StyleDisplay::Grid:
-    case mozilla::StyleDisplay::InlineGrid:
-    case mozilla::StyleDisplay::Flex:
-    case mozilla::StyleDisplay::InlineFlex:
-      return BaselineBOffset(aWM, BaselineSharingGroup::eFirst,
-                             AlignmentContext::eInline);
-    default:
-      return BSize(aWM) - BaselineBOffset(aWM, BaselineSharingGroup::eLast,
-                                          AlignmentContext::eInline);
-  }
-}
-
-bool
-nsFieldSetFrame::GetVerticalAlignBaseline(WritingMode aWM,
-                                          nscoord* aBaseline) const
+nsFieldSetFrame::GetLogicalBaseline(WritingMode aWritingMode) const
 {
  nsIFrame* inner = GetInner();
-  MOZ_ASSERT(!inner->GetWritingMode().IsOrthogonalTo(aWM));
-  if (!inner->GetVerticalAlignBaseline(aWM, aBaseline)) {
-    return false;
-  }
-  nscoord innerBStart = inner->BStart(aWM, GetSize());
-  *aBaseline += innerBStart;
-  return true;
-}
-
-bool
-nsFieldSetFrame::GetNaturalBaselineBOffset(WritingMode          aWM,
-                                           BaselineSharingGroup aBaselineGroup,
-                                           nscoord*             aBaseline) const
-{
-  nsIFrame* inner = GetInner();
-  MOZ_ASSERT(!inner->GetWritingMode().IsOrthogonalTo(aWM));
-  if (!inner->GetNaturalBaselineBOffset(aWM, aBaselineGroup, aBaseline)) {
-    return false;
-  }
-  nscoord innerBStart = inner->BStart(aWM, GetSize());
-  if (aBaselineGroup == BaselineSharingGroup::eFirst) {
-    *aBaseline += innerBStart;
-  } else {
-    *aBaseline += BSize(aWM) - (innerBStart + inner->BSize(aWM));
-  }
-  return true;
+  return inner->BStart(aWritingMode, GetParent()->GetSize()) +
+    inner->GetLogicalBaseline(aWritingMode);
 }
--- a/layout/forms/nsFieldSetFrame.h
+++ b/layout/forms/nsFieldSetFrame.h
@ -7,7 +7,7 @@
 #define nsFieldSetFrame_h___

 #include "mozilla/Attributes.h"
-#include "DrawResult.h"
+#include "imgIContainer.h"
 #include "nsContainerFrame.h"

 class nsFieldSetFrame final : public nsContainerFrame
@ -24,6 +24,7 @@ public:
                      nsLayoutUtils::IntrinsicISizeType);
  virtual nscoord GetMinISize(nsRenderingContext* aRenderingContext) override;
  virtual nscoord GetPrefISize(nsRenderingContext* aRenderingContext) override;
+  virtual nscoord GetLogicalBaseline(mozilla::WritingMode aWritingMode) const override;

  /**
   * The area to paint box-shadows around.  It's the border rect except
@ -36,13 +37,6 @@ public:
                      const ReflowInput& aReflowInput,
                      nsReflowStatus&          aStatus) override;
                               
-  nscoord GetLogicalBaseline(mozilla::WritingMode aWM) const override;
-  bool GetVerticalAlignBaseline(mozilla::WritingMode aWM,
-                                nscoord* aBaseline) const override;
-  bool GetNaturalBaselineBOffset(mozilla::WritingMode aWM,
-                                 BaselineSharingGroup aBaselineGroup,
-                                 nscoord* aBaseline) const override;
-
  virtual void BuildDisplayList(nsDisplayListBuilder*   aBuilder,
                                const nsRect&           aDirtyRect,
                                const nsDisplayListSet& aLists) override;
--- a/layout/forms/nsHTMLButtonControlFrame.cpp
+++ b/layout/forms/nsHTMLButtonControlFrame.cpp
@ -337,47 +337,6 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
  aButtonDesiredSize.SetOverflowAreasToDesiredBounds();
 }

-bool
-nsHTMLButtonControlFrame::GetVerticalAlignBaseline(mozilla::WritingMode aWM,
-                                                   nscoord* aBaseline) const
-{
-  nsIFrame* inner = mFrames.FirstChild();
-  if (MOZ_UNLIKELY(inner->GetWritingMode().IsOrthogonalTo(aWM))) {
-    return false;
-  }
-  if (!inner->GetVerticalAlignBaseline(aWM, aBaseline)) {
-    // <input type=color> has an empty block frame as inner frame
-    *aBaseline = inner->
-      SynthesizeBaselineBOffsetFromBorderBox(aWM, BaselineSharingGroup::eFirst);
-  }
-  nscoord innerBStart = inner->BStart(aWM, GetSize());
-  *aBaseline += innerBStart;
-  return true;
-}
-
-bool
-nsHTMLButtonControlFrame::GetNaturalBaselineBOffset(mozilla::WritingMode aWM,
-                                         BaselineSharingGroup aBaselineGroup,
-                                         nscoord* aBaseline) const
-{
-  nsIFrame* inner = mFrames.FirstChild();
-  if (MOZ_UNLIKELY(inner->GetWritingMode().IsOrthogonalTo(aWM))) {
-    return false;
-  }
-  if (!inner->GetNaturalBaselineBOffset(aWM, aBaselineGroup, aBaseline)) {
-    // <input type=color> has an empty block frame as inner frame
-    *aBaseline = inner->
-      SynthesizeBaselineBOffsetFromBorderBox(aWM, aBaselineGroup);
-  }
-  nscoord innerBStart = inner->BStart(aWM, GetSize());
-  if (aBaselineGroup == BaselineSharingGroup::eFirst) {
-    *aBaseline += innerBStart;
-  } else {
-    *aBaseline += BSize(aWM) - (innerBStart + inner->BSize(aWM));
-  }
-  return true;
-}
-
 nsresult nsHTMLButtonControlFrame::SetFormProperty(nsIAtom* aName, const nsAString& aValue)
 {
  if (nsGkAtoms::value == aName) {
--- a/layout/forms/nsHTMLButtonControlFrame.h
+++ b/layout/forms/nsHTMLButtonControlFrame.h
@ -39,13 +39,6 @@ public:
                      const ReflowInput& aReflowInput,
                      nsReflowStatus&          aStatus) override;

-  bool GetVerticalAlignBaseline(mozilla::WritingMode aWM,
-                                nscoord* aBaseline) const override;
-
-  bool GetNaturalBaselineBOffset(mozilla::WritingMode aWM,
-                                 BaselineSharingGroup aBaselineGroup,
-                                 nscoord* aBaseline) const override;
-
  virtual nsresult HandleEvent(nsPresContext* aPresContext, 
                               mozilla::WidgetGUIEvent* aEvent,
                               nsEventStatus* aEventStatus) override;
--- a/layout/forms/nsLegendFrame.h
+++ b/layout/forms/nsLegendFrame.h
@ -9,8 +9,7 @@
 #include "mozilla/Attributes.h"
 #include "nsBlockFrame.h"

-class nsLegendFrame final : public nsBlockFrame
-{
+class nsLegendFrame : public nsBlockFrame {
 public:
  NS_DECL_QUERYFRAME_TARGET(nsLegendFrame)
  NS_DECL_QUERYFRAME
@ -31,7 +30,7 @@ public:
  virtual nsresult GetFrameName(nsAString& aResult) const override;
 #endif

-  int32_t GetLogicalAlign(mozilla::WritingMode aCBWM);
+  int32_t GetLogicalAlign(WritingMode aCBWM);
 };


--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@ -105,7 +105,6 @@ private:

 nsTextControlFrame::nsTextControlFrame(nsStyleContext* aContext)
  : nsContainerFrame(aContext)
-  , mFirstBaseline(NS_INTRINSIC_WIDTH_UNKNOWN)
  , mEditorHasBeenInitialized(false)
  , mIsProcessing(false)
  , mUsePlaceholder(false)
@ -534,7 +533,7 @@ nsTextControlFrame::Reflow(nsPresContext*   aPresContext,
              aReflowInput.ComputedLogicalBorderPadding().BStartEnd(wm));
  aDesiredSize.SetSize(wm, finalSize);

-  // Calculate the baseline and store it in mFirstBaseline.
+  // computation of the ascent wrt the input height
  nscoord lineHeight = aReflowInput.ComputedBSize();
  float inflation = nsLayoutUtils::FontSizeInflationFor(this);
  if (!IsSingleLineTextControl()) {
@ -543,11 +542,11 @@ nsTextControlFrame::Reflow(nsPresContext*   aPresContext,
  }
  RefPtr<nsFontMetrics> fontMet =
    nsLayoutUtils::GetFontMetricsForFrame(this, inflation);
-  mFirstBaseline =
+  // now adjust for our borders and padding
+  aDesiredSize.SetBlockStartAscent(
    nsLayoutUtils::GetCenteredFontBaseline(fontMet, lineHeight,
                                           wm.IsLineInverted()) +
-    aReflowInput.ComputedLogicalBorderPadding().BStart(wm);
-  aDesiredSize.SetBlockStartAscent(mFirstBaseline);
+    aReflowInput.ComputedLogicalBorderPadding().BStart(wm));

  // overflow handling
  aDesiredSize.SetOverflowAreasToDesiredBounds();
--- a/layout/forms/nsTextControlFrame.h
+++ b/layout/forms/nsTextControlFrame.h
@ -62,29 +62,6 @@ public:
                      const ReflowInput& aReflowInput,
                      nsReflowStatus&          aStatus) override;

-  bool GetVerticalAlignBaseline(mozilla::WritingMode aWM,
-                                nscoord* aBaseline) const override
-  {
-    return GetNaturalBaselineBOffset(aWM, BaselineSharingGroup::eFirst, aBaseline);
-  }
-
-  bool GetNaturalBaselineBOffset(mozilla::WritingMode aWM,
-                                 BaselineSharingGroup aBaselineGroup,
-                                 nscoord* aBaseline) const override
-  {
-    if (!IsSingleLineTextControl()) {
-      return false;
-    }
-    NS_ASSERTION(mFirstBaseline != NS_INTRINSIC_WIDTH_UNKNOWN,
-                 "please call Reflow before asking for the baseline");
-    if (aBaselineGroup == BaselineSharingGroup::eFirst) {
-      *aBaseline = mFirstBaseline;
-    } else {
-      *aBaseline = BSize(aWM) - mFirstBaseline;
-    }
-    return true;
-  }
-
  virtual nsSize GetXULMinSize(nsBoxLayoutState& aBoxLayoutState) override;
  virtual bool IsXULCollapsed() override;

@ -110,14 +87,6 @@ public:
      ~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
  }

-#ifdef DEBUG
-  void MarkIntrinsicISizesDirty() override
-  {
-    // Need another Reflow to have a correct baseline value again.
-    mFirstBaseline = NS_INTRINSIC_WIDTH_UNKNOWN;
-  }
-#endif
-
  // nsIAnonymousContentCreator
  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) override;
  virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
@ -331,10 +300,6 @@ private:
  }

 private:
-  // Our first baseline, or NS_INTRINSIC_WIDTH_UNKNOWN if we have a pending
-  // Reflow.
-  nscoord mFirstBaseline;
-
  // these packed bools could instead use the high order bits on mState, saving 4 bytes 
  bool mEditorHasBeenInitialized;
  bool mIsProcessing;
--- a/layout/reftests/forms/display-block-baselines-1-ref.html
+++ b/layout/reftests/forms/display-block-baselines-1-ref.html
@ -1,87 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
-->
-<html><head>
-  <meta charset="utf-8">
-  <title>Reference: Testcase #1 for bug 1330962</title>
-  <style type="text/css">
-html,body {
-  color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
-}
-* { font:16px/1 monospace; }
-
-.block { display: block; }
-.grid { display: grid; }
-
-.no-theme {
-     -moz-appearance: none;
-  -webkit-appearance: none;
-          appearance: none;
-  padding: 20px 0;
-  border: none;
-  background: white;
-}
-
-.scroll {
-  overflow-y: scroll;
-}
-
-.no-scroll {
-  overflow: visible;
-}
-
-  </style>
-</head>
-<body>
-
-<div>
-  <div style="display:inline-grid">
-    A<img class="block" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAEElEQVQoz2NgGAWjYBTAAAADEAABaJFtwwAAAABJRU5ErkJggg%3D%3D">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-grid">
-    A
-    <input type="image" class="block" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAEElEQVQoz2NgGAWjYBTAAAADEAABaJFtwwAAAABJRU5ErkJggg%3D%3D">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <div style="display:inline-block"><input type="text" value="text"></div>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <div style="display:inline-block"><input type="text" value="text"></div>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <div style="display:inline-block"><input type="text"></div>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <div style="display:inline-block"><input class="no-theme" type="text" value="text"></div>
-  </div>
-  B
-</div>
-
-</body>
-</html>
--- a/layout/reftests/forms/display-block-baselines-1.html
+++ b/layout/reftests/forms/display-block-baselines-1.html
@ -1,88 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
-->
-<html><head>
-  <meta charset="utf-8">
-  <title>Testcase #1 for bug 1330962</title>
-  <style type="text/css">
-html,body {
-  color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
-}
-* { font:16px/1 monospace; }
-
-.block { display: block; }
-.grid { display: grid; }
-
-.no-theme {
-     -moz-appearance: none;
-  -webkit-appearance: none;
-          appearance: none;
-  padding: 20px 0;
-  border: none;
-  background: white;
-}
-
-.scroll {
-  overflow-y: scroll;
-}
-
-.no-scroll {
-  overflow: visible;
-}
-
-  </style>
-</head>
-<body>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <img class="block" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAEElEQVQoz2NgGAWjYBTAAAADEAABaJFtwwAAAABJRU5ErkJggg%3D%3D">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <input type="image" class="block" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAEElEQVQoz2NgGAWjYBTAAAADEAABaJFtwwAAAABJRU5ErkJggg%3D%3D">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <input class="block" type="text" value="text">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <input class="block scroll" type="text" value="text">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <input class="block" type="text">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <input class="block no-theme" type="text" value="text">
-  </div>
-  B
-</div>
-
-</body>
-</html>
--- a/layout/reftests/forms/display-block-baselines-2-ref.html
+++ b/layout/reftests/forms/display-block-baselines-2-ref.html
@ -1,100 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
-->
-<html><head>
-  <meta charset="utf-8">
-  <title>Reference: Testcase #2 for bug 1330962</title>
-  <style type="text/css">
-html,body {
-  color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
-}
-* { font:16px/1 monospace; }
-
-.block { display: block; }
-.grid { display: grid; }
-
-.no-theme {
-     -moz-appearance: none;
-  -webkit-appearance: none;
-          appearance: none;
-  padding: 20px 0;
-  border: none;
-  background: white;
-  color: black;
-  text-align: start;
-}
-
-.scroll {
-  overflow-y: scroll;
-}
-
-.no-scroll {
-  overflow: visible;
-}
-
-  </style>
-</head>
-<body>
-
-<div>
-  <div style="display:inline-block">
-    A<div>
-    <div style="display:inline-block"><input type="button" value="button"></div></div>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <div style="display:inline-block"><button>button</button></div>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <div style="display:inline-block"><input class="no-theme" type="button" value="button"></div>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <button class="no-theme">button-first<div style="font-size:10px">button-last</div></button>
-  </div>
-  B
-  <div class="no-theme" style="display:inline-block">button-first<div style="font-size:10px">button-last</div></div>
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <button class="no-theme" style="display:inline-grid">button-first<x style="font-size:10px">button-last</x></button>
-  </div>
-  B
-  <div class="no-theme" style="display:inline-grid">button-first<x style="font-size:10px">button-last</x></div>
-</div>
-
-<div>
-  <div style="display:inline-grid">
-    A
-    <input type="checkbox" class="block" checked>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-grid">
-    A
-    <input type="radio" class="block" checked>
-  </div>
-  B
-</div>
-
-</body>
-</html>
--- a/layout/reftests/forms/display-block-baselines-2.html
+++ b/layout/reftests/forms/display-block-baselines-2.html
@ -1,100 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
-->
-<html><head>
-  <meta charset="utf-8">
-  <title>Testcase #2 for bug 1330962</title>
-  <style type="text/css">
-html,body {
-  color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
-}
-* { font:16px/1 monospace; }
-
-.block { display: block; }
-.grid { display: grid; }
-
-.no-theme {
-     -moz-appearance: none;
-  -webkit-appearance: none;
-          appearance: none;
-  padding: 20px 0;
-  border: none;
-  background: white;
-  color: black;
-  text-align: start;
-}
-
-.scroll {
-  overflow-y: scroll;
-}
-
-.no-scroll {
-  overflow: visible;
-}
-
-  </style>
-</head>
-<body>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <input class="block" type="button" value="button">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <button class="block">button</button>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <input class="block no-theme" type="button" value="button">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <button class="block no-theme">button-first<div style="font-size:10px">button-last</div></button>
-  </div>
-  B
-  <button class="no-theme">button-first<div style="font-size:10px">button-last</div></button>
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <button class="grid no-theme">button-first<x style="font-size:10px">button-last</x></button>
-  </div>
-  B
-  <button class="no-theme" style="display:inline-grid">button-first<x style="font-size:10px">button-last</x></button>
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <input type="checkbox" class="block" checked>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <input type="radio" class="block" checked>
-  </div>
-  B
-</div>
-
-</body>
-</html>
--- a/layout/reftests/forms/display-block-baselines-3-ref.html
+++ b/layout/reftests/forms/display-block-baselines-3-ref.html
@ -1,72 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
-->
-<html><head>
-  <meta charset="utf-8">
-  <title>Reference: Testcase #3 for bug 1330962</title>
-  <style type="text/css">
-html,body {
-  color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
-}
-* { font:16px/1 monospace; }
-
-.block { display: block; }
-.grid { display: grid; }
-
-.no-theme {
-     -moz-appearance: none;
-  -webkit-appearance: none;
-          appearance: none;
-  padding: 20px 0;
-  border: none;
-  background: white;
-}
-
-.scroll {
-  overflow-y: scroll;
-}
-
-.no-scroll {
-  overflow: visible;
-}
-
-  </style>
-</head>
-<body>
-
-<div>
-  <div style="display:inline-grid">
-    A
-    <textarea class="block">textarea</textarea>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-grid">
-    A
-    <textarea class="block no-theme">textarea</textarea>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-grid">
-    A
-    <textarea class="block no-theme no-scroll">textarea</textarea>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <div style="display:inline-block"><fieldset style="display:inline">fieldset-first<br>fieldset-last</fieldset></div>
-  </div>
-  B
-</div>
-
-</body>
-</html>
--- a/layout/reftests/forms/display-block-baselines-3.html
+++ b/layout/reftests/forms/display-block-baselines-3.html
@ -1,73 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
-->
-<html><head>
-  <meta charset="utf-8">
-  <title>Testcase #3 for bug 1330962</title>
-  <style type="text/css">
-html,body {
-  color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
-}
-* { font:16px/1 monospace; }
-
-.block { display: block; }
-.grid { display: grid; }
-
-.no-theme {
-     -moz-appearance: none;
-  -webkit-appearance: none;
-          appearance: none;
-  padding: 20px 0;
-  border: none;
-  background: white;
-}
-
-.scroll {
-  overflow-y: scroll;
-}
-
-.no-scroll {
-  overflow: visible;
-}
-
-  </style>
-</head>
-<body>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <textarea class="block">textarea</textarea>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <textarea class="block no-theme">textarea</textarea>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <textarea class="block no-theme no-scroll">textarea</textarea>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <fieldset class="block">fieldset-first<br>fieldset-last</fieldset>
-  </div>
-  B
-</div>
-
-
-</body>
-</html>
--- a/layout/reftests/forms/display-block-baselines-4-ref.html
+++ b/layout/reftests/forms/display-block-baselines-4-ref.html
@ -1,73 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
-->
-<html><head>
-  <meta charset="utf-8">
-  <title>Reference: Testcase #4 for bug 1330962</title>
-  <style type="text/css">
-html,body {
-  color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
-}
-* { font:16px/1 monospace; }
-
-.block { display: block; }
-.grid { display: grid; }
-
-.no-theme {
-     -moz-appearance: none;
-  -webkit-appearance: none;
-          appearance: none;
-  padding: 20px 0;
-  border: none;
-  background: white;
-}
-
-.scroll {
-  overflow-y: scroll;
-}
-
-.no-scroll {
-  overflow: visible;
-}
-
-  </style>
-</head>
-<body>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <div style="display:inline-block"><fieldset style="display:inline"><legend>legend</legend>
-fieldset-first<br>fieldset-last</fieldset></div>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <fieldset style="display:inline-grid">grid-fieldset-first<x>grid-fieldset-last</x></fieldset>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <fieldset style="display:inline" class="no-theme">fieldset-first<br>fieldset-last</fieldset>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <fieldset style="display:inline" class="no-theme scroll">fieldset-first<br>fieldset-last</fieldset>
-  </div>
-  B
-</div>
-
-</body>
-</html>
--- a/layout/reftests/forms/display-block-baselines-4.html
+++ b/layout/reftests/forms/display-block-baselines-4.html
@ -1,74 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
-->
-<html><head>
-  <meta charset="utf-8">
-  <title>Testcase #4 for bug 1330962</title>
-  <style type="text/css">
-html,body {
-  color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
-}
-* { font:16px/1 monospace; }
-
-.block { display: block; }
-.grid { display: grid; }
-
-.no-theme {
-     -moz-appearance: none;
-  -webkit-appearance: none;
-          appearance: none;
-  padding: 20px 0;
-  border: none;
-  background: white;
-}
-
-.scroll {
-  overflow-y: scroll;
-}
-
-.no-scroll {
-  overflow: visible;
-}
-
-  </style>
-</head>
-<body>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <fieldset class="block"><legend>legend</legend>
-fieldset-first<br>fieldset-last</fieldset>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <fieldset class="grid"><x style="order:2">grid-fieldset-last</x>grid-fieldset-first</fieldset>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <fieldset class="block no-theme">fieldset-first<br>fieldset-last</fieldset>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <fieldset class="block no-theme scroll">fieldset-first<br>fieldset-last</fieldset>
-  </div>
-  B
-</div>
-
-
-</body>
-</html>
--- a/layout/reftests/forms/display-block-baselines-5-ref.html
+++ b/layout/reftests/forms/display-block-baselines-5-ref.html
@ -1,72 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
-->
-<html><head>
-  <meta charset="utf-8">
-  <title>Reference: Testcase #5 for bug 1330962</title>
-  <style type="text/css">
-html,body {
-  color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
-}
-* { font:16px/1 monospace; }
-
-.block { display: block; }
-.grid { display: grid; }
-
-.no-theme {
-     -moz-appearance: none;
-  -webkit-appearance: none;
-          appearance: none;
-  padding: 20px 0;
-  border: none;
-  background: white;
-}
-
-.scroll {
-  overflow-y: scroll;
-}
-
-.no-scroll {
-  overflow: visible;
-}
-
-  </style>
-</head>
-<body>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <input type="color">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <input type="color" class="no-theme">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <select><option>select</select>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A<br>
-    <select class="no-theme"><option>select</select>
-  </div>
-  B
-</div>
-
-</body>
-</html>
--- a/layout/reftests/forms/display-block-baselines-5.html
+++ b/layout/reftests/forms/display-block-baselines-5.html
@ -1,72 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
-->
-<html><head>
-  <meta charset="utf-8">
-  <title>Testcase #5 for bug 1330962</title>
-  <style type="text/css">
-html,body {
-  color:black; background-color:white; font:16px/1 monospace; padding:0; margin:0;
-}
-* { font:16px/1 monospace; }
-
-.block { display: block; }
-.grid { display: grid; }
-
-.no-theme {
-     -moz-appearance: none;
-  -webkit-appearance: none;
-          appearance: none;
-  padding: 20px 0;
-  border: none;
-  background: white;
-}
-
-.scroll {
-  overflow-y: scroll;
-}
-
-.no-scroll {
-  overflow: visible;
-}
-
-  </style>
-</head>
-<body>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <input type="color" class="block">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <input type="color" class="block no-theme">
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <select class="block"><option>select</select>
-  </div>
-  B
-</div>
-
-<div>
-  <div style="display:inline-block">
-    A
-    <select class="block no-theme"><option>select</select>
-  </div>
-  B
-</div>
-
-</body>
-</html>
--- a/layout/reftests/forms/reftest.list
+++ b/layout/reftests/forms/reftest.list
@ -1,9 +1,4 @@
 fuzzy-if(skiaContent,1,10) HTTP(..) == text-control-baseline-1.html text-control-baseline-1-ref.html
-== display-block-baselines-1.html display-block-baselines-1-ref.html
-== display-block-baselines-2.html display-block-baselines-2-ref.html
-== display-block-baselines-3.html display-block-baselines-3-ref.html
-== display-block-baselines-4.html display-block-baselines-4-ref.html
-fuzzy-if(Android,4,8) == display-block-baselines-5.html display-block-baselines-5-ref.html

 # button element
 include button/reftest.list