Commit 77029463 authored by Marian-Vasile Laza's avatar Marian-Vasile Laza
Browse files

Backed out 5 changesets (bug 1751217) for causing... 

Backed out 5 changesets (bug 1751217) for causing wpt(Screen-pixelDepth-Screen-colorDepth001.html) and mochitest(test_media_queries.html) failures. CLOSED TREE

Backed out changeset 60a4497fd1f5 (bug 1751217)
Backed out changeset 785f4c5f719d (bug 1751217)
Backed out changeset 81e41f7a1ee4 (bug 1751217)
Backed out changeset d35c5648c936 (bug 1751217)
Backed out changeset f16305c6ec83 (bug 1751217)
parent f4d496e2

dom/base/nsScreen.cpp

+3 −1
Original line number Diff line number Diff line
@@ -63,7 +63,9 @@ int32_t nsScreen::GetPixelDepth(ErrorResult& aRv) { 
    return -1;

  }



  return context->GetDepth();

  uint32_t depth;

  context->GetDepth(depth);

  return depth;

}



nsPIDOMWindowOuter* nsScreen::GetOuter() const {

gfx/src/nsDeviceContext.cpp

+4 −4
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ already_AddRefed<gfxContext> nsDeviceContext::CreateRenderingContextCommon( 
  return pContext.forget();

}



uint32_t nsDeviceContext::GetDepth() {

nsresult nsDeviceContext::GetDepth(uint32_t& aDepth) {

  nsCOMPtr<nsIScreen> screen;

  FindScreen(getter_AddRefs(screen));

  if (!screen) {
@@ -219,9 +219,9 @@ uint32_t nsDeviceContext::GetDepth() { 
    screenManager.GetPrimaryScreen(getter_AddRefs(screen));

    MOZ_ASSERT(screen);

  }

  int32_t depth = 0;

  screen->GetColorDepth(&depth);

  return uint32_t(depth);

  screen->GetColorDepth(reinterpret_cast<int32_t*>(&aDepth));



  return NS_OK;

}



nsresult nsDeviceContext::GetDeviceSurfaceDimensions(nscoord& aWidth,

gfx/src/nsDeviceContext.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ class nsDeviceContext final { 
  /**

   * Return the bit depth of the device.

   */

  uint32_t GetDepth();

  nsresult GetDepth(uint32_t& aDepth);



  /**

   * Get the size of the displayable area of the output device

layout/style/GeckoBindings.h

+0 −5
Original line number Diff line number Diff line
@@ -593,11 +593,6 @@ mozilla::StylePrefersContrast Gecko_MediaFeatures_PrefersContrast( 
mozilla::StylePrefersColorScheme Gecko_MediaFeatures_PrefersColorScheme(

    const mozilla::dom::Document*, bool aUseContent);



mozilla::StyleDynamicRange Gecko_MediaFeatures_DynamicRange(

    const mozilla::dom::Document*);

mozilla::StyleDynamicRange Gecko_MediaFeatures_VideoDynamicRange(

    const mozilla::dom::Document*);



mozilla::PointerCapabilities Gecko_MediaFeatures_PrimaryPointerCapabilities(

    const mozilla::dom::Document*);

layout/style/ServoBindings.toml

+0 −1
Original line number Diff line number Diff line
@@ -419,7 +419,6 @@ cbindgen-types = [ 
    { gecko = "StyleDisplayMode", servo = "crate::gecko::media_features::DisplayMode" },

    { gecko = "StylePlatform", servo = "crate::gecko::media_features::Platform" },

    { gecko = "StylePrefersColorScheme", servo = "crate::gecko::media_features::PrefersColorScheme" },

    { gecko = "StyleDynamicRange", servo = "crate::gecko::media_features::DynamicRange" },

    { gecko = "StyleFillRule", servo = "crate::values::generics::basic_shape::FillRule" },

    { gecko = "StyleFontDisplay", servo = "crate::font_face::FontDisplay" },

    { gecko = "StyleFontFaceSourceListComponent", servo = "crate::font_face::FontFaceSourceListComponent" },