Commit ac0687ac authored by Markus Stange's avatar Markus Stange
Browse files

Back out bug 1592739 due to multiple regressions (bug 1599366, bug 1601183, bug 1602193). a=backout 

Differential Revision: https://phabricator.services.mozilla.com/D62753

--HG--
extra : moz-landing-system : lando
parent 147ec7bc

browser/themes/osx/browser.css

+6 −8
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ 
  text-shadow: inherit;

}



:root {

  -moz-appearance: none;

  background-color: #eeeeee;

}



/** Begin titlebar **/



#titlebar {
@@ -492,16 +497,9 @@ 
#sidebar-box {

  /* Default font size is 11px on mac, so this is 12px */

  font-size: 1.0909rem;

  --sidebar-background-color: -moz-mac-source-list;

}



/* Give the sidebar a vibrant -moz-appearance. Only do this when no lwtheme is

 * in use, because vibrant -moz-appearance values only work if there is no

 * background-color rendered behind the element, and we have :root:-moz-lwtheme

 * rules which set -moz-appearance: none and an opaque background color on the

 * root element. That background color would interfere with the vibrancy.

 * See bug 1594132 for fixing this. */

#sidebar-box:not(:-moz-lwtheme) {

#sidebar-box:not([lwt-sidebar]) {

  -moz-appearance: -moz-mac-source-list;

  -moz-font-smoothing-background-color: -moz-mac-source-list;

}

gfx/layers/composite/LayerManagerComposite.cpp

+5 −1
Original line number Diff line number Diff line
@@ -1215,7 +1215,11 @@ bool LayerManagerComposite::Render(const nsIntRegion& aInvalidRegion, 
      // opaque parts of the window are covered by different layers and we can

      // update those parts separately.

      IntRegion opaqueRegion;

      opaqueRegion.And(aOpaqueRegion, mRenderBounds);

#ifdef XP_MACOSX

      opaqueRegion =

          mCompositor->GetWidget()->GetOpaqueWidgetRegion().ToUnknownRegion();

#endif

      opaqueRegion.AndWith(mRenderBounds);



      // Limit the complexity of these regions. Usually, opaqueRegion should be

      // only one or two rects, so this SimplifyInward call will not change the

gfx/src/nsITheme.h

+5 −0
Original line number Diff line number Diff line
@@ -168,6 +168,11 @@ class nsITheme : public nsISupports { 
    return false;

  }



  virtual bool NeedToClearBackgroundBehindWidget(nsIFrame* aFrame,

                                                 StyleAppearance aWidgetType) {

    return false;

  }



  /**

   * ThemeGeometryType values are used for describing themed nsIFrames in

   * calls to nsIWidget::UpdateThemeGeometries. We don't simply pass the

layout/base/PresShell.cpp

+5 −10
Original line number Diff line number Diff line
@@ -5080,16 +5080,11 @@ void PresShell::UpdateCanvasBackground() { 
    // style frame but we don't have access to the canvasframe here. It isn't

    // a problem because only a few frames can return something other than true

    // and none of them would be a canvas frame or root element style frame.

    bool drawBackgroundImage = false;

    bool drawBackgroundColor = false;

    if (rootStyleFrame->IsThemed()) {

      // Ignore the CSS background-color if -moz-appearance is used.

      mCanvasBackgroundColor = NS_RGBA(0, 0, 0, 0);

    } else {

    bool drawBackgroundImage;

    bool drawBackgroundColor;

    mCanvasBackgroundColor = nsCSSRendering::DetermineBackgroundColor(

        mPresContext, bgStyle, rootStyleFrame, drawBackgroundImage,

        drawBackgroundColor);

    }

    mHasCSSBackgroundColor = drawBackgroundColor;

    if (mPresContext->IsRootContentDocumentCrossProcess() &&

        !IsTransparentContainerElement(mPresContext)) {

layout/painting/nsDisplayItemTypesList.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ DECLARE_DISPLAY_ITEM_TYPE(CHECKED_CHECKBOX, 
                          TYPE_RENDERS_NO_IMAGES | TYPE_IS_CONTENTFUL)

DECLARE_DISPLAY_ITEM_TYPE(CHECKED_RADIOBUTTON,

                          TYPE_RENDERS_NO_IMAGES | TYPE_IS_CONTENTFUL)

DECLARE_DISPLAY_ITEM_TYPE(CLEAR_BACKGROUND, TYPE_RENDERS_NO_IMAGES)

DECLARE_DISPLAY_ITEM_TYPE(COLUMN_RULE, TYPE_RENDERS_NO_IMAGES)

DECLARE_DISPLAY_ITEM_TYPE(COMBOBOX_FOCUS, TYPE_RENDERS_NO_IMAGES)

DECLARE_DISPLAY_ITEM_TYPE(COMPOSITOR_HITTEST_INFO, TYPE_RENDERS_NO_IMAGES)