diff --git a/firefox.spec b/firefox.spec index 2ee0c51..8a17cf5 100644 --- a/firefox.spec +++ b/firefox.spec @@ -276,7 +276,7 @@ cd %{tarballdir} %patch425 -p1 -b .1192243 %patch426 -p1 -b .1180971 %patch427 -p1 -b .1190935 -%patch428 -p1 -b .1205045 +#%patch428 -p1 -b .1205045 %endif %patch500 -p1 @@ -770,8 +770,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Tue Sep 22 2015 Martin Stransky - 41.0-4 -- Added OMTC stability patches - (mozbz#1180971, mozbz#1190935, mozbz#1205045) +- Added OMTC stability patches (mozbz#1180971, mozbz#1190935) * Thu Sep 17 2015 Martin Stransky - 41.0-3 - Update to 40.0 Build 3 diff --git a/mozilla-1205045.patch b/mozilla-1205045.patch index 8672742..9574772 100644 --- a/mozilla-1205045.patch +++ b/mozilla-1205045.patch @@ -1,6 +1,6 @@ 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:30:27.551051763 +0200 ++++ mozilla-release/gfx/layers/basic/BasicCompositor.cpp 2015-09-22 12:57:51.047938671 +0200 @@ -509,11 +509,11 @@ BasicCompositor::BeginFrame(const nsIntR } @@ -17,8 +17,8 @@ diff -up mozilla-release/gfx/layers/basic/BasicCompositor.cpp.1205045 mozilla-re 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:30:27.547051758 +0200 -+++ mozilla-release/widget/gtk/nsWindow.cpp 2015-09-22 12:37:16.149573664 +0200 +--- 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 @@ -145,7 +145,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.1205045 mozilla-release/widget/ + return dt.forget(); +} + -+already_AddRefed ++TemporaryRef +nsWindow::StartRemoteDrawingInRegion(nsIntRegion& aInvalidRegion) +{ + return GetDrawTarget(aInvalidRegion); @@ -229,7 +229,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.cpp.1205045 mozilla-release/widget/ 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:30:27.553051766 +0200 ++++ mozilla-release/widget/gtk/nsWindow.h 2015-09-22 12:57:51.049938673 +0200 @@ -195,7 +195,7 @@ public: gpointer aData); @@ -244,7 +244,7 @@ diff -up mozilla-release/widget/gtk/nsWindow.h.1205045 mozilla-release/widget/gt nsresult UpdateTranslucentWindowAlphaInternal(const nsIntRect& aRect, uint8_t* aAlphas, int32_t aStride); - virtual gfxASurface *GetThebesSurface(); -+ virtual already_AddRefed GetDrawTarget(const nsIntRegion& aRegion); ++ virtual mozilla::TemporaryRef GetDrawTarget(const nsIntRegion& aRegion); #if (MOZ_WIDGET_GTK == 2) static already_AddRefed GetSurfaceForGdkDrawable(GdkDrawable* aDrawable, @@ -270,12 +270,12 @@ diff -up mozilla-release/widget/gtk/nsWindow.h.1205045 mozilla-release/widget/gt nsRefPtr 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 12:30:27.554051767 +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 StartRemoteDrawing() = 0; -+ virtual already_AddRefed StartRemoteDrawingInRegion(nsIntRegion& aInvalidRegion) { ++ virtual mozilla::TemporaryRef StartRemoteDrawingInRegion(nsIntRegion& aInvalidRegion) { + return StartRemoteDrawing(); + } @@ -283,7 +283,7 @@ diff -up mozilla-release/widget/nsIWidget.h.1205045 mozilla-release/widget/nsIWi * 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:30:27.554051767 +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" @@ -496,7 +496,7 @@ diff -up mozilla-release/widget/nsShmImage.cpp.1205045 mozilla-release/widget/ns #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:30:27.555051768 +0200 ++++ mozilla-release/widget/nsShmImage.h 2015-09-22 12:57:51.051938675 +0200 @@ -15,8 +15,8 @@ #ifdef MOZ_HAVE_SHMIMAGE