rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 42.0 - WIP

Browse Source
This commit is contained in:
Martin Stransky 2015-10-29 15:27:54 +01:00
parent fab1500216
commit f80b8f8cef
8 changed files with 30 additions and 803 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -164,3 +164,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-41.0.1-20150930.tar.xz /firefox-langpacks-41.0.1-20150930.tar.xz
/firefox-41.0.2.source.tar.xz /firefox-41.0.2.source.tar.xz
/firefox-langpacks-41.0.2-20151015.tar.xz /firefox-langpacks-41.0.2-20151015.tar.xz
/firefox-42.0.source.tar.xz
/firefox-langpacks-42.0-20151029.tar.xz

12
firefox-nspr.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up firefox-42.0/firefox-42.0/configure.in.old firefox-42.0/firefox-42.0/configure.in
--- firefox-42.0/firefox-42.0/configure.in.old 2015-10-27 01:10:02.000000000 +0100
+++ firefox-42.0/firefox-42.0/configure.in 2015-10-29 11:56:49.779827023 +0100
@@ -53,7 +53,7 @@ dnl ====================================
MOZJPEG=62
MOZPNG=10617
NSPR_VERSION=4
-NSPR_MINVER=4.10.10
+NSPR_MINVER=4.10.8
NSS_VERSION=3
dnl Set the minimum version of toolkit libs used by mozilla

30
firefox.spec
View File

