rpms/firefox
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated hiDPI patch to upstream version (mozbz#975919)

Browse Source
This commit is contained in:
Martin Stransky 2015-01-22 13:14:52 +01:00
parent fb99c01350
commit 59628a9fe8
2 changed files with 107 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firefox.spec
View File

@ -107,7 +107,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 35.0 Version: 35.0
Release: 6%{?pre_tag}%{?dist} Release: 7%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -312,7 +312,7 @@ cd %{tarballdir}
%patch410 -p1 -b .1073117-button-focus %patch410 -p1 -b .1073117-button-focus
%patch411 -p1 -b .1073117-focus-sizes %patch411 -p1 -b .1073117-focus-sizes
%patch412 -p1 -b .1073117-no-gap-tab %patch412 -p1 -b .1073117-no-gap-tab
%patch413 -p1 -b .975919-gtk3-hidpi %patch413 -p2 -b .975919-gtk3-hidpi
%endif %endif
%if %{official_branding} %if %{official_branding}
@ -766,6 +766,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Thu Jan 22 2015 Martin Stransky <stransky@redhat.com> - 35.0-7
- Updated hiDPI patch to upstream version (mozbz#975919)
* Thu Jan 22 2015 Martin Stransky <stransky@redhat.com> - 35.0-6 * Thu Jan 22 2015 Martin Stransky <stransky@redhat.com> - 35.0-6
- Disabled flash by default because of 0day live flash exploit - Disabled flash by default because of 0day live flash exploit
(see https://isc.sans.edu/diary/Flash+0-Day+Exploit+Used+by+Angler+Exploit+Kit/19213) (see https://isc.sans.edu/diary/Flash+0-Day+Exploit+Used+by+Angler+Exploit+Kit/19213)

309
mozilla-975919-gtk3-hidpi.patch
View File

@ -1,162 +1,45 @@
diff -up mozilla-release/widget/gtk/nsGtkUtils.h.975919-gtk3-hidpi mozilla-release/widget/gtk/nsGtkUtils.h diff -up firefox-35.0/mozilla-release/widget/gtk/nsLookAndFeel.cpp.975919-gtk3-hidpi firefox-35.0/mozilla-release/widget/gtk/nsLookAndFeel.cpp
--- mozilla-release/widget/gtk/nsGtkUtils.h.975919-gtk3-hidpi 2015-01-09 05:38:28.000000000 +0100 --- firefox-35.0/mozilla-release/widget/gtk/nsLookAndFeel.cpp.975919-gtk3-hidpi 2015-01-22 13:06:41.099114353 +0100
+++ mozilla-release/widget/gtk/nsGtkUtils.h 2015-01-19 18:43:30.101191071 +0100 +++ firefox-35.0/mozilla-release/widget/gtk/nsLookAndFeel.cpp 2015-01-22 13:06:41.118114478 +0100
@@ -9,6 +9,7 @@ @@ -22,6 +22,9 @@
#define nsGtkUtils_h__ #include "gtkdrawing.h"
#include "nsStyleConsts.h"
#include <glib.h> #include "gfxFontConstants.h"
+
+#include <dlfcn.h> +#include <dlfcn.h>
+
#include "mozilla/gfx/2D.h"
// Some gobject functions expect functions for gpointer arguments. using mozilla::LookAndFeel;
// gpointer is void* but C++ doesn't like casting functions to void*. @@ -733,6 +736,16 @@ GetSystemFontInfo(GtkWidget *aWidget,
diff -up mozilla-release/widget/gtk/nsLookAndFeel.cpp.975919-gtk3-hidpi mozilla-release/widget/gtk/nsLookAndFeel.cpp
--- mozilla-release/widget/gtk/nsLookAndFeel.cpp.975919-gtk3-hidpi 2015-01-19 18:43:30.081191055 +0100
+++ mozilla-release/widget/gtk/nsLookAndFeel.cpp 2015-01-20 13:16:48.005399364 +0100
@@ -7,6 +7,7 @@
// for strtod()
#include <stdlib.h>
+#include <dlfcn.h>
#include "nsLookAndFeel.h"
@@ -733,6 +734,17 @@ GetSystemFontInfo(GtkWidget *aWidget,
size *= float(gfxPlatformGtk::GetDPI()) / POINTS_PER_INCH_FLOAT; size *= float(gfxPlatformGtk::GetDPI()) / POINTS_PER_INCH_FLOAT;
} }
+ // Scale fonts up on HiDPI displays. + // Scale fonts up on HiDPI displays.
+ // This would be done automatically with cairo, but we manually manage + // This would be done automatically with cairo, but we manually manage
+ // the display scale for platform consistency. + // the display scale for platform consistency.
+ static gint (*GdkScreenGetMonitorScaleFactorPtr)(GdkScreen*,gint) = + static auto sGdkScreenGetMonitorScaleFactorPtr = (gint (*)(GdkScreen*,gint))
+ (gint (*)(GdkScreen*,gint)) dlsym(RTLD_DEFAULT, + dlsym(RTLD_DEFAULT, "gdk_screen_get_monitor_scale_factor");
+ "gdk_screen_get_monitor_scale_factor"); + if (sGdkScreenGetMonitorScaleFactorPtr) {
+ if (GdkScreenGetMonitorScaleFactorPtr) {
+ GdkScreen *screen = gdk_screen_get_default(); + GdkScreen *screen = gdk_screen_get_default();
+ size *= (*GdkScreenGetMonitorScaleFactorPtr)(screen, 0); + size *= (*sGdkScreenGetMonitorScaleFactorPtr)(screen, 0);
+ } + }
+ +
// |size| is now pixels // |size| is now pixels
aFontStyle->size = size; aFontStyle->size = size;
diff -up mozilla-release/widget/gtk/nsScreenGtk.cpp.975919-gtk3-hidpi mozilla-release/widget/gtk/nsScreenGtk.cpp diff -up firefox-35.0/mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi firefox-35.0/mozilla-release/widget/gtk/nsWindow.cpp
--- mozilla-release/widget/gtk/nsScreenGtk.cpp.975919-gtk3-hidpi 2015-01-09 05:38:28.000000000 +0100 --- firefox-35.0/mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi 2015-01-22 13:06:41.101114366 +0100
+++ mozilla-release/widget/gtk/nsScreenGtk.cpp 2015-01-19 18:43:30.102191072 +0100 +++ firefox-35.0/mozilla-release/widget/gtk/nsWindow.cpp 2015-01-22 13:08:08.152683204 +0100
@@ -11,10 +11,10 @@ @@ -10,6 +10,7 @@
#include <X11/Xatom.h> #include "mozilla/MouseEvents.h"
#endif #include "mozilla/TextEvents.h"
#include <gtk/gtk.h> #include <algorithm>
+#include <dlfcn.h> +#include <dlfcn.h>
static uint32_t sScreenId = 0; #include "prlink.h"
#include "nsGTKToolkit.h"
- @@ -471,6 +472,9 @@ nsWindow::DispatchEvent(WidgetGUIEvent*
nsScreenGtk :: nsScreenGtk ( )
: mScreenNum(0),
mRect(0, 0, 0, 0),
@@ -40,6 +40,37 @@ nsScreenGtk :: GetId(uint32_t *aId)
NS_IMETHODIMP
nsScreenGtk :: GetRect(int32_t *outLeft, int32_t *outTop, int32_t *outWidth, int32_t *outHeight)
{
+ double scale;
+ GetContentsScaleFactor(&scale);
+
+ *outLeft = NSToIntRound(mRect.x * scale);
+ *outTop = NSToIntRound(mRect.y * scale);
+ *outWidth = NSToIntRound(mRect.width * scale);
+ *outHeight = NSToIntRound(mRect.height * scale);
+
+ return NS_OK;
+
+} // GetRect
+
+
+NS_IMETHODIMP
+nsScreenGtk :: GetAvailRect(int32_t *outLeft, int32_t *outTop, int32_t *outWidth, int32_t *outHeight)
+{
+ double scale;
+ GetContentsScaleFactor(&scale);
+
+ *outLeft = NSToIntRound(mAvailRect.x * scale);
+ *outTop = NSToIntRound(mAvailRect.y * scale);
+ *outWidth = NSToIntRound(mAvailRect.width * scale);
+ *outHeight = NSToIntRound(mAvailRect.height * scale);
+
+ return NS_OK;
+
+} // GetAvailRect
+
+NS_IMETHODIMP
+nsScreenGtk :: GetRectDisplayPix(int32_t *outLeft, int32_t *outTop, int32_t *outWidth, int32_t *outHeight)
+{
*outLeft = mRect.x;
*outTop = mRect.y;
*outWidth = mRect.width;
@@ -47,11 +78,11 @@ nsScreenGtk :: GetRect(int32_t *outLeft,
return NS_OK;
-} // GetRect
+} // GetRectDisplayPix
NS_IMETHODIMP
-nsScreenGtk :: GetAvailRect(int32_t *outLeft, int32_t *outTop, int32_t *outWidth, int32_t *outHeight)
+nsScreenGtk :: GetAvailRectDisplayPix(int32_t *outLeft, int32_t *outTop, int32_t *outWidth, int32_t *outHeight)
{
*outLeft = mAvailRect.x;
*outTop = mAvailRect.y;
@@ -60,7 +91,7 @@ nsScreenGtk :: GetAvailRect(int32_t *out
return NS_OK;
-} // GetAvailRect
+} // GetAvailRectDisplayPix
NS_IMETHODIMP
@@ -82,6 +113,23 @@ nsScreenGtk :: GetColorDepth(int32_t *aC
} // GetColorDepth
+NS_IMETHODIMP
+nsScreenGtk :: GetContentsScaleFactor(double* aContentsScaleFactor)
+{
+ static gint (*GdkScreenGetMonitorScaleFactorPtr)(GdkScreen*,gint) =
+ (gint (*)(GdkScreen*,gint)) dlsym(RTLD_DEFAULT,
+ "gdk_screen_get_monitor_scale_factor");
+ if (GdkScreenGetMonitorScaleFactorPtr) {
+ GdkScreen *screen = gdk_screen_get_default();
+ *aContentsScaleFactor = (*GdkScreenGetMonitorScaleFactorPtr)
+ (screen, mScreenNum);
+ } else {
+ *aContentsScaleFactor = 1;
+ }
+ return NS_OK;
+}
+
+
void
nsScreenGtk :: Init (GdkWindow *aRootWindow)
{
diff -up mozilla-release/widget/gtk/nsScreenGtk.h.975919-gtk3-hidpi mozilla-release/widget/gtk/nsScreenGtk.h
--- mozilla-release/widget/gtk/nsScreenGtk.h.975919-gtk3-hidpi 2015-01-09 05:38:28.000000000 +0100
+++ mozilla-release/widget/gtk/nsScreenGtk.h 2015-01-19 18:43:30.102191072 +0100
@@ -33,8 +33,11 @@ public:
NS_IMETHOD GetId(uint32_t* aId);
NS_IMETHOD GetRect(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
NS_IMETHOD GetAvailRect(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
+ NS_IMETHOD GetRectDisplayPix(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
+ NS_IMETHOD GetAvailRectDisplayPix(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
NS_IMETHOD GetPixelDepth(int32_t* aPixelDepth);
NS_IMETHOD GetColorDepth(int32_t* aColorDepth);
+ NS_IMETHOD GetContentsScaleFactor(double* aContentsScaleFactor);
void Init(GdkWindow *aRootWindow);
#ifdef MOZ_X11
diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-release/widget/gtk/nsWindow.cpp
--- mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi 2015-01-19 18:43:30.084191057 +0100
+++ mozilla-release/widget/gtk/nsWindow.cpp 2015-01-19 18:43:30.104191074 +0100
@@ -471,6 +471,9 @@ nsWindow::DispatchEvent(WidgetGUIEvent*
debug_DumpEvent(stdout, aEvent->widget, aEvent, debug_DumpEvent(stdout, aEvent->widget, aEvent,
nsAutoCString("something"), 0); nsAutoCString("something"), 0);
#endif #endif
@ -166,7 +49,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
aStatus = nsEventStatus_eIgnore; aStatus = nsEventStatus_eIgnore;
nsIWidgetListener* listener = nsIWidgetListener* listener =
@@ -729,6 +732,12 @@ nsWindow::GetDPI() @@ -729,6 +733,12 @@ nsWindow::GetDPI()
return float(DisplayHeight(dpy, defaultScreen)/heightInches); return float(DisplayHeight(dpy, defaultScreen)/heightInches);
} }
@ -179,7 +62,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
NS_IMETHODIMP NS_IMETHODIMP
nsWindow::SetParent(nsIWidget *aNewParent) nsWindow::SetParent(nsIWidget *aNewParent)
{ {
@@ -827,8 +836,9 @@ nsWindow::ReparentNativeWidgetInternal(n @@ -827,8 +837,9 @@ nsWindow::ReparentNativeWidgetInternal(n
} }
if (!mIsTopLevel) { if (!mIsTopLevel) {
@ -191,7 +74,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
} }
} }
@@ -863,26 +873,26 @@ NS_IMETHODIMP @@ -863,26 +874,26 @@ NS_IMETHODIMP
nsWindow::ConstrainPosition(bool aAllowSlop, int32_t *aX, int32_t *aY) nsWindow::ConstrainPosition(bool aAllowSlop, int32_t *aX, int32_t *aY)
{ {
if (mIsTopLevel && mShell) { if (mIsTopLevel && mShell) {
@ -228,7 +111,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
} }
} }
return NS_OK; return NS_OK;
@@ -895,10 +905,14 @@ void nsWindow::SetSizeConstraints(const @@ -895,10 +906,14 @@ void nsWindow::SetSizeConstraints(const
if (mShell) { if (mShell) {
GdkGeometry geometry; GdkGeometry geometry;
@ -240,14 +123,14 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
+ mSizeConstraints.mMinSize.width); + mSizeConstraints.mMinSize.width);
+ geometry.min_height = DevicePixelsToGdkCoordRoundUp( + geometry.min_height = DevicePixelsToGdkCoordRoundUp(
+ mSizeConstraints.mMinSize.height); + mSizeConstraints.mMinSize.height);
+ geometry.max_width = DevicePixelsToGdkCoordRoundUp( + geometry.max_width = DevicePixelsToGdkCoordRoundDown(
+ mSizeConstraints.mMaxSize.width); + mSizeConstraints.mMaxSize.width);
+ geometry.max_height = DevicePixelsToGdkCoordRoundUp( + geometry.max_height = DevicePixelsToGdkCoordRoundDown(
+ mSizeConstraints.mMaxSize.height); + mSizeConstraints.mMaxSize.height);
uint32_t hints = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE; uint32_t hints = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE;
gtk_window_set_geometry_hints(GTK_WINDOW(mShell), nullptr, gtk_window_set_geometry_hints(GTK_WINDOW(mShell), nullptr,
@@ -1161,11 +1175,13 @@ nsWindow::Move(double aX, double aY) @@ -1161,11 +1176,13 @@ nsWindow::Move(double aX, double aY)
mNeedsMove = false; mNeedsMove = false;
@ -263,7 +146,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
} }
NotifyRollupGeometryChange(); NotifyRollupGeometryChange();
@@ -1432,7 +1448,7 @@ nsWindow::GetScreenBounds(nsIntRect &aRe @@ -1432,7 +1449,7 @@ nsWindow::GetScreenBounds(nsIntRect &aRe
// use the point including window decorations // use the point including window decorations
gint x, y; gint x, y;
gdk_window_get_root_origin(gtk_widget_get_window(GTK_WIDGET(mContainer)), &x, &y); gdk_window_get_root_origin(gtk_widget_get_window(GTK_WIDGET(mContainer)), &x, &y);
@ -272,7 +155,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
} }
else { else {
aRect.MoveTo(WidgetToScreenOffset()); aRect.MoveTo(WidgetToScreenOffset());
@@ -1602,17 +1618,12 @@ nsWindow::Invalidate(const nsIntRect &aR @@ -1602,17 +1619,12 @@ nsWindow::Invalidate(const nsIntRect &aR
if (!mGdkWindow) if (!mGdkWindow)
return NS_OK; return NS_OK;
@ -292,7 +175,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
return NS_OK; return NS_OK;
} }
@@ -1750,7 +1761,7 @@ nsWindow::WidgetToScreenOffset() @@ -1750,7 +1762,7 @@ nsWindow::WidgetToScreenOffset()
gdk_window_get_origin(mGdkWindow, &x, &y); gdk_window_get_origin(mGdkWindow, &x, &y);
} }
@ -301,7 +184,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
} }
NS_IMETHODIMP NS_IMETHODIMP
@@ -2042,7 +2053,9 @@ nsWindow::OnExposeEvent(cairo_t *cr) @@ -2042,7 +2054,9 @@ nsWindow::OnExposeEvent(cairo_t *cr)
return FALSE; return FALSE;
} }
@ -312,7 +195,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
ClientLayerManager *clientLayers = ClientLayerManager *clientLayers =
(GetLayerManager()->GetBackendType() == LayersBackend::LAYERS_CLIENT) (GetLayerManager()->GetBackendType() == LayersBackend::LAYERS_CLIENT)
@@ -2382,21 +2395,24 @@ nsWindow::OnSizeAllocate(GtkAllocation * @@ -2382,21 +2396,24 @@ nsWindow::OnSizeAllocate(GtkAllocation *
(void *)this, aAllocation->x, aAllocation->y, (void *)this, aAllocation->x, aAllocation->y,
aAllocation->width, aAllocation->height)); aAllocation->width, aAllocation->height));
@ -342,7 +225,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
gdk_window_invalidate_rect(mGdkWindow, &rect, FALSE); gdk_window_invalidate_rect(mGdkWindow, &rect, FALSE);
} }
@@ -3848,14 +3864,17 @@ nsWindow::SetWindowClass(const nsAString @@ -3848,14 +3865,17 @@ nsWindow::SetWindowClass(const nsAString
void void
nsWindow::NativeResize(int32_t aWidth, int32_t aHeight, bool aRepaint) nsWindow::NativeResize(int32_t aWidth, int32_t aHeight, bool aRepaint)
{ {
@ -362,7 +245,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
} }
else if (mContainer) { else if (mContainer) {
GtkWidget *widget = GTK_WIDGET(mContainer); GtkWidget *widget = GTK_WIDGET(mContainer);
@@ -3863,12 +3882,12 @@ nsWindow::NativeResize(int32_t aWidth, i @@ -3863,12 +3883,12 @@ nsWindow::NativeResize(int32_t aWidth, i
gtk_widget_get_allocation(widget, &prev_allocation); gtk_widget_get_allocation(widget, &prev_allocation);
allocation.x = prev_allocation.x; allocation.x = prev_allocation.x;
allocation.y = prev_allocation.y; allocation.y = prev_allocation.y;
@ -378,7 +261,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
} }
} }
@@ -3877,28 +3896,33 @@ nsWindow::NativeResize(int32_t aX, int32 @@ -3877,28 +3897,33 @@ nsWindow::NativeResize(int32_t aX, int32
int32_t aWidth, int32_t aHeight, int32_t aWidth, int32_t aHeight,
bool aRepaint) bool aRepaint)
{ {
@ -421,36 +304,49 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
} }
} }
@@ -6109,8 +6133,8 @@ nsWindow::GetThebesSurface(cairo_t *cr) @@ -6104,8 +6129,8 @@ nsWindow::GetThebesSurface(cairo_t *cr)
#if (MOZ_WIDGET_GTK == 2)
gdk_drawable_get_size(GDK_DRAWABLE(mGdkWindow), &width, &height);
#else
- width = gdk_window_get_width(mGdkWindow);
- height = gdk_window_get_height(mGdkWindow);
+ width = GdkCoordToDevicePixels(gdk_window_get_width(mGdkWindow));
+ height = GdkCoordToDevicePixels(gdk_window_get_height(mGdkWindow));
#endif #endif
// Owen Taylor says this is the right thing to do! // Owen Taylor says this is the right thing to do!
- width = std::min(32767, width); @@ -6131,25 +6156,11 @@ nsWindow::GetThebesSurface(cairo_t *cr)
- height = std::min(32767, height); if (!usingShm)
+ width = std::min(32767, (int)std::ceil(GdkCoordToDevicePixels(width))); # endif // MOZ_HAVE_SHMIMAGE
+ height = std::min(32767, (int)std::ceil(GdkCoordToDevicePixels(height))); {
gfxIntSize size(width, height); -#if (MOZ_WIDGET_GTK == 3)
-#if MOZ_TREE_CAIRO
-#error "cairo-gtk3 target must be built with --enable-system-cairo"
-#else
- if (cr) {
- cairo_surface_t *surf = cairo_get_target(cr);
- if (cairo_surface_status(surf) != CAIRO_STATUS_SUCCESS) {
- NS_NOTREACHED("Missing cairo target?");
- return nullptr;
- }
- mThebesSurface = gfxASurface::Wrap(surf);
- } else
-#endif
-#endif // (MOZ_WIDGET_GTK == 3)
- mThebesSurface = new gfxXlibSurface
- (GDK_WINDOW_XDISPLAY(mGdkWindow),
- gdk_x11_window_get_xid(mGdkWindow),
- visual,
- size);
+ mThebesSurface = new gfxXlibSurface
+ (GDK_WINDOW_XDISPLAY(mGdkWindow),
+ gdk_x11_window_get_xid(mGdkWindow),
+ visual,
+ size);
}
#endif // MOZ_X11
GdkVisual *gdkVisual = gdk_window_get_visual(mGdkWindow); @@ -6217,6 +6228,8 @@ nsWindow::BeginMoveDrag(WidgetMouseEvent
@@ -6135,8 +6159,17 @@ nsWindow::GetThebesSurface(cairo_t *cr)
#if MOZ_TREE_CAIRO
#error "cairo-gtk3 target must be built with --enable-system-cairo"
#else
+ // Available as of Cairo 1.14
+ static void (*CairoSurfaceSetDeviceScalePtr) (cairo_surface_t*,double,double) =
+ (void (*)(cairo_surface_t*,double,double)) dlsym(RTLD_DEFAULT,
+ "cairo_surface_set_device_scale");
+
if (cr) {
cairo_surface_t *surf = cairo_get_target(cr);
+ if (GdkScaleFactor() > 1) {
+ // Disable auto-scaling on HiDPI devices, let mozilla manage it.
+ (*CairoSurfaceSetDeviceScalePtr)(surf, 1, 1);
+ }
if (cairo_surface_status(surf) != CAIRO_STATUS_SUCCESS) {
NS_NOTREACHED("Missing cairo target?");
return nullptr;
@@ -6217,6 +6250,8 @@ nsWindow::BeginMoveDrag(WidgetMouseEvent
} }
// tell the window manager to start the move // tell the window manager to start the move
@ -459,7 +355,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
gdk_window_begin_move_drag(gdk_window, button, screenX, screenY, gdk_window_begin_move_drag(gdk_window, button, screenX, screenY,
aEvent->time); aEvent->time);
@@ -6308,6 +6343,70 @@ nsWindow::ClearCachedResources() @@ -6308,6 +6321,69 @@ nsWindow::ClearCachedResources()
} }
} }
@ -468,11 +364,10 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
+{ +{
+#if (MOZ_WIDGET_GTK >= 3) +#if (MOZ_WIDGET_GTK >= 3)
+ // Available as of GTK 3.10+ + // Available as of GTK 3.10+
+ static gint (*GdkWindowGetScaleFactorPtr) (GdkWindow*) = + static auto sGdkWindowGetScaleFactorPtr = (gint (*)(GdkWindow*))
+ (gint (*)(GdkWindow*)) dlsym(RTLD_DEFAULT, + dlsym(RTLD_DEFAULT, "gdk_window_get_scale_factor");
+ "gdk_window_get_scale_factor"); + if (sGdkWindowGetScaleFactorPtr)
+ if (GdkWindowGetScaleFactorPtr) + return (*sGdkWindowGetScaleFactorPtr)(mGdkWindow);
+ return (*GdkWindowGetScaleFactorPtr)(mGdkWindow);
+#endif +#endif
+ return 1; + return 1;
+} +}
@ -480,35 +375,35 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
+ +
+gint +gint
+nsWindow::DevicePixelsToGdkCoordRoundUp(int pixels) { +nsWindow::DevicePixelsToGdkCoordRoundUp(int pixels) {
+ return NSToIntCeil(float(pixels)/float(GdkScaleFactor())); + gint scale = GdkScaleFactor();
+ return (pixels + scale - 1) / scale;
+} +}
+ +
+gint +gint
+nsWindow::DevicePixelsToGdkCoordRoundDown(int pixels) { +nsWindow::DevicePixelsToGdkCoordRoundDown(int pixels) {
+ return NSToIntFloor(float(pixels)/float(GdkScaleFactor())); + gint scale = GdkScaleFactor();
+ return pixels / scale;
+} +}
+ +
+GdkPoint +GdkPoint
+nsWindow::DevicePixelsToGdkPointRoundDown(nsIntPoint point) { +nsWindow::DevicePixelsToGdkPointRoundDown(nsIntPoint point) {
+ float scale = GdkScaleFactor(); + gint scale = GdkScaleFactor();
+ return { NSToIntFloor(float(point.x)/scale), + return { point.x / scale, point.y / scale };
+ NSToIntFloor(float(point.y)/scale) };
+} +}
+ +
+GdkRectangle +GdkRectangle
+nsWindow::DevicePixelsToGdkRectRoundOut(nsIntRect rect) { +nsWindow::DevicePixelsToGdkRectRoundOut(nsIntRect rect) {
+ gint scale = GdkScaleFactor(); + gint scale = GdkScaleFactor();
+ nsIntRect scaledRect = rect; + int x = rect.x / scale;
+ scaledRect.ScaleInverseRoundOut(scale); + int y = rect.y / scale;
+ return { scaledRect.x, + int right = (rect.x + rect.width + scale - 1) / scale;
+ scaledRect.y, + int bottom = (rect.y + rect.height + scale - 1) / scale;
+ scaledRect.width, + return { x, y, right - x, bottom - y };
+ scaledRect.height };
+} +}
+ +
+int +int
+nsWindow::GdkCoordToDevicePixels(gint coords) { +nsWindow::GdkCoordToDevicePixels(gint coord) {
+ return coords * GdkScaleFactor(); + return coord * GdkScaleFactor();
+} +}
+ +
+nsIntPoint +nsIntPoint
@ -530,9 +425,9 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.975919-gtk3-hidpi mozilla-relea
nsresult nsresult
nsWindow::SynthesizeNativeMouseEvent(nsIntPoint aPoint, nsWindow::SynthesizeNativeMouseEvent(nsIntPoint aPoint,
uint32_t aNativeMessage, uint32_t aNativeMessage,
diff -up mozilla-release/widget/gtk/nsWindow.h.975919-gtk3-hidpi mozilla-release/widget/gtk/nsWindow.h diff -up firefox-35.0/mozilla-release/widget/gtk/nsWindow.h.975919-gtk3-hidpi firefox-35.0/mozilla-release/widget/gtk/nsWindow.h
--- mozilla-release/widget/gtk/nsWindow.h.975919-gtk3-hidpi 2015-01-09 05:38:28.000000000 +0100 --- firefox-35.0/mozilla-release/widget/gtk/nsWindow.h.975919-gtk3-hidpi 2015-01-09 05:38:28.000000000 +0100
+++ mozilla-release/widget/gtk/nsWindow.h 2015-01-19 18:43:30.104191074 +0100 +++ firefox-35.0/mozilla-release/widget/gtk/nsWindow.h 2015-01-22 13:07:51.064571540 +0100
@@ -97,6 +97,7 @@ public: @@ -97,6 +97,7 @@ public:
NS_IMETHOD Destroy(void); NS_IMETHOD Destroy(void);
virtual nsIWidget *GetParent(); virtual nsIWidget *GetParent();
@ -556,7 +451,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.h.975919-gtk3-hidpi mozilla-release
+ GdkRectangle DevicePixelsToGdkRectRoundOut(nsIntRect rect); + GdkRectangle DevicePixelsToGdkRectRoundOut(nsIntRect rect);
+ +
+ // From GDK + // From GDK
+ int GdkCoordToDevicePixels(gint coords); + int GdkCoordToDevicePixels(gint coord);
+ nsIntPoint GdkPointToDevicePixels(GdkPoint point); + nsIntPoint GdkPointToDevicePixels(GdkPoint point);
+ nsIntRect GdkRectToDevicePixels(GdkRectangle rect); + nsIntRect GdkRectToDevicePixels(GdkRectangle rect);
}; };