Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ad249ff48dd14430ebf0bfef0afea9205db6618f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ad249ff48dd14430ebf0bfef0afea9205db6618f)
  • Date: Mon, 24 Apr 2023 22:48:34 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:


http/firefox/patches/0032-bmo-1826583-dont-crash-on-wayland-log-handler.patch
| 27 ---
http/firefox/patches/0033-bmo-1827429-wayland-window-is-visible.patch
| 42 -----
http/firefox/patches/0036-bmo-1827950-bitmap-font-issue.patch
| 73 ----------
3 files changed, 142 deletions(-)

New commits:
commit ad249ff48dd14430ebf0bfef0afea9205db6618f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: dropped unneded patches

diff --git
a/http/firefox/patches/0032-bmo-1826583-dont-crash-on-wayland-log-handler.patch

b/http/firefox/patches/0032-bmo-1826583-dont-crash-on-wayland-log-handler.patch
deleted file mode 100644
index 6be16ab..0000000
---
a/http/firefox/patches/0032-bmo-1826583-dont-crash-on-wayland-log-handler.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/widget/gtk/nsWaylandDisplay.cpp
b/widget/gtk/nsWaylandDisplay.cpp
---- a/widget/gtk/nsWaylandDisplay.cpp
-+++ b/widget/gtk/nsWaylandDisplay.cpp
-@@ -288,19 +288,19 @@
-
- bool nsWaylandDisplay::Matches(wl_display* aDisplay) {
- return mThreadId == PR_GetCurrentThread() && aDisplay == mDisplay;
- }
-
--static void WlCrashHandler(const char* format, va_list args) {
-- MOZ_CRASH_UNSAFE(g_strdup_vprintf(format, args));
-+static void WlLogHandler(const char* format, va_list args) {
-+ vfprintf(stderr, format, args);
- }
-
- nsWaylandDisplay::nsWaylandDisplay(wl_display* aDisplay)
- : mThreadId(PR_GetCurrentThread()), mDisplay(aDisplay) {
- // GTK sets the log handler on display creation, thus we overwrite it here
- // in a similar fashion
-- wl_log_set_handler_client(WlCrashHandler);
-+ wl_log_set_handler_client(WlLogHandler);
-
- wl_registry* registry = wl_display_get_registry(mDisplay);
- wl_registry_add_listener(registry, &registry_listener, this);
- if (!NS_IsMainThread()) {
- mEventQueue = wl_display_create_queue(mDisplay);
-
diff --git
a/http/firefox/patches/0033-bmo-1827429-wayland-window-is-visible.patch
b/http/firefox/patches/0033-bmo-1827429-wayland-window-is-visible.patch
deleted file mode 100644
index 0524355..0000000
--- a/http/firefox/patches/0033-bmo-1827429-wayland-window-is-visible.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-
-# HG changeset patch
-# User stransky <stransky AT redhat.com>
-# Date 1681291030 0
-# Node ID a559fcdcfccf1089673f431a9e8133e888365a7b
-# Parent d553eb2d6e15839e4cafa9fcf537d9f3d0bc1c82
-Bug 1827429 [Wayland] Call NotifyOcclusionState(OcclusionState::VISIBLE)
from nsWindow::OnExposeEvent() as we know the window is visible r=emilio
a=pascalc
-
-Differential Revision: https://phabricator.services.mozilla.com/D175138
-
-diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
---- a/widget/gtk/nsWindow.cpp
-+++ b/widget/gtk/nsWindow.cpp
-@@ -3724,20 +3724,25 @@ void nsWindow::CreateCompositorVsyncDisp
- LOG_VSYNC(" create CompositorVsyncDispatcher()");
- mCompositorVsyncDispatcher =
- new CompositorVsyncDispatcher(mWaylandVsyncDispatcher);
- }
- }
- #endif
-
- gboolean nsWindow::OnExposeEvent(cairo_t* cr) {
-+ // This might destroy us.
-+ NotifyOcclusionState(OcclusionState::VISIBLE);
-+ if (mIsDestroyed) {
-+ return FALSE;
-+ }
-+
- // Send any pending resize events so that layout can update.
-- // May run event loop.
-+ // May run event loop and destroy us.
- MaybeDispatchResized();
--
- if (mIsDestroyed) {
- return FALSE;
- }
-
- // Windows that are not visible will be painted after they become visible.
- if (!mGdkWindow || !mHasMappedToplevel) {
- return FALSE;
- }
-
diff --git a/http/firefox/patches/0036-bmo-1827950-bitmap-font-issue.patch
b/http/firefox/patches/0036-bmo-1827950-bitmap-font-issue.patch
deleted file mode 100644
index dc07cb6..0000000
--- a/http/firefox/patches/0036-bmo-1827950-bitmap-font-issue.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-
-# HG changeset patch
-# User Jonathan Kew <jkew AT mozilla.com>
-# Date 1681473245 0
-# Node ID 80b83057f86ba261009ac5cfcf18d200365b6013
-# Parent c251ad7af1d1de2e7642d09349129e3896db20ed
-Bug 1827950 - Don't attempt to use font extents if we didn't get a valid
'head' table, or if it's not an sfnt resource. r=lsalzman, a=dsmith
-
-Differential Revision: https://phabricator.services.mozilla.com/D175391
-
-diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
---- a/gfx/thebes/gfxFont.cpp
-+++ b/gfx/thebes/gfxFont.cpp
-@@ -2465,17 +2465,25 @@ void gfxFont::Draw(const gfxTextRun* aTe
- }
- } else {
- fontParams.synBoldOnePixelOffset = 0;
- fontParams.extraStrikes = 0;
- }
-
- // Figure out the maximum extents for the font, accounting for synthetic
- // oblique and bold.
-- fontParams.fontExtents =
GetFontEntry()->GetFontExtents(mFUnitsConvFactor);
-+ if (mFUnitsConvFactor > 0.0) {
-+ fontParams.fontExtents =
GetFontEntry()->GetFontExtents(mFUnitsConvFactor);
-+ } else {
-+ // Was it not an sfnt? Maybe on Linux... use arbitrary huge extents, so
we
-+ // don't inadvertently clip stuff. A bit less efficient than true
extents,
-+ // but this should be extremely rare.
-+ auto size = GetAdjustedSize();
-+ fontParams.fontExtents = Rect(-2 * size, -2 * size, 5 * size, 5 * size);
-+ }
- if (fontParams.obliqueSkew != 0.0f) {
- gfx::Point p(fontParams.fontExtents.x, fontParams.fontExtents.y);
- gfx::Matrix skew(1, 0, fontParams.obliqueSkew, 1, 0, 0);
- fontParams.fontExtents = skew.TransformBounds(fontParams.fontExtents);
- }
- if (fontParams.extraStrikes) {
- if (fontParams.isVerticalFont) {
- fontParams.fontExtents.height +=
-diff --git a/gfx/thebes/gfxFontEntry.cpp b/gfx/thebes/gfxFontEntry.cpp
---- a/gfx/thebes/gfxFontEntry.cpp
-+++ b/gfx/thebes/gfxFontEntry.cpp
-@@ -279,21 +279,24 @@ uint16_t gfxFontEntry::UnitsPerEm() {
- if (!mUnitsPerEm) {
- AutoTable headTable(this, TRUETYPE_TAG('h', 'e', 'a', 'd'));
- if (headTable) {
- uint32_t len;
- const HeadTable* head =
- reinterpret_cast<const HeadTable*>(hb_blob_get_data(headTable,
&len));
- if (len >= sizeof(HeadTable)) {
- mUnitsPerEm = head->unitsPerEm;
-+ if (int16_t(head->xMax) > int16_t(head->xMin) &&
-+ int16_t(head->yMax) > int16_t(head->yMin)) {
-+ mXMin = head->xMin;
-+ mYMin = head->yMin;
-+ mXMax = head->xMax;
-+ mYMax = head->yMax;
-+ }
- }
-- mXMin = head->xMin;
-- mYMin = head->yMin;
-- mXMax = head->xMax;
-- mYMax = head->yMax;
- }
-
- // if we didn't find a usable 'head' table, or if the value was
- // outside the valid range, record it as invalid
- if (mUnitsPerEm < kMinUPEM || mUnitsPerEm > kMaxUPEM) {
- mUnitsPerEm = kInvalidUPEM;
- }
- }
-



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ad249ff48dd14430ebf0bfef0afea9205db6618f), Pavel Vinogradov, 04/24/2023

Archive powered by MHonArc 2.6.24.

Top of Page