@ -71,7 +71,7 @@
%global mozappdir %{_libdir}/%{name} %global mozappdir %{_libdir}/%{name}
%global mozappdirdev %{_libdir}/%{name}-devel-%{version} %global mozappdirdev %{_libdir}/%{name}-devel-%{version}
%global langpackdir %{mozappdir}/langpacks %global langpackdir %{mozappdir}/langpacks
%global tarballdir mozilla-release %global tarballdir %{name}-%{version}
%define official_branding 1 %define official_branding 1
%define build_langpacks 1 %define build_langpacks 1
@ -85,14 +85,14 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 41.0.2 Version: 42.0
Release: 2%{?pre_tag}%{?dist} Release: 1%{?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
Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks} %if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20151015.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20151029.tar.xz
%endif %endif
Source10: firefox-mozconfig Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js Source12: firefox-redhat-default-prefs.js
@ -114,6 +114,7 @@ Patch20: firefox-build-prbool.patch
Patch21: firefox-ppc64le.patch Patch21: firefox-ppc64le.patch
Patch24: firefox-debug.patch Patch24: firefox-debug.patch
Patch25: rhbz-1219542-s390-build.patch Patch25: rhbz-1219542-s390-build.patch
Patch26: firefox-nspr.patch
# Fedora specific patches # Fedora specific patches
# Unable to install addons from https pages # Unable to install addons from https pages
@ -126,11 +127,7 @@ Patch221: firefox-fedora-ua.patch
# Upstream patches # Upstream patches
# Gtk3 upstream patches # Gtk3 upstream patches
Patch420: mozilla-1160154.patch
Patch425: mozilla-1192243.patch Patch425: mozilla-1192243.patch
Patch426: mozilla-1180971.patch
Patch427: mozilla-1190935.patch
Patch428: mozilla-1205045.patch
# Fix Skia Neon stuff on AArch64 # Fix Skia Neon stuff on AArch64
Patch500: aarch64-fix-skia.patch Patch500: aarch64-fix-skia.patch
@ -253,11 +250,12 @@ cd %{tarballdir}
%patch18 -p2 -b .jemalloc-ppc %patch18 -p2 -b .jemalloc-ppc
%patch19 -p2 -b .s390-inlines %patch19 -p2 -b .s390-inlines
%patch20 -p1 -b .prbool %patch20 -p1 -b .prbool
%patch21 -p2 -b .ppc64le #%patch21 -p2 -b .ppc64le
%patch24 -p1 -b .debug #%patch24 -p1 -b .debug
%ifarch s390 %ifarch s390
%patch25 -p1 -b .rhbz-1219542-s390 %patch25 -p1 -b .rhbz-1219542-s390
%endif %endif
%patch26 -p2 -b .nspr
%patch3 -p2 -b .arm %patch3 -p2 -b .arm
@ -267,19 +265,15 @@ cd %{tarballdir}
%patch204 -p2 -b .966424 %patch204 -p2 -b .966424
%patch215 -p1 -b .addons %patch215 -p1 -b .addons
%patch219 -p2 -b .rhbz-1173156 %patch219 -p2 -b .rhbz-1173156
%patch220 -p1 -b .rhbz-1014858 #%patch220 -p1 -b .rhbz-1014858
%patch221 -p2 -b .fedora-ua %patch221 -p2 -b .fedora-ua
# Upstream patches # Upstream patches
%if %{toolkit_gtk3} %if %{toolkit_gtk3}
%patch420 -p1 -b .1160154
%patch425 -p1 -b .1192243 %patch425 -p1 -b .1192243
%patch426 -p1 -b .1180971
%patch427 -p1 -b .1190935
#%patch428 -p1 -b .1205045
%endif %endif
%patch500 -p1 #%patch500 -p1
%{__rm} -f .mozconfig %{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig %{__cp} %{SOURCE10} .mozconfig
@ -748,6 +742,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{mozappdir}/browser/crashreporter-override.ini %{mozappdir}/browser/crashreporter-override.ini
%endif %endif
%{mozappdir}/*.so %{mozappdir}/*.so
%{mozappdir}/gtk2/*.so
%{mozappdir}/chrome.manifest %{mozappdir}/chrome.manifest
%{mozappdir}/components %{mozappdir}/components
%{mozappdir}/defaults/pref/channel-prefs.js %{mozappdir}/defaults/pref/channel-prefs.js
@ -769,6 +764,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Thu Oct 29 2015 Martin Stransky <stransky@redhat.com> - 42.0-1
- Update to 42.0
* Thu Oct 15 2015 Petr Jasicek <pjasicek@redhat.com> - 41.0.2-2 * Thu Oct 15 2015 Petr Jasicek <pjasicek@redhat.com> - 41.0.2-2
- Added private browsing action to desktop file - rhbz#1262564 - Added private browsing action to desktop file - rhbz#1262564

115
mozilla-1160154.patch
View File

@ -1,115 +0,0 @@
# HG changeset patch
# Parent 3a4bfa5d2d026f7d3fbfd0f87663b87b5caa9344
# User Petr Jasicek <pjasicek@redhat.com>
Bug 1160154 - Decrease padding between icons in the personal toolbar with Gtk3 by using "image-button" css style class. r=karlt
diff --git a/widget/gtk/gtk3drawing.c b/widget/gtk/gtk3drawing.c
--- a/widget/gtk/gtk3drawing.c
+++ b/widget/gtk/gtk3drawing.c
@@ -2629,26 +2629,35 @@ moz_gtk_get_widget_border(GtkThemeWidget
gboolean inhtml)
{
GtkWidget* w;
GtkStyleContext* style;
*left = *top = *right = *bottom = 0;
switch (widget) {
case MOZ_GTK_BUTTON:
+ case MOZ_GTK_TOOLBAR_BUTTON:
{
ensure_button_widget();
style = gtk_widget_get_style_context(gButtonWidget);
*left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(gButtonWidget));
/* Don't add this padding in HTML, otherwise the buttons will
become too big and stuff the layout. */
if (!inhtml) {
+ if (widget == MOZ_GTK_TOOLBAR_BUTTON) {
+ gtk_style_context_save(style);
+ gtk_style_context_add_class(style, "image-button");
+ }
+
moz_gtk_add_style_padding(style, left, top, right, bottom);
+
+ if (widget == MOZ_GTK_TOOLBAR_BUTTON)
+ gtk_style_context_restore(style);
}
moz_gtk_add_style_border(style, left, top, right, bottom);
return MOZ_GTK_SUCCESS;
}
case MOZ_GTK_ENTRY:
{
ensure_entry_widget();
@@ -3081,16 +3090,17 @@ moz_gtk_widget_paint(GtkThemeWidgetType
GtkTextDirection direction)
{
/* A workaround for https://bugzilla.gnome.org/show_bug.cgi?id=694086
*/
cairo_new_path(cr);
switch (widget) {
case MOZ_GTK_BUTTON:
+ case MOZ_GTK_TOOLBAR_BUTTON:
if (state->depressed) {
ensure_toggle_button_widget();
return moz_gtk_button_paint(cr, rect, state,
(GtkReliefStyle) flags,
gToggleButtonWidget, direction);
}
ensure_button_widget();
return moz_gtk_button_paint(cr, rect, state,
diff --git a/widget/gtk/gtkdrawing.h b/widget/gtk/gtkdrawing.h
--- a/widget/gtk/gtkdrawing.h
+++ b/widget/gtk/gtkdrawing.h
@@ -84,16 +84,18 @@ typedef gint (*style_prop_t)(GtkStyle*,
/*** checkbox/radio flags ***/
#define MOZ_GTK_WIDGET_CHECKED 1
#define MOZ_GTK_WIDGET_INCONSISTENT (1 << 1)
/*** widget type constants ***/
typedef enum {
/* Paints a GtkButton. flags is a GtkReliefStyle. */
MOZ_GTK_BUTTON,
+ /* Paints a button with image and no text */
+ MOZ_GTK_TOOLBAR_BUTTON,
/* Paints a GtkCheckButton. flags is a boolean, 1=checked, 0=not checked. */
MOZ_GTK_CHECKBUTTON,
/* Paints a GtkRadioButton. flags is a boolean, 1=checked, 0=not checked. */
MOZ_GTK_RADIOBUTTON,
/**
* Paints the button of a GtkScrollbar. flags is a GtkArrowType giving
* the arrow direction.
*/
diff --git a/widget/gtk/nsNativeThemeGTK.cpp b/widget/gtk/nsNativeThemeGTK.cpp
--- a/widget/gtk/nsNativeThemeGTK.cpp
+++ b/widget/gtk/nsNativeThemeGTK.cpp
@@ -386,21 +386,25 @@ nsNativeThemeGTK::GetGtkWidgetAndState(u
*aWidgetFlags = CheckBooleanAttr(aFrame, nsGkAtoms::parentfocused);
}
}
}
}
switch (aWidgetType) {
case NS_THEME_BUTTON:
+ if (aWidgetFlags)
+ *aWidgetFlags = GTK_RELIEF_NORMAL;
+ aGtkWidgetType = MOZ_GTK_BUTTON;
+ break;
case NS_THEME_TOOLBAR_BUTTON:
case NS_THEME_TOOLBAR_DUAL_BUTTON:
if (aWidgetFlags)
- *aWidgetFlags = (aWidgetType == NS_THEME_BUTTON) ? GTK_RELIEF_NORMAL : GTK_RELIEF_NONE;
- aGtkWidgetType = MOZ_GTK_BUTTON;
+ *aWidgetFlags = GTK_RELIEF_NONE;
+ aGtkWidgetType = MOZ_GTK_TOOLBAR_BUTTON;
break;
case NS_THEME_FOCUS_OUTLINE:
aGtkWidgetType = MOZ_GTK_ENTRY;
break;
case NS_THEME_CHECKBOX:
case NS_THEME_RADIO:
aGtkWidgetType = (aWidgetType == NS_THEME_RADIO) ? MOZ_GTK_RADIOBUTTON : MOZ_GTK_CHECKBUTTON;
break;

50
mozilla-1180971.patch
View File

@ -1,50 +0,0 @@
# HG changeset patch
# User Andrew Comminos <acomminos@mozilla.com>
Bug 1180971 - Fix X11 SHM invalidation regions on HiDPI with GTK3. r=karlt
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
index 19b634e..064116c 100644
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -2264,17 +2264,17 @@ nsWindow::OnExposeEvent(cairo_t *cr)
ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
ctx->SetPattern(pattern);
ctx->Paint();
}
}
}
# ifdef MOZ_HAVE_SHMIMAGE
if (mShmImage && MOZ_LIKELY(!mIsDestroyed)) {
- mShmImage->Put(mGdkWindow, exposeRegion);
+ mShmImage->Put(mGdkWindow, region);
}
# endif // MOZ_HAVE_SHMIMAGE
#endif // MOZ_X11
listener->DidPaintWindow();
// Synchronously flush any new dirty areas
#if (MOZ_WIDGET_GTK == 2)
@@ -6173,21 +6173,16 @@ nsWindow::EndRemoteDrawingInRegion(DrawTarget* aDrawTarget, nsIntRegion& aInvali
if (!mGdkWindow || mIsFullyObscured || !mHasMappedToplevel || mIsDestroyed ||
!mShmImage)
return;
if (mThebesSurface) {
aInvalidRegion.AndWith(nsIntRect(nsIntPoint(0, 0), mThebesSurface->GetSize()));
}
- gint scale = GdkScaleFactor();
- if (scale != 1) {
- aInvalidRegion.ScaleInverseRoundOut(scale, scale);
- }
-
mShmImage->Put(mGdkWindow, aInvalidRegion);
# endif // MOZ_HAVE_SHMIMAGE
#endif // MOZ_X11
}
// return the gfxASurface for rendering to this widget
gfxASurface*

33
mozilla-1190935.patch
View File

@ -1,33 +0,0 @@
# HG changeset patch
# User Lee Salzman <lsalzman@mozilla.com>
# Date 1438873323 14400
# Thu Aug 06 11:02:03 2015 -0400
# Node ID 9ad90210cc51eb61d21230086b9acf5c8003aea0
# Parent abc56d57f6e1aebade48949fb557d26eae555df8
fix race condition in gtk window EndRemoteDrawingInRegion
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -6203,19 +6203,19 @@ nsWindow::StartRemoteDrawing()
}
}
void
nsWindow::EndRemoteDrawingInRegion(DrawTarget* aDrawTarget, nsIntRegion& aInvalidRegion)
{
#ifdef MOZ_X11
# ifdef MOZ_HAVE_SHMIMAGE
- if (!mGdkWindow || mIsFullyObscured || !mHasMappedToplevel || mIsDestroyed ||
- !mShmImage)
+ if (!mGdkWindow || !mShmImage) {
return;
+ }
if (mThebesSurface) {
aInvalidRegion.AndWith(nsIntRect(nsIntPoint(0, 0), mThebesSurface->GetSize()));
}
mShmImage->Put(mGdkWindow, aInvalidRegion);
# endif // MOZ_HAVE_SHMIMAGE

587
mozilla-1205045.patch
View File

@ -1,587 +0,0 @@
diff -up mozilla-release/gfx/layers/basic/BasicCompositor.cpp.1205045 mozilla-release/gfx/layers/basic/BasicCompositor.cpp
--- mozilla-release/gfx/layers/basic/BasicCompositor.cpp.1205045 2015-09-18 00:13:31.000000000 +0200
+++ mozilla-release/gfx/layers/basic/BasicCompositor.cpp 2015-09-22 12:57:51.047938671 +0200
@@ -509,11 +509,11 @@ BasicCompositor::BeginFrame(const nsIntR
}
if (mTarget) {
- // If we have a copy target, then we don't have a widget-provided mDrawTarget (currently). Create a dummy
+ // If we have a copy target, then we don't have a widget-provided mDrawTarget (currently). Use a dummy
// placeholder so that CreateRenderTarget() works.
- mDrawTarget = gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget(IntSize(1,1), SurfaceFormat::B8G8R8A8);
+ mDrawTarget = gfxPlatform::GetPlatform()->ScreenReferenceDrawTarget();
} else {
- mDrawTarget = mWidget->StartRemoteDrawing();
+ mDrawTarget = mWidget->StartRemoteDrawingInRegion(mInvalidRegion);
}
if (!mDrawTarget) {
return;
diff -up mozilla-release/widget/gtk/nsWindow.cpp.1205045 mozilla-release/widget/gtk/nsWindow.cpp
--- mozilla-release/widget/gtk/nsWindow.cpp.1205045 2015-09-22 12:57:51.043938667 +0200
+++ mozilla-release/widget/gtk/nsWindow.cpp 2015-09-22 12:57:51.049938673 +0200
@@ -351,6 +351,11 @@ nsWindow::nsWindow()
#ifdef MOZ_X11
mOldFocusWindow = 0;
+
+ mXDisplay = nullptr;
+ mXWindow = None;
+ mXVisual = nullptr;
+ mXDepth = 0;
#endif /* MOZ_X11 */
mPluginType = PluginType_NONE;
@@ -649,10 +654,6 @@ nsWindow::Destroy(void)
gPluginFocusWindow->LoseNonXEmbedPluginFocus();
}
#endif /* MOZ_X11 && MOZ_WIDGET_GTK2 */
-
- // Destroy thebes surface now. Badness can happen if we destroy
- // the surface after its X Window.
- mThebesSurface = nullptr;
GtkWidget *owningWidget = GetMozContainerWidget();
if (mShell) {
@@ -2069,7 +2070,13 @@ ExtractExposeRegion(nsIntRegion& aRegion
#if (MOZ_WIDGET_GTK == 2)
gboolean
-nsWindow::OnExposeEvent(GdkEventExpose *aEvent)
+nsWindow::
+
+
+
+
+
+Event(GdkEventExpose *aEvent)
#else
gboolean
nsWindow::OnExposeEvent(cairo_t *cr)
@@ -2191,7 +2198,7 @@ nsWindow::OnExposeEvent(cairo_t *cr)
return TRUE;
}
- RefPtr<DrawTarget> dt = StartRemoteDrawing();
+ RefPtr<DrawTarget> dt = GetDrawTarget(region);
if(!dt) {
return FALSE;
}
@@ -2269,8 +2276,8 @@ nsWindow::OnExposeEvent(cairo_t *cr)
}
}
# ifdef MOZ_HAVE_SHMIMAGE
- if (mShmImage && MOZ_LIKELY(!mIsDestroyed)) {
- mShmImage->Put(mGdkWindow, region);
+ if (mShmImage && MOZ_LIKELY(!mIsDestroyed)) {
+ mShmImage->Put(mXDisplay, mXWindow, region);
}
# endif // MOZ_HAVE_SHMIMAGE
#endif // MOZ_X11
@@ -3818,9 +3825,12 @@ nsWindow::Create(nsIWidget *aPare
#ifdef MOZ_X11
if (mGdkWindow) {
- // force creation of native window via internal call to gdk_window_ensure_native
- // in case it was not created already
- gdk_x11_window_get_xid(mGdkWindow);
+ mXDisplay = GDK_WINDOW_XDISPLAY(mGdkWindow);
+ mXWindow = gdk_x11_window_get_xid(mGdkWindow);
+
+ GdkVisual* gdkVisual = gdk_window_get_visual(mGdkWindow);
+ mXVisual = gdk_x11_visual_get_xvisual(gdkVisual);
+ mXDepth = gdk_visual_get_depth(gdkVisual);
}
#endif
@@ -6155,31 +6165,42 @@ nsWindow::GetSurfaceForGdkDrawable(GdkDr
#endif
TemporaryRef<DrawTarget>
-nsWindow::StartRemoteDrawing()
+nsWindow::GetDrawTarget(const nsIntRegion& aRegion)
{
- gfxASurface *surf = GetThebesSurface();
- if (!surf) {
+ if (!mGdkWindow) {
return nullptr;
}
- nsIntSize size = surf->GetSize();
+ nsIntRect bounds = aRegion.GetBounds();
+ IntSize size(bounds.XMost(), bounds.YMost());
if (size.width <= 0 || size.height <= 0) {
return nullptr;
}
- gfxPlatform *platform = gfxPlatform::GetPlatform();
- if (platform->SupportsAzureContentForType(BackendType::CAIRO) ||
- surf->GetType() == gfxSurfaceType::Xlib) {
- return platform->CreateDrawTargetForSurface(surf, size);
- } else if (platform->SupportsAzureContentForType(BackendType::SKIA) &&
- surf->GetType() == gfxSurfaceType::Image) {
- gfxImageSurface* imgSurf = static_cast<gfxImageSurface*>(surf);
- SurfaceFormat format = ImageFormatToSurfaceFormat(imgSurf->Format());
- return platform->CreateDrawTargetForData(
- imgSurf->Data(), size, imgSurf->Stride(), format);
- } else {
- return nullptr;
+ RefPtr<DrawTarget> dt;
+#ifdef MOZ_X11
+# ifdef MOZ_HAVE_SHMIMAGE
+ if (nsShmImage::UseShm()) {
+ dt = nsShmImage::EnsureShmImage(size,
+ mXDisplay, mXVisual, mXDepth,
+ mShmImage);
}
+# endif // MOZ_HAVE_SHMIMAGE
+ if (!dt) {
+ RefPtr<gfxXlibSurface> surf = new gfxXlibSurface(mXDisplay, mXWindow, mXVisual, size);
+ if (!surf->CairoStatus()) {
+ dt = gfxPlatform::GetPlatform()->CreateDrawTargetForSurface(surf.get(), surf->GetSize());
+ }
+ }
+#endif // MOZ_X11
+
+ return dt.forget();
+}
+
+TemporaryRef<DrawTarget>
+nsWindow::StartRemoteDrawingInRegion(nsIntRegion& aInvalidRegion)
+{
+ return GetDrawTarget(aInvalidRegion);
}
void
@@ -6191,73 +6212,11 @@ nsWindow::EndRemoteDrawingInRegion(DrawT
return;
}
- if (mThebesSurface) {
- aInvalidRegion.AndWith(nsIntRect(nsIntPoint(0, 0), mThebesSurface->GetSize()));
- }
-
- mShmImage->Put(mGdkWindow, aInvalidRegion);
-
+ mShmImage->Put(mXDisplay, mXWindow, aInvalidRegion);
# endif // MOZ_HAVE_SHMIMAGE
#endif // MOZ_X11
}
-// return the gfxASurface for rendering to this widget
-gfxASurface*
-nsWindow::GetThebesSurface()
-{
- if (!mGdkWindow)
- return nullptr;
-
-#ifdef MOZ_X11
- gint width, height;
-
-#if (MOZ_WIDGET_GTK == 2)
- gdk_drawable_get_size(GDK_DRAWABLE(mGdkWindow), &width, &height);
-#else
- width = GdkCoordToDevicePixels(gdk_window_get_width(mGdkWindow));
- height = GdkCoordToDevicePixels(gdk_window_get_height(mGdkWindow));
-#endif
-
- // Owen Taylor says this is the right thing to do!
- width = std::min(32767, width);
- height = std::min(32767, height);
- gfxIntSize size(width, height);
-
- GdkVisual *gdkVisual = gdk_window_get_visual(mGdkWindow);
- Visual* visual = gdk_x11_visual_get_xvisual(gdkVisual);
-
-# ifdef MOZ_HAVE_SHMIMAGE
- bool usingShm = false;
- if (nsShmImage::UseShm()) {
- // EnsureShmImage() is a dangerous interface, but we guarantee
- // that the thebes surface and the shmimage have the same
- // lifetime
- mThebesSurface =
- nsShmImage::EnsureShmImage(size,
- visual, gdk_visual_get_depth(gdkVisual),
- mShmImage);
- usingShm = mThebesSurface != nullptr;
- }
- if (!usingShm)
-# endif // MOZ_HAVE_SHMIMAGE
- {
- mThebesSurface = new gfxXlibSurface
- (GDK_WINDOW_XDISPLAY(mGdkWindow),
- gdk_x11_window_get_xid(mGdkWindow),
- visual,
- size);
- }
-#endif // MOZ_X11
-
- // if the surface creation is reporting an error, then
- // we don't have a surface to give back
- if (mThebesSurface && mThebesSurface->CairoStatus() != 0) {
- mThebesSurface = nullptr;
- }
-
- return mThebesSurface;
-}
-
// Code shared begin BeginMoveDrag and BeginResizeDrag
bool
nsWindow::GetDragInfo(WidgetMouseEvent* aMouseEvent,
diff -up mozilla-release/widget/gtk/nsWindow.h.1205045 mozilla-release/widget/gtk/nsWindow.h
--- mozilla-release/widget/gtk/nsWindow.h.1205045 2015-09-18 00:13:31.000000000 +0200
+++ mozilla-release/widget/gtk/nsWindow.h 2015-09-22 12:57:51.049938673 +0200
@@ -195,7 +195,7 @@ public:
gpointer aData);
virtual mozilla::TemporaryRef<mozilla::gfx::DrawTarget>
- StartRemoteDrawing() override;
+ StartRemoteDrawingInRegion(nsIntRegion& aInvalidRegion) override;
virtual void EndRemoteDrawingInRegion(mozilla::gfx::DrawTarget* aDrawTarget,
nsIntRegion& aInvalidRegion) override;
@@ -292,7 +292,7 @@ public:
virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations) override;
nsresult UpdateTranslucentWindowAlphaInternal(const nsIntRect& aRect,
uint8_t* aAlphas, int32_t aStride);
- virtual gfxASurface *GetThebesSurface();
+ virtual mozilla::TemporaryRef<mozilla::gfx::DrawTarget> GetDrawTarget(const nsIntRegion& aRegion);
#if (MOZ_WIDGET_GTK == 2)
static already_AddRefed<gfxASurface> GetSurfaceForGdkDrawable(GdkDrawable* aDrawable,
@@ -393,11 +393,17 @@ private:
guint32 mLastScrollEventTime;
#endif
+#ifdef MOZ_X11
+ Display* mXDisplay;
+ Drawable mXWindow;
+ Visual* mXVisual;
+ int mXDepth;
+#endif
+
#ifdef MOZ_HAVE_SHMIMAGE
- // If we're using xshm rendering, mThebesSurface wraps mShmImage
+ // If we're using xshm rendering
nsRefPtr<nsShmImage> mShmImage;
#endif
- nsRefPtr<gfxASurface> mThebesSurface;
#ifdef ACCESSIBILITY
nsRefPtr<mozilla::a11y::Accessible> mRootAccessible;
diff -up mozilla-release/widget/nsIWidget.h.1205045 mozilla-release/widget/nsIWidget.h
--- mozilla-release/widget/nsIWidget.h.1205045 2015-09-18 00:13:31.000000000 +0200
+++ mozilla-release/widget/nsIWidget.h 2015-09-22 13:24:51.542447323 +0200
@@ -1706,6 +1706,9 @@ class nsIWidget : public nsISupports {
* before each composition.
*/
virtual mozilla::TemporaryRef<mozilla::gfx::DrawTarget> StartRemoteDrawing() = 0;
+ virtual mozilla::TemporaryRef<mozilla::gfx::DrawTarget> StartRemoteDrawingInRegion(nsIntRegion& aInvalidRegion) {
+ return StartRemoteDrawing();
+ }
/**
* Ensure that what was painted into the DrawTarget returned from
diff -up mozilla-release/widget/nsShmImage.cpp.1205045 mozilla-release/widget/nsShmImage.cpp
--- mozilla-release/widget/nsShmImage.cpp.1205045 2015-09-18 00:13:31.000000000 +0200
+++ mozilla-release/widget/nsShmImage.cpp 2015-09-22 12:57:51.050938674 +0200
@@ -15,11 +15,11 @@
#ifdef MOZ_WIDGET_GTK
#include "gfxPlatformGtk.h"
#endif
-#include "gfxImageSurface.h"
#ifdef MOZ_HAVE_SHMIMAGE
using namespace mozilla::ipc;
+using namespace mozilla::gfx;
// If XShm isn't available to our client, we'll try XShm once, fail,
// set this to false and then never try again.
@@ -33,14 +33,25 @@ bool nsShmImage::UseShm()
#endif
}
+#ifdef MOZ_WIDGET_GTK
+static int gShmError = 0;
+
+static int
+TrapShmError(Display* aDisplay, XErrorEvent* aEvent)
+{
+ // store the error code and ignore the error
+ gShmError = aEvent->error_code;
+ return 0;
+}
+#endif
+
already_AddRefed<nsShmImage>
nsShmImage::Create(const gfxIntSize& aSize,
- Visual* aVisual, unsigned int aDepth)
+ Display* aDisplay, Visual* aVisual, unsigned int aDepth)
{
- Display* dpy = DISPLAY();
-
nsRefPtr<nsShmImage> shm = new nsShmImage();
- shm->mImage = XShmCreateImage(dpy, aVisual, aDepth,
+ shm->mDisplay = aDisplay;
+ shm->mImage = XShmCreateImage(aDisplay, aVisual, aDepth,
ZPixmap, nullptr,
&(shm->mInfo),
aSize.width, aSize.height);
@@ -60,17 +71,20 @@ nsShmImage::Create(const gfxIntSize& aSi
shm->mImage->data = static_cast<char*>(shm->mSegment->memory());
shm->mInfo.readOnly = False;
- int xerror = 0;
#if defined(MOZ_WIDGET_GTK)
- gdk_error_trap_push();
- Status attachOk = XShmAttach(dpy, &shm->mInfo);
- XSync(dpy, False);
- xerror = gdk_error_trap_pop();
+ gShmError = 0;
+ XErrorHandler previousHandler = XSetErrorHandler(TrapShmError);
+ Status attachOk = XShmAttach(aDisplay, &shm->mInfo);
+ XSync(aDisplay, False);
+ XSetErrorHandler(previousHandler);
+ if (gShmError) {
+ attachOk = 0;
+ }
#elif defined(MOZ_WIDGET_QT)
- Status attachOk = XShmAttach(dpy, &shm->mInfo);
+ Status attachOk = XShmAttach(aDisplay, &shm->mInfo);
#endif
- if (!attachOk || xerror) {
+ if (!attachOk) {
// Assume XShm isn't available, and don't attempt to use it
// again.
gShmAvailable = false;
@@ -84,7 +98,7 @@ nsShmImage::Create(const gfxIntSize& aSi
if ((shm->mImage->red_mask == 0xff0000) &&
(shm->mImage->green_mask == 0xff00) &&
(shm->mImage->blue_mask == 0xff)) {
- shm->mFormat = gfxImageFormat::ARGB32;
+ shm->mFormat = SurfaceFormat::B8G8R8A8;
break;
}
goto unsupported;
@@ -93,12 +107,13 @@ nsShmImage::Create(const gfxIntSize& aSi
if ((shm->mImage->red_mask == 0xff0000) &&
(shm->mImage->green_mask == 0xff00) &&
(shm->mImage->blue_mask == 0xff)) {
- shm->mFormat = gfxImageFormat::RGB24;
+ shm->mFormat = SurfaceFormat::B8G8R8X8;
break;
}
goto unsupported;
case 16:
- shm->mFormat = gfxImageFormat::RGB16_565; break;
+ shm->mFormat = SurfaceFormat::R5G6B5;
+ break;
unsupported:
default:
NS_WARNING("Unsupported XShm Image format!");
@@ -108,20 +123,19 @@ nsShmImage::Create(const gfxIntSize& aSi
return shm.forget();
}
-already_AddRefed<gfxASurface>
-nsShmImage::AsSurface()
+already_AddRefed<DrawTarget>
+nsShmImage::CreateDrawTarget()
{
- return nsRefPtr<gfxASurface>(
- new gfxImageSurface(static_cast<unsigned char*>(mSegment->memory()),
- mSize,
- mImage->bytes_per_line,
- mFormat)
- ).forget();
+ return gfxPlatform::GetPlatform()->CreateDrawTargetForData(
+ static_cast<unsigned char*>(mSegment->memory()),
+ mSize,
+ mImage->bytes_per_line,
+ mFormat);
}
-#if (MOZ_WIDGET_GTK == 2)
+#ifdef MOZ_WIDGET_GTK
void
-nsShmImage::Put(GdkWindow* aWindow, const nsIntRegion& aRegion)
+nsShmImage::Put(Display* aDisplay, Drawable aWindow, const nsIntRegion& aRegion)
{
GdkDrawable* gd;
gint dx, dy;
@@ -130,45 +144,16 @@ nsShmImage::Put(GdkWindow* aWindow, cons
Display* dpy = gdk_x11_get_default_xdisplay();
Drawable d = GDK_DRAWABLE_XID(gd);
- GC gc = XCreateGC(dpy, d, 0, nullptr);
+ GC gc = XCreateGC(aDisplay, aWindow, 0, nullptr);
nsIntRegionRectIterator iter(aRegion);
for (const nsIntRect *r = iter.Next(); r; r = iter.Next()) {
- XShmPutImage(dpy, d, gc, mImage,
+ XShmPutImage(aDisplay, aWindow, gc, mImage,
r->x, r->y,
- r->x - dx, r->y - dy,
- r->width, r->height,
- False);
- }
- XFreeGC(dpy, gc);
-
- // FIXME/bug 597336: we need to ensure that the shm image isn't
- // scribbled over before all its pending XShmPutImage()s complete.
- // However, XSync() is an unnecessarily heavyweight
- // synchronization mechanism; other options are possible. If this
- // XSync is shown to hurt responsiveness, we need to explore the
- // other options.
- XSync(dpy, False);
-}
-
-#elif (MOZ_WIDGET_GTK == 3)
-void
-nsShmImage::Put(GdkWindow* aWindow, const nsIntRegion& aRegion)
-{
- Display* dpy = gdk_x11_get_default_xdisplay();
- Drawable d = GDK_WINDOW_XID(aWindow);
- int dx = 0, dy = 0;
-
- GC gc = XCreateGC(dpy, d, 0, nullptr);
- nsIntRegionRectIterator iter(aRegion);
- for (const nsIntRect *r = iter.Next(); r; r = iter.Next()) {
- XShmPutImage(dpy, d, gc, mImage,
r->x, r->y,
- r->x - dx, r->y - dy,
r->width, r->height,
False);
}
-
- XFreeGC(dpy, gc);
+ XFreeGC(aDisplay, gc);
// FIXME/bug 597336: we need to ensure that the shm image isn't
// scribbled over before all its pending XShmPutImage()s complete.
@@ -176,7 +161,7 @@ nsShmImage::Put(GdkWindow* aWindow, cons
// synchronization mechanism; other options are possible. If this
// XSync is shown to hurt responsiveness, we need to explore the
// other options.
- XSync(dpy, False);
+ XSync(aDisplay, False);
}
#elif defined(MOZ_WIDGET_QT)
@@ -198,9 +183,10 @@ nsShmImage::Put(QWindow* aWindow, QRect&
}
#endif
-already_AddRefed<gfxASurface>
-nsShmImage::EnsureShmImage(const gfxIntSize& aSize, Visual* aVisual, unsigned int aDepth,
- nsRefPtr<nsShmImage>& aImage)
+already_AddRefed<DrawTarget>
+nsShmImage::EnsureShmImage(const gfxIntSize& aSize,
+ Display* aDisplay, Visual* aVisual, unsigned int aDepth,
+ nsRefPtr<nsShmImage>& aImage)
{
if (!aImage || aImage->Size() != aSize) {
// Because we XSync() after XShmAttach() to trap errors, we
@@ -208,9 +194,9 @@ nsShmImage::EnsureShmImage(const gfxIntS
// into its address space, so it's OK to destroy the old image
// here even if there are outstanding Puts. The Detach is
// ordered after the Puts.
- aImage = nsShmImage::Create(aSize, aVisual, aDepth);
+ aImage = nsShmImage::Create(aSize, aDisplay, aVisual, aDepth);
}
- return !aImage ? nullptr : aImage->AsSurface();
+ return !aImage ? nullptr : aImage->CreateDrawTarget();
}
#endif // defined(MOZ_X11) && defined(MOZ_HAVE_SHAREDMEMORYSYSV)
diff -up mozilla-release/widget/nsShmImage.h.1205045 mozilla-release/widget/nsShmImage.h
--- mozilla-release/widget/nsShmImage.h.1205045 2015-09-18 00:13:31.000000000 +0200
+++ mozilla-release/widget/nsShmImage.h 2015-09-22 12:57:51.051938675 +0200
@@ -15,8 +15,8 @@
#ifdef MOZ_HAVE_SHMIMAGE
+#include "mozilla/gfx/2D.h"
#include "nsIWidget.h"
-#include "gfxTypes.h"
#include "nsAutoPtr.h"
#include "mozilla/X11Util.h"
@@ -24,15 +24,10 @@
#include <X11/Xutil.h>
#include <X11/extensions/XShm.h>
-#if defined(MOZ_WIDGET_GTK)
-#define DISPLAY gdk_x11_get_default_xdisplay
-#elif defined(MOZ_WIDGET_QT)
-#define DISPLAY mozilla::DefaultXDisplay
-#endif
-
+#ifdef MOZ_WIDGET_QT
class QRect;
class QWindow;
-class gfxASurface;
+#endif
class nsShmImage {
// bug 1168843, compositor thread may create shared memory instances that are destroyed by main thread on shutdown, so this must use thread-safe RC to avoid hitting assertion
@@ -41,31 +36,31 @@ class nsShmImage {
typedef mozilla::ipc::SharedMemorySysV SharedMemorySysV;
public:
- typedef gfxImageFormat Format;
-
static bool UseShm();
static already_AddRefed<nsShmImage>
- Create(const gfxIntSize& aSize, Visual* aVisual, unsigned int aDepth);
- static already_AddRefed<gfxASurface>
- EnsureShmImage(const gfxIntSize& aSize, Visual* aVisual, unsigned int aDepth,
+ Create(const gfxIntSize& aSize,
+ Display* aDisplay, Visual* aVisual, unsigned int aDepth);
+ static already_AddRefed<mozilla::gfx::DrawTarget>
+ EnsureShmImage(const gfxIntSize& aSize,
+ Display* aDisplay, Visual* aVisual, unsigned int aDepth,
nsRefPtr<nsShmImage>& aImage);
private:
~nsShmImage() {
if (mImage) {
- mozilla::FinishX(DISPLAY());
+ mozilla::FinishX(mDisplay);
if (mXAttached) {
- XShmDetach(DISPLAY(), &mInfo);
+ XShmDetach(mDisplay, &mInfo);
}
XDestroyImage(mImage);
}
}
public:
- already_AddRefed<gfxASurface> AsSurface();
+ already_AddRefed<mozilla::gfx::DrawTarget> CreateDrawTarget();
#ifdef MOZ_WIDGET_GTK
- void Put(GdkWindow* aWindow, const nsIntRegion& aRegion);
+ void Put(Display* aDisplay, Drawable aWindow, const nsIntRegion& aRegion);
#elif defined(MOZ_WIDGET_QT)
void Put(QWindow* aWindow, QRect& aRect);
#endif
@@ -75,14 +70,17 @@ public:
private:
nsShmImage()
: mImage(nullptr)
+ , mDisplay(nullptr)
+ , mFormat(mozilla::gfx::SurfaceFormat::UNKNOWN)
, mXAttached(false)
{ mInfo.shmid = SharedMemorySysV::NULLHandle(); }
nsRefPtr<SharedMemorySysV> mSegment;
XImage* mImage;
+ Display* mDisplay;
XShmSegmentInfo mInfo;
gfxIntSize mSize;
- Format mFormat;
+ mozilla::gfx::SurfaceFormat mFormat;
bool mXAttached;
};

4
sources
View File

@ -1,2 +1,2 @@
d71f0f761c51aeae03e367001afc9f8d firefox-41.0.2.source.tar.xz 493e983a16dc2bc7a721e1e1457b074e firefox-42.0.source.tar.xz
8363ecb5ca3b26e80b829a714dc5fc84 firefox-langpacks-41.0.2-20151015.tar.xz 58282feac2ca4f2431e969ec5eda5dce firefox-langpacks-42.0-20151029.tar.xz