diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /widget/Screen.cpp | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'widget/Screen.cpp')
-rw-r--r-- | widget/Screen.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/widget/Screen.cpp b/widget/Screen.cpp index 71a1624624..ccc78a9413 100644 --- a/widget/Screen.cpp +++ b/widget/Screen.cpp @@ -30,7 +30,7 @@ Screen::Screen(LayoutDeviceIntRect aRect, LayoutDeviceIntRect aAvailRect, uint32_t aPixelDepth, uint32_t aColorDepth, uint32_t aRefreshRate, DesktopToLayoutDeviceScale aContentsScale, CSSToLayoutDeviceScale aDefaultCssScale, float aDPI, - IsPseudoDisplay aIsPseudoDisplay, + IsPseudoDisplay aIsPseudoDisplay, IsHDR aIsHDR, hal::ScreenOrientation aOrientation, OrientationAngle aOrientationAngle) : mRect(aRect), @@ -45,7 +45,8 @@ Screen::Screen(LayoutDeviceIntRect aRect, LayoutDeviceIntRect aAvailRect, mDPI(aDPI), mScreenOrientation(EffectiveOrientation(aOrientation, aRect)), mOrientationAngle(aOrientationAngle), - mIsPseudoDisplay(aIsPseudoDisplay == IsPseudoDisplay::Yes) {} + mIsPseudoDisplay(aIsPseudoDisplay == IsPseudoDisplay::Yes), + mIsHDR(aIsHDR == IsHDR::Yes) {} Screen::Screen(const dom::ScreenDetails& aScreen) : mRect(aScreen.rect()), @@ -60,7 +61,8 @@ Screen::Screen(const dom::ScreenDetails& aScreen) mDPI(aScreen.dpi()), mScreenOrientation(aScreen.orientation()), mOrientationAngle(aScreen.orientationAngle()), - mIsPseudoDisplay(aScreen.isPseudoDisplay()) {} + mIsPseudoDisplay(aScreen.isPseudoDisplay()), + mIsHDR(aScreen.isHDR()) {} Screen::Screen(const Screen& aOther) : mRect(aOther.mRect), @@ -75,13 +77,14 @@ Screen::Screen(const Screen& aOther) mDPI(aOther.mDPI), mScreenOrientation(aOther.mScreenOrientation), mOrientationAngle(aOther.mOrientationAngle), - mIsPseudoDisplay(aOther.mIsPseudoDisplay) {} + mIsPseudoDisplay(aOther.mIsPseudoDisplay), + mIsHDR(aOther.mIsHDR) {} dom::ScreenDetails Screen::ToScreenDetails() const { return dom::ScreenDetails( mRect, mRectDisplayPix, mAvailRect, mAvailRectDisplayPix, mPixelDepth, mColorDepth, mRefreshRate, mContentsScale, mDefaultCssScale, mDPI, - mScreenOrientation, mOrientationAngle, mIsPseudoDisplay); + mScreenOrientation, mOrientationAngle, mIsPseudoDisplay, mIsHDR); } NS_IMETHODIMP |