Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1431337) for M15 failures in parser/htmlparser/tests/mochitest/test_img_picture_preload.html on a CLOSED TREE

Browse Source 
Backed out changeset c70e75e993fc (bug 1431337)
Backed out changeset 016f4ce0803b (bug 1431337)
This commit is contained in:
Noemi Erli 2018-01-24 18:09:50 +02:00
parent b57b9c07af
commit a111747a97
2 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
widget/gtk/nsLookAndFeel.cpp
View File

@ -737,9 +737,13 @@ GetSystemFontInfo(GtkStyleContext *aStyle,
// |size| is in pango-points, so convert to pixels.
size *= float(gfxPlatformGtk::GetFontScaleDPI()) / POINTS_PER_INCH_FLOAT;
}
// |size| is now pixels but not scaled for the hidpi displays,
// this needs to be done in GetFontImpl where the aDevPixPerCSSPixel
// parameter is provided.
// Scale fonts up on HiDPI displays.
// This would be done automatically with cairo, but we manually manage
// the display scale for platform consistency.
size *= mozilla::widget::ScreenHelperGTK::GetGTKMonitorScaleFactor();
// |size| is now pixels
aFontStyle->size = size;
@ -756,18 +760,18 @@ nsLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName,
case eFont_PullDownMenu: // css3
aFontName = mMenuFontName;
aFontStyle = mMenuFontStyle;
break;
return true;
case eFont_Field: // css3
case eFont_List: // css3
aFontName = mFieldFontName;
aFontStyle = mFieldFontStyle;
break;
return true;
case eFont_Button: // css3
aFontName = mButtonFontName;
aFontStyle = mButtonFontStyle;
break;
return true;
case eFont_Caption: // css2
case eFont_Icon: // css2
@ -785,11 +789,8 @@ nsLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName,
default:
aFontName = mDefaultFontName;
aFontStyle = mDefaultFontStyle;
break;
return true;
}
// Scale the font for the current monitor
aFontStyle.size *= aDevPixPerCSSPixel;
return true;
}
void

30
widget/gtk/nsNativeThemeGTK.cpp
View File

@ -59,23 +59,6 @@ NS_IMPL_ISUPPORTS_INHERITED(nsNativeThemeGTK, nsNativeTheme, nsITheme,
static int gLastGdkError;
// Return scale factor of the monitor where the window is located
// by the most part.
static inline double
GetThemeDpiScaleFactor(nsIFrame* aFrame)
{
nsIWidget* rootWidget = aFrame->PresContext()->GetRootWidget();
if (rootWidget) {
// We need to use GetDefaultScale() despite it return monitor scale
// factor multiplied by font scale factor because it is the scale which
// is updated in nsPuppetWidget.
// Since we don't want to apply font scale factor for UI elements
// (because GTK does not do so) we need to remove that from returned value.
return rootWidget->GetDefaultScale().scale / gfxPlatformGtk::GetFontScaleFactor();
}
return 1.0;
}
nsNativeThemeGTK::nsNativeThemeGTK()
{
if (moz_gtk_init() != MOZ_GTK_SUCCESS) {
@ -1062,7 +1045,7 @@ nsNativeThemeGTK::GetExtraSizeForWidget(nsIFrame* aFrame, uint8_t aWidgetType,
default:
return false;
}
gint scale = GetThemeDpiScaleFactor(aFrame);
gint scale = ScreenHelperGTK::GetGTKMonitorScaleFactor();
aExtra->top *= scale;
aExtra->right *= scale;
aExtra->bottom *= scale;
@ -1090,7 +1073,7 @@ nsNativeThemeGTK::DrawWidgetBackground(gfxContext* aContext,
gfxRect rect = presContext->AppUnitsToGfxUnits(aRect);
gfxRect dirtyRect = presContext->AppUnitsToGfxUnits(aDirtyRect);
gint scaleFactor = GetThemeDpiScaleFactor(aFrame);
gint scaleFactor = ScreenHelperGTK::GetGTKMonitorScaleFactor();
// Align to device pixels where sensible
// to provide crisper and faster drawing.
@ -1336,7 +1319,7 @@ nsNativeThemeGTK::GetWidgetBorder(nsDeviceContext* aContext, nsIFrame* aFrame,
}
}
gint scale = GetThemeDpiScaleFactor(aFrame);
gint scale = ScreenHelperGTK::GetGTKMonitorScaleFactor();
aResult->top *= scale;
aResult->right *= scale;
aResult->bottom *= scale;
@ -1394,7 +1377,7 @@ nsNativeThemeGTK::GetWidgetPadding(nsDeviceContext* aContext,
aResult->left += horizontal_padding;
aResult->right += horizontal_padding;
gint scale = GetThemeDpiScaleFactor(aFrame);
gint scale = ScreenHelperGTK::GetGTKMonitorScaleFactor();
aResult->top *= scale;
aResult->right *= scale;
aResult->bottom *= scale;
@ -1615,7 +1598,8 @@ nsNativeThemeGTK::GetMinimumWidgetSize(nsPresContext* aPresContext,
// box model may consider border and padding with child minimum sizes.
nsIntMargin border;
GetCachedWidgetBorder(aFrame, aWidgetType, GetTextDirection(aFrame), &border);
nsNativeThemeGTK::GetWidgetBorder(aFrame->PresContext()->DeviceContext(),
aFrame, aWidgetType, &border);
aResult->width += border.left + border.right;
aResult->height += border.top + border.bottom;
}
@ -1667,7 +1651,7 @@ nsNativeThemeGTK::GetMinimumWidgetSize(nsPresContext* aPresContext,
break;
}
*aResult = *aResult * GetThemeDpiScaleFactor(aFrame);
*aResult = *aResult * ScreenHelperGTK::GetGTKMonitorScaleFactor();
return NS_OK;
}